update

Author: mevdschee

src/Router.php

@@ -145,15 +145,15 @@ protected static function routeFile($templateRoot,$root,$dir,$path,$parameters,$
 
       if (substr($url,-7)=='//index') $redirect = substr($url,0,-7);
       if (substr(static::$original,-6)=='/index') $redirect = substr($url,0,-6);
-      if (count($parameters)>count($parameterNames)) {
+      if (count($parameters)>count($parameterNames) || count(array_diff(array_keys($getParameters),$parameterNames))>0) {
         if (substr($url,-6)=='/index') $url = substr($url,0,-6);
         if ($url=='index') $url = '';
-        if (count($parameterNames)) {
-          $redirect = ($url?$url.'/':'');
-          $redirect .= implode('/',array_slice($parameters, 0, count($parameterNames)));
-        } else {
-          $redirect = $url;
+        $redirect = $url;
+        for ($i=0;$i<min(count($parameters),count($parameterNames));$i++) {
+          $redirect .= '/'.$parameters[$i];
         }
+        $query = http_build_query(array_intersect_key($getParameters,array_flip($parameterNames)));
+        $redirect .= $query?'?'.$query:'';
       }
       $parameters = array_map('urldecode', $parameters);
       if (count($parameters)<count($parameterNames)) {
@@ -244,11 +244,6 @@ protected static function route()
       parse_str($query,$getParameters);
     }
 
-    if (!static::$allowGet) {
-      $_SERVER['REQUEST_URI'] = static::$baseUrl.$request;
-      $_GET = array();
-    }
-
     $parts = explode('/',$request);
     for ($i=count($parts);$i>=0;$i--) {
     	if ($i==0) $dir = '';
@@ -268,7 +263,7 @@ protected static function route()
     	$templateFile = static::$template;
     	$parameters = array();
     	$parameters['url'] = static::$parameters;
-    	$parameters['get'] = $getParameters;
+    	$parameters['get'] = $_GET;
     	$parameters['post'] = $_POST;
     	Debugger::set('router',compact('method','csrfOk','request','url','dir','view','template','viewFile','actionFile','templateFile','parameters'));
     	Debugger::set('status',$status);

src/Tests/RouterTest.php

@@ -67,10 +67,6 @@ protected function request($method, $uri)
     {
         $_SERVER['REQUEST_METHOD'] = $method;
         $_SERVER['REQUEST_URI'] = $uri;
-        $q = strpos($uri, '?');
-        if ($q !== false) {
-            parse_str(substr($uri, $q + 1), $_GET);
-        }
         Router::$initialized = false;
     }
 
@@ -155,7 +151,7 @@ public function testGetParameters()
     public function testGetParameterWithWrongName()
     {
         $this->request('GET', '/admin/posts/view?idea=12');
-        $this->assertEquals(array('id' => null), Router::getParameters());
+        $this->assertEquals('/admin/posts/view', Router::getRedirect());
     }
 
     public function testGetParameterHalf()
@@ -182,12 +178,10 @@ public function testGetParameterLastOnly()
         $this->assertEquals(array('code' => null, 'state' => '12'), Router::getParameters());
     }
 
-    public function testGetParameterGloballyUnset()
+    public function testGetParametersTooMany()
     {
-        $this->request('GET', '/admin/posts/view/4?state=12&code=23');
-        $this->assertEquals(array('id' => '4'), Router::getParameters());
-        $this->assertEquals(array(), $_GET);
-        $this->assertEquals('/admin/posts/view/4', $_SERVER['REQUEST_URI']);
+        $this->request('GET', '/admin/posts/view?state=12&code=23&id=4');
+        $this->assertEquals('/admin/posts/view?id=4', Router::getRedirect());
     }
 
     public function testActionWithoutView()