Merge branch '5.0RC'5.0

1 files changed, 7 insertions, 25 deletions

diff --git a/vendor/sabre/dav/lib/DAVACL/Plugin.php b/vendor/sabre/dav/lib/DAVACL/Plugin.php
index c1ea6027c..6f071927d 100644
--- a/vendor/sabre/dav/lib/DAVACL/Plugin.php
+++ b/vendor/sabre/dav/lib/DAVACL/Plugin.php
@@ -214,7 +214,7 @@ class Plugin extends DAV\ServerPlugin
                     $this->server->httpRequest,
                     $this->server->httpResponse
                 );
-                throw new notAuthenticated(implode(', ', $reasons).'. Login was needed for privilege: '.implode(', ', $failed).' on '.$uri);
+                throw new NotAuthenticated(implode(', ', $reasons).'. Login was needed for privilege: '.implode(', ', $failed).' on '.$uri);
             }
             if ($throwExceptions) {
                 throw new NeedPrivileges($uri, $failed);
@@ -269,8 +269,6 @@ class Plugin extends DAV\ServerPlugin
      * Sets the default ACL rules.
      *
      * These rules are used for all nodes that don't implement the IACL interface.
-     *
-     * @param array $acl
      */
     public function setDefaultAcl(array $acl)
     {
@@ -763,8 +761,6 @@ class Plugin extends DAV\ServerPlugin
      * Sets up the plugin.
      *
      * This method is automatically called by the server class.
-     *
-     * @param DAV\Server $server
      */
     public function initialize(DAV\Server $server)
     {
@@ -829,9 +825,6 @@ class Plugin extends DAV\ServerPlugin
 
     /**
      * Triggered before any method is handled.
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
      */
     public function beforeMethod(RequestInterface $request, ResponseInterface $response)
     {
@@ -923,8 +916,7 @@ class Plugin extends DAV\ServerPlugin
     /**
      * Triggered before a node is unlocked.
      *
-     * @param string             $uri
-     * @param DAV\Locks\LockInfo $lock
+     * @param string $uri
      * @TODO: not yet implemented
      */
     public function beforeUnlock($uri, DAV\Locks\LockInfo $lock)
@@ -934,8 +926,6 @@ class Plugin extends DAV\ServerPlugin
     /**
      * Triggered before properties are looked up in specific nodes.
      *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode    $node
      * @TODO really should be broken into multiple methods, or even a class.
      *
      * @return bool
@@ -1044,8 +1034,7 @@ class Plugin extends DAV\ServerPlugin
      * This method intercepts PROPPATCH methods and make sure the
      * group-member-set is updated correctly.
      *
-     * @param string        $path
-     * @param DAV\PropPatch $propPatch
+     * @param string $path
      */
     public function propPatch($path, DAV\PropPatch $propPatch)
     {
@@ -1118,9 +1107,6 @@ class Plugin extends DAV\ServerPlugin
     /**
      * This method is responsible for handling the 'ACL' event.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     *
      * @return bool
      */
     public function httpAcl(RequestInterface $request, ResponseInterface $response)
@@ -1211,8 +1197,7 @@ class Plugin extends DAV\ServerPlugin
      * or a principal URL, the principal URL and principal URLs of groups that
      * principal belongs to.
      *
-     * @param string                           $path
-     * @param Xml\Request\PrincipalMatchReport $report
+     * @param string $path
      */
     protected function principalMatchReport($path, Xml\Request\PrincipalMatchReport $report)
     {
@@ -1434,8 +1419,7 @@ class Plugin extends DAV\ServerPlugin
      * clients to search for groups of principals, based on the value of one
      * or more properties.
      *
-     * @param string                                    $path
-     * @param Xml\Request\PrincipalPropertySearchReport $report
+     * @param string $path
      */
     protected function principalPropertySearchReport($path, Xml\Request\PrincipalPropertySearchReport $report)
     {
@@ -1473,8 +1457,7 @@ class Plugin extends DAV\ServerPlugin
      * is used to for example generate a UI with ACL rules, allowing you
      * to show names for principals for every entry.
      *
-     * @param string                                $path
-     * @param Xml\Request\AclPrincipalPropSetReport $report
+     * @param string $path
      */
     protected function aclPrincipalPropSetReport($path, Xml\Request\AclPrincipalPropSetReport $report)
     {
@@ -1520,8 +1503,7 @@ class Plugin extends DAV\ServerPlugin
      * DAV\Browser\Plugin. This allows us to generate an interface users
      * can use to create new calendars.
      *
-     * @param DAV\INode $node
-     * @param string    $output
+     * @param string $output
      *
      * @return bool
      */