Video 12

.github/workflows/main.yml

@@ -41,6 +41,7 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
     steps:
       - uses: actions/checkout@v4
 
@@ -81,6 +82,7 @@ jobs:
           - '8.2'
           - '8.3'
           - '8.4'
+          - '8.5'
 
     services:
       mariadb:

docker-compose.yml

@@ -71,7 +71,34 @@ services:
     networks:
       - app-network
     environment:
-      - PHP_IDE_CONFIG=serverName=rest-api-app-83
+      - PHP_IDE_CONFIG=serverName=rest-api-app-84
+      - APP_ENV=development
+      - APP_ENV_ADAPTER=dotenv
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/fpm-ping"]
+      interval: 30s
+      timeout: 3s
+      retries: 3
+      start_period: 5s
+
+  app-8.5:
+    build:
+      dockerfile: ./resources/docker/Dockerfile
+      args:
+        PHP_VERSION: 8.5
+    hostname: rest-api-app-85
+    container_name: "${PROJECT_NAME}-api-8.5"
+    tty: true
+    working_dir: /app
+    volumes:
+      - ./:/app
+    depends_on:
+      - app-db
+      - app-cache
+    networks:
+      - app-network
+    environment:
+      - PHP_IDE_CONFIG=serverName=rest-api-app-85
       - APP_ENV=development
       - APP_ENV_ADAPTER=dotenv
     healthcheck:

resources/db/migrations/20251226161244_add_companies_table.php

@@ -0,0 +1,190 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddCompaniesTable extends AbstractMigration
+{
+    public function down(): void
+    {
+        $this->table('co_companies')->drop()->save();
+    }
+
+    public function up(): void
+    {
+        $table = $this->table(
+            'co_companies',
+            [
+                'id'     => 'com_id',
+                'signed' => false,
+            ]
+        );
+
+        $table
+            ->addColumn(
+                'com_name',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_phone',
+                'string',
+                [
+                    'limit'   => 32,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_email',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_website',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_address_line_1',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_address_line_2',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_city',
+                'string',
+                [
+                    'limit'   => 128,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_state_province',
+                'string',
+                [
+                    'limit'   => 64,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_zip_code',
+                'string',
+                [
+                    'limit'   => 32,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_country',
+                'string',
+                [
+                    'limit'   => 8,
+                    'null'    => false,
+                    'default' => '',
+                ]
+            )
+            ->addColumn(
+                'com_created_date',
+                'timestamp',
+                [
+                    'timezone' => true,
+                    'default'  => 'CURRENT_TIMESTAMP',
+                ]
+            )
+            ->addColumn(
+                'com_created_usr_id',
+                'biginteger',
+                [
+                    'null'    => false,
+                    'default' => 0,
+                ]
+            )
+            ->addColumn(
+                'com_updated_date',
+                'timestamp',
+                [
+                    'timezone' => true,
+                    'default'  => null,
+                ]
+            )
+            ->addColumn(
+                'com_updated_usr_id',
+                'biginteger',
+                [
+                    'null'    => false,
+                    'default' => 0,
+                ]
+            )
+            ->addIndex(
+                [
+                    'com_name',
+                ],
+                [
+                    'name' => 'i_name',
+                ]
+            )
+            ->addIndex(
+                [
+                    'com_email',
+                ],
+                [
+                    'name' => 'i_email',
+                ]
+            )
+            ->addIndex(
+                [
+                    'com_city',
+                ],
+                [
+                    'name' => 'i_city',
+                ]
+            )
+            ->addIndex(
+                [
+                    'com_state_province',
+                ],
+                [
+                    'name' => 'i_state_province',
+                ]
+            )
+            ->addIndex(
+                [
+                    'com_country',
+                ],
+                [
+                    'name' => 'i_country',
+                ]
+            )
+            ->save()
+        ;
+    }
+}

src/Domain/ADR/InputTypes.php

@@ -29,6 +29,26 @@
  *     token?: string
  * }
  *
+ * @phpstan-type TCompanyInput array{
+ *     id?: int,
+ *     name?: string,
+ *     phone?: string,
+ *     email?: string,
+ *     website?: string,
+ *     addressLine1?: string,
+ *     addressLine2?: string,
+ *     city?: string,
+ *     stateProvince?: string,
+ *     zipCode?: string,
+ *     country?: string,
+ *     createdDate?: string,
+ *     createdUserId?: int,
+ *     updatedDate?: string,
+ *     updatedUserId?: int,
+ *     page?: int,
+ *     perPage?: int
+ * }
+ *
  * @phpstan-type TUserInput array{
  *     id?: int,
  *     status?: int,

src/Domain/Application/Auth/Facade/AuthFacade.php

@@ -26,7 +26,8 @@
 final readonly class AuthFacade
 {
     /**
-     * @param CommandBusInterface $bus
+     * @param CommandBusInterface         $bus
+     * @param AuthCommandFactoryInterface $factory
      */
     public function __construct(
         private CommandBusInterface $bus,

src/Domain/Application/Auth/Handler/AbstractAuthLogoutRefreshHandler.php

@@ -15,6 +15,7 @@
 
 use Phalcon\Api\Domain\ADR\InputTypes;
 use Phalcon\Api\Domain\Infrastructure\CommandBus\HandlerInterface;
+use Phalcon\Api\Domain\Infrastructure\DataSource\Auth\Transformer\AuthTransformer;
 use Phalcon\Api\Domain\Infrastructure\DataSource\Validation\ValidatorInterface;
 use Phalcon\Api\Domain\Infrastructure\Encryption\TokenManagerInterface;
 
@@ -25,10 +26,12 @@ abstract class AbstractAuthLogoutRefreshHandler implements HandlerInterface
 {
     /**
      * @param TokenManagerInterface $tokenManager
+     * @param AuthTransformer       $transformer
      * @param ValidatorInterface    $validator
      */
     public function __construct(
         protected readonly TokenManagerInterface $tokenManager,
+        protected readonly AuthTransformer $transformer,
         protected readonly ValidatorInterface $validator,
     ) {
     }

src/Domain/Application/Auth/Handler/AuthLoginPostHandler.php

@@ -18,6 +18,7 @@
 use Phalcon\Api\Domain\Application\Auth\Command\AuthLoginPostCommand;
 use Phalcon\Api\Domain\Infrastructure\CommandBus\CommandInterface;
 use Phalcon\Api\Domain\Infrastructure\CommandBus\HandlerInterface;
+use Phalcon\Api\Domain\Infrastructure\DataSource\Auth\Transformer\AuthTransformer;
 use Phalcon\Api\Domain\Infrastructure\DataSource\User\Repository\UserRepositoryInterface;
 use Phalcon\Api\Domain\Infrastructure\DataSource\Validation\ValidatorInterface;
 use Phalcon\Api\Domain\Infrastructure\Encryption\Security;
@@ -27,19 +28,21 @@
 /**
  * @phpstan-import-type TAuthLoginInput from InputTypes
  */
-final class AuthLoginPostHandler implements HandlerInterface
+final readonly class AuthLoginPostHandler implements HandlerInterface
 {
     /**
      * @param UserRepositoryInterface $repository
      * @param TokenManagerInterface   $tokenManager
+     * @param AuthTransformer         $transformer
      * @param Security                $security
      * @param ValidatorInterface      $validator
      */
     public function __construct(
-        private readonly UserRepositoryInterface $repository,
-        private readonly TokenManagerInterface $tokenManager,
-        private readonly Security $security,
-        private readonly ValidatorInterface $validator
+        private UserRepositoryInterface $repository,
+        private TokenManagerInterface $tokenManager,
+        private AuthTransformer $transformer,
+        private Security $security,
+        private ValidatorInterface $validator
     ) {
     }
 
@@ -87,22 +90,6 @@ public function __invoke(CommandInterface $command): Payload
          */
         $tokens = $this->tokenManager->issue($domainUser);
 
-        /**
-         * Construct the response
-         */
-        $results = [
-            'authenticated' => true,
-            'user'          => [
-                'id'    => $domainUser->id,
-                'name'  => $domainUser->fullName(),
-                'email' => $domainUser->email,
-            ],
-            'jwt'           => [
-                'token'        => $tokens['token'],
-                'refreshToken' => $tokens['refreshToken'],
-            ],
-        ];
-
-        return Payload::success($results);
+        return Payload::success($this->transformer->login($domainUser, $tokens));
     }
 }

src/Domain/Application/Auth/Handler/AuthLogoutPostHandler.php

@@ -49,6 +49,6 @@ public function __invoke(CommandInterface $command): Payload
 
         $this->tokenManager->revoke($domainUser);
 
-        return Payload::success(['authenticated' => false]);
+        return Payload::success($this->transformer->logout());
     }
 }

src/Domain/Application/Auth/Handler/AuthRefreshPostHandler.php

@@ -49,9 +49,6 @@ public function __invoke(CommandInterface $command): Payload
 
         $tokens = $this->tokenManager->refresh($domainUser);
 
-        return Payload::success([
-            'token'        => $tokens['token'],
-            'refreshToken' => $tokens['refreshToken'],
-        ]);
+        return Payload::success($this->transformer->refresh($tokens));
     }
 }