Merge branch 'hotfix/ZF-206' of https://github.com/Maks3w/zf2 into ho…

…tfix/zf2-206
zendframework · May 20, 2012 · 024e8cb · 024e8cb
2 parents 3426297 + 6aed368
commit 024e8cb
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
@@ -311,21 +311,10 @@ protected function detectBaseUrl()
         } else {
             // Backtrack up the SCRIPT_FILENAME to find the portion
             // matching PHP_SELF.
-            $path = $phpSelf ?: '';
-            if (!isset($path[1]) || $path[1] !== '~') {
-                $segments = array_reverse(explode('/', trim($filename, '/')));
-            } else {
-                $segments = array_reverse(explode('/', trim($path, '/')));
-            }
-            $index    = 0;
-            $last     = count($segments);
-            $baseUrl  = '';
-
-            do {
-                $segment = $segments[$index];
-                $baseUrl = '/' . $segment . $baseUrl;
-                $index++;
-            } while ($last > $index && false !== ($pos = strpos($path, $baseUrl)) && 0 !== $pos);
+
+            $basename = basename($filename);
+            $path = ($phpSelf ? trim($phpSelf, '/') : '');
+            $baseUrl = '/'. substr($path, 0, strpos($path, $basename)) . $basename;
         }
 
         // Does the base URL have anything in common with the request URI?
@@ -370,7 +359,7 @@ protected function detectBaseUrl()
     /**
      * Autodetect the base path of the request
      *
-     * Uses several crtieria to determine the base path of the request.
+     * Uses several criteria to determine the base path of the request.
      * 
      * @return string
      */
@@ -386,7 +375,7 @@ protected function detectBasePath()
 
         // basename() matches the script filename; return the directory
         if (basename($baseUrl) === $filename) {
-            return dirname($baseUrl);
+            return str_replace('\\', '/', dirname($baseUrl));
         }
 
         // Base path is identical to base URL

diff --git a/test/PhpEnvironment/RequestTest.php b/test/PhpEnvironment/RequestTest.php
@@ -48,7 +48,7 @@ public function tearDown()
     /**
      * Data provider for testing base URL and path detection.
      */
-    public static function baseUrlandPathProvider()
+    public static function baseUrlAndPathProvider()
     {
         return array(
             array(
@@ -160,11 +160,41 @@ public static function baseUrlandPathProvider()
                 '/~username/public',
                 '/~username/public'
             ),
+            // ZF2-206
+            array(
+                array(
+                    'SCRIPT_NAME'     => '/zf2tut/index.php',
+                    'REQUEST_URI'     => '/zf2tut/',
+                    'PHP_SELF'        => '/zf2tut/index.php',
+                    'SCRIPT_FILENAME' => 'c:/ZF2Tutorial/public/index.php',
+                    'ORIG_SCRIPT_NAME'=> null
+                ),
+                '/zf2tut',
+                '/zf2tut'
+            ),
+            array(
+                array(
+                    'REQUEST_URI'     => '/html/index.php/news/3?var1=val1&var2=/index.php',
+                    'PHP_SELF'        => '/html/index.php/news/3',
+                    'SCRIPT_FILENAME' => '/var/web/html/index.php',
+                ),
+                '/html/index.php',
+                '/html'
+            ),
+            array(
+                array(
+                    'REQUEST_URI'     => '/html/index.php/news/index.php',
+                    'PHP_SELF'        => '/html/index.php/news/index.php',
+                    'SCRIPT_FILENAME' => '/var/web/html/index.php',
+                ),
+                '/html/index.php',
+                '/html'
+            ),
         );
     }
 
     /**
-     * @dataProvider baseUrlandPathProvider
+     * @dataProvider baseUrlAndPathProvider
      * @param array  $server
      * @param string $baseUrl
      * @param string $basePath