Merge pull request #14 from theiconic/feature/allow-salutation-at-end

Allow having salutations in last position without comma-separation (fixes #11)
theiconic · Aug 28, 2018 · 17ce0ba · 17ce0ba
2 parents 81de7cb + f7f4888
commit 17ce0ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/Mapper/FirstnameMapper.php b/src/Mapper/FirstnameMapper.php
@@ -88,6 +88,10 @@ protected function getStartIndex(array $parts): int
             return 0;
         }
 
+        if ($index === count($parts) - 1) {
+            return 0;
+        }
+
         return $index + 1;
     }
 }
diff --git a/src/Mapper/LastnameMapper.php b/src/Mapper/LastnameMapper.php
@@ -7,6 +7,7 @@
 use TheIconic\NameParser\Part\Lastname;
 use TheIconic\NameParser\Part\LastnamePrefix;
 use TheIconic\NameParser\Part\Nickname;
+use TheIconic\NameParser\Part\Salutation;
 use TheIconic\NameParser\Part\Suffix;
 
 class LastnameMapper extends AbstractMapper
@@ -49,11 +50,7 @@ protected function mapReversedParts(array $parts): array
         $length = count($parts);
 
         foreach ($parts as $k => $part) {
-            if ($part instanceof Suffix) {
-                continue;
-            }
-
-            if ($part instanceof Nickname) {
+            if ($part instanceof Suffix || $part instanceof Nickname || $part instanceof Salutation) {
                 continue;
             }
 

diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -431,6 +431,15 @@ public function provider()
                     'middlename' => 'Eric',
                 ]
             ],
+            [
+                'PAUL M LEWIS MR',
+                [
+                    'salutation' => 'Mr.',
+                    'firstname' => 'Paul',
+                    'initials' => 'M',
+                    'lastname' => 'Lewis',
+                ]
+            ]
         ];
     }