Merge pull request #31 from moufmouf/feature/reset

Support for the "reset" feature.

Author: moufmouf

composer.json

@@ -15,7 +15,7 @@
     "require": {
     	"php": ">=7.1",
     	"mouf/database.doctrine-dbal-wrapper": "^1.0",
-    	"mouf/utils.patcher": "^2.0",
+    	"mouf/utils.patcher": "^2.1",
         "mouf/classname-mapper": "^1.0",
         "symfony/filesystem": "^2.0 || ^3.0",
         "thecodingmachine/dbal-fluid-schema-builder": "^1.0"
@@ -30,7 +30,7 @@
             "install": [
                 {
                   "type": "class",
-                  "class": "Mouf\\Database\\Patcher\\DatabasePatchInstaller2",
+                  "class": "Mouf\\Database\\Patcher\\DatabasePatchInstaller3",
                   "description": "Create the 'patches' table in your database to track patches applied."
                 }
             ],

src/Mouf/Database/Patcher/AbstractDatabasePatch.php

@@ -154,7 +154,7 @@ protected function saveDbSchema()
     {
         $schema = $this->patchConnection->getConnection()->getSchemaManager()->createSchema();
         file_put_contents(__DIR__.'/../../../../generated/schema', serialize($schema));
-        chmod(__DIR__.'/../../../../generated/schema', 0664);
+        @chmod(__DIR__.'/../../../../generated/schema', 0664);
     }
 
     /**

…base/Patcher/DatabasePatchInstaller2.php …base/Patcher/DatabasePatchInstaller3.phpsrc/Mouf/Database/Patcher/DatabasePatchInstaller2.php renamed to src/Mouf/Database/Patcher/DatabasePatchInstaller3.php src/Mouf/Database/Patcher/DatabasePatchInstaller2.php renamed to src/Mouf/Database/Patcher/DatabasePatchInstaller3.php

@@ -35,7 +35,7 @@
  *
  * @author David Negrier <[email protected]>
  */
-class DatabasePatchInstaller2 implements PackageInstallerInterface
+class DatabasePatchInstaller3 implements PackageInstallerInterface
 {
     /**
      * (non-PHPdoc)
@@ -48,7 +48,7 @@ public static function install(MoufManager $moufManager) {
         $dbConnectionDescriptor = $moufManager->getInstanceDescriptor('dbalConnection');
 
         //Let's get the instance of PatchConnection or create it if not exist
-       if ($moufManager->has('patchConnection')) {
+        if ($moufManager->has('patchConnection')) {
             $patchConnection = $moufManager->get('patchConnection');
             $patchConnectionDescriptor = $moufManager->getInstanceDescriptor('patchConnection');
         } else {
@@ -60,11 +60,15 @@ public static function install(MoufManager $moufManager) {
             $patchConnection = $moufManager->get('patchConnection');
         }
 
-        // Let's create the table.
         $existingPatches = $moufManager->findInstances("Mouf\\Database\\Patcher\\DatabasePatch");
-        foreach($existingPatches as $existingPatche){
-            $patchIntance = $moufManager->getInstanceDescriptor($existingPatche);
-            $patchIntance->getProperty('patchConnection')->setValue($patchConnectionDescriptor);
+        foreach($existingPatches as $existingPatch) {
+            $patchInstance = $moufManager->getInstanceDescriptor($existingPatch);
+            $patchInstance->getProperty('patchConnection')->setValue($patchConnectionDescriptor);
+        }
+
+        $patchServiceDescriptor = $moufManager->getInstanceDescriptor('patchService');
+        if ($patchServiceDescriptor->getProperty('listeners')->getValue() === null) {
+            $patchServiceDescriptor->getProperty('listeners')->setValue([ $patchConnectionDescriptor ]);
         }
 
         // Finally, let's change the dbalConnection configuration to add an ignore rule on the "patches" table.

src/Mouf/Database/Patcher/PatchConnection.php

@@ -21,14 +21,16 @@
 namespace Mouf\Database\Patcher;
 
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver\AbstractMySQLDriver;
+use Mouf\Utils\Patcher\PatchListenerInterface;
 
 
 /**
  * Class representing the patches table in database
  *
  * @author Pierre Vaidie
  */
-class PatchConnection
+class PatchConnection implements PatchListenerInterface
 {
     /**
      * @var string
@@ -39,16 +41,22 @@ class PatchConnection
      * @var Connection
      */
     private $dbalConnection;
+    /**
+     * @var Connection
+     */
+    private $dbalRootConnection;
 
     /**
      * DatabasePatchTable constructor.
-     * @param  string      $tableName
-     * @param  Connection  $dbalConnection
+     * @param  string $tableName
+     * @param  Connection $dbalConnection
+     * @param Connection|null $dbalRootConnection The DBAL connection with "root" credentials to drop and create the database again.
      */
-    public function __construct($tableName, Connection $dbalConnection)
+    public function __construct($tableName, Connection $dbalConnection, Connection $dbalRootConnection = null)
     {
         $this->tableName = $tableName;
         $this->dbalConnection = $dbalConnection;
+        $this->dbalRootConnection = $dbalRootConnection ?: $dbalConnection;
     }
 
     /**
@@ -86,4 +94,18 @@ public function getConnection() {
     public function setConnnection(Connection $dbalConnection) {
         $this->dbalConnection = $dbalConnection;
     }
+
+    /**
+     * Triggered when the 'reset()' method is called on the PatchService
+     */
+    public function onReset(): void
+    {
+        // Let's drop and recreate the database from 0!
+        $dbName = $this->dbalConnection->getDatabase();
+        $this->dbalRootConnection->getSchemaManager()->dropAndCreateDatabase($dbName);
+
+        if ($this->dbalRootConnection->getDriver() instanceof AbstractMySQLDriver) {
+            $this->dbalRootConnection->exec('USE '.$dbName);
+        }
+    }
 }