Structure: rework Entity / Repository

Author: jgauthi

.php-cs-fixer.dist.php

@@ -39,6 +39,7 @@
         'single_trait_insert_per_statement' => false,
         'strict_comparison' => true,
         'strict_param' => true,
+        'nullable_type_declaration_for_default_null_value' => true,
     ])
     ->setFinder($finder)
     ->setCacheFile(__DIR__.'/var/cache/.php_cs.cache')

config/packages/doctrine.yaml

@@ -8,9 +8,9 @@ parameters:
 
 doctrine:
   dbal:
-    default_connection: default
+    default_connection: main
     connections:
-      default:
+      main:
         url: '%env(resolve:DATABASE_URL)%'
         default_table_options:
           charset: utf8
@@ -22,18 +22,18 @@ doctrine:
           collate: utf8_unicode_ci
 
   orm:
-    auto_generate_proxy_classes: false # true on BB-Api
-    default_entity_manager: default
+    auto_generate_proxy_classes: true
+    default_entity_manager: main
     entity_managers:
-      default:
-        connection: default
+      main:
+        connection: main
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
         mappings:
           App:
             is_bundle: false
             type: attribute
-            dir: '%kernel.project_dir%/src/Entity/'
-            prefix: 'App\Entity'
+            dir: '%kernel.project_dir%/src/Entity/Main'
+            prefix: 'App\Entity\Main'
             alias: App
       second:
         connection: second
@@ -42,8 +42,8 @@ doctrine:
           Second:
             is_bundle: false
             type: attribute
-            dir: '%kernel.project_dir%/src/Entity2/'
-            prefix: 'App\Entity2'
+            dir: '%kernel.project_dir%/src/Entity/Second'
+            prefix: 'App\Entity\Second'
             alias: Second
 
 when@prod:

config/packages/doctrine_migrations_multiple_database.yaml

@@ -1,6 +1,6 @@
 doctrine_migrations_multiple_database:
   entity_managers:
-    default:
+    main:
       migrations_paths:
         DoctrineMigrations\Main: '%kernel.project_dir%/migrations/Main'
     second:

config/packages/security.yaml

@@ -3,10 +3,10 @@ security:
     # Our user class and the algorithm we'll use to encode passwords
     # 'auto' means to let Symfony choose the best possible password hasher (Argon2 or Bcrypt)
     # https://symfony.com/doc/current/security.html#c-encoding-passwords
-    App\Entity\User: 'auto'
+    App\Entity\Main\User: 'auto'
   providers:
     database_users:
-      entity: { class: App\Entity\User, property: username }
+      entity: { class: App\Entity\Main\User, property: username }
 
   firewalls:
     dev:
@@ -53,7 +53,7 @@ when@test:
       # important to generate secure password hashes. In tests however, secure hashes
       # are not important, waste resources and increase test times. The following
       # reduces the work factor to the lowest possible values.
-      App\Entity\User:
+      App\Entity\Main\User:
         algorithm: auto
         cost: 4 # Lowest possible value for bcrypt
         time_cost: 3 # Lowest possible value for argon

config/services.yaml

@@ -21,7 +21,6 @@ services:
     exclude:
       - '../src/DependencyInjection/'
       - '../src/Entity/'
-      - '../src/Entity2/'
       - '../src/Kernel.php'
 
   # add more service definitions when explicit configuration is needed

src/Command/FixtureCommand.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Command;
 
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -16,12 +15,12 @@
 class FixtureCommand extends Command
 {
     // Entity Manager name (groups should be used the same value)
-    private const LIST_DATABASE = ['default', 'second'];
+    private const LIST_DATABASE = ['main', 'second'];
 
     /** @var bool[] */
     private array $requirement;
 
-    public function __construct(KernelInterface $kernel, string $name = null)
+    public function __construct(KernelInterface $kernel, ?string $name = null)
     {
         parent::__construct($name);
 

src/DataFixtures/AbstractFixture.php

@@ -17,8 +17,8 @@ public function __construct()
     /**
      * @return string[]
      */
-    static public function getGroups(): array
+    public static function getGroups(): array
     {
-        return ['default'];
+        return ['main'];
     }
 }

src/DataFixtures/CategoryFixtures.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\DataFixtures;
 
-use App\Entity\Category;
+use App\Entity\Main\Category;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

src/DataFixtures/ClientFixtures.php

@@ -1,7 +1,7 @@
 <?php
 namespace App\DataFixtures;
 
-use App\Entity\Client;
+use App\Entity\Main\Client;
 use Doctrine\Persistence\ObjectManager;
 
 class ClientFixtures extends AbstractFixture

src/DataFixtures/DossierFixtures.php

@@ -2,7 +2,7 @@
 namespace App\DataFixtures;
 
 use App\Entity\Enum\DossierStatusEnum;
-use App\Entity\{Client, Dossier, User};
+use App\Entity\{Main\Client, Main\Dossier, Main\User};
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;