diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php index 5cce97b216..c2377b8844 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/appframework/middleware/middlewaredispatcher.php @@ -26,7 +26,7 @@ namespace OC\AppFramework\Middleware; use OC\AppFramework\Controller\Controller; use OCP\AppFramework\Http\Response; -use OCP\AppFramework\IMiddleWare; +use OCP\AppFramework\MiddleWare; /** * This class is used to store and run all the middleware in correct order @@ -58,7 +58,7 @@ class MiddlewareDispatcher { * Adds a new middleware * @param Middleware $middleware the middleware which will be added */ - public function registerMiddleware(IMiddleware $middleWare){ + public function registerMiddleware(Middleware $middleWare){ array_push($this->middlewares, $middleWare); } diff --git a/lib/public/appframework/imiddleware.php b/lib/public/appframework/imiddleware.php deleted file mode 100644 index 1e76d3bbe4..0000000000 --- a/lib/public/appframework/imiddleware.php +++ /dev/null @@ -1,88 +0,0 @@ -. - * - */ - - -namespace OCP\AppFramework; -use OCP\AppFramework\Http\Response; - - -/** - * Middleware is used to provide hooks before or after controller methods and - * deal with possible exceptions raised in the controller methods. - * They're modeled after Django's middleware system: - * https://docs.djangoproject.com/en/dev/topics/http/middleware/ - */ -interface IMiddleWare { - - - /** - * This is being run in normal order before the controller is being - * called which allows several modifications and checks - * - * @param Controller $controller the controller that is being called - * @param string $methodName the name of the method that will be called on - * the controller - */ - function beforeController($controller, $methodName); - - - /** - * This is being run when either the beforeController method or the - * controller method itself is throwing an exception. The middleware is - * asked in reverse order to handle the exception and to return a response. - * If the response is null, it is assumed that the exception could not be - * handled and the error will be thrown again - * - * @param Controller $controller the controller that is being called - * @param string $methodName the name of the method that will be called on - * the controller - * @param \Exception $exception the thrown exception - * @throws \Exception the passed in exception if it cant handle it - * @return Response a Response object in case that the exception was handled - */ - function afterException($controller, $methodName, \Exception $exception); - - /** - * This is being run after a successful controller method call and allows - * the manipulation of a Response object. The middleware is run in reverse order - * - * @param Controller $controller the controller that is being called - * @param string $methodName the name of the method that will be called on - * the controller - * @param Response $response the generated response from the controller - * @return Response a Response object - */ - function afterController($controller, $methodName, Response $response); - - /** - * This is being run after the response object has been rendered and - * allows the manipulation of the output. The middleware is run in reverse order - * - * @param Controller $controller the controller that is being called - * @param string $methodName the name of the method that will be called on - * the controller - * @param string $output the generated output from a response - * @return string the output that should be printed - */ - function beforeOutput($controller, $methodName, $output); -} diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php index 0f08eaef36..12776c119c 100644 --- a/lib/public/appframework/middleware.php +++ b/lib/public/appframework/middleware.php @@ -33,7 +33,7 @@ use OCP\AppFramework\Http\Response; * They're modeled after Django's middleware system: * https://docs.djangoproject.com/en/dev/topics/http/middleware/ */ -abstract class Middleware implements IMiddleWare { +abstract class Middleware { /**