Merge pull request #655 from skipperbent/v5-development

Version 5.3.0.1

Author: skipperbent

src/Pecee/SimpleRouter/Router.php

@@ -35,7 +35,7 @@ class Router
      * @var bool
      */
     protected bool $isProcessingRoute;
-    
+
     /**
      * Defines all data from current processing route.
      * @var ILoadableRoute
@@ -59,7 +59,7 @@ class Router
      * when a route is being processed.
      * @var array
      */
-    protected array$routeStack = [];
+    protected array $routeStack = [];
 
     /**
      * List of added bootmanagers
@@ -166,7 +166,7 @@ public function reset(): void
     public function addRoute(IRoute $route): IRoute
     {
         $this->fireEvents(EventHandler::EVENT_ADD_ROUTE, [
-            'route'      => $route,
+            'route' => $route,
             'isSubRoute' => $this->isProcessingRoute,
         ]);
 
@@ -307,7 +307,7 @@ public function loadRoutes(): void
             $this->debug('Rendering bootmanager "%s"', $className);
             $this->fireEvents(EventHandler::EVENT_RENDER_BOOTMANAGER, [
                 'bootmanagers' => $this->bootManagers,
-                'bootmanager'  => $manager,
+                'bootmanager' => $manager,
             ]);
 
             /* Render bootmanager */
@@ -345,7 +345,7 @@ public function start(): ?string
             try {
                 /* Verify csrf token for request */
                 $this->csrfVerifier->handle($this->request);
-            } catch(Exception $e) {
+            } catch (Exception $e) {
                 return $this->handleException($e);
             }
         }
@@ -381,7 +381,7 @@ public function routeRequest(): ?string
             foreach ($this->processedRoutes as $key => $route) {
 
                 $this->debug('Matching route "%s"', get_class($route));
-                
+
                 /* Add current processing route to constants */
                 $this->currentProcessingRoute = $route;
 
@@ -405,7 +405,7 @@ public function routeRequest(): ?string
                     }
 
                     $this->fireEvents(EventHandler::EVENT_RENDER_MIDDLEWARES, [
-                        'route'       => $route,
+                        'route' => $route,
                         'middlewares' => $route->getMiddlewares(),
                     ]);
 
@@ -443,8 +443,12 @@ public function routeRequest(): ?string
                 }
             }
 
-        } 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) {
@@ -500,7 +504,7 @@ protected function handleRouteRewrite(string $key, string $url): ?string
             $this->request->setHasPendingRewrite(false);
 
             $this->fireEvents(EventHandler::EVENT_REWRITE, [
-                'rewriteUrl'   => $this->request->getRewriteUrl(),
+                'rewriteUrl' => $this->request->getRewriteUrl(),
                 'rewriteRoute' => $this->request->getRewriteRoute(),
             ]);
 
@@ -521,7 +525,7 @@ protected function handleException(Exception $e): ?string
         $this->debug('Starting exception handling for "%s"', get_class($e));
 
         $this->fireEvents(EventHandler::EVENT_LOAD_EXCEPTIONS, [
-            'exception'         => $e,
+            'exception' => $e,
             'exceptionHandlers' => $this->exceptionHandlers,
         ]);
 
@@ -533,8 +537,8 @@ protected function handleException(Exception $e): ?string
             }
 
             $this->fireEvents(EventHandler::EVENT_RENDER_EXCEPTION, [
-                'exception'         => $e,
-                'exceptionHandler'  => $handler,
+                'exception' => $e,
+                'exceptionHandler' => $handler,
                 'exceptionHandlers' => $this->exceptionHandlers,
             ]);
 
@@ -556,7 +560,7 @@ protected function handleException(Exception $e): ?string
                     $this->debug('Exception handler contains rewrite, reloading routes');
 
                     $this->fireEvents(EventHandler::EVENT_REWRITE, [
-                        'rewriteUrl'   => $this->request->getRewriteUrl(),
+                        'rewriteUrl' => $this->request->getRewriteUrl(),
                         'rewriteRoute' => $this->request->getRewriteRoute(),
                     ]);
 
@@ -667,9 +671,9 @@ public function getUrl(?string $name = null, $parameters = null, ?array $getPara
         $this->debug('Finding url', func_get_args());
 
         $this->fireEvents(EventHandler::EVENT_GET_URL, [
-            'name'       => $name,
+            'name' => $name,
             'parameters' => $parameters,
-            'getParams'  => $getParams,
+            'getParams' => $getParams,
         ]);
 
         if ($name === '' && $parameters === '') {
@@ -913,8 +917,8 @@ public function debug(string $message, ...$args): void
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
         $this->debugList[] = [
             'message' => vsprintf($message, $args),
-            'time'    => number_format(microtime(true) - $this->debugStartTime, 10),
-            'trace'   => end($trace),
+            'time' => number_format(microtime(true) - $this->debugStartTime, 10),
+            'trace' => end($trace),
         ];
     }
 
@@ -940,7 +944,7 @@ public function getDebugLog(): array
     {
         return $this->debugList;
     }
-    
+
     /**
      * Get the current processing route details.
      *