Merge pull request #1 from theiconic/hotfix/OPS-1870-Allow-Van-as-Sur…

…name IOPS-1870 Allow Van as surname when only surname
theiconic · Aug 14, 2017 · ffb66dd · ffb66dd
2 parents d45c6ec + 1124002
commit ffb66dd
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/src/Mapper/LastnameMapper.php b/src/Mapper/LastnameMapper.php
@@ -58,7 +58,9 @@ protected function mapReversedParts(array $parts): array
 
             if ($this->isFollowedByLastnamePart($originalParts, $originalIndex)) {
                 if ($this->isApplicablePrefix($originalParts, $originalIndex)) {
-                    $parts[$k] = new Lastname($part);
+                    $lastname = new Lastname($part);
+                    $lastname->setApplyPrefix(true);
+                    $parts[$k] = $lastname;
                     continue;
                 }
                 break;

diff --git a/src/Part/Lastname.php b/src/Part/Lastname.php
@@ -24,6 +24,8 @@ class Lastname extends AbstractPart
         'la' => 'la',
         'ter' => 'ter'
     ];
+    /** @var bool */
+    private $applyPrefix = false;
 
     /**
      * check if the given word is a lastname prefix
@@ -57,10 +59,18 @@ public function normalize()
     {
         $value = $this->getValue();
 
-        if (self::isPrefix($value)) {
+        if ($this->applyPrefix && self::isPrefix($value)) {
             return static::$prefixes[self::getKey($value)];
         }
 
         return $this->camelcase($this->getValue());
     }
+
+    /**
+     * @param bool $applyPrefix
+     */
+    public function setApplyPrefix(bool $applyPrefix)
+    {
+        $this->applyPrefix = $applyPrefix;
+    }
 }
diff --git a/tests/Mapper/LastnameMapperTest.php b/tests/Mapper/LastnameMapperTest.php
@@ -13,6 +13,9 @@ class LastnameMapperTest extends AbstractMapperTest
      */
     public function provider()
     {
+        $vanPrefix = new Lastname('van');
+        $vanPrefix->setApplyPrefix(true);
+
         return [
             [
                 'input' => [
@@ -58,7 +61,7 @@ public function provider()
                 'expectation' => [
                     new Salutation('Mr'),
                     'Lars',
-                    new Lastname('van'),
+                    $vanPrefix,
                     new Lastname('Trier'),
                 ],
             ],

diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -319,6 +319,13 @@ public function provider()
                     'lastname' => 'Truong',
                 ],
             ],
+            [
+                'John Van',
+                [
+                    'firstname' => 'John',
+                    'lastname' => 'Van',
+                ],
+            ],
             [
                 'Mr. Van Truong',
                 [