Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/apps/dav/lib/CardDAV/AddressBookImpl.php b/apps/dav/lib/CardDAV/AddressBookImpl.php
index 5f77c0f44f68b1b2171cd936b533df3222baf453..c650f6c30be06ec890a1dc19a1a553a8de766759 100644 (file)
--- a/apps/dav/lib/CardDAV/AddressBookImpl.php
+++ b/apps/dav/lib/CardDAV/AddressBookImpl.php
@@ -225,7 +225,6 @@ class AddressBookImpl implements IAddressBook {
                ];
 
                foreach ($vCard->children() as $property) {
-                       $result[$property->name] = $property->getValue();
                        if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') {
                                $url = $this->urlGenerator->getAbsoluteURL(
                                        $this->urlGenerator->linkTo('', 'remote.php') . '/dav/');

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
index bd63f4cdffb1bb4df693d95adde5d279b0114957..172b341bd79f3de8bcbe11c205c4cf09afb6d058 100644 (file)
--- a/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
+++ b/apps/dav/tests/unit/CardDAV/AddressBookImplTest.php
@@ -332,10 +332,11 @@ class AddressBookImplTest extends TestCase {
 
                $array = $this->invokePrivate($this->addressBookImpl, 'vCard2Array', ['uri', $vCard]);
                unset($array['PRODID']);
+               unset($array['UID']);
 
                $this->assertEquals([
                        'URI' => 'uri',
-                       'VERSION' => '3.0',
+                       'VERSION' => '4.0',
                        'FN' => 'Full Name',
                        'CLOUD' => [
                                'cloud-user1@localhost',