Fix the type of the return array in a few more places

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

build/psalm-baseline.xml

@@ -2337,12 +2337,9 @@
     </UndefinedMethod>
   </file>
   <file src="lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php">
-    <InvalidReturnStatement occurrences="2">
-      <code>$providers</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="2">
+    <InvalidReturnStatement occurrences="1"/>
+    <InvalidReturnType occurrences="1">
       <code>int[]</code>
-      <code>string[]</code>
     </InvalidReturnType>
   </file>
   <file src="lib/private/Authentication/TwoFactorAuth/Manager.php">
@@ -2350,12 +2347,6 @@
       <code>IProvider::EVENT_FAILED</code>
       <code>IProvider::EVENT_SUCCESS</code>
     </InvalidArgument>
-    <InvalidReturnStatement occurrences="1">
-      <code>$providerStates</code>
-    </InvalidReturnStatement>
-    <InvalidReturnType occurrences="1">
-      <code>string[]</code>
-    </InvalidReturnType>
     <InvalidScalarArgument occurrences="2">
       <code>$this-&gt;timeFactory-&gt;getTime()</code>
       <code>$tokenId</code>

lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php

@@ -47,7 +47,7 @@ class ProviderUserAssignmentDao {
 	/**
 	 * Get all assigned provider IDs for the given user ID
 	 *
-	 * @return string[] where the array key is the provider ID (string) and the
+	 * @return array<string, bool> where the array key is the provider ID (string) and the
 	 *                  value is the enabled state (bool)
 	 */
 	public function getState(string $uid): array {
@@ -59,7 +59,7 @@ class ProviderUserAssignmentDao {
 		$result = $query->execute();
 		$providers = [];
 		foreach ($result->fetchAll() as $row) {
-			$providers[$row['provider_id']] = 1 === (int)$row['enabled'];
+			$providers[(string)$row['provider_id']] = 1 === (int)$row['enabled'];
 		}
 		$result->closeCursor();
 

lib/private/Authentication/TwoFactorAuth/Manager.php

@@ -170,10 +170,10 @@ class Manager {
 	 *
 	 * @todo remove in Nextcloud 17 as by then all providers should have been updated
 	 *
-	 * @param string[] $providerStates
+	 * @param array<string, bool> $providerStates
 	 * @param IProvider[] $providers
 	 * @param IUser $user
-	 * @return string[] the updated $providerStates variable
+	 * @return array<string, bool> the updated $providerStates variable
 	 */
 	private function fixMissingProviderStates(array $providerStates,
 		array $providers, IUser $user): array {