Fix bug with append option

Author: alexislefebvre

src/Services/DatabaseBackup/AbstractDatabaseBackup.php

@@ -33,18 +33,23 @@ abstract class AbstractDatabaseBackup implements DatabaseBackupInterface
      *
      * @var array
      */
-    protected $classNames;
+    protected $classNames = [];
 
     public function __construct(ContainerInterface $container, FixturesLoaderFactory $fixturesLoaderFactory)
     {
         $this->container = $container;
         $this->fixturesLoaderFactory = $fixturesLoaderFactory;
     }
 
-    public function init(array $metadatas, array $classNames): void
+    public function init(array $metadatas, array $classNames, bool $append = false): void
     {
         $this->metadatas = $metadatas;
-        $this->classNames = $classNames;
+
+        if ($append) {
+            $this->classNames = array_merge($this->classNames, $classNames);
+        } else {
+            $this->classNames = $classNames;
+        }
     }
 
     /**

src/Services/DatabaseBackup/DatabaseBackupInterface.php

@@ -18,7 +18,7 @@
  */
 interface DatabaseBackupInterface
 {
-    public function init(array $metadatas, array $classNames): void;
+    public function init(array $metadatas, array $classNames, bool $append = false): void;
 
     public function getBackupFilePath(): string;
 

src/Services/DatabaseBackup/MongodbDatabaseBackup.php

@@ -25,12 +25,6 @@ final class MongodbDatabaseBackup extends AbstractDatabaseBackup implements Data
 
     protected static $databases;
 
-    public function init(array $metadatas, array $classNames): void
-    {
-        $this->metadatas = $metadatas;
-        $this->classNames = $classNames;
-    }
-
     public function getBackupFilePath(): string
     {
         return $this->container->getParameter('kernel.cache_dir').'/test_mongodb_'.md5(serialize($this->metadatas).serialize($this->classNames));

src/Services/DatabaseBackup/MysqlDatabaseBackup.php

@@ -22,8 +22,6 @@ final class MysqlDatabaseBackup extends AbstractDatabaseBackup implements Databa
 {
     protected static $referenceData;
 
-    protected static $sql;
-
     protected static $metadata;
 
     protected static $schemaUpdatedFlag = false;
@@ -40,11 +38,7 @@ public function getReferenceBackupFilePath(): string
 
     protected function getBackup()
     {
-        if (empty(self::$sql)) {
-            self::$sql = file_get_contents($this->getBackupFilePath());
-        }
-
-        return self::$sql;
+        return file_get_contents($this->getBackupFilePath());
     }
 
     protected function getReferenceBackup(): string

src/Services/DatabaseTools/ORMDatabaseTool.php

@@ -96,8 +96,9 @@ public function loadFixtures(array $classNames = [], bool $append = false): Abst
         $this->createDatabaseIfNotExists();
 
         $backupService = $this->getBackupService();
+
         if ($backupService) {
-            $backupService->init($this->getMetadatas(), $classNames);
+            $backupService->init($this->getMetadatas(), $classNames, $append);
 
             if ($backupService->isBackupActual()) {
                 if (null !== $this->connection) {