Simplify lastname parser by getting rid of array reversals

theiconic · Sep 16, 2018 · a1d94da · a1d94da
1 parent 015bb01
commit a1d94da
Showing 1 changed file with 19 additions and 16 deletions.
diff --git a/src/Mapper/LastnameMapper.php b/src/Mapper/LastnameMapper.php
@@ -34,11 +34,7 @@ public function map(array $parts): array
             return $parts;
         }
 
-        $parts = array_reverse($parts);
-
-        $parts = $this->mapReversedParts($parts);
-
-        return array_reverse($parts);
+        return $this->mapParts($parts);
     }
 
     /**
@@ -48,12 +44,14 @@ public function map(array $parts): array
      * @param array $parts
      * @return array
      */
-    protected function mapReversedParts(array $parts): array
+    protected function mapParts(array $parts): array
     {
-        $length = count($parts);
+        $k = count($parts);
         $remapIgnored = true;
 
-        foreach ($parts as $k => $part) {
+        while (--$k >= 0) {
+            $part = $parts[$k];
+
             if ($this->isIgnoredPart($part)) {
                 continue;
             }
@@ -62,11 +60,8 @@ protected function mapReversedParts(array $parts): array
                 break;
             }
 
-            $originalIndex = $length - $k - 1;
-            $originalParts = array_reverse($parts);
-
-            if ($this->isFollowedByLastnamePart($originalParts, $originalIndex)) {
-                if ($this->isApplicablePrefix($originalParts, $originalIndex)) {
+            if ($this->isFollowedByLastnamePart($parts, $k)) {
+                if ($this->isApplicablePrefix($parts, $k)) {
                     $parts[$k] = new LastnamePrefix($part, $this->prefixes[$this->getKey($part)]);
                     continue;
                 }
@@ -99,11 +94,15 @@ protected function mapReversedParts(array $parts): array
      */
     protected function shouldStopMapping(array $parts, int $k): bool
     {
-        if ($k + 2 > count($parts)) {
+        if ($k < 1) {
             return true;
         }
 
-        return strlen($parts[$k - 1]->getValue()) >= 3;
+        if ($parts[$k + 1] instanceof LastnamePrefix) {
+            return true;
+        }
+
+        return strlen($parts[$k + 1]->getValue()) >= 3;
     }
 
     /**
@@ -128,7 +127,11 @@ protected function isIgnoredPart($part) {
      */
     protected function remapIgnored(array $parts): array
     {
-        foreach ($parts as $k => $part) {
+        $k = count($parts);
+
+        while (--$k >= 0) {
+            $part = $parts[$k];
+
             if (!$this->isIgnoredPart($part)) {
                 break;
             }