Merge pull request #227 from dotkernel/issue-225

Refactored doctrine config

Author: marioradu05

composer.json

@@ -29,7 +29,7 @@
     "require": {
         "php": "~8.2.0 || ~8.3.0",
         "ext-gettext": "*",
-        "dotkernel/dot-annotated-services": "^4.1.3",
+        "dotkernel/dot-annotated-services": "^4.1.7",
         "dotkernel/dot-cli": "^3.5.0",
         "dotkernel/dot-controller": "^3.4.3",
         "dotkernel/dot-data-fixtures": "^1.1.3",

config/autoload/doctrine.global.php

@@ -5,6 +5,7 @@
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Frontend\App\Resolver\EntityListenerResolver;
 use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;
 use Ramsey\Uuid\Doctrine\UuidBinaryType;
 use Ramsey\Uuid\Doctrine\UuidType;
@@ -22,28 +23,33 @@
         ],
     ],
     'doctrine'            => [
-        'connection' => [
+        'configuration' => [
+            'orm_default' => [
+                'entity_listener_resolver' => EntityListenerResolver::class,
+            ],
+        ],
+        'connection'    => [
             'orm_default' => [
                 'doctrine_mapping_types' => [
                     UuidBinaryType::NAME            => 'binary',
                     UuidBinaryOrderedTimeType::NAME => 'binary',
                 ],
             ],
         ],
-        'driver'     => [
+        'driver'        => [
             // default metadata driver, aggregates all other drivers into a single one.
             // Override `orm_default` only if you know what you're doing
             'orm_default' => [
                 'class'   => MappingDriverChain::class,
                 'drivers' => [],
             ],
         ],
-        'types'      => [
+        'types'         => [
             UuidType::NAME                  => UuidType::class,
             UuidBinaryType::NAME            => UuidBinaryType::class,
             UuidBinaryOrderedTimeType::NAME => UuidBinaryOrderedTimeType::class,
         ],
-        'fixtures'   => getcwd() . '/data/doctrine/fixtures',
+        'fixtures'      => getcwd() . '/data/doctrine/fixtures',
     ],
     'resultCacheLifetime' => 300,
 ];

src/App/src/ConfigProvider.php

@@ -23,7 +23,6 @@ public function __invoke(): array
     {
         return [
             'dependencies' => $this->getDependencies(),
-            'doctrine'     => $this->getDoctrineConfig(),
             'templates'    => $this->getTemplates(),
         ];
     }
@@ -52,17 +51,6 @@ public function getDependencies(): array
         ];
     }
 
-    public function getDoctrineConfig(): array
-    {
-        return [
-            'configuration' => [
-                'orm_default' => [
-                    'entity_listener_resolver' => EntityListenerResolver::class,
-                ],
-            ],
-        ];
-    }
-
     public function getTemplates(): array
     {
         return [

test/Unit/Admin/ConfigProviderTest.php

@@ -43,11 +43,6 @@ public function testConfigHasDotForm(): void
         $this->assertArrayHasKey('form', $this->config);
     }
 
-    public function testConfigHasDoctrine(): void
-    {
-        $this->assertArrayHasKey('doctrine', $this->config);
-    }
-
     public function testDependenciesHasFactories(): void
     {
         $this->assertArrayHasKey('factories', $this->config['dependencies']);

test/Unit/App/ConfigProviderTest.php

@@ -32,11 +32,6 @@ public function testConfigHasDependencies(): void
         $this->assertArrayHasKey('dependencies', $this->config);
     }
 
-    public function testConfigHasDoctrine(): void
-    {
-        $this->assertArrayHasKey('doctrine', $this->config);
-    }
-
     public function testConfigHasTemplates(): void
     {
         $this->assertArrayHasKey('templates', $this->config);
@@ -76,22 +71,6 @@ public function testDependenciesHasAliases(): void
         $this->assertArrayHasKey(EntityManagerInterface::class, $this->config['dependencies']['aliases']);
     }
 
-    public function testGetDoctrineConfig(): void
-    {
-        $this->assertArrayHasKey('configuration', $this->config['doctrine']);
-        $this->assertIsArray($this->config['doctrine']['configuration']);
-        $this->assertArrayHasKey('orm_default', $this->config['doctrine']['configuration']);
-        $this->assertIsArray($this->config['doctrine']['configuration']['orm_default']);
-        $this->assertArrayHasKey(
-            'entity_listener_resolver',
-            $this->config['doctrine']['configuration']['orm_default']
-        );
-        $this->assertSame(
-            EntityListenerResolver::class,
-            $this->config['doctrine']['configuration']['orm_default']['entity_listener_resolver']
-        );
-    }
-
     public function testGetTemplates(): void
     {
         $this->assertArrayHasKey('paths', $this->config['templates']);