Fixed nullability of authenticator (#290)

* Fixed nullability of authenticator * Fixed Psalm error * Fixed Psalm error
aphiria · Aug 19, 2023 · a02a992 · a02a992
1 parent cfe2101
commit a02a992
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Framework/src/Api/Testing/IntegrationTest.php b/src/Framework/src/Api/Testing/IntegrationTest.php
@@ -123,12 +123,15 @@ protected function createApiGateway(IContainer $container): IRequestHandler
      * Creates the authenticator
      *
      * @param IContainer $container The DI container
-     * @return IAuthenticator The authenticator
-     * @throws ResolutionException Thrown if the authenticator could not be resolved
+     * @return IAuthenticator|IMockAuthenticator|null The authenticator if one could be created, otherwise null
      */
-    protected function createAuthenticator(IContainer $container): IAuthenticator
+    protected function createAuthenticator(IContainer $container): IAuthenticator|IMockAuthenticator|null
     {
-        return $container->resolve(IAuthenticator::class);
+        /** @var IAuthenticator|IMockAuthenticator|null $authenticator */
+        $authenticator = null;
+        $container->tryResolve(IAuthenticator::class, $authenticator);
+
+        return $authenticator;
     }
 
     /**

diff --git a/src/Framework/tests/Api/Testing/PhpUnit/IntegrationTestCaseTest.php b/src/Framework/tests/Api/Testing/PhpUnit/IntegrationTestCaseTest.php
@@ -178,7 +178,7 @@ protected function createApplication(IContainer $container): IApplication
                 return $this->app;
             }
 
-            protected function createAuthenticator(IContainer $container): IAuthenticator
+            protected function createAuthenticator(IContainer $container): IAuthenticator|IMockAuthenticator|null
             {
                 if ($this->authenticator === null) {
                     throw new LogicException('The authenticator was not set in the integration test');