Merge branch '5.0RC'5.0

16 files changed, 13 insertions, 79 deletions

diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBook.php b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
index 434801554..86994f2d5 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBook.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
@@ -36,9 +36,6 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
 
     /**
      * Constructor.
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param array                    $addressBookInfo
      */
     public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo)
     {
@@ -181,8 +178,6 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
      *
      * To update specific properties, call the 'handle' method on this object.
      * Read the PropPatch documentation for more information.
-     *
-     * @param DAV\PropPatch $propPatch
      */
     public function propPatch(DAV\PropPatch $propPatch)
     {
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
index fb03000aa..884e9b24e 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
@@ -39,8 +39,7 @@ class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection,
     /**
      * Constructor.
      *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param string                   $principalUri
+     * @param string $principalUri
      */
     public function __construct(Backend\BackendInterface $carddavBackend, $principalUri)
     {
@@ -152,7 +151,6 @@ class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection,
      * Creates a new address book.
      *
      * @param string $name
-     * @param MkCol  $mkCol
      *
      * @throws DAV\Exception\InvalidResourceType
      */
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php b/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
index 219f98906..ee1721a45 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookRoot.php
@@ -41,9 +41,7 @@ class AddressBookRoot extends DAVACL\AbstractPrincipalCollection
      * actually located in a different path, use the $principalPrefix argument
      * to override this.
      *
-     * @param DAVACL\PrincipalBackend\BackendInterface $principalBackend
-     * @param Backend\BackendInterface                 $carddavBackend
-     * @param string                                   $principalPrefix
+     * @param string $principalPrefix
      */
     public function __construct(DAVACL\PrincipalBackend\BackendInterface $principalBackend, Backend\BackendInterface $carddavBackend, $principalPrefix = 'principals')
     {
@@ -68,8 +66,6 @@ class AddressBookRoot extends DAVACL\AbstractPrincipalCollection
      * at least contain a uri item. Other properties may or may not be
      * supplied by the authentication backend.
      *
-     * @param array $principal
-     *
      * @return \Sabre\DAV\INode
      */
     public function getChildForPrincipal(array $principal)
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php
index 6b041ade4..a900c6256 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php
@@ -26,7 +26,6 @@ abstract class AbstractBackend implements BackendInterface
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $addressBookId
-     * @param array $uris
      *
      * @return array
      */
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
index 804f09a36..6ef34d173 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
@@ -51,8 +51,7 @@ interface BackendInterface
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string               $addressBookId
-     * @param \Sabre\DAV\PropPatch $propPatch
+     * @param string $addressBookId
      */
     public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch);
 
@@ -64,7 +63,6 @@ interface BackendInterface
      *
      * @param string $principalUri
      * @param string $url          just the 'basename' of the url
-     * @param array  $properties
      *
      * @return mixed
      */
@@ -123,7 +121,6 @@ interface BackendInterface
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $addressBookId
-     * @param array $uris
      *
      * @return array
      */
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
index 0659455e5..a33de48de 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
@@ -44,8 +44,6 @@ class PDO extends AbstractBackend implements SyncSupport
 
     /**
      * Sets up the object.
-     *
-     * @param \PDO $pdo
      */
     public function __construct(\PDO $pdo)
     {
@@ -93,8 +91,7 @@ class PDO extends AbstractBackend implements SyncSupport
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string               $addressBookId
-     * @param \Sabre\DAV\PropPatch $propPatch
+     * @param string $addressBookId
      */
     public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch)
     {
@@ -143,7 +140,6 @@ class PDO extends AbstractBackend implements SyncSupport
      *
      * @param string $principalUri
      * @param string $url          just the 'basename' of the url
-     * @param array  $properties
      *
      * @return int Last insert id
      */
@@ -269,7 +265,6 @@ class PDO extends AbstractBackend implements SyncSupport
      * If the backend supports this, it may allow for some speed-ups.
      *
      * @param mixed $addressBookId
-     * @param array $uris
      *
      * @return array
      */
diff --git a/vendor/sabre/dav/lib/CardDAV/Card.php b/vendor/sabre/dav/lib/CardDAV/Card.php
index 1d544f4aa..c9cd2bbf6 100644
--- a/vendor/sabre/dav/lib/CardDAV/Card.php
+++ b/vendor/sabre/dav/lib/CardDAV/Card.php
@@ -41,10 +41,6 @@ class Card extends DAV\File implements ICard, DAVACL\IACL
 
     /**
      * Constructor.
-     *
-     * @param Backend\BackendInterface $carddavBackend
-     * @param array                    $addressBookInfo
-     * @param array                    $cardData
      */
     public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData)
     {
diff --git a/vendor/sabre/dav/lib/CardDAV/Plugin.php b/vendor/sabre/dav/lib/CardDAV/Plugin.php
index 10398a4d2..09d1f593d 100644
--- a/vendor/sabre/dav/lib/CardDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/Plugin.php
@@ -59,8 +59,6 @@ class Plugin extends DAV\ServerPlugin
 
     /**
      * Initializes the plugin.
-     *
-     * @param DAV\Server $server
      */
     public function initialize(DAV\Server $server)
     {
@@ -131,9 +129,6 @@ class Plugin extends DAV\ServerPlugin
 
     /**
      * Adds all CardDAV-specific properties.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode    $node
      */
     public function propFindEarly(DAV\PropFind $propFind, DAV\INode $node)
     {
@@ -267,11 +262,10 @@ class Plugin extends DAV\ServerPlugin
      * This plugin uses this method to ensure that Card nodes receive valid
      * vcard data.
      *
-     * @param string    $path
-     * @param DAV\IFile $node
-     * @param resource  $data
-     * @param bool      $modified should be set to true, if this event handler
-     *                            changed &$data
+     * @param string   $path
+     * @param resource $data
+     * @param bool     $modified should be set to true, if this event handler
+     *                           changed &$data
      */
     public function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified)
     {
@@ -288,11 +282,10 @@ class Plugin extends DAV\ServerPlugin
      * This plugin uses this method to ensure that Card nodes receive valid
      * vcard data.
      *
-     * @param string          $path
-     * @param resource        $data
-     * @param DAV\ICollection $parentNode
-     * @param bool            $modified   should be set to true, if this event handler
-     *                                    changed &$data
+     * @param string   $path
+     * @param resource $data
+     * @param bool     $modified should be set to true, if this event handler
+     *                           changed &$data
      */
     public function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified)
     {
@@ -481,7 +474,6 @@ class Plugin extends DAV\ServerPlugin
      * Validates if a vcard makes it throught a list of filters.
      *
      * @param string $vcardData
-     * @param array  $filters
      * @param string $test      anyof or allof (which means OR or AND)
      *
      * @return bool
@@ -565,8 +557,6 @@ class Plugin extends DAV\ServerPlugin
      *       property. Any subsequence parameters with the same name are
      *       ignored.
      *
-     * @param array  $vProperties
-     * @param array  $filters
      * @param string $test
      *
      * @return bool
@@ -628,8 +618,6 @@ class Plugin extends DAV\ServerPlugin
     /**
      * Validates if a text-filter can be applied to a specific property.
      *
-     * @param array  $texts
-     * @param array  $filters
      * @param string $test
      *
      * @return bool
@@ -672,9 +660,6 @@ class Plugin extends DAV\ServerPlugin
      *
      * This event is scheduled late in the process, after most work for
      * propfind has been done.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode    $node
      */
     public function propFindLate(DAV\PropFind $propFind, DAV\INode $node)
     {
@@ -699,8 +684,7 @@ class Plugin extends DAV\ServerPlugin
      * Sabre\DAV\Browser\Plugin. This allows us to generate an interface users
      * can use to create new addressbooks.
      *
-     * @param DAV\INode $node
-     * @param string    $output
+     * @param string $output
      *
      * @return bool
      */
@@ -727,9 +711,6 @@ class Plugin extends DAV\ServerPlugin
      * This event is triggered after GET requests.
      *
      * This is used to transform data into jCal, if this was requested.
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
      */
     public function httpAfterGet(RequestInterface $request, ResponseInterface $response)
     {
diff --git a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
index 194927c53..431391e04 100644
--- a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
@@ -32,8 +32,6 @@ class VCFExportPlugin extends DAV\ServerPlugin
 
     /**
      * Initializes the plugin and registers event handlers.
-     *
-     * @param DAV\Server $server
      */
     public function initialize(DAV\Server $server)
     {
@@ -49,9 +47,6 @@ class VCFExportPlugin extends DAV\ServerPlugin
     /**
      * Intercepts GET requests on addressbook urls ending with ?export.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     *
      * @return bool
      */
     public function httpGet(RequestInterface $request, ResponseInterface $response)
@@ -112,8 +107,6 @@ class VCFExportPlugin extends DAV\ServerPlugin
     /**
      * Merges all vcard objects, and builds one big vcf export.
      *
-     * @param array $nodes
-     *
      * @return string
      */
     public function generateVCF(array $nodes)
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
index f1b651e76..b60fcebb6 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
@@ -43,8 +43,6 @@ class AddressData implements XmlDeserializable
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param Reader $reader
-     *
      * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
index 2d39dea7f..0a7ec0659 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php
@@ -43,8 +43,6 @@ abstract class ParamFilter implements Element
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param Reader $reader
-     *
      * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
index a22a577c9..5dedac800 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php
@@ -43,8 +43,6 @@ class PropFilter implements XmlDeserializable
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param Reader $reader
-     *
      * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
index 9d0051698..fe5f976a0 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php
@@ -33,8 +33,6 @@ class SupportedAddressData implements XmlSerializable
 
     /**
      * Creates the property.
-     *
-     * @param array|null $supportedData
      */
     public function __construct(array $supportedData = null)
     {
@@ -64,8 +62,6 @@ class SupportedAddressData implements XmlSerializable
      * This allows serializers to be re-used for different element names.
      *
      * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
      */
     public function xmlSerialize(Writer $writer)
     {
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
index 66e451a91..b19eddd9c 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php
@@ -34,8 +34,6 @@ class SupportedCollationSet implements XmlSerializable
      * This allows serializers to be re-used for different element names.
      *
      * If you are opening new elements, you must also close them again.
-     *
-     * @param Writer $writer
      */
     public function xmlSerialize(Writer $writer)
     {
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
index 845796760..c11d2dd73 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
@@ -71,8 +71,6 @@ class AddressBookMultiGetReport implements XmlDeserializable
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param Reader $reader
-     *
      * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
index 0e6f26d38..d3651ae61 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php
@@ -115,8 +115,6 @@ class AddressBookQueryReport implements XmlDeserializable
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @param Reader $reader
-     *
      * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)