Merge branch 'adambro-request_uri_with_params' into 3.x

Closes 1896

Author: akrabat

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 = '';

tests/Http/UriTest.php

@@ -632,4 +632,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());
+    }
 }