Merge branch '3.2' of github.com:fruux/sabre-dav into 3.2

Author: evert

tests/Sabre/CardDAV/AddressBookHomeTest.php

@@ -90,7 +90,7 @@ function testGetChild404() {
     function testGetChildren() {
 
         $children = $this->s->getChildren();
-        $this->assertEquals(1, count($children));
+        $this->assertEquals(2, count($children));
         $this->assertInstanceOf('Sabre\\CardDAV\\AddressBook', $children[0]);
         $this->assertEquals('book1', $children[0]->getName());
 
@@ -109,7 +109,7 @@ function testCreateExtendedCollection() {
             'uri'               => 'book2',
             '{DAV:}displayname' => 'a-book 2',
             'principaluri'      => 'principals/user1',
-        ], $this->backend->addressBooks[1]);
+        ], $this->backend->addressBooks[2]);
 
     }
 

tests/Sabre/CardDAV/AddressBookTest.php

@@ -85,7 +85,7 @@ function testCreateFile() {
     function testDelete() {
 
         $this->ab->delete();
-        $this->assertEquals([], $this->backend->addressBooks);
+        $this->assertEquals(1, count($this->backend->addressBooks));
 
     }
 

tests/Sabre/CardDAV/Backend/Mock.php

@@ -20,6 +20,12 @@ function __construct($addressBooks = null, $cards = null) {
                     'principaluri'      => 'principals/user1',
                     '{DAV:}displayname' => 'd-name',
                 ],
+                [
+                    'id'                => 'bar',
+                    'uri'               => 'book3',
+                    'principaluri'      => 'principals/user1',
+                    '{DAV:}displayname' => 'd-name',
+                ],
             ];
 
             $card2 = fopen('php://memory', 'r+');
@@ -30,6 +36,9 @@ function __construct($addressBooks = null, $cards = null) {
                     'card1' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
                     'card2' => $card2,
                 ],
+                'bar' => [
+                    'card3' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD",
+                ],
             ];
         }