Use rawurldecode on the REQUST_URI instead of changing the SCRIPT_NAME

slimphp · Oct 12, 2016 · df1591c · df1591c
1 parent ee3f068
commit df1591c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Slim/Http/Uri.php b/Slim/Http/Uri.php
@@ -197,13 +197,13 @@ public static function createFromEnvironment(Environment $env)
         }
 
         // Path
-        $envScriptName = str_replace(' ', '%20', $env->get('SCRIPT_NAME'));
-        $requestScriptName = parse_url($envScriptName, PHP_URL_PATH);
+        $requestScriptName = parse_url($env->get('SCRIPT_NAME'), PHP_URL_PATH);
         $requestScriptDir = dirname($requestScriptName);
 
         // parse_url() requires a full URL. As we don't extract the domain name or scheme,
         // we use a stand-in.
         $requestUri = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_PATH);
+        $requestUri = rawurldecode($requestUri);
 
         $basePath = '';
         $virtualPath = $requestUri;

diff --git a/tests/Http/UriTest.php b/tests/Http/UriTest.php
@@ -558,15 +558,15 @@ public function testCreateEnvironmentWithBasePath()
     public function testCreateEnvironmentWithBasePathContainingSpace()
     {
         $environment = Environment::mock([
-            'SCRIPT_NAME' => '/foo bar/index.php',
-            'REQUEST_URI' => '/foo%20bar/baz',
+            'SCRIPT_NAME' => "/f'oo bar/index.php",
+            'REQUEST_URI' => "/f'oo%20bar/baz",
         ]);
         $uri = Uri::createFromEnvironment($environment);
 
-        $this->assertEquals('/foo%20bar', $uri->getBasePath());
+        $this->assertEquals("/f%27oo%20bar", $uri->getBasePath());
         $this->assertEquals('baz', $uri->getPath());
 
-        $this->assertEquals('http://localhost/foo%20bar/baz', (string) $uri);
+        $this->assertEquals('http://localhost/f%27oo%20bar/baz', (string) $uri);
     }
 
     public function testGetBaseUrl()