diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-05-13 16:14:01 +0200 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-05-13 16:14:01 +0200 |
| commit | 7f899b3bc8a4debcde2d4f4b81d9044221718292 (patch) | |
| tree | dfa981a7a2aa28817b10b482f788e264aebd814f | |
| parent | f4058a2432f748ffff6d7e45f2fb79ca383f8dd1 (diff) | |
| download | nextcloud-server-7f899b3bc8a4debcde2d4f4b81d9044221718292.tar.gz nextcloud-server-7f899b3bc8a4debcde2d4f4b81d9044221718292.zip | |
Improve psalm annotation to make it stricter
Now using class-string<T> as input will only return T, and any other
string will return mixed
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
| -rw-r--r-- | build/psalm-baseline.xml | 1 | ||||
| -rw-r--r-- | lib/public/Server.php | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index c35d71a79ae..84030160d7b 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -1371,7 +1371,6 @@ </InvalidReturnType> </file> <file src="apps/files_external/lib/Lib/Storage/SMB.php"> - <InvalidPropertyAssignmentValue occurrences="1"/> <InvalidScalarArgument occurrences="7"> <code>$e->getCode()</code> <code>$e->getCode()</code> diff --git a/lib/public/Server.php b/lib/public/Server.php index be6b6a49236..f4522e8ae10 100644 --- a/lib/public/Server.php +++ b/lib/public/Server.php @@ -41,8 +41,9 @@ use Psr\Container\NotFoundExceptionInterface; final class Server { /** * @template T - * @param class-string<T>|string $serviceName - * @return T|mixed + * @template S as class-string<T>|string + * @param S $serviceName + * @return (S is class-string<T> ? T : mixed) * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface * @since 25.0.0 |