wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update query method for DIContainer

Browse source 
To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-03-17 14:25:35 +01:00
parent fd0e42e093
commit 886202123c
No known key found for this signature in database
GPG key ID: F941078878347C0C
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -43,12 +43,11 @@ use OC\AppFramework\Middleware\OCSMiddleware;
use OC\AppFramework\Middleware\Security\SecurityMiddleware;
use OC\AppFramework\Middleware\SessionMiddleware;
use OC\AppFramework\Utility\SimpleContainer;
use OC\AppFramework\Utility\TimeFactory;
use OC\Core\Middleware\TwoFactorMiddleware;
use OC\RichObjectStrings\Validator;
use OC\Security\Bruteforce\Throttler;
use OCP\AppFramework\IApi;
use OCP\AppFramework\IAppContainer;
use OCP\AppFramework\QueryException;
use OCP\Federation\ICloudIdManager;
use OCP\Files\IAppData;
use OCP\Files\Mount\IMountManager;
@ -568,7 +567,16 @@ class DIContainer extends SimpleContainer implements IAppContainer {
});
}
public function query($name) {
return parent::query($name);
public function query($name, $checkServerContainer = true) {
$name = $this->sanitizeName($name);
try {
return parent::query($name);
} catch (QueryException $e) {
if ($checkServerContainer === false) {
throw $e;
}
}
return $this->getServer()->query($name);
}
}

2
lib/private/ServerContainer.php
View file

@ -79,7 +79,7 @@ class ServerContainer extends SimpleContainer {
$segments = explode('\\', $name);
$appContainer = $this->getAppContainer(strtolower($segments[1]));
try {
return $appContainer->query($name);
return $appContainer->query($name, false);
} catch (QueryException $e) {
// Didn't find the service in the respective app container,
// ignore it and fall back to the core container.