upgrade to sabre32

4 files changed, 35 insertions, 31 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
index 625f64211..23c248825 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class CollectionTest extends \PHPUnit_Framework_TestCase {
@@ -9,9 +10,9 @@ class CollectionTest extends \PHPUnit_Framework_TestCase {
 
         $back = new DAVACL\PrincipalBackend\Mock();
         $col = new Collection($back);
-        $r = $col->getChildForPrincipal(array(
+        $r = $col->getChildForPrincipal([
             'uri' => 'principals/admin',
-        ));
+        ]);
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\User', $r);
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
index 1ee999a92..fe07f0131 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class ProxyReadTest extends \PHPUnit_Framework_TestCase {
@@ -10,9 +11,9 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $principal = new ProxyRead($backend, array(
+        $principal = new ProxyRead($backend, [
             'uri' => 'principal/user',
-        ));
+        ]);
         $this->backend = $backend;
         return $principal;
 
@@ -61,7 +62,7 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function testGetAlternateUriSet() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getAlternateUriSet());
+        $this->assertEquals([], $i->getAlternateUriSet());
 
     }
 
@@ -75,25 +76,25 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function testGetGroupMemberSet() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getGroupMemberSet());
+        $this->assertEquals([], $i->getGroupMemberSet());
 
     }
 
     function testGetGroupMembership() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getGroupMembership());
+        $this->assertEquals([], $i->getGroupMembership());
 
     }
 
     function testSetGroupMemberSet() {
 
         $i = $this->getInstance();
-        $i->setGroupMemberSet(array('principals/foo'));
+        $i->setGroupMemberSet(['principals/foo']);
 
-        $expected = array(
-            $i->getPrincipalUrl() => array('principals/foo')
-        );
+        $expected = [
+            $i->getPrincipalUrl() => ['principals/foo']
+        ];
 
         $this->assertEquals($expected, $this->backend->groupMembers);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
index c0186ff0d..6cdb9b30e 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class ProxyWriteTest extends ProxyReadTest {
@@ -8,9 +9,9 @@ class ProxyWriteTest extends ProxyReadTest {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $principal = new ProxyWrite($backend, array(
+        $principal = new ProxyWrite($backend, [
             'uri' => 'principal/user',
-        ));
+        ]);
         $this->backend = $backend;
         return $principal;
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
index 37b5eae97..420bb3b1a 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class UserTest extends \PHPUnit_Framework_TestCase {
@@ -8,18 +9,18 @@ class UserTest extends \PHPUnit_Framework_TestCase {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $backend->addPrincipal(array(
+        $backend->addPrincipal([
             'uri' => 'principals/user/calendar-proxy-read',
-        ));
-        $backend->addPrincipal(array(
+        ]);
+        $backend->addPrincipal([
             'uri' => 'principals/user/calendar-proxy-write',
-        ));
-        $backend->addPrincipal(array(
+        ]);
+        $backend->addPrincipal([
             'uri' => 'principals/user/random',
-        ));
-        return new User($backend, array(
+        ]);
+        return new User($backend, [
             'uri' => 'principals/user',
-        ));
+        ]);
 
     }
 
@@ -100,23 +101,23 @@ class UserTest extends \PHPUnit_Framework_TestCase {
 
     function testGetACL() {
 
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
+        $expected = [
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user/calendar-proxy-read',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user/calendar-proxy-write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $u = $this->getInstance();
         $this->assertEquals($expected, $u->getACL());