Merge pull request #60780 from nextcloud/carl/modernize-containers

refactor: Remove most usages of IAppContainer and IServerContainer

Author: AndyScherzinger

apps/dav/lib/CalDAV/CalendarHome.php

@@ -16,6 +16,7 @@
 use OCP\App\IAppManager;
 use OCP\IConfig;
 use OCP\IL10N;
+use OCP\L10N\IFactory;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
 use Sabre\CalDAV\Backend\BackendInterface;
@@ -50,7 +51,7 @@ public function __construct(
 		private bool $returnCachedSubscriptions,
 	) {
 		parent::__construct($caldavBackend, $principalInfo);
-		$this->l10n = \OC::$server->getL10N('dav');
+		$this->l10n = Server::get(IFactory::class)->get('dav');
 		$this->config = Server::get(IConfig::class);
 		$this->pluginManager = new PluginManager(
 			\OC::$server,

apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php

@@ -26,6 +26,7 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
 use Sabre\VObject\ITip\Message;
@@ -46,7 +47,7 @@ public function __construct(bool $public = true) {
 		$this->server = new \OCA\DAV\Connector\Sabre\Server(new CachingTree($root));
 
 		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+		$this->server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), Server::get(IFactory::class)->get('dav')));
 
 		// Set URL explicitly due to reverse-proxy situations
 		$this->server->httpRequest->setUrl($baseUri);

apps/dav/lib/Connector/Sabre/MaintenancePlugin.php

@@ -17,9 +17,6 @@
 
 class MaintenancePlugin extends ServerPlugin {
 
-	/** @var IL10N */
-	private $l10n;
-
 	/**
 	 * Reference to main server object
 	 *
@@ -31,10 +28,9 @@ class MaintenancePlugin extends ServerPlugin {
 	 * @param IConfig $config
 	 */
 	public function __construct(
-		private IConfig $config,
-		IL10N $l10n,
+		private readonly IConfig $config,
+		private readonly IL10N $l10n,
 	) {
-		$this->l10n = \OC::$server->getL10N('dav');
 	}
 
 	/**
@@ -59,9 +55,8 @@ public function initialize(\Sabre\DAV\Server $server) {
 	 * in case the system is in maintenance mode.
 	 *
 	 * @throws ServiceUnavailable
-	 * @return bool
 	 */
-	public function checkMaintenanceMode() {
+	public function checkMaintenanceMode(): bool {
 		if ($this->config->getSystemValueBool('maintenance')) {
 			throw new ServerMaintenanceMode($this->l10n->t('System is in maintenance mode.'));
 		}

apps/dav/lib/RootCollection.php

@@ -53,7 +53,7 @@
 
 class RootCollection extends SimpleCollection {
 	public function __construct() {
-		$l10n = \OC::$server->getL10N('dav');
+		$l10n = Server::get(IFactory::class)->get('dav');
 		$random = Server::get(ISecureRandom::class);
 		$logger = Server::get(LoggerInterface::class);
 		$userManager = Server::get(IUserManager::class);

apps/dav/lib/Server.php

@@ -96,6 +96,7 @@
 use OCP\ITagManager;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
+use OCP\L10N\IFactory;
 use OCP\Mail\IEmailValidator;
 use OCP\Mail\IMailer;
 use OCP\Profiler\IProfiler;
@@ -133,7 +134,7 @@ public function __construct(
 		$this->server->setLogger($logger);
 
 		// Add maintenance plugin
-		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OC::$server->getL10N('dav')));
+		$this->server->addPlugin(new MaintenancePlugin(\OCP\Server::get(IConfig::class), \OCP\Server::get(IFactory::class)->get('dav')));
 
 		$this->server->addPlugin(new AppleQuirksPlugin());
 
@@ -401,7 +402,7 @@ public function __construct(
 					\OCP\Server::get(IURLGenerator::class),
 					\OCP\Server::get(ThemingDefaults::class),
 					\OCP\Server::get(IRequest::class),
-					\OC::$server->getL10N('dav'),
+					\OCP\Server::get(IFactory::class)->get('dav'),
 					function () {
 						return UUIDUtil::getUUID();
 					}

apps/files_external/tests/Service/StoragesServiceTestCase.php

@@ -22,7 +22,6 @@
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\DBConfigService;
 use OCA\Files_External\Service\StoragesService;
-use OCP\AppFramework\IAppContainer;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\Cache\ICache;
 use OCP\Files\Config\IUserMountCache;
@@ -128,14 +127,6 @@ protected function setUp(): void {
 			Filesystem::CLASSNAME,
 			Filesystem::signal_delete_mount,
 			get_class($this), 'deleteHookCallback');
-
-		$containerMock = $this->createMock(IAppContainer::class);
-		$containerMock->method('query')
-			->willReturnCallback(function ($name) {
-				if ($name === 'OCA\Files_External\Service\BackendService') {
-					return $this->backendService;
-				}
-			});
 	}
 
 	protected function tearDown(): void {

apps/files_sharing/lib/AppInfo/Application.php

@@ -165,15 +165,15 @@ public function registerEventsScripts(IEventDispatcher $dispatcher): void {
 		// notifications api to accept incoming user shares
 		$dispatcher->addListener(ShareCreatedEvent::class, function (ShareCreatedEvent $event): void {
 			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
+			$listener = $this->getContainer()->get(Listener::class);
 			$listener->shareNotification($event);
 		});
 		$dispatcher->addListener(IGroup::class . '::postAddUser', function ($event): void {
 			if (!$event instanceof OldGenericEvent) {
 				return;
 			}
 			/** @var Listener $listener */
-			$listener = $this->getContainer()->query(Listener::class);
+			$listener = $this->getContainer()->get(Listener::class);
 			$listener->userAddedToGroup($event);
 		});
 	}

apps/settings/tests/AppInfo/ApplicationTest.php

@@ -17,8 +17,8 @@
 use OCA\Settings\Controller\UsersController;
 use OCA\Settings\Middleware\SubadminMiddleware;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\Middleware;
+use Psr\Container\ContainerInterface;
 use Test\TestCase;
 
 /**
@@ -29,7 +29,7 @@
 #[\PHPUnit\Framework\Attributes\Group(name: 'DB')]
 class ApplicationTest extends TestCase {
 	protected Application $app;
-	protected IAppContainer $container;
+	protected ContainerInterface $container;
 
 	protected function setUp(): void {
 		parent::setUp();

apps/theming/tests/ServicesTest.php

@@ -15,11 +15,11 @@
 use OCA\Theming\ThemingDefaults;
 use OCA\Theming\Util;
 use OCP\AppFramework\App;
-use OCP\AppFramework\IAppContainer;
 use OCP\Capabilities\ICapability;
 use OCP\IL10N;
 use OCP\Settings\IIconSection;
 use OCP\Settings\ISettings;
+use Psr\Container\ContainerInterface;
 use Test\TestCase;
 
 /**
@@ -31,7 +31,7 @@
 class ServicesTest extends TestCase {
 	protected App $app;
 
-	protected IAppContainer $container;
+	protected ContainerInterface $container;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -66,6 +66,6 @@ public function testContainerQuery(string $service, ?string $expected = null): v
 		if ($expected === null) {
 			$expected = $service;
 		}
-		$this->assertInstanceOf($expected, $this->container->query($service));
+		$this->assertInstanceOf($expected, $this->container->get($service));
 	}
 }

apps/user_ldap/lib/AppInfo/Application.php

@@ -30,7 +30,6 @@
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
-use OCP\AppFramework\IAppContainer;
 use OCP\AppFramework\Services\IAppConfig;
 use OCP\Config\IUserConfig;
 use OCP\EventDispatcher\IEventDispatcher;
@@ -86,7 +85,7 @@ function (ContainerInterface $c) {
 	public function boot(IBootContext $context): void {
 		$context->injectFn(function (
 			INotificationManager $notificationManager,
-			IAppContainer $appContainer,
+			ContainerInterface $appContainer,
 			IEventDispatcher $dispatcher,
 			IUserManager $userManager,
 			IGroupManager $groupManager,
@@ -120,7 +119,7 @@ public function boot(IBootContext $context): void {
 		);
 	}
 
-	private function registerBackendDependents(IAppContainer $appContainer, IEventDispatcher $dispatcher): void {
+	private function registerBackendDependents(ContainerInterface $appContainer, IEventDispatcher $dispatcher): void {
 		$dispatcher->addListener(
 			'OCA\\Files_External::loadAdditionalBackends',
 			function () use ($appContainer): void {