another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

1 files changed, 89 insertions, 96 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
index 91de64372..28e328ea6 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
@@ -7,24 +9,24 @@ use Sabre\HTTP;
 
 require_once 'Sabre/HTTP/ResponseMock.php';
 
-class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
-
-    function getServer() {
-
+class ExpandPropertiesTest extends \PHPUnit\Framework\TestCase
+{
+    public function getServer()
+    {
         $tree = [
             new DAV\Mock\PropertiesCollection('node1', [], [
                 '{http://sabredav.org/ns}simple' => 'foo',
-                '{http://sabredav.org/ns}href'   => new DAV\Xml\Property\Href('node2'),
-                '{DAV:}displayname'              => 'Node 1',
+                '{http://sabredav.org/ns}href' => new DAV\Xml\Property\Href('node2'),
+                '{DAV:}displayname' => 'Node 1',
             ]),
             new DAV\Mock\PropertiesCollection('node2', [], [
-                '{http://sabredav.org/ns}simple'   => 'simple',
+                '{http://sabredav.org/ns}simple' => 'simple',
                 '{http://sabredav.org/ns}hreflist' => new DAV\Xml\Property\Href(['node1', 'node3']),
-                '{DAV:}displayname'                => 'Node 2',
+                '{DAV:}displayname' => 'Node 2',
             ]),
             new DAV\Mock\PropertiesCollection('node3', [], [
                 '{http://sabredav.org/ns}simple' => 'simple',
-                '{DAV:}displayname'              => 'Node 3',
+                '{DAV:}displayname' => 'Node 3',
             ]),
         ];
 
@@ -39,7 +41,7 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
             [
                 'principal' => '{DAV:}all',
                 'privilege' => '{DAV:}all',
-            ]
+            ],
         ]);
         $this->assertTrue($plugin instanceof Plugin);
 
@@ -47,11 +49,10 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
 
         return $fakeServer;
-
     }
 
-    function testSimple() {
-
+    public function testSimple()
+    {
         $xml = '<?xml version="1.0"?>
 <d:expand-property xmlns:d="DAV:">
   <d:property name="displayname" />
@@ -62,8 +63,8 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
-            'HTTP_DEPTH'     => '0',
-            'REQUEST_URI'    => '/node1',
+            'HTTP_DEPTH' => '0',
+            'REQUEST_URI' => '/node1',
         ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
@@ -74,22 +75,21 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $server->exec();
 
-        $this->assertEquals(207, $server->httpResponse->status, 'Incorrect status code received. Full body: ' . $server->httpResponse->body);
+        $this->assertEquals(207, $server->httpResponse->status, 'Incorrect status code received. Full body: '.$server->httpResponse->body);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Content-Type' => ['application/xml; charset=utf-8'],
         ], $server->httpResponse->getHeaders());
 
-
         $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response'                                 => 1,
-            '/d:multistatus/d:response/d:href'                          => 1,
-            '/d:multistatus/d:response/d:propstat'                      => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop'               => 2,
+            '/d:multistatus/d:response' => 1,
+            '/d:multistatus/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop' => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:simple'      => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href'        => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:simple' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:href' => 1,
         ];
 
@@ -97,25 +97,24 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $xml->registerXPathNamespace('d', 'DAV:');
         $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
         foreach ($check as $v1 => $v2) {
-
             $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
-            if (!is_int($v1)) $count = $v2;
-
-            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response: ' . $server->httpResponse->body);
+            if (!is_int($v1)) {
+                $count = $v2;
+            }
 
+            $this->assertEquals($count, count($result), 'we expected '.$count.' appearances of '.$xpath.' . We found '.count($result).'. Full response: '.$server->httpResponse->body);
         }
-
     }
 
     /**
      * @depends testSimple
      */
-    function testExpand() {
-
+    public function testExpand()
+    {
         $xml = '<?xml version="1.0"?>
 <d:expand-property xmlns:d="DAV:">
   <d:property name="href" namespace="http://sabredav.org/ns">
@@ -125,8 +124,8 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
-            'HTTP_DEPTH'     => '0',
-            'REQUEST_URI'    => '/node1',
+            'HTTP_DEPTH' => '0',
+            'REQUEST_URI' => '/node1',
         ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
@@ -137,24 +136,23 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $server->exec();
 
-        $this->assertEquals(207, $server->httpResponse->status, 'Incorrect response status received. Full response body: ' . $server->httpResponse->body);
+        $this->assertEquals(207, $server->httpResponse->status, 'Incorrect response status received. Full response body: '.$server->httpResponse->body);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Content-Type' => ['application/xml; charset=utf-8'],
         ], $server->httpResponse->getHeaders());
 
-
         $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response'                                                                     => 1,
-            '/d:multistatus/d:response/d:href'                                                              => 1,
-            '/d:multistatus/d:response/d:propstat'                                                          => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop'                                                   => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href'                                            => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response'                                 => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:href'                          => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat'                      => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop'               => 1,
+            '/d:multistatus/d:response' => 1,
+            '/d:multistatus/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
         ];
 
@@ -162,25 +160,24 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $xml->registerXPathNamespace('d', 'DAV:');
         $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
         foreach ($check as $v1 => $v2) {
-
             $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
-            if (!is_int($v1)) $count = $v2;
-
-            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . ' Full response body: ' . $server->httpResponse->getBodyAsString());
+            if (!is_int($v1)) {
+                $count = $v2;
+            }
 
+            $this->assertEquals($count, count($result), 'we expected '.$count.' appearances of '.$xpath.' . We found '.count($result).' Full response body: '.$server->httpResponse->getBodyAsString());
         }
-
     }
 
     /**
      * @depends testSimple
      */
-    function testExpandHrefList() {
-
+    public function testExpandHrefList()
+    {
         $xml = '<?xml version="1.0"?>
 <d:expand-property xmlns:d="DAV:">
   <d:property name="hreflist" namespace="http://sabredav.org/ns">
@@ -190,8 +187,8 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
-            'HTTP_DEPTH'     => '0',
-            'REQUEST_URI'    => '/node2',
+            'HTTP_DEPTH' => '0',
+            'REQUEST_URI' => '/node2',
         ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
@@ -205,21 +202,20 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(207, $server->httpResponse->status);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Content-Type' => ['application/xml; charset=utf-8'],
         ], $server->httpResponse->getHeaders());
 
-
         $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response'                                                                         => 1,
-            '/d:multistatus/d:response/d:href'                                                                  => 1,
-            '/d:multistatus/d:response/d:propstat'                                                              => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop'                                                       => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist'                                            => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response'                                 => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href'                          => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat'                      => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop'               => 2,
+            '/d:multistatus/d:response' => 1,
+            '/d:multistatus/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
         ];
 
@@ -227,25 +223,24 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $xml->registerXPathNamespace('d', 'DAV:');
         $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
         foreach ($check as $v1 => $v2) {
-
             $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
-            if (!is_int($v1)) $count = $v2;
-
-            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
+            if (!is_int($v1)) {
+                $count = $v2;
+            }
 
+            $this->assertEquals($count, count($result), 'we expected '.$count.' appearances of '.$xpath.' . We found '.count($result));
         }
-
     }
 
     /**
      * @depends testExpand
      */
-    function testExpandDeep() {
-
+    public function testExpandDeep()
+    {
         $xml = '<?xml version="1.0"?>
 <d:expand-property xmlns:d="DAV:">
   <d:property name="hreflist" namespace="http://sabredav.org/ns">
@@ -258,8 +253,8 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
-            'HTTP_DEPTH'     => '0',
-            'REQUEST_URI'    => '/node2',
+            'HTTP_DEPTH' => '0',
+            'REQUEST_URI' => '/node2',
         ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
@@ -273,27 +268,26 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(207, $server->httpResponse->status);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Content-Type' => ['application/xml; charset=utf-8'],
         ], $server->httpResponse->getHeaders());
 
-
         $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response'                                                                                                             => 1,
-            '/d:multistatus/d:response/d:href'                                                                                                      => 1,
-            '/d:multistatus/d:response/d:propstat'                                                                                                  => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop'                                                                                           => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist'                                                                                => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response'                                                                     => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href'                                                              => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat'                                                          => 3,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop'                                                   => 3,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname'                                     => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href'                                            => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response'                                 => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:href'                          => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat'                      => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop'               => 1,
+            '/d:multistatus/d:response' => 1,
+            '/d:multistatus/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 3,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 3,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href' => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
         ];
 
@@ -301,17 +295,16 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $xml->registerXPathNamespace('d', 'DAV:');
         $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
         foreach ($check as $v1 => $v2) {
-
             $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
-            if (!is_int($v1)) $count = $v2;
-
-            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
+            if (!is_int($v1)) {
+                $count = $v2;
+            }
 
+            $this->assertEquals($count, count($result), 'we expected '.$count.' appearances of '.$xpath.' . We found '.count($result));
         }
-
     }
 }