Merge pull request #16913 from nextcloud/fix/declare_members

SessionMiddleware: declare session property

2 files changed, 6 insertions, 18 deletions

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;
 	}