initial sabre upgrade (needs lots of work - to wit: authentication, redo the browser interface, and rework event export/import)

1 files changed, 35 insertions, 15 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
index 3fe75ca0e..3814ebc0d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
@@ -128,10 +128,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
-        $result = $backend->updatePrincipal('principals/user', array(
+        $propPatch = new DAV\PropPatch([
             '{DAV:}displayname' => 'pietje',
-            '{http://sabredav.org/ns}vcard-url' => 'blabla',
-        ));
+        ]);
+
+        $backend->updatePrincipal('principals/user', $propPatch);
+        $result = $propPatch->commit();
 
         $this->assertTrue($result);
 
@@ -139,7 +141,6 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'id' => 1,
             'uri' => 'principals/user',
             '{DAV:}displayname' => 'pietje',
-            '{http://sabredav.org/ns}vcard-url' => 'blabla',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
         ), $backend->getPrincipalByPath('principals/user'));
 
@@ -150,21 +151,20 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
-        $result = $backend->updatePrincipal('principals/user', array(
+        $propPatch = new DAV\PropPatch([
             '{DAV:}displayname' => 'pietje',
-            '{http://sabredav.org/ns}vcard-url' => 'blabla',
             '{DAV:}unknown' => 'foo',
-        ));
+        ]);
+
+        $backend->updatePrincipal('principals/user', $propPatch);
+        $result = $propPatch->commit();
+
+        $this->assertFalse($result);
 
         $this->assertEquals(array(
-            424 => array(
-                '{DAV:}displayname' => null,
-                '{http://sabredav.org/ns}vcard-url' => null,
-            ),
-            403 => array(
-                '{DAV:}unknown' => null,
-            ),
-        ), $result); 
+            '{DAV:}displayname' => 424,
+            '{DAV:}unknown' => 403
+        ), $propPatch->getResult());
 
         $this->assertEquals(array(
             'id' => '1',
@@ -175,4 +175,24 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    function testFindByUriUnknownScheme() {
+
+        $pdo = $this->getPDO();
+        $backend = new PDO($pdo);
+        $this->assertNull($backend->findByUri('http://foo', 'principals'));
+
+    }
+
+
+    function testFindByUri() {
+
+        $pdo = $this->getPDO();
+        $backend = new PDO($pdo);
+        $this->assertEquals(
+            'principals/user',
+            $backend->findByUri('mailto:user@example.org', 'principals')
+        );
+
+    }
+
 }