fix: split address overtoom

myparcelnl · Nov 8, 2021 · 4c34848 · 4c34848
1 parent 6de7954
commit 4c34848
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/Tests/SplitStreet/SplitStreetTest.php b/Tests/SplitStreet/SplitStreetTest.php
@@ -65,6 +65,36 @@ public function testSplitStreet(
     public function additionProvider()
     {
         return [
+            [
+                'carrier_id'        => PostNLConsignment::CARRIER_ID,
+                'country'           => 'NL',
+                'full_street_input' => 'overtoom 452-2',
+                'full_street'       => 'overtoom 452 -2',
+                'street'            => 'overtoom',
+                'number'            => '452',
+                'number_suffix'     => '-2',
+                'box_number'        => null,
+            ],
+            [
+                'carrier_id'        => BpostConsignment::CARRIER_ID,
+                'country'           => 'BE',
+                'full_street_input' => 'avenue roger lallemand 13 B13',
+                'full_street'       => 'avenue roger lallemand 13 bus 13',
+                'street'            => 'avenue roger lallemand',
+                'number'            => '13',
+                'number_suffix'     => null,
+                'box_number'        => '13',
+            ],
+            [
+                'carrier_id'        => PostNLConsignment::CARRIER_ID,
+                'country'           => 'BE',
+                'full_street_input' => 'avenue roger lallemand 13 B13',
+                'full_street'       => 'avenue roger lallemand 13 bus 13',
+                'street'            => 'avenue roger lallemand 13 bus 13',
+                'number'            => null,
+                'number_suffix'     => null,
+                'box_number'        => null,
+            ],
             [
                 'carrier_id'        => PostNLConsignment::CARRIER_ID,
                 'country'           => 'NL',

diff --git a/src/Helper/SplitStreet.php b/src/Helper/SplitStreet.php
@@ -86,7 +86,7 @@ public static function splitStreet(string $fullStreet, string $local, string $de
             $fullStreet = str_ireplace(self::BOX_SEPARATOR, self::BOX_NL, $fullStreet);
             // When a caracter is present at BOX_SEPARATOR_BY_REGEX and followed by a number, it must replaced by bus
             foreach (self::BOX_SEPARATOR_BY_REGEX as $boxRegex) {
-                $fullStreet = preg_replace('#' . $boxRegex . '([0-9])#', self::BOX_NL . '$1', $fullStreet);
+                $fullStreet = preg_replace('#' . $boxRegex . '([0-9])#', self::BOX_NL . ' ' . ltrim('$1'), $fullStreet);
             }
         }