fixed absolute url generation for query strings

alexander-schranz · alexander-schranz · commit 14399e546428 · 2017-06-22T11:10:30.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -70,6 +70,10 @@ public function generateAbsoluteUrl($path)
                     $port = ':'.$this->requestContext->getHttpsPort();
                 }
 
+                if ('?' === $path[0]) {
+                    $path = $this->requestContext->getPathInfo() . $path;
+                }
+
                 if ('/' !== $path[0]) {
                     $path = rtrim($this->requestContext->getBaseUrl(), '/').'/'.$path;
                 }
@@ -80,6 +84,10 @@ public function generateAbsoluteUrl($path)
             return $path;
         }
 
+        if ('?' === $path[0]) {
+            $path = $request->getPathInfo() . $path;
+        }
+
         if (!$path || '/' !== $path[0]) {
             $prefix = $request->getPathInfo();
             $last = strlen($prefix) - 1;
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
@@ -42,6 +42,10 @@ public function getGenerateAbsoluteUrlData()
             array('http://example.com/baz', 'http://example.com/baz', '/'),
             array('https://example.com/baz', 'https://example.com/baz', '/'),
             array('//example.com/baz', '//example.com/baz', '/'),
+
+            array('https://example.com/foo/bar?baz', '?baz', '/foo/bar'),
+            array('https://example.com/foo/bar?baz=1', '?baz=1', '/foo/bar?foo=1'),
+            array('https://example.com/foo/baz?baz=1', 'baz?baz=1', '/foo/bar?foo=1'),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,10 @@ public function generateAbsoluteUrl($path)`
`70`	`70`	`$port = ':'.$this->requestContext->getHttpsPort();`
`71`	`71`	`}`
`72`	`72`
	`73`	`+ if ('?' === $path[0]) {`
	`74`	`+ $path = $this->requestContext->getPathInfo() . $path;`
	`75`	`+ }`
	`76`	`+`
`73`	`77`	`if ('/' !== $path[0]) {`
`74`	`78`	`$path = rtrim($this->requestContext->getBaseUrl(), '/').'/'.$path;`
`75`	`79`	`}`
`@@ -80,6 +84,10 @@ public function generateAbsoluteUrl($path)`
`80`	`84`	`return $path;`
`81`	`85`	`}`
`82`	`86`
	`87`	`+ if ('?' === $path[0]) {`
	`88`	`+ $path = $request->getPathInfo() . $path;`
	`89`	`+ }`
	`90`	`+`
`83`	`91`	`if (!$path \|\| '/' !== $path[0]) {`
`84`	`92`	`$prefix = $request->getPathInfo();`
`85`	`93`	`$last = strlen($prefix) - 1;`