Merge pull request #552 from skipperbent/v4-exception-callback-fix

SimpleRouter::error not working within group

src/Pecee/SimpleRouter/SimpleRouter.php

@@ -425,16 +425,11 @@ class SimpleRouter
      */
     public static function error(Closure $callback): CallbackExceptionHandler
     {
-        $routes = static::router()->getRoutes();
-
         $callbackHandler = new CallbackExceptionHandler($callback);
 
-        $group = new RouteGroup();
+        static::router()->addRoute(
-        $group->addExceptionHandler($callbackHandler);
+            (new RouteGroup())->addExceptionHandler($callbackHandler)
-
+        );
-        array_unshift($routes, $group);
-
-        static::router()->setRoutes($routes);
 
         return $callbackHandler;
     }

tests/Pecee/SimpleRouter/RouterCallbackExceptionHandlerTest.php

@@ -19,10 +19,29 @@ class RouterCallbackExceptionHandlerTest extends \PHPUnit\Framework\TestCase
             throw new ExceptionHandlerException();
         });
 
-        TestRouter::debugNoReset('/404-url', 'get');
+        TestRouter::debug('/404-url');
-        TestRouter::router()->reset();
+    }
 
-        $this->assertTrue(true);
+    public function testExceptionHandlerCallback() {
+
+        TestRouter::group(['prefix' => null], function() {
+            TestRouter::get('/', function() {
+                return 'Hello world';
+            });
+
+            TestRouter::get('/not-found', 'DummyController@method1');
+            TestRouter::error(function(\Pecee\Http\Request $request, \Exception $exception) {
+
+                if($exception instanceof \Pecee\SimpleRouter\Exceptions\NotFoundHttpException && $exception->getCode() === 404) {
+                    return $request->setRewriteCallback(static function() {
+                        return 'success';
+                    });
+                }
+            });
+        });
+
+        $result = TestRouter::debugOutput('/thisdoes-not/existssss', 'get');
+        $this->assertEquals('success', $result);
     }
 
 }