Merge pull request #5

Fixed: UrlBuilder creates errorneous URLs when there is no path but query parameter.
contao-community-alliance · Feb 7, 2022 · 753ac00 · 753ac00
2 parents c193079 + 28ab354
commit 753ac00
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/UrlBuilder.php b/src/UrlBuilder.php
@@ -86,6 +86,15 @@ class UrlBuilder
      */
     protected $fragment;
 
+    /**
+     * Flag to determine if the query string is to be prefixed with a question mark.
+     *
+     * See issue #3
+     *
+     * @var bool
+     */
+    private $queryWasPrefixed = false;
+
     /**
      * Create a new instance.
      *
@@ -558,6 +567,8 @@ public function getUrl()
                     $url .= '/';
                 }
                 $url .= '?';
+            } elseif ($this->queryWasPrefixed) {
+                $url .= '?';
             }
 
             $url .= $query;
@@ -593,17 +604,23 @@ private function parseUrl($url)
             return [];
         }
 
+        if (count($parsed) !== 1) {
+            $this->queryWasPrefixed = false;
+            return $parsed;
+        }
         if (
-            (count($parsed) === 1)
-            && isset($parsed['path'])
-            && (0 === strpos($parsed['path'], '?') || false !== strpos($parsed['path'], '&'))
+            isset($parsed['path'])
+            && (($queryWasPrefixed = (0 === strpos($parsed['path'], '?'))) || false !== strpos($parsed['path'], '&'))
         ) {
             $parsed = array(
                 'query' => $parsed['path']
             );
 
+            $this->queryWasPrefixed = $queryWasPrefixed;
+
             return $parsed;
         }
+        $this->queryWasPrefixed = isset($parsed['query']);
 
         return $parsed;
     }

diff --git a/tests/UrlBuilderTest.php b/tests/UrlBuilderTest.php
@@ -120,7 +120,7 @@ public function prepareUrls()
             ),
             array(
                 'input' => '?authenticated=1&token=123&perform',
-                'expected' => 'authenticated=1&token=123&perform',
+                'expected' => '?authenticated=1&token=123&perform',
                 'query'    => 'authenticated=1&token=123&perform',
             ),
             array(