From 3f12ec95f0c220dfcfa9d495f981fee6ded4b002 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 28 Aug 2019 13:02:29 +0200 Subject: SessionMiddleware: declare session property * Remove request since we don't useit * Update tests as well Signed-off-by: Roeland Jago Douma --- .../DependencyInjection/DIContainer.php | 1 - .../AppFramework/Middleware/SessionMiddleware.php | 23 ++++++---------------- 2 files changed, 6 insertions(+), 18 deletions(-) (limited to 'lib') diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php index 89ebc60b226..7f416c3ed90 100644 --- a/lib/private/AppFramework/DependencyInjection/DIContainer.php +++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php @@ -284,7 +284,6 @@ class DIContainer extends SimpleContainer implements IAppContainer { $dispatcher->registerMiddleware( new SessionMiddleware( - $c->query(IRequest::class), $c->query(IControllerMethodReflector::class), $c->query(ISession::class) ) diff --git a/lib/private/AppFramework/Middleware/SessionMiddleware.php b/lib/private/AppFramework/Middleware/SessionMiddleware.php index 7b52cc1e319..3cb60874b38 100644 --- a/lib/private/AppFramework/Middleware/SessionMiddleware.php +++ b/lib/private/AppFramework/Middleware/SessionMiddleware.php @@ -34,25 +34,14 @@ use OCP\ISession; class SessionMiddleware extends Middleware { - /** - * @var IRequest - */ - private $request; - - /** - * @var ControllerMethodReflector - */ + /** @var ControllerMethodReflector */ private $reflector; - /** - * @param IRequest $request - * @param ControllerMethodReflector $reflector - */ - public function __construct(IRequest $request, - ControllerMethodReflector $reflector, - ISession $session -) { - $this->request = $request; + /** @var ISession */ + private $session; + + public function __construct(ControllerMethodReflector $reflector, + ISession $session) { $this->reflector = $reflector; $this->session = $session; } -- cgit v1.2.3