Merge pull request #688 from skipperbent/v5-development

Version 5.4.0.1

README.md

@@ -1742,6 +1742,7 @@ SimpleRouter::setCustomClassLoader(new MyCustomClassLoader());
 php-di support was discontinued by version 4.3, however you can easily add it again by creating your own class-loader like the example below:
 
 ```php
+use Pecee\SimpleRouter\ClassLoader\IClassLoader;
 use Pecee\SimpleRouter\Exceptions\ClassNotFoundHttpException;
 
 class MyCustomClassLoader implements IClassLoader
@@ -1762,19 +1763,14 @@ class MyCustomClassLoader implements IClassLoader
      *
      * @param string $class
      * @return object
-     * @throws NotFoundHttpException
+     * @throws ClassNotFoundHttpException
      */
     public function loadClass(string $class)
     {
-        if (class_exists($class) === false) {
-            throw new NotFoundHttpException(sprintf('Class "%s" does not exist', $class), 404);
+        if ($this->container->has($class) === false) {
+            throw new ClassNotFoundHttpException($class, null, sprintf('Class "%s" does not exist', $class), 404, null);
         }
-
-		try {
-			return $this->container->get($class);
-		} catch (\Exception $e) {
-			throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
-		}
+        return $this->container->get($class);
     }
     
     /**
@@ -1782,15 +1778,11 @@ class MyCustomClassLoader implements IClassLoader
      * @param object $class
      * @param string $method
      * @param array $parameters
-     * @return object
+     * @return string
      */
     public function loadClassMethod($class, string $method, array $parameters)
     {
-		try {
-			return $this->container->call([$class, $method], $parameters);
-		} catch (\Exception $e) {
-			throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
-		}
+        return (string)$this->container->call([$class, $method], $parameters);
     }
 
     /**
@@ -1798,15 +1790,11 @@ class MyCustomClassLoader implements IClassLoader
      *
      * @param Callable $closure
      * @param array $parameters
-     * @return mixed
+     * @return string
      */
     public function loadClosure(callable $closure, array $parameters)
     {
-		try {
-			return $this->container->call($closure, $parameters);
-		} catch (\Exception $e) {
-			throw new NotFoundHttpException($e->getMessage(), (int)$e->getCode(), $e->getPrevious());
-		}
+        return (string)$this->container->call($closure, $parameters);
     }
 }
 ```

src/Pecee/Http/Input/InputHandler.php

@@ -82,6 +82,10 @@ class InputHandler
                 if ($post !== false) {
                     $this->originalPost += $post;
                 }
+            } else {
+                $post = [];
+                parse_str($contents, $post);
+                $this->originalPost += $post;
             }
         }
 
@@ -108,7 +112,7 @@ class InputHandler
         foreach ($files as $key => $value) {
 
             // Parse multi dept file array
-            if(isset($value['name']) === false && is_array($value) === true) {
+            if (isset($value['name']) === false && is_array($value) === true) {
                 $list[$key] = $this->parseFiles($value, $key);
                 continue;
             }
@@ -161,12 +165,12 @@ class InputHandler
                 try {
 
                     $file = InputFile::createFromArray([
-                        'index'    => ($key === '' && $originalIndex !== '') ? $originalIndex : $key,
-                        'name'     => $original['name'][$key],
-                        'error'    => $original['error'][$key],
+                        'index' => ($key === '' && $originalIndex !== '') ? $originalIndex : $key,
+                        'name' => $original['name'][$key],
+                        'error' => $original['error'][$key],
                         'tmp_name' => $original['tmp_name'][$key],
-                        'type'     => $original['type'][$key],
-                        'size'     => $original['size'][$key],
+                        'type' => $original['type'][$key],
+                        'size' => $original['size'][$key],
                     ]);
 
                     if (isset($output[$key]) === true) {
@@ -231,7 +235,7 @@ class InputHandler
     {
         $element = null;
 
-        if(count($methods) > 0) {
+        if (count($methods) > 0) {
             $methods = is_array(...$methods) ? array_values(...$methods) : $methods;
         }
 
@@ -303,9 +307,9 @@ class InputHandler
     public function exists($index, ...$methods): bool
     {
         // Check array
-        if(is_array($index) === true) {
-            foreach($index as $key) {
-                if($this->value($key, null, ...$methods) === null) {
+        if (is_array($index) === true) {
+            foreach ($index as $key) {
+                if ($this->value($key, null, ...$methods) === null) {
                     return false;
                 }
             }

src/Pecee/Http/Response.php

@@ -32,6 +32,8 @@ class Response
      *
      * @param string $url
      * @param ?int $httpCode
+     *
+     * @return never
      */
     public function redirect(string $url, ?int $httpCode = null): void
     {
@@ -127,4 +129,4 @@ class Response
         return $this;
     }
 
-}
+}

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -82,15 +82,18 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
     {
         $this->url = ($url === '/') ? '/' : '/' . trim($url, '/') . '/';
 
+        $parameters = [];
         if (strpos($this->url, $this->paramModifiers[0]) !== false) {
 
             $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
             if ((bool)preg_match_all('/' . $regex . '/u', $this->url, $matches) !== false) {
-                $this->parameters = array_fill_keys($matches[1], null);
+                $parameters = array_fill_keys($matches[1], null);
             }
         }
 
+        $this->parameters = $parameters;
+
         return $this;
     }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -68,15 +68,19 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      */
     public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
-        $url = parent::findUrl($method, $parameters, $name);
+        $url = array_search($name, $this->names, true);
 
-        $action = array_search($name, $this->names, true);
+        $parametersUrl = '';
 
-        if ($action !== false) {
-            return $url . $this->urls[$action];
+        if ($parameters !== null && count($parameters) > 0) {
+            $parametersUrl = join('/', $parameters) . '/';
         }
 
-        return $url;
+        if ($url !== false) {
+            return rtrim($this->url . $parametersUrl . $this->urls[$url], '/') . '/';
+        }
+
+        return $this->url . $parametersUrl;
     }
 
     protected function call($method): bool

src/Pecee/SimpleRouter/Router.php

@@ -562,6 +562,7 @@ class Router
 
                     if ($this->request->getRewriteRoute() !== null) {
                         $this->processedRoutes[] = $this->request->getRewriteRoute();
+                        $this->request->setHasPendingRewrite(false);
                     }
 
                     return $this->routeRequest();

tests/Pecee/SimpleRouter/Dummy/Route/DummyLoadableRoute.php

@@ -0,0 +1,11 @@
+<?php
+
+use Pecee\Http\Request;
+
+class DummyLoadableRoute extends Pecee\SimpleRouter\Route\LoadableRoute {
+
+    public function matchRoute(string $url, Request $request): bool
+    {
+        return false;
+    }
+}

tests/Pecee/SimpleRouter/LoadableRouteTest.php

@@ -0,0 +1,27 @@
+<?php
+
+require_once 'Dummy/Route/DummyLoadableRoute.php';
+
+class LoadableRouteTest extends \PHPUnit\Framework\TestCase
+{
+    public function testSetUrlUpdatesParameters()
+    {
+        $route = new DummyLoadableRoute();
+        $this->assertEmpty($route->getParameters());
+
+        $route->setUrl('/');
+        $this->assertEmpty($route->getParameters());
+
+        $expected = ['param' => null, 'optionalParam' => null];
+        $route->setUrl('/{param}/{optionalParam?}');
+        $this->assertEquals($expected, $route->getParameters());
+
+        $expected = ['otherParam' => null];
+        $route->setUrl('/{otherParam}');
+        $this->assertEquals($expected, $route->getParameters());
+
+        $expected = [];
+        $route->setUrl('/');
+        $this->assertEquals($expected, $route->getParameters());
+    }
+}

tests/Pecee/SimpleRouter/RouterResourceTest.php

@@ -63,20 +63,19 @@ class RouterResourceTest extends \PHPUnit\Framework\TestCase
         $response = TestRouter::debugOutput('/resource/38', 'get');
 
         $this->assertEquals('show 38', $response);
-
     }
 
     public function testResourceUrls()
     {
         TestRouter::resource('/resource', 'ResourceController')->name('resource');
 
-        TestRouter::debugOutputNoReset('/resource');
+        TestRouter::debugNoReset('/resource');
 
         $this->assertEquals('/resource/3/create/', TestRouter::router()->getUrl('resource.create', ['id' => 3]));
-        $this->assertEquals('/resource/3/edit/', TestRouter::router()->getUrl('resource.edit', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.update', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.destroy', ['id' => 3]));
-        $this->assertEquals('/resource/3/', TestRouter::router()->getUrl('resource.delete', ['id' => 3]));
+        $this->assertEquals('/resource/5/edit/', TestRouter::router()->getUrl('resource.edit', ['id' => 5]));
+        $this->assertEquals('/resource/6/', TestRouter::router()->getUrl('resource.update', ['id' => 6]));
+        $this->assertEquals('/resource/9/', TestRouter::router()->getUrl('resource.destroy', ['id' => 9]));
+        $this->assertEquals('/resource/12/', TestRouter::router()->getUrl('resource.delete', ['id' => 12]));
         $this->assertEquals('/resource/', TestRouter::router()->getUrl('resource'));
 
         TestRouter::router()->reset();

tests/Pecee/SimpleRouter/RouterUrlTest.php

@@ -184,7 +184,7 @@ class RouterUrlTest extends \PHPUnit\Framework\TestCase
         // Should match /?jackdaniels=true&cola=yeah
         $this->assertEquals('/?jackdaniels=true&cola=yeah', TestRouter::getUrl('home', null, ['jackdaniels' => 'true', 'cola' => 'yeah']));
 
-        TestRouter::router()->reset();
+        TestRouter::reset();
 
     }
 

tests/TestRouter.php

@@ -8,6 +8,11 @@ class TestRouter extends \Pecee\SimpleRouter\SimpleRouter
         static::request()->setHost('testhost.com');
     }
 
+    public static function reset(): void
+    {
+        static::$router = null;
+    }
+
     public static function debugNoReset(string $testUrl, string $testMethod = 'get'): void
     {
         $request = static::request();