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/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',
     ];
 
@@ -68,15 +68,12 @@ class RouteResource extends LoadableRoute implements IControllerRoute
      */
     public function findUrl(?string $method = null, $parameters = null, ?string $name = null): string
     {
-        $url = parent::findUrl($method, $parameters, $name);
-
-        $action = array_search($name, $this->names, true);
-
-        if ($action !== false) {
-            return $url . $this->urls[$action];
+        $url = array_search($name, $this->names, true);
+        if ($url !== false) {
+            return rtrim($this->url . $this->urls[$url], '/') . '/';
         }
 
-        return $url;
+        return $this->url;
     }
 
     protected function call($method): bool
@@ -175,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/RouterResourceTest.php

@@ -66,20 +66,4 @@ class RouterResourceTest extends \PHPUnit\Framework\TestCase
 
     }
 
-    public function testResourceUrls()
-    {
-        TestRouter::resource('/resource', 'ResourceController')->name('resource');
-
-        TestRouter::debugOutputNoReset('/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/', TestRouter::router()->getUrl('resource'));
-
-        TestRouter::router()->reset();
-    }
-
 }