Fix settings tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

1 files changed, 2 insertions, 12 deletions

diff --git a/lib/private/AppFramework/DependencyInjection/DIContainer.php b/lib/private/AppFramework/DependencyInjection/DIContainer.php
index 3bfc64e85b5..d196eda946a 100644
--- a/lib/private/AppFramework/DependencyInjection/DIContainer.php
+++ b/lib/private/AppFramework/DependencyInjection/DIContainer.php
@@ -92,10 +92,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 		/**
 		 * Core services
 		 */
-		$this->registerService('OCP\\App\\IAppManager', function($c) {
-			return $this->getServer()->getAppManager();
-		});
-
 		$this->registerService('OCP\\AppFramework\\Http\\IOutput', function($c){
 			return new Output($this->getServer()->getWebRoot());
 		});
@@ -119,10 +115,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getCache();
 		});
 
-		$this->registerService('OCP\\ICacheFactory', function($c) {
-			return $this->getServer()->getMemCacheFactory();
-		});
-
 		$this->registerService('OC\\CapabilitiesManager', function($c) {
 			return $this->getServer()->getCapabilitiesManager();
 		});
@@ -243,10 +235,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 			return $this->getServer()->getTagManager();
 		});
 
-		$this->registerService('OCP\\ITempManager', function($c) {
-			return $this->getServer()->getTempManager();
-		});
-
 		$this->registerAlias('OCP\\AppFramework\\Utility\\ITimeFactory', 'OC\AppFramework\Utility\TimeFactory');
 		$this->registerAlias('TimeFactory', 'OCP\\AppFramework\\Utility\\ITimeFactory');
 
@@ -580,6 +568,8 @@ class DIContainer extends SimpleContainer implements IAppContainer {
 				if (strtolower($segments[1]) === strtolower($this['AppName'])) {
 					return parent::query($name);
 				}
+			} else if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
+				return parent::query($name);
 			}
 		}