Subscribe to doctrine events using configuration instead of factory code

pauci · May 25, 2017 · 8556c72 · 8556c72
1 parent 4281c24
commit 8556c72
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 19 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^7.0",
         "psr/container": "^1.0",
-        "pauci/cqrs": "^0.3.1"
+        "pauci/cqrs": "^0.3.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.1",

diff --git a/example/config.php b/example/config.php
@@ -24,7 +24,6 @@
                 'event_bus' => 'cqrs_default',
                 'identity_map' => 'cqrs_default',
                 'event_store' => 'cqrs_default',
-                'entity_manager' => 'doctrine.entity_manager.orm_default',
             ],
         ],
 
@@ -45,7 +44,6 @@
         'identity_map' => [
             'cqrs_default' => [
                 'class' => CQRS\Plugin\Doctrine\EventHandling\Publisher\DoctrineIdentityMap::class,
-                'entity_manager' => 'doctrine.entity_manager.orm_default',
             ],
         ],
 
@@ -67,4 +65,15 @@
             'App\Model\Entity\Event\OriginalEvent' => CQRSFactory\Event\RenamedEvent::class,
         ],
     ],
+
+    'doctrine' => [
+        'event_manager' => [
+            'orm_default' => [
+                'subscribers' => [
+                    'cqrs.event_publisher.cqrs_default',
+                    'cqrs.identity_map.cqrs_default',
+                ],
+            ],
+        ],
+    ],
 ];
diff --git a/src/EventPublisherFactory.php b/src/EventPublisherFactory.php
@@ -5,7 +5,6 @@
 use CQRS\EventHandling\Publisher\DomainEventQueue;
 use CQRS\EventHandling\Publisher\EventPublisherInterface;
 use CQRS\EventHandling\Publisher\SimpleEventPublisher;
-use CQRS\Plugin\Doctrine\EventHandling\Publisher\DoctrineEventPublisher;
 use Psr\Container\ContainerInterface;
 
 class EventPublisherFactory extends AbstractFactory
@@ -40,12 +39,6 @@ public function createWithConfig(ContainerInterface $container, string $configKe
             )
         );
 
-        if ($eventPublisher instanceof DoctrineEventPublisher) {
-            $container->get($config['entity_manager'])
-                ->getEventManager()
-                ->addEventSubscriber($eventPublisher);
-        }
-
         return $eventPublisher;
     }
 
@@ -59,7 +52,6 @@ protected function getDefaultConfig(): array
             'event_bus' => 'cqrs_default',
             'identity_map' => 'cqrs_default',
             'event_store' => 'cqrs_default',
-            'entity_manager' => 'doctrine.entity_manager.orm_default',
         ];
     }
 }
diff --git a/src/IdentityMapFactory.php b/src/IdentityMapFactory.php
@@ -4,7 +4,6 @@
 
 use CQRS\EventHandling\Publisher\IdentityMapInterface;
 use CQRS\EventHandling\Publisher\SimpleIdentityMap;
-use CQRS\Plugin\Doctrine\EventHandling\Publisher\DoctrineIdentityMap;
 use Psr\Container\ContainerInterface;
 
 class IdentityMapFactory extends AbstractFactory
@@ -18,12 +17,6 @@ protected function createWithConfig(ContainerInterface $container, string $confi
     {
         $config = $this->retrieveConfig($container, $configKey, 'identity_map');
 
-        if ($config['class'] === DoctrineIdentityMap::class) {
-            return new DoctrineIdentityMap(
-                $container->get($config['entity_manager'])
-            );
-        }
-
         return new $config['class'];
     }
 
@@ -34,7 +27,6 @@ protected function getDefaultConfig(): array
     {
         return [
             'class' => SimpleIdentityMap::class,
-            'entity_manager' => 'doctrine.entity_manager.orm_default',
         ];
     }
 }