Better way to parse the request URI in 'ugly URLs' mode.

ludovicchabant · Oct 7, 2011 · c0c1188 · c0c1188
1 parent 7a00ae4
commit c0c1188
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 7 deletions.
diff --git a/_piecrust/src/PieCrust/Util/ServerHelper.php b/_piecrust/src/PieCrust/Util/ServerHelper.php
@@ -19,14 +19,16 @@ public static function getRequestUri(array $server, $prettyUrls)
         if (!$prettyUrls)
         {
             // Using standard query (no pretty URLs / URL rewriting)
-            $requestUri = $server['QUERY_STRING'];
-            if ($requestUri == null or $requestUri == '')
+            $requestUri = '/';
+            $requestVars = array();
+            parse_str($server['QUERY_STRING'], $requestVars);
+            foreach ($requestVars as $key => $value)
             {
-                $requestUri = '/';
-            }
-            else if (strpos($requestUri, '&') !== false)
-            {
-                $requestUri = strstr($requestUri, '&', true);
+                if ($key[0] == '/' and $value == null)
+                {
+                    $requestUri = $key;
+                    break;
+                }
             }
         }
         else

diff --git a/tests/src/test-cases/ServerHelperTest.php b/tests/src/test-cases/ServerHelperTest.php
@@ -0,0 +1,84 @@
+<?php
+
+require_once (dirname(__DIR__) . '/unittest_setup.php');
+
+use PieCrust\Util\ServerHelper;
+
+
+class ServerHelperTest extends PHPUnit_Framework_TestCase
+{
+    public function getRequestUriDataProvider()
+    {
+        return array(
+            array(
+                array('QUERY_STRING' => ''),
+                false,
+                '/'
+            ),
+            array(
+                array('QUERY_STRING' => '/'),
+                false,
+                '/'
+            ),
+            array(
+                array('QUERY_STRING' => '/blah'),
+                false,
+                '/blah'
+            ),
+            array(
+                array('QUERY_STRING' => '/foo/bar'),
+                false,
+                '/foo/bar'
+            ),
+            array(
+                array('QUERY_STRING' => '!debug'),
+                false,
+                '/'
+            ),
+            array(
+                array('QUERY_STRING' => '/&!debug'),
+                false,
+                '/'
+            ),
+            array(
+                array('QUERY_STRING' => '/foo/bar&!debug'),
+                false,
+                '/foo/bar'
+            ),
+            array(
+                array('QUERY_STRING' => '/blah&!debug&!nocache'),
+                false,
+                '/blah'
+            ),
+            array(
+                array('REQUEST_URI' => '/blah'),
+                true,
+                '/blah'
+            ),
+            array(
+                array('REQUEST_URI' => '/blah?!debug'),
+                true,
+                '/blah'
+            ),
+            array(
+                array('REQUEST_URI' => '/foo/bar'),
+                true,
+                '/foo/bar'
+            ),
+            array(
+                array('REQUEST_URI' => '/foo/bar?!debug&!nocache'),
+                true,
+                '/foo/bar'
+            )
+        );
+    }
+
+    /**
+     * @dataProvider getRequestUriDataProvider
+     */
+    public function testGetRequestUri($server, $prettyUrls, $expectedRequestUri)
+    {
+        $actualUri = ServerHelper::getRequestUri($server, $prettyUrls);
+        $this->assertEquals($expectedRequestUri, $actualUri, 'The request URI was not what was expected.');
+    }
+}