Merge branch '4.6RC'4.6

5 files changed, 45 insertions, 55 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
index 1cdf2949f..60fb8f3e8 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class AceConflictTest extends \PHPUnit_Framework_TestCase {
-
-    function testSerialize() {
-
+class AceConflictTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSerialize()
+    {
         $ex = new AceConflict('message');
 
         $server = new DAV\Server();
@@ -18,7 +20,7 @@ class AceConflictTest extends \PHPUnit_Framework_TestCase {
         $ex->serialize($server, $root);
 
         $xpaths = [
-            '/d:root'                   => 1,
+            '/d:root' => 1,
             '/d:root/d:no-ace-conflict' => 1,
         ];
 
@@ -29,11 +31,7 @@ class AceConflictTest extends \PHPUnit_Framework_TestCase {
         $dxpath = new \DOMXPath($dom2);
         $dxpath->registerNamespace('d', 'DAV:');
         foreach ($xpaths as $xpath => $count) {
-
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : '.$xpath.', we could only find '.$dxpath->query($xpath)->length.' elements, while we expected '.$count);
         }
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
index b13e7722d..f08e536b5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class NeedPrivilegesExceptionTest extends \PHPUnit_Framework_TestCase {
-
-    function testSerialize() {
-
+class NeedPrivilegesExceptionTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSerialize()
+    {
         $uri = 'foo';
         $privileges = [
             '{DAV:}read',
@@ -23,12 +25,12 @@ class NeedPrivilegesExceptionTest extends \PHPUnit_Framework_TestCase {
         $ex->serialize($server, $root);
 
         $xpaths = [
-            '/d:root'                                                  => 1,
-            '/d:root/d:need-privileges'                                => 1,
-            '/d:root/d:need-privileges/d:resource'                     => 2,
-            '/d:root/d:need-privileges/d:resource/d:href'              => 2,
-            '/d:root/d:need-privileges/d:resource/d:privilege'         => 2,
-            '/d:root/d:need-privileges/d:resource/d:privilege/d:read'  => 1,
+            '/d:root' => 1,
+            '/d:root/d:need-privileges' => 1,
+            '/d:root/d:need-privileges/d:resource' => 2,
+            '/d:root/d:need-privileges/d:resource/d:href' => 2,
+            '/d:root/d:need-privileges/d:resource/d:privilege' => 2,
+            '/d:root/d:need-privileges/d:resource/d:privilege/d:read' => 1,
             '/d:root/d:need-privileges/d:resource/d:privilege/d:write' => 1,
         ];
 
@@ -39,11 +41,7 @@ class NeedPrivilegesExceptionTest extends \PHPUnit_Framework_TestCase {
         $dxpath = new \DOMXPath($dom2);
         $dxpath->registerNamespace('d', 'DAV:');
         foreach ($xpaths as $xpath => $count) {
-
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : '.$xpath.', we could only find '.$dxpath->query($xpath)->length.' elements, while we expected '.$count);
         }
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
index f52b17371..38e9d8b93 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class NoAbstractTest extends \PHPUnit_Framework_TestCase {
-
-    function testSerialize() {
-
+class NoAbstractTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSerialize()
+    {
         $ex = new NoAbstract('message');
 
         $server = new DAV\Server();
@@ -18,7 +20,7 @@ class NoAbstractTest extends \PHPUnit_Framework_TestCase {
         $ex->serialize($server, $root);
 
         $xpaths = [
-            '/d:root'               => 1,
+            '/d:root' => 1,
             '/d:root/d:no-abstract' => 1,
         ];
 
@@ -29,11 +31,7 @@ class NoAbstractTest extends \PHPUnit_Framework_TestCase {
         $dxpath = new \DOMXPath($dom2);
         $dxpath->registerNamespace('d', 'DAV:');
         foreach ($xpaths as $xpath => $count) {
-
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : '.$xpath.', we could only find '.$dxpath->query($xpath)->length.' elements, while we expected '.$count);
         }
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
index df89aaf84..62915ea1d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
-
-    function testSerialize() {
-
+class NotRecognizedPrincipalTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSerialize()
+    {
         $ex = new NotRecognizedPrincipal('message');
 
         $server = new DAV\Server();
@@ -18,7 +20,7 @@ class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
         $ex->serialize($server, $root);
 
         $xpaths = [
-            '/d:root'                        => 1,
+            '/d:root' => 1,
             '/d:root/d:recognized-principal' => 1,
         ];
 
@@ -29,11 +31,7 @@ class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
         $dxpath = new \DOMXPath($dom2);
         $dxpath->registerNamespace('d', 'DAV:');
         foreach ($xpaths as $xpath => $count) {
-
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : '.$xpath.', we could only find '.$dxpath->query($xpath)->length.' elements, while we expected '.$count);
         }
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
index 50623952b..668c713d2 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
-
-    function testSerialize() {
-
+class NotSupportedPrivilegeTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSerialize()
+    {
         $ex = new NotSupportedPrivilege('message');
 
         $server = new DAV\Server();
@@ -18,7 +20,7 @@ class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
         $ex->serialize($server, $root);
 
         $xpaths = [
-            '/d:root'                           => 1,
+            '/d:root' => 1,
             '/d:root/d:not-supported-privilege' => 1,
         ];
 
@@ -29,11 +31,7 @@ class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
         $dxpath = new \DOMXPath($dom2);
         $dxpath->registerNamespace('d', 'DAV:');
         foreach ($xpaths as $xpath => $count) {
-
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : '.$xpath.', we could only find '.$dxpath->query($xpath)->length.' elements, while we expected '.$count);
         }
-
     }
-
 }