improve MiddlenameMapper to be less greedy and improve its unit test

Webifi · May 16, 2017 · a33cb5f · a33cb5f
1 parent c4f174f
commit a33cb5f
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 31 deletions.
diff --git a/src/Mapper/AbstractMapper.php b/src/Mapper/AbstractMapper.php
@@ -52,4 +52,22 @@ protected function hasUnmappedPartsBefore(array $parts, $index)
 
         return false;
     }
+
+    /**
+     * @param string $type
+     * @param array $parts
+     * @return int|bool
+     */
+    protected function findFirstMapped(string $type, array $parts)
+    {
+        $total = count($parts);
+
+        for ($i = 0; $i < $total; $i++) {
+            if ($parts[$i] instanceof $type) {
+                return $i;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/src/Mapper/FirstnameMapper.php b/src/Mapper/FirstnameMapper.php
@@ -23,7 +23,7 @@ public function map(array $parts)
         }
 
         $length = count($parts);
-        $start = $this->getStartIndex($parts, $length);
+        $start = $this->getStartIndex($parts);
 
         $pos = null;
 
@@ -68,20 +68,16 @@ protected function handleSinglePart($part)
 
     /**
      * @param array $parts
-     * @param int $total
      * @return int
      */
-    protected function getStartIndex(array $parts, $total)
+    protected function getStartIndex(array $parts)
     {
-        // skip to after salutation
-        $start = 0;
+        $index = $this->findFirstMapped(Salutation::class, $parts);
 
-        for ($i = 0; $i < $total; $i++) {
-            if ($parts[$i] instanceof Salutation) {
-                $start = $i + 1;
-            }
+        if (false === $index) {
+            return 0;
         }
 
-        return $start;
+        return $index + 1;
     }
 }
diff --git a/src/Mapper/MiddlenameMapper.php b/src/Mapper/MiddlenameMapper.php
@@ -23,9 +23,13 @@ public function map(array $parts)
 
         // skip to after salutation
         $length = count($parts);
-        $start = $this->getStartIndex($parts, $length);
+        $start = $this->findFirstMapped(Firstname::class, $parts);
 
-        for ($k = $start; $k < $length; $k++) {
+        if (false === $start) {
+            return $parts;
+        }
+
+        for ($k = $start; $k < $length - 1; $k++) {
             $part = $parts[$k];
 
             if ($part instanceof Lastname) {
@@ -41,23 +45,4 @@ public function map(array $parts)
 
         return $parts;
     }
-
-    /**
-     * @param array $parts
-     * @param int $total
-     * @return int
-     */
-    protected function getStartIndex(array $parts, $total)
-    {
-        // skip to after salutation
-        $start = 0;
-
-        for ($i = 0; $i < $total; $i++) {
-            if ($parts[$i] instanceof Firstname) {
-                $start = $i + 1;
-            }
-        }
-
-        return $start;
-    }
 }
diff --git a/tests/Mapper/MiddlenameMapperTest.php b/tests/Mapper/MiddlenameMapperTest.php
@@ -41,6 +41,30 @@ public function provider()
                     new Lastname('Brown'),
                 ],
             ],
+            [
+                'input' => [
+                    'Mr',
+                    new Firstname('James'),
+                    'Tiberius',
+                    'Kirk',
+                ],
+                'expectation' => [
+                    'Mr',
+                    new Firstname('James'),
+                    new Middlename('Tiberius'),
+                    'Kirk',
+                ],
+            ],
+            [
+                'input' => [
+                    'Albert',
+                    'Einstein',
+                ],
+                'expectation' => [
+                    'Albert',
+                    'Einstein',
+                ],
+            ],
         ];
     }
 }