Merge branch '4.6RC'4.6

1 files changed, 8 insertions, 10 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);
         }
-
     }
-
 }