Merge pull request #263 from skipperbent/v3-development

V3 development

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -92,7 +92,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      * Used when calling the url() helper.
      *
      * @param string|null $method
-     * @param array|null $parameters
+     * @param string|array|null $parameters
      * @param string|null $name
      * @return string
      */
@@ -123,11 +123,17 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
         for ($i = $max; $i >= 0; $i--) {
             $param = $keys[$i];
-            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
 
-            /* If parameter is specifically set to null - use the original-defined value */
-            if ($value === null && isset($this->originalParameters[$param])) {
-                $value = $this->originalParameters[$param];
+            if ($parameters === '' || (is_array($parameters) && count($parameters) === 0)) {
+                $value = '';
+            } else {
+                $p = (array)$parameters;
+                $value = array_key_exists($param, $p) ? $p[$param] : $params[$param];
+
+                /* If parameter is specifically set to null - use the original-defined value */
+                if ($value === null && isset($this->originalParameters[$param])) {
+                    $value = $this->originalParameters[$param];
+                }
             }
 
             if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
@@ -138,6 +144,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
             }
         }
 
+        $url = '/' . ltrim($url, '/');
         $url .= join('/', $unknownParams);
 
         return rtrim($url, '/') . '/';

src/Pecee/SimpleRouter/Route/Route.php

@@ -76,9 +76,7 @@ abstract class Route implements IRoute
         if (is_callable($callback) === true) {
 
             /* When the callback is a function */
-            call_user_func_array($callback, $this->getParameters());
-
-            return;
+            return call_user_func_array($callback, $this->getParameters());
 
         }
 
@@ -106,7 +104,7 @@ abstract class Route implements IRoute
             });
         }
 
-        call_user_func_array([$class, $method], $parameters);
+        return call_user_func_array([$class, $method], $parameters);
     }
 
     protected function parseParameters($route, $url, $parameterRegex = null)

src/Pecee/SimpleRouter/Router.php

@@ -248,9 +248,7 @@ class Router
 
                     if ($rewriteRoute !== null) {
                         $rewriteRoute->loadMiddleware($this->request);
-                        $rewriteRoute->renderRoute($this->request);
-
-                        return;
+                        return $rewriteRoute->renderRoute($this->request);
                     }
 
                     /* If the request has changed */
@@ -267,7 +265,7 @@ class Router
                     /* Render route */
                     $routeNotAllowed = false;
                     $this->request->setLoadedRoute($route);
-                    $route->renderRoute($this->request);
+                    return $route->renderRoute($this->request);
 
                     break;
                 }
@@ -295,6 +293,11 @@ class Router
         }
     }
 
+    /**
+     * @param \Exception $e
+     * @throws HttpException
+     * @throws \Exception
+     */
     protected function handleException(\Exception $e)
     {
         $url = ($this->request->getRewriteUrl() !== null) ? $this->request->getRewriteUrl() : $this->request->getUri();
@@ -320,9 +323,7 @@ class Router
 
                 if ($rewriteRoute !== null) {
                     $rewriteRoute->loadMiddleware($this->request);
-                    $rewriteRoute->renderRoute($this->request);
-
-                    return;
+                    return $rewriteRoute->renderRoute($this->request);
                 }
 
                 $rewriteUrl = $this->request->getRewriteUrl();

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -49,7 +49,7 @@ class SimpleRouter
      */
     public static function start()
     {
-        static::router()->routeRequest();
+        echo static::router()->routeRequest();
     }
 
     /**

test/RouterUrlTest.php

@@ -12,6 +12,9 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
     {
         TestRouter::get('/', 'DummyController@method1');
         TestRouter::get('/page/{id?}', 'DummyController@method1');
+        TestRouter::get('/test-output', function() {
+            return 'return value';
+        });
 
         TestRouter::debugNoReset('/page/22', 'get');
         $this->assertEquals('/page/{id?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
@@ -19,6 +22,24 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
         TestRouter::debugNoReset('/', 'get');
         $this->assertEquals('/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
 
+        $output = TestRouter::debugOutput('/test-output', 'get');
+        $this->assertEquals('return value', $output);
+
+        TestRouter::router()->reset();
+    }
+
+    public function testUnicodeCharacters()
+    {
+        // Test spanish characters
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
+        TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
+        $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
+        // Test danish characters
+        TestRouter::get('/kategori/økse', 'DummyController@method1', ['defaultParameterRegex' => '[\w\ø]+']);
+        TestRouter::debugNoReset('/kategori/økse', 'get');
+        $this->assertEquals('/kategori/økse/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
+
         TestRouter::router()->reset();
     }