Merge pull request #23377 from nextcloud/enhancement/psalm-annotate-icontainer

Annotate IContainer so Psalm knows what resove and query return

Author: MorrisJobke

apps/workflowengine/lib/Manager.php

@@ -695,7 +695,7 @@ protected function getBuildInOperators(): array {
 	}
 
 	/**
-	 * @return IEntity[]
+	 * @return ICheck[]
 	 */
 	protected function getBuildInChecks(): array {
 		try {

lib/base.php

@@ -859,6 +859,7 @@ private static function registerAccountHooks() {
 	}
 
 	private static function registerAppRestrictionsHooks() {
+		/** @var \OC\Group\Manager $groupManager */
 		$groupManager = self::$server->query(\OCP\IGroupManager::class);
 		$groupManager->listen('\OC\Group', 'postDelete', function (\OCP\IGroup $group) {
 			$appManager = self::$server->getAppManager();

lib/private/AppFramework/App.php

@@ -34,6 +34,7 @@
 
 use OC\AppFramework\DependencyInjection\DIContainer;
 use OC\AppFramework\Http\Dispatcher;
+use OC\AppFramework\Http\Request;
 use OC\HintException;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\ICallbackResponse;
@@ -114,9 +115,13 @@ public static function getAppIdForClass(string $className, string $topNamespace
 	 */
 	public static function main(string $controllerName, string $methodName, DIContainer $container, array $urlParams = null) {
 		if (!is_null($urlParams)) {
-			$container->query(IRequest::class)->setUrlParameters($urlParams);
+			/** @var Request $request */
+			$request = $container->query(IRequest::class);
+			$request->setUrlParameters($urlParams);
 		} elseif (isset($container['urlParams']) && !is_null($container['urlParams'])) {
-			$container->query(IRequest::class)->setUrlParameters($container['urlParams']);
+			/** @var Request $request */
+			$request = $container->query(IRequest::class);
+			$request->setUrlParameters($container['urlParams']);
 		}
 		$appName = $container['AppName'];
 

lib/private/Collaboration/Collaborators/Search.php

@@ -68,14 +68,14 @@ public function search($search, array $shareTypes, $lookup, $limit, $offset) {
 			foreach ($this->pluginList[$type] as $plugin) {
 				/** @var ISearchPlugin $searchPlugin */
 				$searchPlugin = $this->c->resolve($plugin);
-				$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+				$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
 			}
 		}
 
 		// Get from lookup server, not a separate share type
 		if ($lookup) {
 			$searchPlugin = $this->c->resolve(LookupPlugin::class);
-			$hasMoreResults |= $searchPlugin->search($search, $limit, $offset, $searchResult);
+			$hasMoreResults = $searchPlugin->search($search, $limit, $offset, $searchResult) || $hasMoreResults;
 		}
 
 		// sanitizing, could go into the plugins as well

lib/public/IContainer.php

@@ -52,10 +52,14 @@
 interface IContainer extends ContainerInterface {
 
 	/**
+	 * @template T
+	 *
 	 * 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)
 	 * @since 8.2.0
 	 * @deprecated 20.0.0 use \Psr\Container\ContainerInterface::get
 	 * @throws ContainerExceptionInterface if the class could not be found or instantiated
@@ -66,9 +70,13 @@ public function resolve($name);
 	/**
 	 * Look up a service for a given name in the container.
 	 *
+	 * @template T
+	 *
 	 * @param string $name
+	 * @psalm-param string|class-string<T> $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)
 	 * @throws ContainerExceptionInterface if the query could not be resolved
 	 * @throws QueryException if the query could not be resolved
 	 * @since 6.0.0