petru/nextcloud-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(IContainer): Fix parameter and return types

Browse Source 
Signed-off-by: provokateurin <kate@provokateurin.de>
This commit is contained in:
provokateurin
2026-02-16 08:41:03 +01:00
parent 891ec7bed5
commit 9dc1d6372f
7 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/rector-strict.php
+1
View File
@@ -11,6 +11,7 @@ return (require __DIR__ . '/rector-shared.php')
->withPaths([
$nextcloudDir . '/build/rector-strict.php',
$nextcloudDir . '/core/BackgroundJobs/ExpirePreviewsJob.php',
$nextcloudDir . '/lib/public/IContainer.php',
])
->withPreparedSets(
deadCode: true,
lib/private/AppFramework/DependencyInjection/DIContainer.php
+1 -1
View File
@@ -326,7 +326,7 @@ class DIContainer extends SimpleContainer implements IAppContainer {
* @inheritDoc
* @param list<class-string> $chain
*/
public function query(string $name, bool $autoload = true, array $chain = []) {
public function query(string $name, bool $autoload = true, array $chain = []): mixed {
if ($name === 'AppName' || $name === 'appName') {
return $this->appName;
}
lib/private/AppFramework/Utility/SimpleContainer.php
+5 -9
View File
@@ -120,7 +120,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* @inheritDoc
* @param list<class-string> $chain
*/
public function resolve($name, array $chain = []) {
public function resolve(string $name, array $chain = []): mixed {
$baseMsg = 'Could not resolve ' . $name . '!';
try {
$class = new ReflectionClass($name);
@@ -140,7 +140,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* @inheritDoc
* @param list<class-string> $chain
*/
public function query(string $name, bool $autoload = true, array $chain = []) {
public function query(string $name, bool $autoload = true, array $chain = []): mixed {
$name = $this->sanitizeName($name);
if (isset($this->container[$name])) {
return $this->container[$name];
@@ -161,15 +161,11 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
throw new QueryNotFoundException('Could not resolve ' . $name . '!');
}
/**
* @param string $name
* @param mixed $value
*/
public function registerParameter($name, $value) {
public function registerParameter(string $name, mixed $value): void {
$this[$name] = $value;
}
public function registerService($name, Closure $closure, $shared = true) {
public function registerService(string $name, Closure $closure, bool $shared = true): void {
$wrapped = function () use ($closure) {
return $closure($this);
};
@@ -191,7 +187,7 @@ class SimpleContainer implements ArrayAccess, ContainerInterface, IContainer {
* @param string $alias the alias that should be registered
* @param string $target the target that should be resolved instead
*/
public function registerAlias($alias, $target): void {
public function registerAlias(string $alias, string $target): void {
$this->registerService($alias, function (ContainerInterface $container) use ($target): mixed {
return $container->get($target);
}, false);
lib/private/ServerContainer.php
+1 -1
View File
@@ -119,7 +119,7 @@ class ServerContainer extends SimpleContainer {
* @throws QueryException
* @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
*/
public function query(string $name, bool $autoload = true, array $chain = []) {
public function query(string $name, bool $autoload = true, array $chain = []): mixed {
$name = $this->sanitizeName($name);
if (str_starts_with($name, 'OCA\\')) {
lib/public/IContainer.php
+12 -23
View File
@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
@@ -7,11 +9,9 @@
*/
// use OCP namespace for all classes that are considered public.
// This means that they should be used by apps instead of the internal Nextcloud classes
namespace OCP;
use Closure;
use OC\AppFramework\Utility\SimpleContainer;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -30,43 +30,35 @@ interface IContainer extends ContainerInterface {
*
* If a parameter is not registered in the container try to instantiate it
* by using reflection to find out how to build the class
* @param string $name the class name to resolve
* @psalm-param string|class-string<T> $name
* @return \stdClass
* @psalm-return ($name is class-string ? T : mixed)
* @param class-string<T>|string $name
* @return ($name is class-string<T> ? T : mixed)
* @since 8.2.0
* @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
* @throws ContainerExceptionInterface if the class could not be found or instantiated
*/
public function resolve($name);
public function resolve(string $name): mixed;
/**
* Look up a service for a given name in the container.
*
* @template T
*
* @param string $name
* @psalm-param string|class-string<T> $name
* @param class-string<T>|string $name
* @param bool $autoload Should we try to autoload the service. If we are trying to resolve built in types this makes no sense for example
* @return mixed
* @psalm-return ($name is class-string ? T : mixed)
* @return ($name is class-string<T> ? T : mixed)
* @throws ContainerExceptionInterface if the query could not be resolved
* @throws NotFoundExceptionInterface if the name could not be found within the container
* @since 6.0.0
* @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
*/
public function query(string $name, bool $autoload = true);
public function query(string $name, bool $autoload = true): mixed;
/**
* A value is stored in the container with it's corresponding name
*
* @param string $name
* @param mixed $value
* @return void
* @since 6.0.0
* @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerParameter
*/
public function registerParameter($name, $value);
public function registerParameter(string $name, mixed $value): void;
/**
* A service is registered in the container where a closure is passed in which will actually
@@ -75,14 +67,11 @@ interface IContainer extends ContainerInterface {
* memory and be reused on subsequent calls.
* In case the parameter is false the service will be recreated on every call.
*
* @param string $name
* @param \Closure(SimpleContainer): mixed $closure
* @param bool $shared
* @return void
* @param \Closure(IContainer): mixed $closure
* @since 6.0.0
* @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerService
*/
public function registerService($name, Closure $closure, $shared = true);
public function registerService(string $name, Closure $closure, bool $shared = true): void;
/**
* Shortcut for returning a service from a service under a different key,
@@ -93,5 +82,5 @@ interface IContainer extends ContainerInterface {
* @since 8.2.0
* @deprecated 20.0.0 use \OCP\AppFramework\Bootstrap\IRegistrationContext::registerServiceAlias
*/
public function registerAlias($alias, $target);
public function registerAlias(string $alias, string $target): void;
}
psalm-strict.xml
+1
View File
@@ -17,6 +17,7 @@
>
<projectFiles>
<file name="core/BackgroundJobs/ExpirePreviewsJob.php"/>
<file name="lib/public/IContainer.php"/>
<ignoreFiles>
<directory name="apps/**/composer"/>
<directory name="apps/**/tests"/>
tests/lib/Collaboration/Collaborators/SearchTest.php
+8 -8
View File
@@ -91,22 +91,22 @@ class SearchTest extends TestCase {
->willReturnCallback(function ($class) use ($searchResult, $userPlugin, $groupPlugin, $remotePlugin, $mailPlugin) {
if ($class === SearchResult::class) {
return $searchResult;
} elseif ($class === $userPlugin) {
} elseif ($class === 'user') {
return $userPlugin;
} elseif ($class === $groupPlugin) {
} elseif ($class === 'group') {
return $groupPlugin;
} elseif ($class === $remotePlugin) {
} elseif ($class === 'remote') {
return $remotePlugin;
} elseif ($class === $mailPlugin) {
} elseif ($class === 'mail') {
return $mailPlugin;
}
return null;
});
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => $userPlugin]);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => $groupPlugin]);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => $remotePlugin]);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => $mailPlugin]);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => 'user']);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => 'group']);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => 'remote']);
$this->search->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => 'mail']);
[$results, $moreResults] = $this->search->search($searchTerm, $shareTypes, false, $perPage, $perPage * ($page - 1));