Skip to content

chore: Cleanup DIContainer class #53523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
come-nc merged 10 commits into from
Jul 8, 2025
Merged

chore: Cleanup DIContainer class #53523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9913bdd
chore: Cleanup DIContainer class
come-nc Jun 16, 2025
ab310ce
fix: Fix issues and tests in DIContainer and friends
come-nc Jun 17, 2025
5d65f14
chore: Fix CrashReport\Registry tests
come-nc Jun 19, 2025
bbe766b
fix: Make sure Request class can be dependency injected to fix SameSi…
come-nc Jun 19, 2025
2240ace
fix: Put back ScopedPsrLogger service
come-nc Jun 19, 2025
3dd4ba8
fix: Add back ContainerInterface service to DIContainer
come-nc Jun 19, 2025
5803285
fix: Do not use deprecated IServerContainer in EventDispatcher
come-nc Jun 24, 2025
7bdfd94
chore: update psalm baseline
come-nc Jun 24, 2025
90a2c77
fix: Use Server::get in files_sharing DeletedShareAPIController
come-nc Jul 1, 2025
2346a52
fix: Tidy up middleware registration code and scope them to applicati…
come-nc Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions apps/files_sharing/lib/Controller/DeletedShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
use OCP\Files\NotFoundException;
use OCP\IGroupManager;
use OCP\IRequest;
use OCP\IServerContainer;
use OCP\IUserManager;
use OCP\Server;
use OCP\Share\Exceptions\GenericShareException;
use OCP\Share\Exceptions\ShareNotFound;
use OCP\Share\IManager as ShareManager;
Expand All @@ -44,7 +44,6 @@ public function __construct(
private IGroupManager $groupManager,
private IRootFolder $rootFolder,
private IAppManager $appManager,
private IServerContainer $serverContainer,
) {
parent::__construct($appName, $request);
}
Expand Down Expand Up @@ -202,7 +201,7 @@ private function getRoomShareHelper() {
throw new QueryException();
}

return $this->serverContainer->get('\OCA\Talk\Share\Helper\DeletedShareAPIController');
return Server::get('\OCA\Talk\Share\Helper\DeletedShareAPIController');
}

/**
Expand All @@ -219,7 +218,7 @@ private function getDeckShareHelper() {
throw new QueryException();
}

return $this->serverContainer->get('\OCA\Deck\Sharing\ShareAPIHelper');
return Server::get('\OCA\Deck\Sharing\ShareAPIHelper');
}

/**
Expand All @@ -236,6 +235,6 @@ private function getSciencemeshShareHelper() {
throw new QueryException();
}

return $this->serverContainer->get('\OCA\ScienceMesh\Sharing\ShareAPIHelper');
return Server::get('\OCA\ScienceMesh\Sharing\ShareAPIHelper');
}
}
2 changes: 1 addition & 1 deletion apps/settings/tests/AppInfo/ApplicationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected function setUp(): void {

public function testContainerAppName(): void {
$this->app = new Application();
$this->assertEquals('settings', $this->container->getAppName());
$this->assertEquals('settings', $this->container->get('appName'));
}

public static function dataContainerQuery(): array {
Expand Down
9 changes: 0 additions & 9 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,9 +1581,6 @@
<code><![CDATA[new QueryException()]]></code>
<code><![CDATA[new QueryException()]]></code>
</DeprecatedClass>
<DeprecatedInterface>
<code><![CDATA[private]]></code>
</DeprecatedInterface>
</file>
<file src="apps/files_sharing/lib/Controller/ShareAPIController.php">
<DeprecatedClass>
Expand Down Expand Up @@ -3364,18 +3361,12 @@
</UndefinedMethod>
</file>
<file src="lib/private/AppFramework/DependencyInjection/DIContainer.php">
<ImplementedReturnTypeMismatch>
<code><![CDATA[boolean|null]]></code>
</ImplementedReturnTypeMismatch>
<InvalidReturnStatement>
<code><![CDATA[$this->server]]></code>
</InvalidReturnStatement>
<InvalidReturnType>
<code><![CDATA[\OCP\IServerContainer]]></code>
</InvalidReturnType>
<UndefinedInterfaceMethod>
<code><![CDATA[getAppDataDir]]></code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/AppFramework/Http/Dispatcher.php">
<NullArgument>
Expand Down
4 changes: 2 additions & 2 deletions lib/private/AppFramework/App.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public static function main(string $controllerName, string $methodName, DIContai
$profiler->setEnabled($profiler->isEnabled() && !is_null($urlParams) && isset($urlParams['_route']) && !str_starts_with($urlParams['_route'], 'profiler.'));
if ($profiler->isEnabled()) {
\OC::$server->get(IEventLogger::class)->activate();
$profiler->add(new RoutingDataCollector($container['AppName'], $controllerName, $methodName));
$profiler->add(new RoutingDataCollector($container['appName'], $controllerName, $methodName));
}

$eventLogger->start('app:controller:params', 'Gather controller parameters');
Expand All @@ -115,7 +115,7 @@ public static function main(string $controllerName, string $methodName, DIContai
$request = $container->get(IRequest::class);
$request->setUrlParameters($container['urlParams']);
}
$appName = $container['AppName'];
$appName = $container['appName'];

$eventLogger->end('app:controller:params');

Expand Down
Loading
Loading