Merge branch '4.6RC'4.6

1 files changed, 32 insertions, 25 deletions

diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
index 18c0c0a99..804f09a36 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CardDAV\Backend;
 
 /**
- * CardDAV Backend Interface
+ * CardDAV Backend Interface.
  *
  * Any CardDAV backend must implement this interface.
  *
@@ -15,8 +17,8 @@ namespace Sabre\CardDAV\Backend;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-interface BackendInterface {
-
+interface BackendInterface
+{
     /**
      * Returns the list of addressbooks for a specific user.
      *
@@ -32,9 +34,10 @@ interface BackendInterface {
      *   {http://calendarserver.org/ns/}getctag
      *
      * @param string $principalUri
+     *
      * @return array
      */
-    function getAddressBooksForUser($principalUri);
+    public function getAddressBooksForUser($principalUri);
 
     /**
      * Updates properties for an address book.
@@ -48,11 +51,10 @@ interface BackendInterface {
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string $addressBookId
+     * @param string               $addressBookId
      * @param \Sabre\DAV\PropPatch $propPatch
-     * @return void
      */
-    function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch);
+    public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch);
 
     /**
      * Creates a new address book.
@@ -61,19 +63,19 @@ interface BackendInterface {
      * in any format, including ints, strings, arrays or objects.
      *
      * @param string $principalUri
-     * @param string $url Just the 'basename' of the url.
-     * @param array $properties
+     * @param string $url          just the 'basename' of the url
+     * @param array  $properties
+     *
      * @return mixed
      */
-    function createAddressBook($principalUri, $url, array $properties);
+    public function createAddressBook($principalUri, $url, array $properties);
 
     /**
-     * Deletes an entire addressbook and all its contents
+     * Deletes an entire addressbook and all its contents.
      *
      * @param mixed $addressBookId
-     * @return void
      */
-    function deleteAddressBook($addressBookId);
+    public function deleteAddressBook($addressBookId);
 
     /**
      * Returns all cards for a specific addressbook id.
@@ -92,9 +94,10 @@ interface BackendInterface {
      * This may speed up certain requests, especially with large cards.
      *
      * @param mixed $addressbookId
+     *
      * @return array
      */
-    function getCards($addressbookId);
+    public function getCards($addressbookId);
 
     /**
      * Returns a specfic card.
@@ -104,11 +107,12 @@ interface BackendInterface {
      *
      * If the card does not exist, you must return false.
      *
-     * @param mixed $addressBookId
+     * @param mixed  $addressBookId
      * @param string $cardUri
+     *
      * @return array
      */
-    function getCard($addressBookId, $cardUri);
+    public function getCard($addressBookId, $cardUri);
 
     /**
      * Returns a list of cards.
@@ -120,9 +124,10 @@ interface BackendInterface {
      *
      * @param mixed $addressBookId
      * @param array $uris
+     *
      * @return array
      */
-    function getMultipleCards($addressBookId, array $uris);
+    public function getMultipleCards($addressBookId, array $uris);
 
     /**
      * Creates a new card.
@@ -144,12 +149,13 @@ interface BackendInterface {
      *
      * If you don't return an ETag, you can just return null.
      *
-     * @param mixed $addressBookId
+     * @param mixed  $addressBookId
      * @param string $cardUri
      * @param string $cardData
+     *
      * @return string|null
      */
-    function createCard($addressBookId, $cardUri, $cardData);
+    public function createCard($addressBookId, $cardUri, $cardData);
 
     /**
      * Updates a card.
@@ -171,20 +177,21 @@ interface BackendInterface {
      *
      * If you don't return an ETag, you can just return null.
      *
-     * @param mixed $addressBookId
+     * @param mixed  $addressBookId
      * @param string $cardUri
      * @param string $cardData
+     *
      * @return string|null
      */
-    function updateCard($addressBookId, $cardUri, $cardData);
+    public function updateCard($addressBookId, $cardUri, $cardData);
 
     /**
-     * Deletes a card
+     * Deletes a card.
      *
-     * @param mixed $addressBookId
+     * @param mixed  $addressBookId
      * @param string $cardUri
+     *
      * @return bool
      */
-    function deleteCard($addressBookId, $cardUri);
-
+    public function deleteCard($addressBookId, $cardUri);
 }