aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2025-02-27 22:23:20 +0100
committerGitHub <noreply@github.com>2025-02-27 22:23:20 +0100
commit6900ac99e01a8cda5bf8c93cd1240610ae4c6729 (patch)
treee8c13944abbe801450832178cfe893ce78f775ae
parent8f28fa232a9915b1dd80a5d8832cc7529c7b46c8 (diff)
parent28ce57d0f474fa675f3d78824fc3ed7bfe1d0daf (diff)
downloadnextcloud-server-6900ac99e01a8cda5bf8c93cd1240610ae4c6729.tar.gz
nextcloud-server-6900ac99e01a8cda5bf8c93cd1240610ae4c6729.zip
Merge pull request #50908 from nextcloud/chore/server-annotations
chore: Adjust `OCP\Server::get` annotation to work with phpstan
-rw-r--r--lib/public/Server.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/public/Server.php b/lib/public/Server.php
index 55dbfed578e..e30d67701f6 100644
--- a/lib/public/Server.php
+++ b/lib/public/Server.php
@@ -15,6 +15,7 @@ use Psr\Container\NotFoundExceptionInterface;
* use whenever possible dependency injections instead.
*
* ```php
+ * use OCP\ITagManager;
* use OCP\Server;
*
* $tagManager = Server::get(ITagManager::class);
@@ -24,12 +25,9 @@ use Psr\Container\NotFoundExceptionInterface;
*/
final class Server {
/**
- * @template T
- * @param class-string<T>|string $serviceName
- * @return T|mixed
- * @psalm-template S as class-string<T>|string
- * @psalm-param S $serviceName
- * @psalm-return (S is class-string<T> ? T : mixed)
+ * @psalm-template T
+ * @psalm-param class-string<T>|string $serviceName
+ * @psalm-return ($serviceName is class-string<T> ? T : mixed)
* @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface
* @since 25.0.0