Merge branch 'master' into fixing-appframework-master

Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

2 files changed, 7 insertions, 7 deletions

diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 7ff55bb809d..6d3effbf1fa 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -42,12 +42,9 @@ class App {
 	 * @param string $controllerName the name of the controller under which it is
 	 *                               stored in the DI container
 	 * @param string $methodName the method that you want to call
-	 * @param array $urlParams an array with variables extracted from the routes
 	 * @param DIContainer $container an instance of a pimple container.
 	 */
-	public static function main($controllerName, $methodName, array $urlParams,
-	                            IAppContainer $container) {
-		$container['urlParams'] = $urlParams;
+	public static function main($controllerName, $methodName, IAppContainer $container) {
 		$controller = $container[$controllerName];
 
 		// initialize the dispatcher and run all the middleware before the controller
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index 7276a11e4d9..81910df6990 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -50,9 +50,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 	 * Put your class dependencies in here
 	 * @param string $appName the name of the app
 	 */
-	public function __construct($appName){
+	public function __construct($appName, $urlParams = array()){
 
 		$this['AppName'] = $appName;
+		$this['urlParams'] = $urlParams;
 
 		$this->registerParameter('ServerContainer', \OC::$server);
 
@@ -67,6 +68,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			/** @var $c SimpleContainer */
 			/** @var $server IServerContainer */
 			$server = $c->query('ServerContainer');
+			$server->registerParameter('urlParams', $c['urlParams']);
 			return $server->getRequest();
 		});
 
@@ -90,11 +92,12 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			return new SecurityMiddleware($this, $c['Request']);
 		});
 
-		$this['MiddlewareDispatcher'] = $this->share(function($c){
+        $middleWares = $this->middleWares;
+		$this['MiddlewareDispatcher'] = $this->share(function($c) use ($middleWares) {
 			$dispatcher = new MiddlewareDispatcher();
 			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
 
-			foreach($this->middleWares as $middleWare) {
+			foreach($middleWares as $middleWare) {
 				$dispatcher->registerMiddleware($middleWare);
 			}