fix(splitstreet): ensure box separator for be address (#496)

* fix(splitstreet): ensure box separator for be address * refactor: remove unused use classes
myparcelnl · Aug 8, 2024 · 2997ac8 · 2997ac8
1 parent 12d184c
commit 2997ac8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/Helper/ValidateStreet.php b/src/Helper/ValidateStreet.php
@@ -25,7 +25,7 @@ class ValidateStreet
         ')?$~i';
 
     const SPLIT_STREET_REGEX_BE =
-        '~(?P<box_number>)(?P<street>.*?)\s(?P<street_suffix>(?P<number>[0-9\-]{0,7}[0-9])(?P<number_suffix>[A-z]{0,4})\s?(?P<box_separator>' . self::REGEX_BE_BOX_SEPARATORS . '|\,\s+)*\s?(?P<box_number>[0-9A-z]{0,7}[0-9])?\s?(?:(?P<number_suffix>[A-z]{1,4}$)|))?$~J';
+        '~(?P<box_separator>)(?P<box_number>)(?P<street>.*?)\s(?P<street_suffix>(?P<number>[0-9\-]{0,7}[0-9])(?P<number_suffix>[A-z]{0,4})\s?(?P<box_separator>' . self::REGEX_BE_BOX_SEPARATORS . '|\,\s+)*\s?(?P<box_number>[0-9A-z]{0,7}[0-9])?\s?(?:(?P<number_suffix>[A-z]{1,4}$)|))?$~J';
     const REGEX_BE_BOX_SEPARATORS = SplitStreet::BOX_BTE . '|' . SplitStreet::BOX_EN . '|' . SplitStreet::BOX_FR . '|' . SplitStreet::BOX_NL . '|' . SplitStreet::BOX_DE . '|' . SplitStreet::BOX_SLASH . '|' . SplitStreet::BOX_DASH . '|' . SplitStreet::BOX_B . '.+';
     /**
      * @param string      $fullStreet

diff --git a/test/Model/Consignment/ConsignmentSplitStreetTest.php b/test/Model/Consignment/ConsignmentSplitStreetTest.php
@@ -4,6 +4,7 @@
 
 namespace MyParcelNL\Sdk\Test\Model\Consignment;
 
+use MyParcelNL\Sdk\src\Helper\ValidateStreet;
 use MyParcelNL\Sdk\src\Model\Carrier\CarrierBpost;
 use MyParcelNL\Sdk\src\Model\Carrier\CarrierPostNL;
 use MyParcelNL\Sdk\src\Model\Consignment\AbstractConsignment;
@@ -547,5 +548,11 @@ public function testSplitStreet(array $testData): void
             ],
             $consignment
         );
+
+        if (AbstractConsignment::CC_BE === $testData[self::COUNTRY]) {
+            $matches = [];
+            preg_match(ValidateStreet::SPLIT_STREET_REGEX_BE, $testData[self::FULL_STREET], $matches);
+            self::assertEquals(true, array_key_exists('box_separator', $matches));
+        }
     }
 }