#534 - Psalm fixes

os2display · Feb 29, 2024 · 3a3e2c0 · 3a3e2c0
1 parent f53c6bd
commit 3a3e2c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -537,12 +537,6 @@
     </MissingParamType>
   </file>
   <file src="src/Security/AzureOidcAuthenticator.php">
-    <InvalidNullableReturnType>
-      <code><![CDATA[User]]></code>
-    </InvalidNullableReturnType>
-    <NullableReturnStatement>
-      <code><![CDATA[$this->entityManager->getRepository(User::class)->findOneBy(['providerId' => $identifier])]]></code>
-    </NullableReturnStatement>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[empty($signInName)]]></code>
     </RiskyTruthyFalsyComparison>

diff --git a/src/Security/AzureOidcAuthenticator.php b/src/Security/AzureOidcAuthenticator.php
@@ -36,6 +36,8 @@ class AzureOidcAuthenticator extends OpenIdLoginAuthenticator implements LoggerA
 
     final public const APP_ADMIN_ROLE = Roles::ROLE_ADMIN;
     final public const APP_EDITOR_ROLE = Roles::ROLE_EDITOR;
+
+    /** @psalm-suppress PropertyNotSetInConstructor */
     private LoggerInterface $logger;
 
     public function __construct(
@@ -208,8 +210,8 @@ private function getTenantKeyWithRole(string $oidcGroup): array
             return [$tenantKey, $role];
         }
 
-        $this->logger->warning('Unknown role for group: '.$oidcGroup, [
-           'source' => self::class,
-        ]);
+        $e = new \InvalidArgumentException('Unknown role for group: '.$oidcGroup);
+        $this->logger->error($e);
+        throw $e;
     }
 }