NTR: fix tracking code (#846)

Co-authored-by: Vitalij Mik <[email protected]>
mollie · Sep 26, 2024 · d527e37 · d527e37
1 parent 64ff8c5
commit d527e37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Service/TrackingInfoStructFactory.php b/src/Service/TrackingInfoStructFactory.php
@@ -120,7 +120,7 @@ private function createInfoStruct(string $trackingCarrier, string $trackingCode,
         ]);
 
         // determine if the provided tracking code is actually a tracking URL
-        if (empty($trackingUrl) === true || $this->urlParsingService->isUrl($trackingCode)) {
+        if (empty($trackingUrl) === true && $this->urlParsingService->isUrl($trackingCode)) {
             $this->logger->debug('Tracking code is a URL, parsing tracking code from URL.', [
                 'trackingCode' => $trackingCode,
                 'trackingUrl' => $trackingUrl

diff --git a/src/Service/UrlParsingService.php b/src/Service/UrlParsingService.php
@@ -36,7 +36,7 @@ public function parseTrackingCodeFromUrl(string $value): array
             $urlQuery = parse_url($value, PHP_URL_FRAGMENT);
         }
         if ($urlQuery === null) {
-            return ['', $value];
+            return [$value,''];
         }
         $urlQuery = (string)$urlQuery;
         $urlWithoutQuery = str_replace($urlQuery, '', $value);

diff --git a/tests/PHPUnit/Service/UrlParsingServiceTest.php b/tests/PHPUnit/Service/UrlParsingServiceTest.php
@@ -82,8 +82,8 @@ public function testParseTrackingCodeNotFound(string $input, array $expected)
     public function notFoundProvider(): array
     {
         return [
-            ['https://www.example.com/product', ['', 'https://www.example.com/product']],
-            ['https://www.example.com/code/product', ['', 'https://www.example.com/code/product']],
+            ['https://www.example.com/product', ['https://www.example.com/product','']],
+            ['https://www.example.com/code/product', ['https://www.example.com/code/product','']],
         ];
     }