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

Migrate files versions to the PSR container 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2020-07-16 10:32:34 +02:00
parent 33aeef2d10
commit 3b0478773a
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/files_versions/lib/AppInfo/Application.php
View File

@ -43,9 +43,9 @@ use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootContext;
use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\AppFramework\IAppContainer;
use OCP\ILogger; use OCP\ILogger;
use OCP\IServerContainer; use OCP\IServerContainer;
use Psr\Container\ContainerInterface;
class Application extends App implements IBootstrap { class Application extends App implements IBootstrap {
public const APP_ID = 'files_versions'; public const APP_ID = 'files_versions';
@ -63,20 +63,21 @@ class Application extends App implements IBootstrap {
/** /**
* Register $principalBackend for the DAV collection * Register $principalBackend for the DAV collection
*/ */
$context->registerService('principalBackend', function (IAppContainer $c) { $context->registerService('principalBackend', function (ContainerInterface $c) {
$server = $c->getServer(); /** @var IServerContainer $server */
$server = $c->get(IServerContainer::class);
return new Principal( return new Principal(
$server->getUserManager(), $server->getUserManager(),
$server->getGroupManager(), $server->getGroupManager(),
$server->getShareManager(), $server->getShareManager(),
$server->getUserSession(), $server->getUserSession(),
$server->getAppManager(), $server->getAppManager(),
$server->query(ProxyMapper::class), $server->get(ProxyMapper::class),
$server->getConfig() $server->getConfig()
); );
}); });
$context->registerService(IVersionManager::class, function (IAppContainer $c) { $context->registerService(IVersionManager::class, function () {
return new VersionManager(); return new VersionManager();
}); });
@ -96,17 +97,17 @@ class Application extends App implements IBootstrap {
Hooks::connectHooks(); Hooks::connectHooks();
} }
public function registerVersionBackends(IServerContainer $server, IAppManager $appManager, ILogger $logger) { public function registerVersionBackends(ContainerInterface $container, IAppManager $appManager, ILogger $logger) {
foreach ($appManager->getInstalledApps() as $app) { foreach ($appManager->getInstalledApps() as $app) {
$appInfo = $appManager->getAppInfo($app); $appInfo = $appManager->getAppInfo($app);
if (isset($appInfo['versions'])) { if (isset($appInfo['versions'])) {
$backends = $appInfo['versions']; $backends = $appInfo['versions'];
foreach ($backends as $backend) { foreach ($backends as $backend) {
if (isset($backend['@value'])) { if (isset($backend['@value'])) {
$this->loadBackend($backend, $server, $logger); $this->loadBackend($backend, $container, $logger);
} else { } else {
foreach ($backend as $singleBackend) { foreach ($backend as $singleBackend) {
$this->loadBackend($singleBackend, $server, $logger); $this->loadBackend($singleBackend, $container, $logger);
} }
} }
} }
@ -114,13 +115,13 @@ class Application extends App implements IBootstrap {
} }
} }
private function loadBackend(array $backend, IServerContainer $server, ILogger $logger) { private function loadBackend(array $backend, ContainerInterface $container, ILogger $logger) {
/** @var IVersionManager $versionManager */ /** @var IVersionManager $versionManager */
$versionManager = $server->query(IVersionManager::class); $versionManager = $container->get(IVersionManager::class);
$class = $backend['@value']; $class = $backend['@value'];
$for = $backend['@attributes']['for']; $for = $backend['@attributes']['for'];
try { try {
$backendObject = $server->query($class); $backendObject = $container->get($class);
$versionManager->registerBackend($for, $backendObject); $versionManager->registerBackend($for, $backendObject);
} catch (\Exception $e) { } catch (\Exception $e) {
$logger->logException($e); $logger->logException($e);