nextcloud / server

lib/private/AppFramework/DependencyInjection/DIContainer.php

Indentation +383 added lines, -383 removed lines

@@ -65,387 +65,387 @@
 
 class DIContainer extends SimpleContainer implements IAppContainer {
 
-	/**
-	 * @var array
-	 */
-	private $middleWares = array();
-
-	/** @var ServerContainer */
-	private $server;
-
-	/**
-	 * Put your class dependencies in here
-	 * @param string $appName the name of the app
-	 * @param array $urlParams
-	 * @param ServerContainer|null $server
-	 */
-	public function __construct($appName, $urlParams = array(), ServerContainer $server = null){
-		parent::__construct();
-		$this['AppName'] = $appName;
-		$this['urlParams'] = $urlParams;
-
-		/** @var \OC\ServerContainer $server */
-		if ($server === null) {
-			$server = \OC::$server;
-		}
-		$this->server = $server;
-		$this->server->registerAppContainer($appName, $this);
-
-		// aliases
-		$this->registerAlias('appName', 'AppName');
-		$this->registerAlias('webRoot', 'WebRoot');
-		$this->registerAlias('userId', 'UserId');
-
-		/**
-		 * Core services
-		 */
-		$this->registerService(IOutput::class, function($c){
-			return new Output($this->getServer()->getWebRoot());
-		});
-
-		$this->registerService(Folder::class, function() {
-			return $this->getServer()->getUserFolder();
-		});
-
-		$this->registerService(IAppData::class, function (SimpleContainer $c) {
-			return $this->getServer()->getAppDataDir($c->query('AppName'));
-		});
-
-		$this->registerService(IL10N::class, function($c) {
-			return $this->getServer()->getL10N($c->query('AppName'));
-		});
-
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
-		$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
-
-		$this->registerService(IRequest::class, function() {
-			return $this->getServer()->query(IRequest::class);
-		});
-		$this->registerAlias('Request', IRequest::class);
-
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
-
-		$this->registerAlias(\OC\User\Session::class, \OCP\IUserSession::class);
-
-		$this->registerService(IServerContainer::class, function ($c) {
-			return $this->getServer();
-		});
-		$this->registerAlias('ServerContainer', IServerContainer::class);
-
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function ($c) {
-			return $c->query('OCA\WorkflowEngine\Manager');
-		});
-
-		$this->registerService(\OCP\AppFramework\IAppContainer::class, function ($c) {
-			return $c;
-		});
-
-		// commonly used attributes
-		$this->registerService('UserId', function ($c) {
-			return $c->query('OCP\\IUserSession')->getSession()->get('user_id');
-		});
-
-		$this->registerService('WebRoot', function ($c) {
-			return $c->query('ServerContainer')->getWebRoot();
-		});
-
-		$this->registerService('fromMailAddress', function() {
-			return Util::getDefaultEmailAddress('no-reply');
-		});
-
-		$this->registerService('OC_Defaults', function ($c) {
-			return $c->getServer()->getThemingDefaults();
-		});
-
-		$this->registerService('OCP\Encryption\IManager', function ($c) {
-			return $this->getServer()->getEncryptionManager();
-		});
-
-		$this->registerService(IConfig::class, function ($c) {
-			return $c->query(OC\GlobalScale\Config::class);
-		});
-
-		$this->registerService(IValidator::class, function($c) {
-			return $c->query(Validator::class);
-		});
-
-		$this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
-			return new \OC\Security\IdentityProof\Manager(
-				$this->getServer()->query(\OC\Files\AppData\Factory::class),
-				$this->getServer()->getCrypto(),
-				$this->getServer()->getConfig()
-			);
-		});
-
-		$this->registerService('Protocol', function($c){
-			/** @var \OC\Server $server */
-			$server = $c->query('ServerContainer');
-			$protocol = $server->getRequest()->getHttpProtocol();
-			return new Http($_SERVER, $protocol);
-		});
-
-		$this->registerService('Dispatcher', function($c) {
-			return new Dispatcher(
-				$c['Protocol'],
-				$c['MiddlewareDispatcher'],
-				$c['ControllerMethodReflector'],
-				$c['Request']
-			);
-		});
-
-		/**
-		 * App Framework default arguments
-		 */
-		$this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
-		$this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
-		$this->registerParameter('corsMaxAge', 1728000);
-
-		/**
-		 * Middleware
-		 */
-		$app = $this;
-		$this->registerService('SecurityMiddleware', function($c) use ($app){
-			/** @var \OC\Server $server */
-			$server = $app->getServer();
-
-			return new SecurityMiddleware(
-				$c['Request'],
-				$c['ControllerMethodReflector'],
-				$server->getNavigationManager(),
-				$server->getURLGenerator(),
-				$server->getLogger(),
-				$c['AppName'],
-				$server->getUserSession()->isLoggedIn(),
-				$server->getGroupManager()->isAdmin($this->getUserId()),
-				$server->getContentSecurityPolicyManager(),
-				$server->getCsrfTokenManager(),
-				$server->getContentSecurityPolicyNonceManager(),
-				$server->getAppManager()
-			);
-		});
-
-		$this->registerService(OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class, function ($c) use ($app) {
-			/** @var \OC\Server $server */
-			$server = $app->getServer();
-
-			return new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
-				$c['ControllerMethodReflector'],
-				$server->getSession(),
-				$server->getUserSession(),
-				$server->query(ITimeFactory::class)
-			);
-		});
-
-		$this->registerService('BruteForceMiddleware', function($c) use ($app) {
-			/** @var \OC\Server $server */
-			$server = $app->getServer();
-
-			return new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
-				$c['ControllerMethodReflector'],
-				$server->getBruteForceThrottler(),
-				$server->getRequest()
-			);
-		});
-
-		$this->registerService('RateLimitingMiddleware', function($c) use ($app) {
-			/** @var \OC\Server $server */
-			$server = $app->getServer();
-
-			return new RateLimitingMiddleware(
-				$server->getRequest(),
-				$server->getUserSession(),
-				$c['ControllerMethodReflector'],
-				$c->query(OC\Security\RateLimiting\Limiter::class)
-			);
-		});
-
-		$this->registerService('CORSMiddleware', function($c) {
-			return new CORSMiddleware(
-				$c['Request'],
-				$c['ControllerMethodReflector'],
-				$c->query(IUserSession::class),
-				$c->getServer()->getBruteForceThrottler()
-			);
-		});
-
-		$this->registerService('SessionMiddleware', function($c) use ($app) {
-			return new SessionMiddleware(
-				$c['Request'],
-				$c['ControllerMethodReflector'],
-				$app->getServer()->getSession()
-			);
-		});
-
-		$this->registerService('TwoFactorMiddleware', function (SimpleContainer $c) use ($app) {
-			$twoFactorManager = $c->getServer()->getTwoFactorAuthManager();
-			$userSession = $app->getServer()->getUserSession();
-			$session = $app->getServer()->getSession();
-			$urlGenerator = $app->getServer()->getURLGenerator();
-			$reflector = $c['ControllerMethodReflector'];
-			$request = $app->getServer()->getRequest();
-			return new TwoFactorMiddleware($twoFactorManager, $userSession, $session, $urlGenerator, $reflector, $request);
-		});
-
-		$this->registerService('OCSMiddleware', function (SimpleContainer $c) {
-			return new OCSMiddleware(
-				$c['Request']
-			);
-		});
-
-		$this->registerService(OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class, function (SimpleContainer $c) {
-			return new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
-				$c['Request'],
-				$c['ControllerMethodReflector']
-			);
-		});
-
-		$middleWares = &$this->middleWares;
-		$this->registerService('MiddlewareDispatcher', function($c) use (&$middleWares) {
-			$dispatcher = new MiddlewareDispatcher();
-			$dispatcher->registerMiddleware($c[OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class]);
-			$dispatcher->registerMiddleware($c['CORSMiddleware']);
-			$dispatcher->registerMiddleware($c['OCSMiddleware']);
-			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
-			$dispatcher->registerMiddleware($c[OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class]);
-			$dispatcher->registerMiddleware($c['TwoFactorMiddleware']);
-			$dispatcher->registerMiddleware($c['BruteForceMiddleware']);
-			$dispatcher->registerMiddleware($c['RateLimitingMiddleware']);
-
-			foreach($middleWares as $middleWare) {
-				$dispatcher->registerMiddleware($c[$middleWare]);
-			}
-
-			$dispatcher->registerMiddleware($c['SessionMiddleware']);
-			return $dispatcher;
-		});
-
-	}
-
-	/**
-	 * @return \OCP\IServerContainer
-	 */
-	public function getServer()
-	{
-		return $this->server;
-	}
-
-	/**
-	 * @param string $middleWare
-	 * @return boolean|null
-	 */
-	public function registerMiddleWare($middleWare) {
-		array_push($this->middleWares, $middleWare);
-	}
-
-	/**
-	 * used to return the appname of the set application
-	 * @return string the name of your application
-	 */
-	public function getAppName() {
-		return $this->query('AppName');
-	}
-
-	/**
-	 * @deprecated use IUserSession->isLoggedIn()
-	 * @return boolean
-	 */
-	public function isLoggedIn() {
-		return \OC::$server->getUserSession()->isLoggedIn();
-	}
-
-	/**
-	 * @deprecated use IGroupManager->isAdmin($userId)
-	 * @return boolean
-	 */
-	public function isAdminUser() {
-		$uid = $this->getUserId();
-		return \OC_User::isAdminUser($uid);
-	}
-
-	private function getUserId() {
-		return $this->getServer()->getSession()->get('user_id');
-	}
-
-	/**
-	 * @deprecated use the ILogger instead
-	 * @param string $message
-	 * @param string $level
-	 * @return mixed
-	 */
-	public function log($message, $level) {
-		switch($level){
-			case 'debug':
-				$level = \OCP\Util::DEBUG;
-				break;
-			case 'info':
-				$level = \OCP\Util::INFO;
-				break;
-			case 'warn':
-				$level = \OCP\Util::WARN;
-				break;
-			case 'fatal':
-				$level = \OCP\Util::FATAL;
-				break;
-			default:
-				$level = \OCP\Util::ERROR;
-				break;
-		}
-		\OCP\Util::writeLog($this->getAppName(), $message, $level);
-	}
-
-	/**
-	 * Register a capability
-	 *
-	 * @param string $serviceName e.g. 'OCA\Files\Capabilities'
-	 */
-	public function registerCapability($serviceName) {
-		$this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
-			return $this->query($serviceName);
-		});
-	}
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function query($name) {
-		try {
-			return $this->queryNoFallback($name);
-		} catch (QueryException $firstException) {
-			try {
-				return $this->getServer()->query($name);
-			} catch (QueryException $secondException) {
-				if ($firstException->getCode() === 1) {
-					throw $secondException;
-				}
-				throw $firstException;
-			}
-		}
-	}
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws QueryException if the query could not be resolved
-	 */
-	public function queryNoFallback($name) {
-		$name = $this->sanitizeName($name);
-
-		if ($this->offsetExists($name)) {
-			return parent::query($name);
-		} else {
-			if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
-				return parent::query($name);
-			} else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
-				return parent::query($name);
-			} else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
-				return parent::query($name);
-			}
-		}
-
-		throw new QueryException('Could not resolve ' . $name . '!' .
-			' Class can not be instantiated', 1);
-	}
+    /**
+     * @var array
+     */
+    private $middleWares = array();
+
+    /** @var ServerContainer */
+    private $server;
+
+    /**
+     * Put your class dependencies in here
+     * @param string $appName the name of the app
+     * @param array $urlParams
+     * @param ServerContainer|null $server
+     */
+    public function __construct($appName, $urlParams = array(), ServerContainer $server = null){
+        parent::__construct();
+        $this['AppName'] = $appName;
+        $this['urlParams'] = $urlParams;
+
+        /** @var \OC\ServerContainer $server */
+        if ($server === null) {
+            $server = \OC::$server;
+        }
+        $this->server = $server;
+        $this->server->registerAppContainer($appName, $this);
+
+        // aliases
+        $this->registerAlias('appName', 'AppName');
+        $this->registerAlias('webRoot', 'WebRoot');
+        $this->registerAlias('userId', 'UserId');
+
+        /**
+         * Core services
+         */
+        $this->registerService(IOutput::class, function($c){
+            return new Output($this->getServer()->getWebRoot());
+        });
+
+        $this->registerService(Folder::class, function() {
+            return $this->getServer()->getUserFolder();
+        });
+
+        $this->registerService(IAppData::class, function (SimpleContainer $c) {
+            return $this->getServer()->getAppDataDir($c->query('AppName'));
+        });
+
+        $this->registerService(IL10N::class, function($c) {
+            return $this->getServer()->getL10N($c->query('AppName'));
+        });
+
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
+
+        $this->registerService(IRequest::class, function() {
+            return $this->getServer()->query(IRequest::class);
+        });
+        $this->registerAlias('Request', IRequest::class);
+
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
+
+        $this->registerAlias(\OC\User\Session::class, \OCP\IUserSession::class);
+
+        $this->registerService(IServerContainer::class, function ($c) {
+            return $this->getServer();
+        });
+        $this->registerAlias('ServerContainer', IServerContainer::class);
+
+        $this->registerService(\OCP\WorkflowEngine\IManager::class, function ($c) {
+            return $c->query('OCA\WorkflowEngine\Manager');
+        });
+
+        $this->registerService(\OCP\AppFramework\IAppContainer::class, function ($c) {
+            return $c;
+        });
+
+        // commonly used attributes
+        $this->registerService('UserId', function ($c) {
+            return $c->query('OCP\\IUserSession')->getSession()->get('user_id');
+        });
+
+        $this->registerService('WebRoot', function ($c) {
+            return $c->query('ServerContainer')->getWebRoot();
+        });
+
+        $this->registerService('fromMailAddress', function() {
+            return Util::getDefaultEmailAddress('no-reply');
+        });
+
+        $this->registerService('OC_Defaults', function ($c) {
+            return $c->getServer()->getThemingDefaults();
+        });
+
+        $this->registerService('OCP\Encryption\IManager', function ($c) {
+            return $this->getServer()->getEncryptionManager();
+        });
+
+        $this->registerService(IConfig::class, function ($c) {
+            return $c->query(OC\GlobalScale\Config::class);
+        });
+
+        $this->registerService(IValidator::class, function($c) {
+            return $c->query(Validator::class);
+        });
+
+        $this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
+            return new \OC\Security\IdentityProof\Manager(
+                $this->getServer()->query(\OC\Files\AppData\Factory::class),
+                $this->getServer()->getCrypto(),
+                $this->getServer()->getConfig()
+            );
+        });
+
+        $this->registerService('Protocol', function($c){
+            /** @var \OC\Server $server */
+            $server = $c->query('ServerContainer');
+            $protocol = $server->getRequest()->getHttpProtocol();
+            return new Http($_SERVER, $protocol);
+        });
+
+        $this->registerService('Dispatcher', function($c) {
+            return new Dispatcher(
+                $c['Protocol'],
+                $c['MiddlewareDispatcher'],
+                $c['ControllerMethodReflector'],
+                $c['Request']
+            );
+        });
+
+        /**
+         * App Framework default arguments
+         */
+        $this->registerParameter('corsMethods', 'PUT, POST, GET, DELETE, PATCH');
+        $this->registerParameter('corsAllowedHeaders', 'Authorization, Content-Type, Accept');
+        $this->registerParameter('corsMaxAge', 1728000);
+
+        /**
+         * Middleware
+         */
+        $app = $this;
+        $this->registerService('SecurityMiddleware', function($c) use ($app){
+            /** @var \OC\Server $server */
+            $server = $app->getServer();
+
+            return new SecurityMiddleware(
+                $c['Request'],
+                $c['ControllerMethodReflector'],
+                $server->getNavigationManager(),
+                $server->getURLGenerator(),
+                $server->getLogger(),
+                $c['AppName'],
+                $server->getUserSession()->isLoggedIn(),
+                $server->getGroupManager()->isAdmin($this->getUserId()),
+                $server->getContentSecurityPolicyManager(),
+                $server->getCsrfTokenManager(),
+                $server->getContentSecurityPolicyNonceManager(),
+                $server->getAppManager()
+            );
+        });
+
+        $this->registerService(OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class, function ($c) use ($app) {
+            /** @var \OC\Server $server */
+            $server = $app->getServer();
+
+            return new OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware(
+                $c['ControllerMethodReflector'],
+                $server->getSession(),
+                $server->getUserSession(),
+                $server->query(ITimeFactory::class)
+            );
+        });
+
+        $this->registerService('BruteForceMiddleware', function($c) use ($app) {
+            /** @var \OC\Server $server */
+            $server = $app->getServer();
+
+            return new OC\AppFramework\Middleware\Security\BruteForceMiddleware(
+                $c['ControllerMethodReflector'],
+                $server->getBruteForceThrottler(),
+                $server->getRequest()
+            );
+        });
+
+        $this->registerService('RateLimitingMiddleware', function($c) use ($app) {
+            /** @var \OC\Server $server */
+            $server = $app->getServer();
+
+            return new RateLimitingMiddleware(
+                $server->getRequest(),
+                $server->getUserSession(),
+                $c['ControllerMethodReflector'],
+                $c->query(OC\Security\RateLimiting\Limiter::class)
+            );
+        });
+
+        $this->registerService('CORSMiddleware', function($c) {
+            return new CORSMiddleware(
+                $c['Request'],
+                $c['ControllerMethodReflector'],
+                $c->query(IUserSession::class),
+                $c->getServer()->getBruteForceThrottler()
+            );
+        });
+
+        $this->registerService('SessionMiddleware', function($c) use ($app) {
+            return new SessionMiddleware(
+                $c['Request'],
+                $c['ControllerMethodReflector'],
+                $app->getServer()->getSession()
+            );
+        });
+
+        $this->registerService('TwoFactorMiddleware', function (SimpleContainer $c) use ($app) {
+            $twoFactorManager = $c->getServer()->getTwoFactorAuthManager();
+            $userSession = $app->getServer()->getUserSession();
+            $session = $app->getServer()->getSession();
+            $urlGenerator = $app->getServer()->getURLGenerator();
+            $reflector = $c['ControllerMethodReflector'];
+            $request = $app->getServer()->getRequest();
+            return new TwoFactorMiddleware($twoFactorManager, $userSession, $session, $urlGenerator, $reflector, $request);
+        });
+
+        $this->registerService('OCSMiddleware', function (SimpleContainer $c) {
+            return new OCSMiddleware(
+                $c['Request']
+            );
+        });
+
+        $this->registerService(OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class, function (SimpleContainer $c) {
+            return new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
+                $c['Request'],
+                $c['ControllerMethodReflector']
+            );
+        });
+
+        $middleWares = &$this->middleWares;
+        $this->registerService('MiddlewareDispatcher', function($c) use (&$middleWares) {
+            $dispatcher = new MiddlewareDispatcher();
+            $dispatcher->registerMiddleware($c[OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class]);
+            $dispatcher->registerMiddleware($c['CORSMiddleware']);
+            $dispatcher->registerMiddleware($c['OCSMiddleware']);
+            $dispatcher->registerMiddleware($c['SecurityMiddleware']);
+            $dispatcher->registerMiddleware($c[OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class]);
+            $dispatcher->registerMiddleware($c['TwoFactorMiddleware']);
+            $dispatcher->registerMiddleware($c['BruteForceMiddleware']);
+            $dispatcher->registerMiddleware($c['RateLimitingMiddleware']);
+
+            foreach($middleWares as $middleWare) {
+                $dispatcher->registerMiddleware($c[$middleWare]);
+            }
+
+            $dispatcher->registerMiddleware($c['SessionMiddleware']);
+            return $dispatcher;
+        });
+
+    }
+
+    /**
+     * @return \OCP\IServerContainer
+     */
+    public function getServer()
+    {
+        return $this->server;
+    }
+
+    /**
+     * @param string $middleWare
+     * @return boolean|null
+     */
+    public function registerMiddleWare($middleWare) {
+        array_push($this->middleWares, $middleWare);
+    }
+
+    /**
+     * used to return the appname of the set application
+     * @return string the name of your application
+     */
+    public function getAppName() {
+        return $this->query('AppName');
+    }
+
+    /**
+     * @deprecated use IUserSession->isLoggedIn()
+     * @return boolean
+     */
+    public function isLoggedIn() {
+        return \OC::$server->getUserSession()->isLoggedIn();
+    }
+
+    /**
+     * @deprecated use IGroupManager->isAdmin($userId)
+     * @return boolean
+     */
+    public function isAdminUser() {
+        $uid = $this->getUserId();
+        return \OC_User::isAdminUser($uid);
+    }
+
+    private function getUserId() {
+        return $this->getServer()->getSession()->get('user_id');
+    }
+
+    /**
+     * @deprecated use the ILogger instead
+     * @param string $message
+     * @param string $level
+     * @return mixed
+     */
+    public function log($message, $level) {
+        switch($level){
+            case 'debug':
+                $level = \OCP\Util::DEBUG;
+                break;
+            case 'info':
+                $level = \OCP\Util::INFO;
+                break;
+            case 'warn':
+                $level = \OCP\Util::WARN;
+                break;
+            case 'fatal':
+                $level = \OCP\Util::FATAL;
+                break;
+            default:
+                $level = \OCP\Util::ERROR;
+                break;
+        }
+        \OCP\Util::writeLog($this->getAppName(), $message, $level);
+    }
+
+    /**
+     * Register a capability
+     *
+     * @param string $serviceName e.g. 'OCA\Files\Capabilities'
+     */
+    public function registerCapability($serviceName) {
+        $this->query('OC\CapabilitiesManager')->registerCapability(function() use ($serviceName) {
+            return $this->query($serviceName);
+        });
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     */
+    public function query($name) {
+        try {
+            return $this->queryNoFallback($name);
+        } catch (QueryException $firstException) {
+            try {
+                return $this->getServer()->query($name);
+            } catch (QueryException $secondException) {
+                if ($firstException->getCode() === 1) {
+                    throw $secondException;
+                }
+                throw $firstException;
+            }
+        }
+    }
+
+    /**
+     * @param string $name
+     * @return mixed
+     * @throws QueryException if the query could not be resolved
+     */
+    public function queryNoFallback($name) {
+        $name = $this->sanitizeName($name);
+
+        if ($this->offsetExists($name)) {
+            return parent::query($name);
+        } else {
+            if ($this['AppName'] === 'settings' && strpos($name, 'OC\\Settings\\') === 0) {
+                return parent::query($name);
+            } else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
+                return parent::query($name);
+            } else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
+                return parent::query($name);
+            }
+        }
+
+        throw new QueryException('Could not resolve ' . $name . '!' .
+            ' Class can not be instantiated', 1);
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -79,7 +79,7 @@ 
 	 * @param array $urlParams
 	 * @param ServerContainer|null $server
 	 */
-	public function __construct($appName, $urlParams = array(), ServerContainer $server = null){
+	public function __construct($appName, $urlParams = array(), ServerContainer $server = null) {
 		parent::__construct();
 		$this['AppName'] = $appName;
 		$this['urlParams'] = $urlParams;
@@ -99,7 +99,7 @@ 
 		/**
 		 * Core services
 		 */
-		$this->registerService(IOutput::class, function($c){
+		$this->registerService(IOutput::class, function($c) {
 			return new Output($this->getServer()->getWebRoot());
 		});
 
@@ -107,7 +107,7 @@ 
 			return $this->getServer()->getUserFolder();
 		});
 
-		$this->registerService(IAppData::class, function (SimpleContainer $c) {
+		$this->registerService(IAppData::class, function(SimpleContainer $c) {
 			return $this->getServer()->getAppDataDir($c->query('AppName'));
 		});
 
@@ -128,25 +128,25 @@ 
 
 		$this->registerAlias(\OC\User\Session::class, \OCP\IUserSession::class);
 
-		$this->registerService(IServerContainer::class, function ($c) {
+		$this->registerService(IServerContainer::class, function($c) {
 			return $this->getServer();
 		});
 		$this->registerAlias('ServerContainer', IServerContainer::class);
 
-		$this->registerService(\OCP\WorkflowEngine\IManager::class, function ($c) {
+		$this->registerService(\OCP\WorkflowEngine\IManager::class, function($c) {
 			return $c->query('OCA\WorkflowEngine\Manager');
 		});
 
-		$this->registerService(\OCP\AppFramework\IAppContainer::class, function ($c) {
+		$this->registerService(\OCP\AppFramework\IAppContainer::class, function($c) {
 			return $c;
 		});
 
 		// commonly used attributes
-		$this->registerService('UserId', function ($c) {
+		$this->registerService('UserId', function($c) {
 			return $c->query('OCP\\IUserSession')->getSession()->get('user_id');
 		});
 
-		$this->registerService('WebRoot', function ($c) {
+		$this->registerService('WebRoot', function($c) {
 			return $c->query('ServerContainer')->getWebRoot();
 		});
 
@@ -154,15 +154,15 @@ 
 			return Util::getDefaultEmailAddress('no-reply');
 		});
 
-		$this->registerService('OC_Defaults', function ($c) {
+		$this->registerService('OC_Defaults', function($c) {
 			return $c->getServer()->getThemingDefaults();
 		});
 
-		$this->registerService('OCP\Encryption\IManager', function ($c) {
+		$this->registerService('OCP\Encryption\IManager', function($c) {
 			return $this->getServer()->getEncryptionManager();
 		});
 
-		$this->registerService(IConfig::class, function ($c) {
+		$this->registerService(IConfig::class, function($c) {
 			return $c->query(OC\GlobalScale\Config::class);
 		});
 
@@ -170,7 +170,7 @@ 
 			return $c->query(Validator::class);
 		});
 
-		$this->registerService(\OC\Security\IdentityProof\Manager::class, function ($c) {
+		$this->registerService(\OC\Security\IdentityProof\Manager::class, function($c) {
 			return new \OC\Security\IdentityProof\Manager(
 				$this->getServer()->query(\OC\Files\AppData\Factory::class),
 				$this->getServer()->getCrypto(),
@@ -178,7 +178,7 @@ 
 			);
 		});
 
-		$this->registerService('Protocol', function($c){
+		$this->registerService('Protocol', function($c) {
 			/** @var \OC\Server $server */
 			$server = $c->query('ServerContainer');
 			$protocol = $server->getRequest()->getHttpProtocol();
@@ -225,7 +225,7 @@ 
 			);
 		});
 
-		$this->registerService(OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class, function ($c) use ($app) {
+		$this->registerService(OC\AppFramework\Middleware\Security\PasswordConfirmationMiddleware::class, function($c) use ($app) {
 			/** @var \OC\Server $server */
 			$server = $app->getServer();
 
@@ -277,7 +277,7 @@ 
 			);
 		});
 
-		$this->registerService('TwoFactorMiddleware', function (SimpleContainer $c) use ($app) {
+		$this->registerService('TwoFactorMiddleware', function(SimpleContainer $c) use ($app) {
 			$twoFactorManager = $c->getServer()->getTwoFactorAuthManager();
 			$userSession = $app->getServer()->getUserSession();
 			$session = $app->getServer()->getSession();
@@ -287,13 +287,13 @@ 
 			return new TwoFactorMiddleware($twoFactorManager, $userSession, $session, $urlGenerator, $reflector, $request);
 		});
 
-		$this->registerService('OCSMiddleware', function (SimpleContainer $c) {
+		$this->registerService('OCSMiddleware', function(SimpleContainer $c) {
 			return new OCSMiddleware(
 				$c['Request']
 			);
 		});
 
-		$this->registerService(OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class, function (SimpleContainer $c) {
+		$this->registerService(OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware::class, function(SimpleContainer $c) {
 			return new OC\AppFramework\Middleware\Security\SameSiteCookieMiddleware(
 				$c['Request'],
 				$c['ControllerMethodReflector']
@@ -312,7 +312,7 @@ 
 			$dispatcher->registerMiddleware($c['BruteForceMiddleware']);
 			$dispatcher->registerMiddleware($c['RateLimitingMiddleware']);
 
-			foreach($middleWares as $middleWare) {
+			foreach ($middleWares as $middleWare) {
 				$dispatcher->registerMiddleware($c[$middleWare]);
 			}
 
@@ -374,7 +374,7 @@ 
 	 * @return mixed
 	 */
 	public function log($message, $level) {
-		switch($level){
+		switch ($level) {
 			case 'debug':
 				$level = \OCP\Util::DEBUG;
 				break;
@@ -440,12 +440,12 @@ 
 				return parent::query($name);
 			} else if ($this['AppName'] === 'core' && strpos($name, 'OC\\Core\\') === 0) {
 				return parent::query($name);
-			} else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']) . '\\') === 0) {
+			} else if (strpos($name, \OC\AppFramework\App::buildAppNamespace($this['AppName']).'\\') === 0) {
 				return parent::query($name);
 			}
 		}
 
-		throw new QueryException('Could not resolve ' . $name . '!' .
+		throw new QueryException('Could not resolve '.$name.'!'.
 			' Class can not be instantiated', 1);
 	}
 }