refactor: better ADR pattern try

Author: COil

src/Controller/ListUsersAction.php

@@ -4,8 +4,7 @@
 
 namespace App\Controller;
 
-use App\Repository\UserRepository;
-use Doctrine\DBAL\Connection;
+use App\Data\Controller\ListUsersActionData;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Attribute\AsController;
@@ -15,11 +14,10 @@
 final class ListUsersAction extends AbstractController
 {
     #[Route(path: '/users', name: self::class)]
-    public function __invoke(Connection $conn, UserRepository $userRepository): Response
+    public function __invoke(ListUsersActionData $listUsersActionData): Response
     {
         return $this->render(self::class.'.html.twig', [
-            'users_dbal' => $conn->fetchAllAssociative('SELECT * FROM user'),
-            'users_orm' => $userRepository->findAll(),
+            'data' => $listUsersActionData->getData(),
         ]);
     }
 }

src/Controller/ListUsersActionDto.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Controller;
+
+use App\Entity\User;
+
+final class ListUsersActionDto
+{
+    /**
+     * @param list<array<string, mixed>> $usersDbal
+     * @param array<User>                $usersOrm
+     */
+    public function __construct(
+        public array $usersDbal,
+        public array $usersOrm,
+    ) {
+    }
+}

src/Data/Controller/ListUsersActionData.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Data\Controller;
+
+use App\Controller\ListUsersActionDto;
+use App\Repository\UserRepository;
+use Doctrine\DBAL\Connection;
+
+final readonly class ListUsersActionData
+{
+    public function __construct(
+        private Connection $conn,
+        private UserRepository $userRepository,
+    ) {
+    }
+
+    public function getData(): ListUsersActionDto
+    {
+        return new ListUsersActionDto(
+            usersDbal: $this->conn->fetchAllAssociative('SELECT * FROM user'),
+            usersOrm: $this->userRepository->findAll(),
+        );
+    }
+}

templates/App/Controller/ListUsersAction.html.twig

@@ -8,7 +8,7 @@
     <h3>Doctrine DBAL</h3>
 
     <code>
-        'users_dbal' => $conn->fetchAllAssociative('SELECT * FROM user'),
+        usersDbal: $this->conn->fetchAllAssociative('SELECT * FROM user'),
     </code>
 
     <table class="striped">
@@ -22,7 +22,7 @@
         </tr>
         </thead>
         <tbody>
-        {% for user in users_dbal %}
+        {% for user in data.usersDbal %}
             <tr>
                 <td>{{ user.id }}</td>
                 <td>{{ user.email }}</td>
@@ -35,7 +35,7 @@
         <tfoot>
             <tr>
                 <th colspan="5" scope="row">
-                    There are <b>{{ users_dbal|length }}</b> user(s).
+                    There are <b>{{ data.usersDbal|length }}</b> user(s).
                 </th>
             </tr>
         </tfoot>
@@ -46,7 +46,7 @@
     <h3>Doctrine ORM</h3>
 
     <code>
-        'users_orm' => $userRepository->findAll(),
+        usersOrm: $this->userRepository->findAll(),
     </code>
 
     <table class="striped">
@@ -60,7 +60,7 @@
         </tr>
         </thead>
         <tbody>
-        {% for user in users_orm %}
+        {% for user in data.usersOrm %}
             <tr>
                 <td>{{ user.id }}</td>
                 <td>{{ user.email }}</td>
@@ -73,7 +73,7 @@
         <tfoot>
             <tr>
                 <th colspan="5" scope="row">
-                    There are <b>{{ users_orm|length }}</b> user(s).
+                    There are <b>{{ data.usersOrm|length }}</b> user(s).
                 </th>
             </tr>
         </tfoot>