Merge branch 'cherry-pick-6685381f' into 'dev'

another bulk of composer updates

See merge request hubzilla/core!1781

1 files changed, 47 insertions, 57 deletions

diff --git a/vendor/sabre/dav/lib/CardDAV/Card.php b/vendor/sabre/dav/lib/CardDAV/Card.php
index 42a2d7b6a..1d544f4aa 100644
--- a/vendor/sabre/dav/lib/CardDAV/Card.php
+++ b/vendor/sabre/dav/lib/CardDAV/Card.php
@@ -1,94 +1,96 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
 use Sabre\DAVACL;
 
 /**
- * The Card object represents a single Card from an addressbook
+ * The Card object represents a single Card from an addressbook.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Card extends DAV\File implements ICard, DAVACL\IACL {
-
+class Card extends DAV\File implements ICard, DAVACL\IACL
+{
     use DAVACL\ACLTrait;
 
     /**
-     * CardDAV backend
+     * CardDAV backend.
      *
      * @var Backend\BackendInterface
      */
     protected $carddavBackend;
 
     /**
-     * Array with information about this Card
+     * Array with information about this Card.
      *
      * @var array
      */
     protected $cardData;
 
     /**
-     * Array with information about the containing addressbook
+     * Array with information about the containing addressbook.
      *
      * @var array
      */
     protected $addressBookInfo;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param Backend\BackendInterface $carddavBackend
-     * @param array $addressBookInfo
-     * @param array $cardData
+     * @param array                    $addressBookInfo
+     * @param array                    $cardData
      */
-    function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData) {
-
+    public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData)
+    {
         $this->carddavBackend = $carddavBackend;
         $this->addressBookInfo = $addressBookInfo;
         $this->cardData = $cardData;
-
     }
 
     /**
-     * Returns the uri for this object
+     * Returns the uri for this object.
      *
      * @return string
      */
-    function getName() {
-
+    public function getName()
+    {
         return $this->cardData['uri'];
-
     }
 
     /**
-     * Returns the VCard-formatted object
+     * Returns the VCard-formatted object.
      *
      * @return string
      */
-    function get() {
-
+    public function get()
+    {
         // Pre-populating 'carddata' is optional. If we don't yet have it
         // already, we fetch it from the backend.
         if (!isset($this->cardData['carddata'])) {
             $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
         }
-        return $this->cardData['carddata'];
 
+        return $this->cardData['carddata'];
     }
 
     /**
-     * Updates the VCard-formatted object
+     * Updates the VCard-formatted object.
      *
      * @param string $cardData
+     *
      * @return string|null
      */
-    function put($cardData) {
-
-        if (is_resource($cardData))
+    public function put($cardData)
+    {
+        if (is_resource($cardData)) {
             $cardData = stream_get_contents($cardData);
+        }
 
         // Converting to UTF-8, if needed
         $cardData = DAV\StringUtil::ensureUTF8($cardData);
@@ -98,92 +100,82 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
         $this->cardData['etag'] = $etag;
 
         return $etag;
-
     }
 
     /**
-     * Deletes the card
-     *
-     * @return void
+     * Deletes the card.
      */
-    function delete() {
-
+    public function delete()
+    {
         $this->carddavBackend->deleteCard($this->addressBookInfo['id'], $this->cardData['uri']);
-
     }
 
     /**
-     * Returns the mime content-type
+     * Returns the mime content-type.
      *
      * @return string
      */
-    function getContentType() {
-
+    public function getContentType()
+    {
         return 'text/vcard; charset=utf-8';
-
     }
 
     /**
-     * Returns an ETag for this object
+     * Returns an ETag for this object.
      *
      * @return string
      */
-    function getETag() {
-
+    public function getETag()
+    {
         if (isset($this->cardData['etag'])) {
             return $this->cardData['etag'];
         } else {
             $data = $this->get();
             if (is_string($data)) {
-                return '"' . md5($data) . '"';
+                return '"'.md5($data).'"';
             } else {
                 // We refuse to calculate the md5 if it's a stream.
                 return null;
             }
         }
-
     }
 
     /**
-     * Returns the last modification date as a unix timestamp
+     * Returns the last modification date as a unix timestamp.
      *
      * @return int
      */
-    function getLastModified() {
-
+    public function getLastModified()
+    {
         return isset($this->cardData['lastmodified']) ? $this->cardData['lastmodified'] : null;
-
     }
 
     /**
-     * Returns the size of this object in bytes
+     * Returns the size of this object in bytes.
      *
      * @return int
      */
-    function getSize() {
-
+    public function getSize()
+    {
         if (array_key_exists('size', $this->cardData)) {
             return $this->cardData['size'];
         } else {
             return strlen($this->get());
         }
-
     }
 
     /**
-     * Returns the owner principal
+     * Returns the owner principal.
      *
      * This must be a url to a principal, or null if there's no owner
      *
      * @return string|null
      */
-    function getOwner() {
-
+    public function getOwner()
+    {
         return $this->addressBookInfo['principaluri'];
-
     }
 
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -196,8 +188,8 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
      *
      * @return array
      */
-    function getACL() {
-
+    public function getACL()
+    {
         // An alternative acl may be specified through the cardData array.
         if (isset($this->cardData['acl'])) {
             return $this->cardData['acl'];
@@ -210,7 +202,5 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
                 'protected' => true,
             ],
         ];
-
     }
-
 }