Test: Run phan with github workflows

apps/admin_audit/lib/AppInfo/Application.php

@@ -36,7 +36,8 @@
 use Closure;
 use OC\Files\Filesystem;
 use OC\Files\Node\File;
-use OC\Group\Manager;
+use OC\Group\Manager as GroupManager;
+use OC\User\Session as UserSession;
 use OCA\AdminAudit\Actions\AppManagement;
 use OCA\AdminAudit\Actions\Auth;
 use OCA\AdminAudit\Actions\Console;
@@ -134,6 +135,7 @@ private function userManagementHooks(ILogger $logger,
 		Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete');
 		Util::connectHook('OC_User', 'changeUser', $userActions, 'change');
 
+		assert($userSession instanceof UserSession);
 		$userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']);
 		$userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']);
 		$userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']);
@@ -143,7 +145,7 @@ private function groupHooks(ILogger $logger,
 								IGroupManager $groupManager) {
 		$groupActions = new GroupManagement($logger);
 
-		/** @var IGroupManager|Manager $groupManager */
+		assert($groupManager instanceof GroupManager);
 		$groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']);
 		$groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']);
 		$groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']);

apps/provisioning_api/lib/AppInfo/Application.php

@@ -29,11 +29,13 @@
 
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
+use OC\Group\Manager as GroupManager;
 use OCA\Provisioning_API\Middleware\ProvisioningApiMiddleware;
 use OCA\Settings\Mailer\NewUserMailHelper;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Utility\IControllerMethodReflector;
 use OCP\Defaults;
+use OCP\IUser;
 use OCP\Util;
 
 class Application extends App {
@@ -58,8 +60,15 @@ public function __construct(array $urlParams = []) {
 		});
 		$container->registerService('ProvisioningApiMiddleware', function (SimpleContainer $c) use ($server) {
 			$user = $server->getUserManager()->get($c['UserId']);
-			$isAdmin = $user !== null ? $server->getGroupManager()->isAdmin($user->getUID()) : false;
-			$isSubAdmin = $user !== null ? $server->getGroupManager()->getSubAdmin()->isSubAdmin($user) : false;
+			$isAdmin = false;
+			$isSubAdmin = false;
+
+			if ($user instanceof IUser) {
+				$groupManager = $server->query(GroupManager::class);
+				$isAdmin = $groupManager->isAdmin($user->getUID());
+				$isSubAdmin = $groupManager->getSubAdmin()->isSubAdmin($user);
+			}
+
 			return new ProvisioningApiMiddleware(
 				$c->query(IControllerMethodReflector::class),
 				$isAdmin,

apps/settings/lib/Controller/ChangePasswordController.php

@@ -35,6 +35,7 @@
 
 namespace OCA\Settings\Controller;
 
+use OC\Group\Manager as GroupManager;
 use OC\HintException;
 use OC\User\Session;
 use OCP\App\IAppManager;
@@ -58,7 +59,7 @@ class ChangePasswordController extends Controller {
 	/** @var IL10N */
 	private $l;
 
-	/** @var IGroupManager */
+	/** @var GroupManager */
 	private $groupManager;
 
 	/** @var Session */
@@ -72,7 +73,7 @@ public function __construct(string $appName,
 								string $userId,
 								IUserManager $userManager,
 								IUserSession $userSession,
-								IGroupManager $groupManager,
+								GroupManager $groupManager,
 								IAppManager $appManager,
 								IL10N $l) {
 		parent::__construct($appName, $request);

apps/settings/lib/Controller/UsersController.php

@@ -63,7 +63,10 @@
 use function in_array;
 
 class UsersController extends Controller {
-	/** @var IUserManager */
+	/**
+	 * @var IUserManager
+	 * @phan-var \OC\User\Manager
+	 */
 	private $userManager;
 	/** @var IGroupManager */
 	private $groupManager;
@@ -77,7 +80,10 @@ class UsersController extends Controller {
 	private $l10n;
 	/** @var IMailer */
 	private $mailer;
-	/** @var IFactory */
+	/**
+	 * @var IFactory
+	 * @phan-var \OC\L10N\Factory
+	 */
 	private $l10nFactory;
 	/** @var IAppManager */
 	private $appManager;
@@ -214,7 +220,7 @@ public function usersList() {
 						$groups[$key]['usercount']--;
 						$userCount -= 1; // we also lower from one the total count
 					}
-				};
+				}
 				$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
 				$disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames);
 			}

lib/private/Group/MetaData.php

@@ -44,7 +44,10 @@ class MetaData {
 	protected $isAdmin;
 	/** @var array */
 	protected $metaData = [];
-	/** @var IGroupManager */
+	/**
+	 * @var IGroupManager
+	 * @phan-var \OC\Group\Manager
+	 */
 	protected $groupManager;
 	/** @var bool */
 	protected $sorting = false;
@@ -55,7 +58,6 @@ class MetaData {
 	 * @param string $user the uid of the current user
 	 * @param bool $isAdmin whether the current users is an admin
 	 * @param IGroupManager $groupManager
-	 * @param IUserManager $userManager
 	 * @param IUserSession $userSession
 	 */
 	public function __construct(

lib/public/IContainer.php

@@ -66,9 +66,10 @@ public function resolve($name);
 	/**
 	 * Look up a service for a given name in the container.
 	 *
-	 * @param string $name
+	 * @template T
+	 * @param 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
+	 * @return T
 	 * @throws ContainerExceptionInterface if the query could not be resolved
 	 * @throws QueryException if the query could not be resolved
 	 * @since 6.0.0