refactor Doctrine transformer

samsonasik · May 1, 2018 · edca996 · edca996
1 parent 9bdae95
commit edca996
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ CREATE TABLE `log` (
 
 **2. Setup your Zend\Db\Adapter\Adapter service or your Doctrine\ORM\EntityManager service config**
 
-You can use 'db' (with _Zend\Db_) config or 'doctrine' (with _DoctrineORMModule_) config that will be converted to be usable with `Zend\Log\Writer\Db`.
+You can use 'db' (with _Zend\Db_) config or 'doctrine' (with _DoctrineORMModule_) config that will be transformed to be usable with `Zend\Log\Writer\Db`.
 
 ```php
 <?php

diff --git a/spec/Integration/IntegrationViaErrorPreviewConsoleControllerWithDoctrineORMModuleSpec.php b/spec/Integration/IntegrationViaErrorPreviewConsoleControllerWithDoctrineORMModuleSpec.php
@@ -2,14 +2,12 @@
 
 namespace ErrorHeroModule\Spec;
 
+use Doctrine\ORM\EntityManager;
 use ErrorHeroModule;
 use ErrorHeroModule\Controller\ErrorPreviewConsoleController;
 use Kahlan\Plugin\Quit;
 use Kahlan\QuitException;
 use Zend\Console\Console;
-use Zend\Db\Adapter\Adapter;
-use Zend\Db\ResultSet\ResultSet;
-use Zend\Db\TableGateway\TableGateway;
 use Zend\Mvc\Application;
 
 describe('Integration via ErrorPreviewConsoleController with doctrine', function () {
@@ -38,9 +36,9 @@
         $serviceManager->get('SendResponseListener')
                        ->detach($events);
 
-        $db  = $serviceManager->get(Adapter::class);
-        $tableGateway = new TableGateway('log', $db, null, new ResultSet());
-        $tableGateway->delete([]);
+        $entityManager  = $serviceManager->get(EntityManager::class);
+        $stmt = $entityManager->getConnection()->prepare('DELETE FROM log');
+        $stmt->execute();
 
         return $application;
 

diff --git a/spec/ModuleSpec.php b/spec/ModuleSpec.php
@@ -41,7 +41,7 @@
             $eventManager    = Double::instance(['implements' => EventManagerInterface::class]);
 
             allow($moduleManager)->toReceive('getEventManager')->andReturn($eventManager);
-            expect($eventManager)->toReceive('attach')->with(ModuleEvent::EVENT_LOAD_MODULES_POST, [$this->module, 'convertDoctrineToZendDbService']);
+            expect($eventManager)->toReceive('attach')->with(ModuleEvent::EVENT_LOAD_MODULES_POST, [$this->module, 'doctrineTransform']);
             expect($eventManager)->toReceive('attach')->with(ModuleEvent::EVENT_MERGE_CONFIG, [$this->module, 'errorPreviewPageHandler'], 101);
 
             $this->module->init($moduleManager);
@@ -50,7 +50,7 @@
 
     });
 
-    describe('->convertDoctrineToZendDbService()', function () {
+    describe('->doctrineTransform()', function () {
 
         it('does not has EntityManager service', function () {
 
@@ -59,7 +59,7 @@
             allow($moduleEvent)->toReceive('getParam')->with('ServiceManager')->andReturn($serviceManager);
             allow($serviceManager)->toReceive('has')->with(EntityManager::class)->andReturn(false);
 
-            $this->module->convertDoctrineToZendDbService($moduleEvent);
+            $this->module->doctrineTransform($moduleEvent);
             expect($moduleEvent)->not->toReceive('getConfigListener');
 
         });
@@ -80,7 +80,7 @@
                 ],
             ]);
 
-            $this->module->convertDoctrineToZendDbService($moduleEvent);
+            $this->module->doctrineTransform($moduleEvent);
             expect($serviceManager)->not->toReceive('get')->with(EntityManager::class);
 
         });
@@ -139,7 +139,7 @@
             allow($entityManager)->toReceive('getConnection')->andReturn($connection);
             allow($serviceManager)->toReceive('get')->with(EntityManager::class)->andReturn($entityManager);
 
-            $this->module->convertDoctrineToZendDbService($moduleEvent);
+            $this->module->doctrineTransform($moduleEvent);
             expect($serviceManager)->toReceive('get')->with(EntityManager::class);
 
         });
@@ -202,7 +202,7 @@
             allow($entityManager)->toReceive('getConnection')->andReturn($connection);
             allow($serviceManager)->toReceive('get')->with(EntityManager::class)->andReturn($entityManager);
 
-            $this->module->convertDoctrineToZendDbService($moduleEvent);
+            $this->module->doctrineTransform($moduleEvent);
             expect($serviceManager)->toReceive('get')->with(EntityManager::class);
 
         });

diff --git a/src/Middleware/ExpressiveFactory.php b/src/Middleware/ExpressiveFactory.php
@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\EntityManager;
 use ErrorHeroModule\Handler\Logging;
-use ErrorHeroModule\Transformer\DoctrineToZendDb;
+use ErrorHeroModule\Transformer\Doctrine;
 use ErrorHeroModule\Transformer\SymfonyService;
 use Psr\Container\ContainerInterface;
 use RuntimeException;
@@ -20,7 +20,7 @@ public function __invoke(ContainerInterface $container) : Expressive
         $configuration = $container->get('config');
 
         if ($container->has(EntityManager::class) && ! isset($configuration['db'])) {
-            $container = DoctrineToZendDb::transform($container, $configuration);
+            $container = Doctrine::transform($container, $configuration);
         }
 
         if ($container instanceof SymfonyContainerBuilder) {

diff --git a/src/Module.php b/src/Module.php
@@ -13,19 +13,19 @@ class Module
     public function init(ModuleManager $moduleManager) : void
     {
         $eventManager = $moduleManager->getEventManager();
-        $eventManager->attach(ModuleEvent::EVENT_LOAD_MODULES_POST, [$this, 'convertDoctrineToZendDbService']);
+        $eventManager->attach(ModuleEvent::EVENT_LOAD_MODULES_POST, [$this, 'doctrineTransform']);
         $eventManager->attach(ModuleEvent::EVENT_MERGE_CONFIG, [$this, 'errorPreviewPageHandler'], 101);
     }
 
-    public function convertDoctrineToZendDbService(ModuleEvent $event) : void
+    public function doctrineTransform(ModuleEvent $event) : void
     {
         $container = $event->getParam('ServiceManager');
         if (! $container->has(EntityManager::class)) {
             return;
         }
 
         $configuration  = $container->get('config');
-        $configuration['db'] ?? Transformer\DoctrineToZendDb::transform($container, $configuration);
+        $configuration['db'] ?? Transformer\Doctrine::transform($container, $configuration);
     }
 
     public function errorPreviewPageHandler(ModuleEvent $event) : void

diff --git a/src/Transformer/DoctrineToZendDb.php → src/Transformer/Doctrine.php b/src/Transformer/DoctrineToZendDb.php → src/Transformer/Doctrine.php
@@ -7,9 +7,10 @@
 use Doctrine\ORM\EntityManager;
 use Psr\Container\ContainerInterface;
 use Zend\Db\Adapter\Adapter;
+use Zend\Log\Logger;
 use Zend\ServiceManager\ServiceManager;
 
-class DoctrineToZendDb implements TransformerInterface
+class Doctrine implements TransformerInterface
 {
     public static function transform(ContainerInterface $container, array $configuration) : ContainerInterface
     {
@@ -30,19 +31,15 @@ public static function transform(ContainerInterface $container, array $configura
                 'driver_options' => $driverOptions,
             ];
 
-            $adapterName = Adapter::class;
             $writers = $configuration['log']['ErrorHeroModuleLogger']['writers'];
             foreach ($writers as $key => $writer) {
                 if ($writer['name'] === 'db') {
-                    $adapterName = $writer['options']['db'];
+                    $writers[$key]['options']['db'] = new Adapter($config);
                     break;
                 }
             }
 
-            $allowOverride = $container->getAllowOverride();
-            $container->setAllowOverride(true);
-            $container->setService($adapterName, new Adapter($config));
-            $container->setAllowOverride($allowOverride);
+            $container->setService('ErrorHeroModuleLogger', new Logger(['writers' => $writers]));
         }
 
         return $container;