Merge pull request #16 from interactive-solutions/cache-service-manager

Cache the zf2 service manager
interactive-solutions · Aug 1, 2017 · 97d1c30 · 97d1c30
2 parents 0c0cd2b + 0133011
commit 97d1c30
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 10 deletions.
diff --git a/src/Context/EntityFixtureContext.php b/src/Context/EntityFixtureContext.php
@@ -9,8 +9,6 @@
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
-use DateTime;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\OptimisticLockException;

diff --git a/src/Context/EntityHydrationTrait.php b/src/Context/EntityHydrationTrait.php
@@ -46,6 +46,10 @@ private function hydrateEntity(ClassMetadata $metadata, $entity, $values)
                     $this->setBoolFieldOfObject($entity, $field, $values[$field]);
                     break;
 
+                case Type::INTEGER:
+                    $this->setFieldOfObject($entity, $field, (int) $values[$field]);
+                    break;
+
                 default:
                     $this->setFieldOfObject($entity, $field, $values[$field]);
             }

diff --git a/src/Context/Initializer/ServiceManagerInitializer.php b/src/Context/Initializer/ServiceManagerInitializer.php
@@ -9,6 +9,7 @@
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\Initializer\ContextInitializer;
+use Doctrine\ORM\EntityManager;
 use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceManager;
@@ -21,6 +22,11 @@ class ServiceManagerInitializer implements ContextInitializer
      */
     private $file;
 
+    /**
+     * @var ServiceManager
+     */
+    private $serviceManager;
+
     /**
      * @param string $file
      */
@@ -44,16 +50,53 @@ public function initializeContext(Context $context)
             throw new \LogicException(sprintf('The file %s was not found', $this->file));
         }
 
-        // We _should_ always be in the root of a zf2 project when executing this
-        $config = include $this->file;
+        if (!$this->serviceManager) {
+            // We _should_ always be in the root of a zf2 project when executing this
+            $config = include $this->file;
+
+            $this->serviceManager = new ServiceManager(new ServiceManagerConfig($config));
+            $this->serviceManager->setService('ApplicationConfig', $config);
+
+            /* @var $moduleManager \Zend\ModuleManager\ModuleManager */
+            $moduleManager = $this->serviceManager->get('ModuleManager');
+            $moduleManager->loadModules();
+
+            $this->clearDoctrineCache();
+        }
+
+        /* @var EntityManager $entityManager */
+        $entityManager = $this->serviceManager->get(EntityManager::class);
+
+        if (!$entityManager->isOpen()) {
+            $this->serviceManager->setAllowOverride(true);
+            $this->serviceManager->setService(
+                EntityManager::class,
+                EntityManager::create(
+                    $entityManager->getConnection(),
+                    $entityManager->getConfiguration()
+                )
+            );
+        }
+
+        $context->setServiceManager($this->serviceManager);
+    }
+
+    /**
+     * Clear the doctrine cache
+     */
+    private function clearDoctrineCache()
+    {
+        /* @var EntityManager $entityManager */
+        $entityManager = $this->serviceManager->get(EntityManager::class);
 
-        $serviceManager = new ServiceManager(new ServiceManagerConfig($config));
-        $serviceManager->setService('ApplicationConfig', $config);
+        // Clear doctrine cache
+        $cacheDriver = $entityManager->getConfiguration()->getMetadataCacheImpl();
+        $cacheDriver->deleteAll();
 
-        /* @var $moduleManager \Zend\ModuleManager\ModuleManager */
-        $moduleManager = $serviceManager->get('ModuleManager');
-        $moduleManager->loadModules();
+        $cacheDriver = $entityManager->getConfiguration()->getQueryCacheImpl();
+        $cacheDriver->deleteAll();
 
-        $context->setServiceManager($serviceManager);
+        $cacheDriver = $entityManager->getConfiguration()->getResultCacheImpl();
+        $cacheDriver->deleteAll();
     }
 }