From 580c3f4ffe9608d2beb56d418c68b3b112420e76 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 10 Nov 2019 12:49:51 +0000
Subject: another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
---
 vendor/sabre/dav/lib/DAVACL/Principal.php | 101 +++++++++++++-----------------
 1 file changed, 43 insertions(+), 58 deletions(-)

(limited to 'vendor/sabre/dav/lib/DAVACL/Principal.php')

diff --git a/vendor/sabre/dav/lib/DAVACL/Principal.php b/vendor/sabre/dav/lib/DAVACL/Principal.php
index d7db94999..e2df1c35e 100644
--- a/vendor/sabre/dav/lib/DAVACL/Principal.php
+++ b/vendor/sabre/dav/lib/DAVACL/Principal.php
@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP\URLUtil;
+use Sabre\Uri;
 
 /**
- * Principal class
+ * Principal class.
  *
  * This class is a representation of a simple principal
  *
@@ -20,8 +22,8 @@ use Sabre\HTTP\URLUtil;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
-
+class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL
+{
     use ACLTrait;
 
     /**
@@ -32,93 +34,86 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
     protected $principalProperties;
 
     /**
-     * Principal backend
+     * Principal backend.
      *
      * @var PrincipalBackend\BackendInterface
      */
     protected $principalBackend;
 
     /**
-     * Creates the principal object
+     * Creates the principal object.
      *
      * @param PrincipalBackend\BackendInterface $principalBackend
-     * @param array $principalProperties
+     * @param array                             $principalProperties
      */
-    function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = []) {
-
+    public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = [])
+    {
         if (!isset($principalProperties['uri'])) {
             throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
         }
         $this->principalBackend = $principalBackend;
         $this->principalProperties = $principalProperties;
-
     }
 
     /**
-     * Returns the full principal url
+     * Returns the full principal url.
      *
      * @return string
      */
-    function getPrincipalUrl() {
-
+    public function getPrincipalUrl()
+    {
         return $this->principalProperties['uri'];
-
     }
 
     /**
-     * Returns a list of alternative urls for a principal
+     * Returns a list of alternative urls for a principal.
      *
      * This can for example be an email address, or ldap url.
      *
      * @return array
      */
-    function getAlternateUriSet() {
-
+    public function getAlternateUriSet()
+    {
         $uris = [];
         if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-
             $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-
         }
 
         if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:' . $this->principalProperties['{http://sabredav.org/ns}email-address'];
+            $uris[] = 'mailto:'.$this->principalProperties['{http://sabredav.org/ns}email-address'];
         }
 
         return array_unique($uris);
-
     }
 
     /**
-     * Returns the list of group members
+     * Returns the list of group members.
      *
      * If this principal is a group, this function should return
      * all member principal uri's for the group.
      *
      * @return array
      */
-    function getGroupMemberSet() {
-
+    public function getGroupMemberSet()
+    {
         return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-
     }
 
     /**
-     * Returns the list of groups this principal is member of
+     * Returns the list of groups this principal is member of.
      *
      * If this principal is a member of a (list of) groups, this function
      * should return a list of principal uri's for it's members.
      *
      * @return array
      */
-    function getGroupMembership() {
-
+    public function getGroupMembership()
+    {
         return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-
     }
 
     /**
-     * Sets a list of group members
+     * Sets a list of group members.
      *
      * If this principal is a group, this method sets all the group members.
      * The list of members is always overwritten, never appended to.
@@ -126,12 +121,10 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
      * This method should throw an exception if the members could not be set.
      *
      * @param array $groupMembers
-     * @return void
      */
-    function setGroupMemberSet(array $groupMembers) {
-
+    public function setGroupMemberSet(array $groupMembers)
+    {
         $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-
     }
 
     /**
@@ -139,48 +132,45 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
      *
      * @return string
      */
-    function getName() {
-
+    public function getName()
+    {
         $uri = $this->principalProperties['uri'];
-        list(, $name) = URLUtil::splitPath($uri);
-        return $name;
+        list(, $name) = Uri\split($uri);
 
+        return $name;
     }
 
     /**
-     * Returns the name of the user
+     * Returns the name of the user.
      *
      * @return string
      */
-    function getDisplayName() {
-
+    public function getDisplayName()
+    {
         if (isset($this->principalProperties['{DAV:}displayname'])) {
             return $this->principalProperties['{DAV:}displayname'];
         } else {
             return $this->getName();
         }
-
     }
 
     /**
-     * Returns a list of properties
+     * Returns a list of properties.
      *
      * @param array $requestedProperties
+     *
      * @return array
      */
-    function getProperties($requestedProperties) {
-
+    public function getProperties($requestedProperties)
+    {
         $newProperties = [];
         foreach ($requestedProperties as $propName) {
-
             if (isset($this->principalProperties[$propName])) {
                 $newProperties[$propName] = $this->principalProperties[$propName];
             }
-
         }
 
         return $newProperties;
-
     }
 
     /**
@@ -193,29 +183,24 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
      * Read the PropPatch documentation for more information.
      *
      * @param DAV\PropPatch $propPatch
-     * @return void
      */
-    function propPatch(DAV\PropPatch $propPatch) {
-
+    public function propPatch(DAV\PropPatch $propPatch)
+    {
         return $this->principalBackend->updatePrincipal(
             $this->principalProperties['uri'],
             $propPatch
         );
-
     }
 
     /**
-     * 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->principalProperties['uri'];
-
-
     }
-
 }
-- 
cgit v1.2.3