Merge pull request #17755 from owncloud/alias-container-alive

 Add registerAlias method to shortcut interface registration #17714 

1 files changed, 11 insertions, 39 deletions

diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index a11e4ee05b3..c7ce6545972 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -39,8 +39,6 @@ use OC\AppFramework\Middleware\Security\SecurityMiddleware;
 use OC\AppFramework\Middleware\Security\CORSMiddleware;
 use OC\AppFramework\Middleware\SessionMiddleware;
 use OC\AppFramework\Utility\SimpleContainer;
-use OC\AppFramework\Utility\TimeFactory;
-use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\IApi;
 use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\Middleware;
@@ -63,15 +61,9 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		$this['urlParams'] = $urlParams;
 
 		// aliases
-		$this->registerService('appName', function($c) {
-			return $c->query('AppName');
-		});
-		$this->registerService('webRoot', function($c) {
-			return $c->query('WebRoot');
-		});
-		$this->registerService('userId', function($c) {
-			return $c->query('UserId');
-		});
+		$this->registerAlias('appName', 'AppName');
+		$this->registerAlias('webRoot', 'WebRoot');
+		$this->registerAlias('userId', 'UserId');
 
 		/**
 		 * Core services
@@ -156,9 +148,8 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getJobList();
 		});
 
-		$this->registerService('OCP\\AppFramework\\Utility\\IControllerMethodReflector', function($c) {
-			return $c->query('ControllerMethodReflector');
-		});
+		$this->registerAlias('OCP\\AppFramework\\Utility\\IControllerMethodReflector', 'OC\AppFramework\Utility\ControllerMethodReflector');
+		$this->registerAlias('ControllerMethodReflector', 'OCP\\AppFramework\\Utility\\IControllerMethodReflector');
 
 		$this->registerService('OCP\\INavigationManager', function($c) {
 			return $this->getServer()->getNavigationManager();
@@ -168,9 +159,10 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getPreviewManager();
 		});
 
-		$this->registerService('OCP\\IRequest', function($c) {
-			return $c->query('Request');
+		$this->registerService('OCP\\IRequest', function () {
+			return $this->getServer()->getRequest();
 		});
+		$this->registerAlias('Request', 'OCP\\IRequest');
 
 		$this->registerService('OCP\\ITagManager', function($c) {
 			return $this->getServer()->getTagManager();
@@ -180,9 +172,9 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getTempManager();
 		});
 
-		$this->registerService('OCP\\AppFramework\\Utility\\ITimeFactory', function($c) {
-			return $c->query('TimeFactory');
-		});
+		$this->registerAlias('OCP\\AppFramework\\Utility\\ITimeFactory', 'OC\AppFramework\Utility\TimeFactory');
+		$this->registerAlias('TimeFactory', 'OCP\\AppFramework\\Utility\\ITimeFactory');
+
 
 		$this->registerService('OCP\\Route\\IRouter', function($c) {
 			return $this->getServer()->getRouter();
@@ -245,14 +237,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return new API($c['AppName']);
 		});
 
-		$this->registerService('Request', function($c) {
-			/** @var $c SimpleContainer */
-			/** @var $server SimpleContainer */
-			$server = $c->query('ServerContainer');
-			/** @var $server IServerContainer */
-			return $server->getRequest();
-		});
-
 		$this->registerService('Protocol', function($c){
 			if(isset($_SERVER['SERVER_PROTOCOL'])) {
 				return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
@@ -318,18 +302,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $dispatcher;
 		});
 
-
-		/**
-		 * Utilities
-		 */
-		$this->registerService('TimeFactory', function($c){
-			return new TimeFactory();
-		});
-
-		$this->registerService('ControllerMethodReflector', function($c) {
-			return new ControllerMethodReflector();
-		});
-
 	}