Request 3282 (accepted)

Overview

Request 3282 (accepted)

New release 0.4.8.4

Created by mollekopf 25 days ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit iRony

Submit package Kolab:16:Testing / iRony to package Kolab:16 / iRony

iRony.spec Changed

debian.changelog Changed

iRony-0.4.8.tar.gz/composer.json Changed

iRony-0.4.8.tar.gz/composer.json-dist Changed

iRony-0.4.8.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

@@ -681,12 +681,12 @@
         $vc = new VObject\Component\VCard();
         $vc->VERSION = '3.0';  // always set to 3.0 and let Sabre/DAV convert to 4.0 if necessary
         $vc->PRODID = '-//Kolab//iRony DAV Server ' . KOLAB_DAV_VERSION . '//Sabre//Sabre VObject ' . VObject\Version::VERSION . '//EN';
+        $vc->UID = $contact'uid';
 
-        $vc->add('UID', $contact'uid');
         $vc->add('FN', $contact'name');
 
         // distlists are KIND:group
-        if ($contact'_type' == 'distribution-list') {
+        if (isset($contact'_type') && $contact'_type' == 'distribution-list') {
             // group cards are actually vcard version 4
             if (!$this->is_apple()) {
                 $vc->version = '4.0';
@@ -709,10 +709,18 @@
                 $vc->add($prop_prefix . 'MEMBER', $value);
             }
         }
-        else if ($contact'surname' . $contact'firstname' . $contact'middlename' . $contact'prefix' . $contact'suffix' != '') {
-            $n = $vc->create('N');
-            $n->setParts(array(strval($contact'surname'), strval($contact'firstname'), strval($contact'middlename'), strval($contact'prefix'), strval($contact'suffix')));
-            $vc->add($n);
+        else {
+            $allname = ($contact'surname' ?? '')
+                . ($contact'firstname' ?? '')
+                . ($contact'middlename' ?? '')
+                . ($contact'prefix' ?? '')
+                . ($contact'suffix' ?? '');
+
+            if ($allname != '') {
+                $n = $vc->create('N');
+                $n->setParts(array($contact'surname' ?? '', $contact'firstname' ?? '', $contact'middlename' ?? '', $contact'prefix' ?? '', $contact'suffix' ?? ''));
+                $vc->add($n);
+            }
         }
 
         if (!empty($contact'nickname'))
@@ -760,7 +768,7 @@
             }
         }
 
-        if (!empty($contact'email')) {
+        if (!empty($contact'phone')) {
             foreach ((array)$contact'phone' as $phone) {
                 $type = $this->phonetypes$phone'type' ?? $phone'type';
                 $params = !empty($type) ? array('type' => explode(',', strtoupper($type))) : array();
@@ -1079,8 +1087,9 @@
             }
         }
 
-        if (is_array($contact'im'))
+        if (isset($contact'im') && is_array($contact'im')) {
             $contact'im' = array_unique($contact'im');
+        }
 
         return $contact;
     }

iRony-0.4.8.tar.gz/test/Unit/CardDAV/ContactsBackend.php Changed

@@ -1,14 +1,10 @@
 <?php
 
 use Kolab\CardDAV\ContactsBackend;
+use PHPUnit\Framework\TestCase;
 
-class ContactsBackendTest extends PHPUnit_Framework_TestCase
+class ContactsBackendTest extends TestCase
 {
-    function setUp()
-    {
-    }
-
-
     /**
      * Test vCard PHOTO (T1082)
      */
@@ -23,7 +19,7 @@
 
         $vcard = $backend->to_vcard($contact);
 
-        $this->assertRegexp('/PHOTO;ENCODING=b;TYPE=GIF:R0l/', $vcard);
+        $this->assertMatchesRegularExpression('/PHOTO;ENCODING=b;TYPE=GIF:R0l/', $vcard);
     }
 
     /**
@@ -37,7 +33,7 @@
         $vcard   = "BEGIN:VCARD\nVERSION:$version\nN:Thompson;Default;;;\nUID:1\n$input\nEND:VCARD";
         $contact = $backend->parse_vcard($vcard);
 
-        $this->assertSame($output, $contact'photo');
+        $this->assertSame($output, $contact'photo' ?? null);
     }
 
     function data_T2043()
@@ -64,7 +60,7 @@
         $vcard   = "BEGIN:VCARD\nVERSION:4.0\nN:Thompson;Default;;;\nUID:1\n$input\nEND:VCARD";
         $contact = $backend->parse_vcard($vcard);
 
-        if ($result = $contact$key) {
+        if ($result = ($contact$key ?? null)) {
             $result = $result->format('Ymd');
         }
 
@@ -84,4 +80,39 @@
             array("ANNIVERSARY;VALUE=text:circa 1800", null, 'anniversary'),
         );
     }
+
+    /**
+     * Test basic vCard generation
+     */
+    function test_to_vcard()
+    {
+        $backend = new ContactsBackend();
+        $contact = array(
+            'uid'   => '123',
+            'name'  => 'Test',
+            'phone' => array(
+                array (
+                    'number' => '+48',
+                    'type' => 'home',
+                ),
+            ),
+        );
+
+        $vcard = $backend->to_vcard($contact);
+
+        $prodid = '-//Kolab//iRony DAV Server ' . KOLAB_DAV_VERSION . '//Sabre//Sabre VObject ' . Sabre\VObject\Version::VERSION . '//EN';
+        $expected = <<<EOF
+            BEGIN:VCARD\r
+            VERSION:3.0\r
+            PRODID:$prodid\r
+            UID:123\r
+            FN:Test\r
+            TEL;TYPE=HOME:+48\r
+            END:VCARD\r
+            EOF;
+
+        $this->assertSame(trim($expected), trim($vcard));
+
+        // TODO: Test all contact/group properties
+    }
 }

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3282 0

Request History

mollekopf created request 25 days ago

New release 0.4.8.4

mollekopf accepted request 25 days ago