mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22027 from nextcloud/bugfix/noid/fix-overwrite-service-for-apps 

Fix overwriteService() for apps
This commit is contained in:
Joas Schilling 2020-07-28 18:37:35 +02:00 committed by GitHub
parent 6c176b064c bab4fb98eb
commit 4824e5e1a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/private/ServerContainer.php
View File

@ -156,7 +156,12 @@ class ServerContainer extends SimpleContainer {
return parent::query($name, $autoload); return parent::query($name, $autoload);
} }
private function getAppContainerForService(string $id): ?DIContainer { /**
* @internal
* @param string $id
* @return DIContainer|null
*/
public function getAppContainerForService(string $id): ?DIContainer {
if (strpos($id, 'OCA\\') !== 0 || substr_count($id, '\\') < 2) { if (strpos($id, 'OCA\\') !== 0 || substr_count($id, '\\') < 2) {
return null; return null;
} }

15
tests/lib/TestCase.php
View File

@ -51,13 +51,16 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
* @param mixed $newService * @param mixed $newService
* @return bool * @return bool
*/ */
public function overwriteService($name, $newService) { public function overwriteService(string $name, $newService): bool {
if (isset($this->services[$name])) { if (isset($this->services[$name])) {
return false; return false;
} }
$this->services[$name] = \OC::$server->query($name); $this->services[$name] = \OC::$server->query($name);
\OC::$server->registerService($name, function () use ($newService) { $container = \OC::$server->getAppContainerForService($name);
$container = $container ?? \OC::$server;
$container->registerService($name, function () use ($newService) {
return $newService; return $newService;
}); });
@ -68,10 +71,14 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
* @param string $name * @param string $name
* @return bool * @return bool
*/ */
public function restoreService($name) { public function restoreService(string $name): bool {
if (isset($this->services[$name])) { if (isset($this->services[$name])) {
$oldService = $this->services[$name]; $oldService = $this->services[$name];
\OC::$server->registerService($name, function () use ($oldService) {
$container = \OC::$server->getAppContainerForService($name);
$container = $container ?? \OC::$server;
$container->registerService($name, function () use ($oldService) {
return $oldService; return $oldService;
}); });