Merge pull request #50908 from nextcloud/chore/server-annotations

chore: Adjust `OCP\Server::get` annotation to work with phpstan
nextcloud · Feb 27, 2025 · 6900ac9 · 6900ac9
2 parents 8f28fa2 + 28ce57d
commit 6900ac9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/public/Server.php b/lib/public/Server.php
@@ -15,6 +15,7 @@
  * use whenever possible dependency injections instead.
  *
  * ```php
+ * use OCP\ITagManager;
  * use OCP\Server;
  *
  * $tagManager = Server::get(ITagManager::class);
@@ -24,12 +25,9 @@
  */
 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