diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-07-17 08:21:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-17 08:21:48 +0200 |
commit | 79c677e26d861fd92cff5281aea15e9cfc7e0011 (patch) | |
tree | 52b209100a4d39f77d8939150c48fac75409d746 | |
parent | 2c79083f27c764fb35cc1692e105a02378cbd690 (diff) | |
parent | 5005510d828fb86602965af5c9263770f8af1f62 (diff) | |
download | nextcloud-server-79c677e26d861fd92cff5281aea15e9cfc7e0011.tar.gz nextcloud-server-79c677e26d861fd92cff5281aea15e9cfc7e0011.zip |
Merge pull request #21859 from nextcloud/techdebt/dav-psr-container
Migrate DAV to the PSR container
-rw-r--r-- | apps/dav/lib/AppInfo/Application.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/dav/lib/AppInfo/Application.php b/apps/dav/lib/AppInfo/Application.php index 083bd8a474f..bf1e6146330 100644 --- a/apps/dav/lib/AppInfo/Application.php +++ b/apps/dav/lib/AppInfo/Application.php @@ -62,11 +62,11 @@ use OCP\AppFramework\IAppContainer; use OCP\Calendar\IManager as ICalendarManager; use OCP\Contacts\IManager as IContactsManager; use OCP\IConfig; -use OCP\IContainer; use OCP\ILogger; use OCP\IServerContainer; use OCP\IUser; use OCP\Notification\IManager as INotificationManager; +use Psr\Container\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\GenericEvent; use Throwable; @@ -76,22 +76,19 @@ use function strpos; class Application extends App implements IBootstrap { public const APP_ID = 'dav'; - /** - * Application constructor. - */ public function __construct() { parent::__construct(self::APP_ID); } public function register(IRegistrationContext $context): void { $context->registerServiceAlias('CardDAVSyncService', SyncService::class); - $context->registerService(PhotoCache::class, function (IContainer $c) { + $context->registerService(PhotoCache::class, function (ContainerInterface $c) { /** @var IServerContainer $server */ - $server = $c->query(IServerContainer::class); + $server = $c->get(IServerContainer::class); return new PhotoCache( $server->getAppDataDir('dav-photocache'), - $server->getLogger() + $c->get(ILogger::class) ); }); |