Merge pull request #15 from liip/fix-conflict-with-dama-doctrine-test…

…-bundle

Fix conflict with dama/doctrine-test-bundle

CHANGELOG.md

@@ -1,3 +1,9 @@
 # Changelog
 
-## 1.0 [TBA]
+## 1.1.0 (TBA)
+
+- Added parameter `liip_test_fixtures.keep_database_and_schema` to avoid issue with [DAMADoctrineTestBundle](https://github.com/dmaicher/doctrine-test-bundle)
+
+## 1.0.0 (2019-06-11)
+
+Initial release, code extracted from [LiipFunctionalTestBundle](https://github.com/liip/LiipFunctionalTestBundle)

doc/caveats.md

@@ -4,19 +4,15 @@
 
 ### DAMADoctrineTestBundle
 
-Due to conflicting operations with databases, this bundle has compatibility issues with [DAMADoctrineTestBundle](https://github.com/dmaicher/doctrine-test-bundle). 
-
-This triggers the following error:
+Due to conflicting operations with databases, this bundle can trigger the following error with [DAMADoctrineTestBundle](https://github.com/dmaicher/doctrine-test-bundle): 
 
 ```
 Doctrine\DBAL\Driver\PDOException: SQLSTATE[42000]: Syntax error or access violation: 1305 SAVEPOINT DOCTRINE2_SAVEPOINT_2 does not exist
 ``` 
 
-Use the following configuration to avoid this issue:
+To avoid this, disable automatic changes to database and schema:
 
 ```
-dama_doctrine_test:
-    enable_static_connection: false
+liip_test_fixtures:
+    keep_database_and_schema: true
 ```
-
-See https://github.com/liip/LiipFunctionalTestBundle/issues/423 and https://github.com/dmaicher/doctrine-test-bundle/issues/58 for reference

src/DependencyInjection/Configuration.php

@@ -46,7 +46,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->end()
                     ->end()
                 ->end()
-            ->end()
+            ->booleanNode('keep_database_and_schema')->defaultFalse()->end()
         ;
 
         return $treeBuilder;

src/Services/DatabaseTools/AbstractDatabaseTool.php

@@ -25,6 +25,8 @@
  */
 abstract class AbstractDatabaseTool
 {
+    const KEEP_DATABASE_AND_SCHEMA_PARAMETER_NAME = 'liip_test_fixtures.keep_database_and_schema';
+
     protected $container;
 
     protected $fixturesLoaderFactory;
@@ -200,4 +202,10 @@ public function setExcludedDoctrineTables(array $excludedDoctrineTables): void
     {
         $this->excludedDoctrineTables = $excludedDoctrineTables;
     }
+
+    protected function getKeepDatabaseAndSchemaParameter()
+    {
+        return $this->container->hasParameter(self::KEEP_DATABASE_AND_SCHEMA_PARAMETER_NAME)
+            && true === $this->container->getParameter(self::KEEP_DATABASE_AND_SCHEMA_PARAMETER_NAME);
+    }
 }

src/Services/DatabaseTools/ORMDatabaseTool.php

@@ -125,17 +125,21 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst
         }
 
         // TODO: handle case when using persistent connections. Fail loudly?
-        $schemaTool = new SchemaTool($this->om);
-        if (count($this->excludedDoctrineTables) > 0 || true === $append) {
-            if (!empty($this->getMetadatas())) {
-                $schemaTool->updateSchema($this->getMetadatas());
-            }
-        } else {
-            $schemaTool->dropDatabase();
-            if (!empty($this->getMetadatas())) {
-                $schemaTool->createSchema($this->getMetadatas());
+        if (false === $this->getKeepDatabaseAndSchemaParameter()) {
+
+            $schemaTool = new SchemaTool($this->om);
+            if (count($this->excludedDoctrineTables) > 0 || true === $append) {
+                if (!empty($this->getMetadatas())) {
+                    $schemaTool->updateSchema($this->getMetadatas());
+                }
+            } else {
+                $schemaTool->dropDatabase();
+                if (!empty($this->getMetadatas())) {
+                    $schemaTool->createSchema($this->getMetadatas());
+                }
             }
         }
+
         $this->webTestCase->postFixtureSetup();
 
         $executor = $this->getExecutor($this->getPurger());