From ca9f364fd4746093a38cdcaf2456f5f86aebb89f Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 21 Feb 2018 10:54:17 +0100 Subject: Fix tests Signed-off-by: Roeland Jago Douma --- lib/private/AppFramework/Http/Dispatcher.php | 3 --- lib/private/AppFramework/Middleware/MiddlewareDispatcher.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/private/AppFramework') diff --git a/lib/private/AppFramework/Http/Dispatcher.php b/lib/private/AppFramework/Http/Dispatcher.php index 6219ba47a41..7b9ad015de6 100644 --- a/lib/private/AppFramework/Http/Dispatcher.php +++ b/lib/private/AppFramework/Http/Dispatcher.php @@ -105,9 +105,6 @@ class Dispatcher { } catch(\Exception $exception){ $response = $this->middlewareDispatcher->afterException( $controller, $methodName, $exception); - if ($response === null) { - throw $exception; - } } $response = $this->middlewareDispatcher->afterController( diff --git a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php index 30efe815888..e1262b6c712 100644 --- a/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php +++ b/lib/private/AppFramework/Middleware/MiddlewareDispatcher.php @@ -85,7 +85,7 @@ class MiddlewareDispatcher { * @param string $methodName the name of the method that will be called on * the controller */ - public function beforeController(Controller $controller, $methodName){ + public function beforeController(Controller $controller, string $methodName){ // we need to count so that we know which middlewares we have to ask in // case there is an exception $middlewareCount = \count($this->middlewares); -- cgit v1.2.3