fixup! Cleanup middleware registering

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Jan 3, 2019 · 4b695a4 · 4b695a4
1 parent 6c6b3b4
commit 4b695a4
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -71,7 +71,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 	/**
 	 * @var array
 	 */
-	private $middleWares = array();
+	private $middleWares = [];
 
 	/** @var ServerContainer */
 	private $server;
@@ -104,7 +104,7 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser
 		/**
 		 * Core services
 		 */
-		$this->registerService(IOutput::class, function($c){
+		$this->registerService(IOutput::class, function(){
 			return new Output($this->getServer()->getWebRoot());
 		});
 
@@ -125,7 +125,7 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser
 			return new OC\AppFramework\Logger($this->server->query(ILogger::class), $c->query('AppName'));
 		});
 
-		$this->registerService(IServerContainer::class, function ($c) {
+		$this->registerService(IServerContainer::class, function () {
 			return $this->getServer();
 		});
 		$this->registerAlias('ServerContainer', IServerContainer::class);
@@ -181,11 +181,8 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser
 		/**
 		 * Middleware
 		 */
-		$app = $this;
-
-		$middleWares = &$this->middleWares;
-		$this->registerService('MiddlewareDispatcher', function(SimpleContainer $c) use (&$middleWares, $app) {
-			$server =  $app->getServer();
+		$this->registerService('MiddlewareDispatcher', function(SimpleContainer $c) {
+			$server =  $this->getServer();
 
 			$dispatcher = new MiddlewareDispatcher();
 			$dispatcher->registerMiddleware(
@@ -265,7 +262,7 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser
 				)
 			);
 
-			foreach($middleWares as $middleWare) {
+			foreach($this->middleWares as $middleWare) {
 				$dispatcher->registerMiddleware($c[$middleWare]);
 			}