Merge pull request #655 from skipperbent/v5-development

Version 5.3.0.1

src/Pecee/Http/Input/InputItem.php

@@ -89,7 +89,6 @@ class InputItem implements ArrayAccess, IInputItem, IteratorAggregate
         return isset($this->value[$offset]);
     }
 
-    #[\ReturnTypeWillChange]
     public function offsetGet($offset): ?self
     {
         if ($this->offsetExists($offset) === true) {

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -82,18 +82,15 @@ 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) {
-                $parameters = array_fill_keys($matches[1], null);
+                $this->parameters = array_fill_keys($matches[1], null);
             }
         }
 
-        $this->parameters = $parameters;
-
         return $this;
     }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -7,22 +7,22 @@ use Pecee\Http\Request;
 class RouteResource extends LoadableRoute implements IControllerRoute
 {
     protected array $urls = [
-        'index' => '',
-        'create' => 'create',
-        'store' => '',
-        'show' => '',
-        'edit' => 'edit',
-        'update' => '',
+        'index'   => '',
+        'create'  => 'create',
+        'store'   => '',
+        'show'    => '',
+        'edit'    => 'edit',
+        'update'  => '',
         'destroy' => '',
     ];
 
     protected array $methodNames = [
-        'index' => 'index',
-        'create' => 'create',
-        'store' => 'store',
-        'show' => 'show',
-        'edit' => 'edit',
-        'update' => 'update',
+        'index'   => 'index',
+        'create'  => 'create',
+        'store'   => 'store',
+        'show'    => 'show',
+        'edit'    => 'edit',
+        'update'  => 'update',
         'destroy' => 'destroy',
     ];
 
@@ -69,18 +69,11 @@ class RouteResource extends LoadableRoute implements IControllerRoute
     public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
         $url = array_search($name, $this->names, true);
-
-        $parametersUrl = '';
-
-        if ($parameters !== null && count($parameters) > 0) {
-            $parametersUrl = join('/', $parameters) . '/';
-        }
-
         if ($url !== false) {
-            return rtrim($this->url . $parametersUrl . $this->urls[$url], '/') . '/';
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
         }
 
-        return $this->url . $parametersUrl;
+        return $this->url;
     }
 
     protected function call($method): bool
@@ -179,12 +172,12 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         $this->name = $name;
 
         $this->names = [
-            'index' => $this->name . '.index',
-            'create' => $this->name . '.create',
-            'store' => $this->name . '.store',
-            'show' => $this->name . '.show',
-            'edit' => $this->name . '.edit',
-            'update' => $this->name . '.update',
+            'index'   => $this->name . '.index',
+            'create'  => $this->name . '.create',
+            'store'   => $this->name . '.store',
+            'show'    => $this->name . '.show',
+            'edit'    => $this->name . '.edit',
+            'update'  => $this->name . '.update',
             'destroy' => $this->name . '.destroy',
         ];
 

src/Pecee/SimpleRouter/Router.php

@@ -443,8 +443,12 @@ class Router
                 }
             }
 
-        } catch (Exception $e) {
-            return $this->handleException($e);
+        } catch (\Throwable $e) {
+            if ($e instanceof Exception) {
+                return $this->handleException($e);
+            }
+
+            return $this->handleException(new Exception($e->getMessage(), $e->getCode()));
         }
 
         if ($methodNotAllowed === true) {

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

@@ -1,11 +0,0 @@
-<?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

@@ -1,27 +0,0 @@
-<?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,22 +63,7 @@ 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::debugNoReset('/resource');
-
-        $this->assertEquals('/resource/3/create/', TestRouter::router()->getUrl('resource.create', ['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::reset();
+        TestRouter::router()->reset();
 
     }
 

tests/TestRouter.php

@@ -8,11 +8,6 @@ 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();