[#.x] - phpstan corrections

Author: niden

src/Domain/ADR/ActionHandler.php renamed to src/Domain/ADR/Action/ActionHandler.php

@@ -11,11 +11,10 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Api\Domain\Services;
+namespace Phalcon\Api\Domain\ADR\Action;
 
-use Phalcon\Api\Domain\Interfaces\ActionInterface;
-use Phalcon\Api\Domain\Interfaces\DomainInterface;
-use Phalcon\Api\Domain\Interfaces\ResponderInterface;
+use Phalcon\Api\Domain\ADR\Domain\DomainInterface;
+use Phalcon\Api\Domain\ADR\Responder\ResponderInterface;
 
 final readonly class ActionHandler implements ActionInterface
 {

src/Domain/Interfaces/ADR/ActionInterface.php renamed to src/Domain/ADR/Action/ActionInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Api\Domain\Interfaces;
+namespace Phalcon\Api\Domain\ADR\Action;
 
 interface ActionInterface
 {

src/Domain/Interfaces/ADR/DomainInterface.php renamed to src/Domain/ADR/Domain/DomainInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Api\Domain\Interfaces;
+namespace Phalcon\Api\Domain\ADR\Domain;
 
 use Phalcon\Domain\Payload;
 

src/Responder/JsonResponder.php renamed to src/Domain/ADR/Responder/JsonResponder.php

@@ -11,9 +11,8 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Api\Responder;
+namespace Phalcon\Api\Domain\ADR\Responder;
 
-use Phalcon\Api\Domain\Interfaces\ResponderInterface;
 use Phalcon\Api\Domain\Services\Http\Response;
 use Phalcon\Domain\Payload;
 

src/Domain/Interfaces/ADR/ResponderInterface.php renamed to src/Domain/ADR/Responder/ResponderInterface.php

@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace Phalcon\Api\Domain\Interfaces;
+namespace Phalcon\Api\Domain\ADR\Responder;
 
 use Phalcon\Domain\Payload;
 use Phalcon\Http\ResponseInterface;

src/Domain/Hello/HelloService.php

@@ -14,7 +14,8 @@
 namespace Phalcon\Api\Domain\Hello;
 
 use PayloadInterop\DomainStatus;
-use Phalcon\Api\Domain\Interfaces\DomainInterface;
+use Phalcon\Api\Domain\ADR\Domain\DomainInterface;
+use Phalcon\Api\Domain\Constants\Dates;
 use Phalcon\Domain\Payload;
 
 use function date;
@@ -26,7 +27,7 @@ public function __invoke(): Payload
         return new Payload(
             DomainStatus::SUCCESS,
             [
-                'results' => "Hello World!!! - " . date("Y-m-d H:i:s"),
+                'results' => "Hello World!!! - " . date(Dates::DATE_TIME_FORMAT),
             ]
         );
     }

src/Domain/Middleware/AbstractMiddleware.php

@@ -15,11 +15,29 @@
 
 use Phalcon\Api\Domain\Services\Container;
 use Phalcon\Api\Domain\Services\Http\Response;
+use Phalcon\Api\Domain\Services\Http\ResponseTypes;
+use Phalcon\Events\Exception as EventsException;
+use Phalcon\Http\Response\Exception as ResponseException;
 use Phalcon\Mvc\Micro;
 use Phalcon\Mvc\Micro\MiddlewareInterface;
 
+/**
+ * @phpstan-import-type TData from ResponseTypes
+ * @phpstan-import-type TErrors from ResponseTypes
+ */
 abstract class AbstractMiddleware implements MiddlewareInterface
 {
+    /**
+     * @param Micro   $application
+     * @param int     $code
+     * @param string  $message
+     * @param TData   $data
+     * @param TErrors $errors
+     *
+     * @return void
+     * @throws EventsException
+     * @throws ResponseException
+     */
     protected function halt(
         Micro $application,
         int $code,

src/Domain/Middleware/NotFoundMiddleware.php

@@ -21,14 +21,22 @@
 
 final class NotFoundMiddleware extends AbstractMiddleware
 {
+    /**
+     * @param Event $event
+     * @param Micro $application
+     *
+     * @return bool
+     * @throws EventsException
+     * @throws Exception
+     */
     public function beforeNotFound(Event $event, Micro $application): bool
     {
         $this->halt(
             $application,
             HttpCodesEnum::NotFound->value,
             'error',
             [],
-            HttpCodesEnum::AppResourceNotFound->error()
+            [HttpCodesEnum::AppResourceNotFound->error()]
         );
 
         return false;
@@ -38,8 +46,6 @@ public function beforeNotFound(Event $event, Micro $application): bool
      * @param Micro $application
      *
      * @return true
-     * @throws EventsException
-     * @throws Exception
      */
     public function call(Micro $application): bool
     {

src/Domain/Services/Container.php

@@ -13,14 +13,14 @@
 
 namespace Phalcon\Api\Domain\Services;
 
+use Phalcon\Api\Domain\ADR\Responder\JsonResponder;
 use Phalcon\Api\Domain\Health\HealthService;
 use Phalcon\Api\Domain\Hello\HelloService;
 use Phalcon\Api\Domain\Middleware\HealthMiddleware;
 use Phalcon\Api\Domain\Middleware\NotFoundMiddleware;
 use Phalcon\Api\Domain\Middleware\ResponseSenderMiddleware;
 use Phalcon\Api\Domain\Services\Env\EnvManager;
 use Phalcon\Api\Domain\Services\Http\Response;
-use Phalcon\Api\Responder\JsonResponder;
 use Phalcon\Di\Di;
 use Phalcon\Di\Service;
 use Phalcon\Events\Manager as EventsManager;

src/Domain/Services/Http/Response.php

@@ -21,9 +21,15 @@
 use function json_encode;
 use function sha1;
 
+/**
+ * @phpstan-import-type TData from ResponseTypes
+ * @phpstan-import-type TErrors from ResponseTypes
+ * @phpstan-import-type TResponsePayload from ResponseTypes
+ */
 class Response extends PhalconResponse
 {
-    private array $payload = [];
+    /** @var TResponsePayload */
+    private array $payload;
 
     /**
      * @return $this
@@ -54,7 +60,7 @@ public function withCode(int $code, string $message = ''): self
     }
 
     /**
-     * @param array $data
+     * @param TData $data
      *
      * @return $this
      * @throws Exception
@@ -71,7 +77,7 @@ public function withPayloadData(array $data): self
     }
 
     /**
-     * @param array $errors
+     * @param TErrors $errors
      *
      * @return $this
      */