Env REQUEST_URI can contain query params.

This is a typical scenario on tests, where REQUEST_URI contains path and all params to perform a request. No need to set QUERY_STRING in environment separately.
slimphp · May 27, 2016 · ab5fa78 · ab5fa78
1 parent 30cfe3c
commit ab5fa78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/Slim/Http/Uri.php b/Slim/Http/Uri.php
@@ -218,6 +218,9 @@ public static function createFromEnvironment(Environment $env)
 
         // Query string
         $queryString = $env->get('QUERY_STRING', '');
+        if ($queryString === '') {
+            $queryString = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_QUERY);
+        }
 
         // Fragment
         $fragment = '';

diff --git a/tests/Http/UriTest.php b/tests/Http/UriTest.php
@@ -633,4 +633,16 @@ public function testRequestURIContainsIndexDotPhp()
         );
         $this->assertSame('/foo/index.php', $uri->getBasePath());
     }
+
+    public function testRequestURICanContainParams()
+    {
+        $uri = Uri::createFromEnvironment(
+            Environment::mock(
+                [
+                    'REQUEST_URI' => '/foo?abc=123',
+                ]
+            )
+        );
+        $this->assertEquals('abc=123', $uri->getQuery());
+    }
 }