Test querystring is ignored in URI fixes

PhpGt · Aug 4, 2014 · fd7e693 · fd7e693
1 parent 3015f74
commit fd7e693
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Request/Standardiser.php b/src/Request/Standardiser.php
@@ -22,12 +22,13 @@ class Standardiser {
  */
 public function fixUri($uri, ConfigObj $config) {
 	$queryString = parse_url($uri, PHP_URL_QUERY);
-	$fixed = $uri;
+	$fixed = strtok($uri, "?");
+
 	$pathinfo = pathinfo($fixed);
-	$file = strtok($pathinfo["filename"], "?");
+	$file = $pathinfo["filename"];
 	$ext  = empty($pathinfo["extension"])
 		? null
-		: strtok($pathinfo["extension"], "?");
+		: $pathinfo["extension"];
 
 	$fixed = $this->fixHtmlExtension($fixed, $file, $ext, $config);
 	$fixed = $this->fixIndexFilename($fixed, $file, $ext, $config);

diff --git a/test/Unit/Request/Standardiser.test.php b/test/Unit/Request/Standardiser.test.php
@@ -251,7 +251,8 @@ public function testQueryStringPreserved($uri) {
  */
 public function testFixUri($uri) {
 	$standardiser = new Standardiser();
-	$fixed = $standardiser->fixUri($uri, new ConfigObj());
+
+	$fixed = $standardiser->fixUri("$uri", new ConfigObj() );
 	$this->assertInternalType("string", $fixed);
 }