Stan cleanup

Author: ADmad

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.0" installed="2.1.0" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.1.11" installed="2.1.11" location="./tools/phpstan" copy="false"/>
 </phive>

src/AuthenticationService.php

@@ -212,14 +212,13 @@ public function authenticate(ServerRequestInterface $request): ResultInterface
      * @param \Psr\Http\Message\ServerRequestInterface $request The request.
      * @param \Psr\Http\Message\ResponseInterface $response The response.
      * @return array Return an array containing the request and response objects.
-     * @psalm-return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
      */
     public function clearIdentity(ServerRequestInterface $request, ResponseInterface $response): array
     {
         foreach ($this->authenticators() as $authenticator) {
             if ($authenticator instanceof PersistenceInterface) {
                 if ($authenticator instanceof ImpersonationInterface && $authenticator->isImpersonating($request)) {
-                    /** @psalm-var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $stopImpersonationResult */
                     $stopImpersonationResult = $authenticator->stopImpersonating($request, $response);
                     ['request' => $request, 'response' => $response] = $stopImpersonationResult;
                 }
@@ -241,8 +240,7 @@ public function clearIdentity(ServerRequestInterface $request, ResponseInterface
      * @param \Psr\Http\Message\ServerRequestInterface $request The request.
      * @param \Psr\Http\Message\ResponseInterface $response The response.
      * @param \ArrayAccess|array $identity Identity data.
-     * @return array
-     * @psalm-return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
      */
     public function persistIdentity(
         ServerRequestInterface $request,

src/Authenticator/ImpersonationInterface.php

@@ -29,7 +29,7 @@ interface ImpersonationInterface
      * @param \Psr\Http\Message\ResponseInterface $response The response
      * @param \ArrayAccess $impersonator User who impersonates
      * @param \ArrayAccess $impersonated User impersonated
-     * @return array
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
      */
     public function impersonate(
         ServerRequestInterface $request,
@@ -43,7 +43,7 @@ public function impersonate(
      *
      * @param \Psr\Http\Message\ServerRequestInterface $request The request
      * @param \Psr\Http\Message\ResponseInterface $response The response
-     * @return array
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface}
      */
     public function stopImpersonating(ServerRequestInterface $request, ResponseInterface $response): array;
 

src/Authenticator/PersistenceInterface.php

@@ -28,8 +28,7 @@ interface PersistenceInterface
      * @param \Psr\Http\Message\ServerRequestInterface $request The request object.
      * @param \Psr\Http\Message\ResponseInterface $response The response object.
      * @param \ArrayAccess|array $identity Identity data to persist.
-     * @return array
-     * @psalm-return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface} Returns an array containing the request and response object
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface} Returns an array containing the request and response object
      */
     public function persistIdentity(
         ServerRequestInterface $request,
@@ -42,8 +41,7 @@ public function persistIdentity(
      *
      * @param \Psr\Http\Message\ServerRequestInterface $request The request object.
      * @param \Psr\Http\Message\ResponseInterface $response The response object.
-     * @return array
-     * @psalm-return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface} Returns an array containing the request and response object
+     * @return array{request: \Psr\Http\Message\ServerRequestInterface, response: \Psr\Http\Message\ResponseInterface} Returns an array containing the request and response object
      */
     public function clearIdentity(ServerRequestInterface $request, ResponseInterface $response): array;
 }

src/Controller/Component/AuthenticationComponent.php

@@ -299,7 +299,7 @@ public function setIdentity(ArrayAccess $identity)
 
         $service->clearIdentity($controller->getRequest(), $controller->getResponse());
 
-        /** @psalm-var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
+        /** @var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
         $result = $service->persistIdentity(
             $controller->getRequest(),
             $controller->getResponse(),
@@ -322,7 +322,7 @@ public function setIdentity(ArrayAccess $identity)
     public function logout(): ?string
     {
         $controller = $this->getController();
-        /** @psalm-var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
+        /** @var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
         $result = $this->getAuthenticationService()->clearIdentity(
             $controller->getRequest(),
             $controller->getResponse(),
@@ -391,7 +391,7 @@ public function impersonate(ArrayAccess $impersonated)
             $impersonator = new ArrayObject($impersonator);
         }
         $controller = $this->getController();
-        /** @psalm-var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
+        /** @var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
         $result = $service->impersonate(
             $controller->getRequest(),
             $controller->getResponse(),
@@ -421,7 +421,7 @@ public function stopImpersonating()
 
         $controller = $this->getController();
 
-        /** @psalm-var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
+        /** @var array{request: \Cake\Http\ServerRequest, response: \Cake\Http\Response} $result */
         $result = $service->stopImpersonating(
             $controller->getRequest(),
             $controller->getResponse(),

src/Middleware/AuthenticationMiddleware.php

@@ -106,11 +106,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $response = $handler->handle($request);
             $authenticator = $service->getAuthenticationProvider();
 
-            if ($authenticator !== null && !$authenticator instanceof StatelessInterface) {
-                /**
-                 * @psalm-suppress PossiblyNullArgument
-                 * @phpstan-ignore-next-line
-                 */
+            if ($authenticator !== null && !$authenticator instanceof StatelessInterface && $result->getData()) {
                 $return = $service->persistIdentity($request, $response, $result->getData());
                 $response = $return['response'];
             }

src/View/Helper/IdentityHelper.php

@@ -56,16 +56,6 @@ class IdentityHelper extends Helper
     public function initialize(array $config): void
     {
         $this->_identity = $this->_View->getRequest()->getAttribute($this->getConfig('identityAttribute'));
-
-        if (empty($this->_identity)) {
-            return;
-        }
-
-        if (!$this->_identity instanceof IdentityInterface) {
-            throw new RuntimeException(
-                sprintf('Identity found in request does not implement %s', IdentityInterface::class),
-            );
-        }
     }
 
     /**