Merge 79ea88e into 3bf2c11

src/Language/English.php

@@ -45,6 +45,8 @@ class English implements LanguageInterface
         'rev' => 'Rev.',
         'sir' => 'Sir',
         'prof' => 'Prof.',
+        'his honour' => 'His Honour',
+        'her honour' => 'Her Honour'
     ];
 
     const LASTNAME_PREFIXES = [

src/Mapper/SalutationMapper.php

@@ -28,20 +28,67 @@ public function map(array $parts): array
         $max = ($this->maxIndex > 0) ? $this->maxIndex : floor(count($parts) / 2);
 
         for ($k = 0; $k < $max; $k++) {
-            $part = $parts[$k];
-
-            if ($part instanceof AbstractPart) {
+            if ($parts[$k] instanceof AbstractPart) {
                 break;
             }
 
-            if ($this->isSalutation($part)) {
-                $parts[$k] = new Salutation($part, $this->salutations[$this->getKey($part)]);
+            $parts = $this->substituteWithSalutation($parts, $k);
+        }
+
+        return $parts;
+    }
+
+    /**
+     * We pass the full parts array and the current position to allow
+     * not only single-word matches but also combined matches with
+     * subsequent words (parts).
+     *
+     * @param array $parts
+     * @param int $start
+     * @return array
+     */
+    protected function substituteWithSalutation(array $parts, int $start): array
+    {
+        if ($this->isSalutation($parts[$start])) {
+            $parts[$start] = new Salutation($parts[$start], $this->salutations[$this->getKey($parts[$start])]);
+            return $parts;
+        }
+
+        foreach ($this->salutations as $key => $salutation) {
+            $keys = explode(' ', $key);
+            $length = count($keys);
+
+            $subset = array_slice($parts, $start, $length);
+
+            if ($this->isMatchingSubset($keys, $subset)) {
+                array_splice($parts, $start, $length, [new Salutation(implode(' ', $subset), $salutation)]);
+                return $parts;
             }
         }
 
         return $parts;
     }
 
+    /**
+     * check if the given subset matches the given keys entry by entry,
+     * which means word by word, except that we first need to key-ify
+     * the subset words
+     *
+     * @param array $keys
+     * @param array $subset
+     * @return bool
+     */
+    private function isMatchingSubset(array $keys, array $subset): bool
+    {
+        for ($i = 0; $i < count($subset); $i++) {
+            if ($this->getKey($subset[$i]) !== $keys[$i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * check if the given word is a viable salutation
      *

tests/ParserTest.php

@@ -520,6 +520,13 @@ public function provider()
                     'lastname' => 'Du',
                     'firstname' => 'Yumeng',
                 ]
+            ],
+            [
+                'Her Honour Mrs Judy',
+                [
+                    'lastname' => 'Judy',
+                    'salutation' => 'Her Honour Mrs.'
+                ]
             ]
         ];
     }