Fix #24

Author: Marco Bunge

src/Application.php

@@ -537,16 +537,18 @@ public function handleError(
         // get last occured exception
         $exception = $this->getLastException();
 
+        $message = $errorHandler->getErrorMessage($exception);
+
+        $errorResponse = $this->determineErrorResponse($exception, $message, $response, $request);
+
         if (
             false === $catch
             && true === $showError
         ) {
             $this->throwException($exception);
         }
 
-        $message = $errorHandler->getErrorMessage($exception);
-
-        return $this->determineErrorResponse($exception, $message, $response, $request);
+        return $errorResponse;
     }
 
     /**
@@ -655,7 +657,7 @@ public function shutdown($response = null)
     public function terminateOutputBuffering($level = 0, $response = null)
     {
 
-        // close response stream berfore terminating output buffer
+        // close response stream before terminating output buffer
         // and only if response is an instance of
         // \Psr\Http\ResponseInterface
         if ($response instanceof ResponseInterface) {
@@ -801,18 +803,18 @@ protected function initContentType()
     protected function initSystem(){
         // error handler
         set_error_handler(function($level, $message, $file = null, $line = null){
-            $this->emit(self::EVENT_HANDLE_ERROR, [$level, $message, $file, $line]);
+            $event = $this->getApplicationEvent();
+            $this->emit($event->setName(self::EVENT_HANDLE_ERROR), $level, $message, $file, $line);
         });
 
         // exception handler
         set_exception_handler(function($exception){
-            $this->emit(self::EVENT_SYSTEM_EXCEPTION, [$exception]);
+            $event = $this->getApplicationEvent();
+            $this->emit($event->setName(self::EVENT_SYSTEM_EXCEPTION), $exception);
         });
 
         // shutdown function
-        register_shutdown_function(function (){
-            $this->emit(self::EVENT_SYSTEM_SHUTDOWN);
-        });
+        register_shutdown_function([$this, 'shutdown']);
     }
 
 }

src/Application/Services/Whoops/ApplicationSystemFacade.php

@@ -54,8 +54,10 @@ public function setErrorHandler(callable $handler, $types = 'use-php-defaults')
         $this->errorHandler = $handler;
         return $this->application->addListener(
             ApplicationInterface::EVENT_HANDLE_ERROR,
-            function ($event, $data) use ($handler) {
-                call_user_func_array($handler, $data);
+            function ($event) use ($handler) {
+                $args = func_get_args();
+                array_shift($args);
+                call_user_func_array($handler, $args);
             }
         );
     }
@@ -68,8 +70,10 @@ public function setExceptionHandler(callable $handler)
     {
         return $this->application->addListener(
             ApplicationInterface::EVENT_SYSTEM_EXCEPTION,
-            function ($event, $data) use ($handler) {
-                call_user_func_array($handler, $data);
+            function ($event) use ($handler) {
+                $args = func_get_args();
+                array_shift($args);
+                call_user_func_array($handler, $args);
             }
         );
     }
@@ -100,7 +104,7 @@ public function registerShutdownFunction(callable $function)
     {
         return $this->application->addListener(
             ApplicationInterface::EVENT_SYSTEM_SHUTDOWN,
-            function () use ($function) {
+            function ($event) use ($function) {
                 call_user_func_array($function, []);
             }
         );

tests/ApplicationTest.php

@@ -112,6 +112,10 @@ public function testTerminate()
     {
         $app = new Application();
 
+        $app->get('/', function (ServerRequestInterface $request, ResponseInterface $response, array $args = []) {
+            return $response;
+        });
+
         $app->addListener('response.sent', function (HttpApplicationEvent $event) {
             $this->assertInstanceOf('League\Event\Event', $event);
             $this->assertInstanceOf(ServerRequestInterface::class, $event->getRequest());
@@ -205,6 +209,7 @@ public function testHandleAutoWiringControllerAction()
      */
     public function testHandleWithOtherException()
     {
+
         $app = new Application();
 
         $request = ServerRequestFactory::fromGlobals();
@@ -225,12 +230,11 @@ public function testHandleWithOtherException()
     }
 
     /**
-     *
+     * This should not throw errors
      */
-    public function testExceptionHandling()
+    public function testHttpErrorHandling()
     {
         $app = new Application();
-        $app->setConfig('error', false);
 
         $request = ServerRequestFactory::fromGlobals();
 
@@ -404,7 +408,7 @@ public function testApplicationMiddlewareOnError()
     {
         $app = new Application();
         $handledOnError = false;
-        $app->addMiddleware(function(ServerRequestInterface $request, ResponseInterface $response, callable $next) use (&$handledOnError){
+        $app->addMiddleware(function (ServerRequestInterface $request, ResponseInterface $response, callable $next) use (&$handledOnError) {
             $handledOnError = true;
             return $response;
         });
@@ -420,7 +424,7 @@ public function testApplicationMiddleware()
         $app = new Application();
         $handled = false;
         $app->get('/', [TestController::class, 'getIndex']);
-        $app->addMiddleware(function(ServerRequestInterface $request, ResponseInterface $response, callable $next) use (&$handled){
+        $app->addMiddleware(function (ServerRequestInterface $request, ResponseInterface $response, callable $next) use (&$handled) {
             $handled = true;
             $response->getBody()->write('<');
             /** @var ResponseInterface $response */
@@ -439,13 +443,12 @@ public function testApplicationMiddleware()
     public function testErrorHandler()
     {
         $app = new Application();
-        $response = $app->handle(ServerRequestFactory::fromGlobals());
 
-        $text = $response->getBody()->__toString();
+        $response = $app->handle(ServerRequestFactory::fromGlobals());
+        $app->shutdown($response);
 
         $this->assertTrue($app->isError());
-        $this->assertEquals('League\Route\Http\Exception\NotFoundException', substr($text, 0, strpos($text, ':')));
-        $this->assertInstanceOf('League\Route\Http\Exception\NotFoundException', $app->getLastException());
+        $this->assertInstanceOf('\League\Route\Http\Exception\NotFoundException', $app->getLastException());
     }