vCard 4.0: fix Name Property

README.md

@@ -128,19 +128,19 @@ More info on how to work with GitHub on help.github.com.
 We use [squizlabs/php_codesniffer](https://packagist.org/packages/squizlabs/php_codesniffer) to maintain the code standards.
 Type the following to execute them:
 ```bash
-# To view the code errors
-vendor/bin/phpcs --standard=psr2 --extensions=php --warning-severity=0 --report=full "src"
+# To view the code violation errors
+composer standard
 
-# OR to fix the code errors
-vendor/bin/phpcbf --standard=psr2 --extensions=php --warning-severity=0 --report=full "src"
+# OR to fix the code violation errors
+composer fix-standard
 ```
 > [Read documentation about the code standards](https://github.com/squizlabs/PHP_CodeSniffer/wiki)
 
 ### Unit Tests
 
-We have build in tests, type the following to execute them:
+We have build-in tests using [PHPUnit](https://phpunit.readthedocs.io/en/8.0/writing-tests-for-phpunit.html), type the following to execute them:
 ```bash
-vendor/bin/phpunit tests
+composer test
 ```
 
 ## Credits

composer.json

@@ -23,5 +23,10 @@
     },
     "autoload": {
         "psr-4": { "JeroenDesloovere\\VCard\\": "src/" }
+    },
+    "scripts": {
+        "test": "phpunit tests",
+	"standard": "phpcs --standard=psr2 --extensions=php --warning-severity=0 --report=full 'src'",
+	"fix-standard": "phpcbf --standard=psr2 --extensions=php --warning-severity=0 --report=full 'src'"
     }
 }

src/Exception/VCardException.php

@@ -12,6 +12,13 @@
 
 class VCardException extends \Exception
 {
+    public static function forRequiredProperty(PropertyInterface $property): self
+    {
+        return new self(
+            'The property "' . get_class($property) . '" is mandatory, and you need to add it once.'
+        );
+    }
+
     public static function forExistingProperty(PropertyInterface $property): self
     {
         return new self(

src/Parser/Property/NameParser.php

@@ -11,7 +11,7 @@ final class NameParser extends PropertyParser implements NodeParserInterface
 {
     public function parseVcfString(string $value, array $parameters = []): NodeInterface
     {
-        @list($firstName, $additional, $lastName, $prefix, $suffix) = explode(';', $value);
+        @list($lastName, $firstName, $additional, $prefix, $suffix) = explode(';', $value);
 
         $this->convertEmptyStringToNull([
             $lastName,

src/Parser/VcfParser.php

@@ -110,7 +110,7 @@ private function parseVCardContentLine(string $line, VCard &$vCard): void
         // As per RFC, group names are alphanumerical, and end with a
         // period (.).
         $line = preg_replace('/^\w+\./', '', trim($line));
-
+        
         /**
          * @var string $node
          * @var string $value

src/Property/Name.php

@@ -13,13 +13,13 @@
 final class Name implements PropertyInterface, NodeInterface
 {
     /** @var null|string */
-    private $additional;
+    private $lastName;
 
     /** @var null|string */
     private $firstName;
 
     /** @var null|string */
-    private $lastName;
+    private $additional;
 
     /** @var null|string */
     private $prefix;

src/Property/Value/DateTimeOrStringValue.php

@@ -17,7 +17,8 @@ public function __construct($value)
     public function __toString(): string
     {
         if ($this->value instanceof \DateTime) {
-            return $this->value->format('u');
+            // According to DATE-AND-OR-TIME rfc6350 standard
+            return $this->value->format('Ymd\THis');
         }
 
         return $this->value;

src/Property/Value/DateTimeValue.php

@@ -16,6 +16,7 @@ public function __construct(\DateTime $value)
 
     public function __toString(): string
     {
+        // TODO: possibly not in line with rfc6350
         return $this->value->format('u');
     }
 

src/VCard.php

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace JeroenDesloovere\VCard;
@@ -160,9 +159,38 @@ public function getParameters(string $filterByPropertyParameterClass = null): ar
         });
     }
 
+    /**
+     * @param string $forPropertyClass
+     * @return array
+     * @throws VCardException
+     */
     public function getProperties(string $forPropertyClass = null): array
     {
         if ($forPropertyClass === null) {
+            $array = $this->properties;
+            //make empty array var for each required Property or Property you need to work with
+            $found_fullname = $found_name = $others = [];
+            foreach ($array as $value) {
+                //search if property exist and add it to the defined array var, else add it to the others array
+                if ($value instanceof FullName) {
+                    $found_fullname[] = $value;
+                } elseif ($value instanceof Name) {
+                    $found_name[] = $value;
+                } else {
+                    $others[] = $value;
+                }
+            }
+            //check for empty and throw exception, if it can not be generated by existing fields
+            if (count($found_fullname) == 0) {
+                if (count($found_name) == 0) {
+                    throw VCardException::forRequiredProperty(new FullName('NoName'));
+                } else {
+                    $found_fullname[] = new FullName(implode(' ', array_filter(array($found_name[0]->getPrefix(), $found_name[0]->getFirstName(), $found_name[0]->getAdditional(), $found_name[0]->getLastName(), $found_name[0]->getSuffix()))));
+                }
+            }
+            $array = array_merge($found_fullname, $found_name, $others);
+            $this->properties = $array;
+
             return $this->properties;
         }