From 3445ad464fe250e51faf676eb80740702e16bd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Slischka?= Date: Sun, 29 Jul 2018 15:34:08 +0200 Subject: [PATCH] Added resetCommand config --- src/Bridges/NetteDI/MigrationsExtension.php | 15 +++++++++------ .../integration/MigrationsExtension.configA.neon | 1 + .../integration/MigrationsExtension.configB.neon | 1 + .../integration/MigrationsExtension.configC.neon | 1 + .../integration/MigrationsExtension.configD.neon | 1 + .../integration/MigrationsExtension.configE.neon | 1 + .../integration/MigrationsExtension.configF.neon | 1 + ...MigrationsExtension.diffGenerator.configA.neon | 1 + ...MigrationsExtension.diffGenerator.configB.neon | 1 + .../MigrationsExtension.dynamicParameters.neon | 1 + 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/Bridges/NetteDI/MigrationsExtension.php b/src/Bridges/NetteDI/MigrationsExtension.php index 8503b88..1c196f8 100644 --- a/src/Bridges/NetteDI/MigrationsExtension.php +++ b/src/Bridges/NetteDI/MigrationsExtension.php @@ -29,6 +29,7 @@ class MigrationsExtension extends Nette\DI\CompilerExtension 'diffGenerator' => TRUE, // false|doctrine 'withDummyData' => FALSE, 'ignoredQueriesFile' => NULL, + 'enableResetCommand' => FALSE, ]; /** @var array */ @@ -84,7 +85,7 @@ public function loadConfiguration() // commands if (class_exists('Symfony\Component\Console\Command\Command')) { - $this->createSymfonyCommandDefinitions($driver, $configuration); + $this->createSymfonyCommandDefinitions($driver, $configuration, $config['enableResetCommand']); } } @@ -312,7 +313,7 @@ private function createDoctrineStructureDiffGeneratorDefinition($ignoredQueriesF } - private function createSymfonyCommandDefinitions($driver, $configuration) + private function createSymfonyCommandDefinitions($driver, $configuration, $enableResetCommand) { $builder = $this->getContainerBuilder(); $builder->addExcludedClasses(['Nextras\Migrations\Bridges\SymfonyConsole\BaseCommand']); @@ -327,10 +328,12 @@ private function createSymfonyCommandDefinitions($driver, $configuration) ->setArguments([$driver, $configuration]) ->addTag('kdyby.console.command'); - $builder->addDefinition($this->prefix('resetCommand')) - ->setClass('Nextras\Migrations\Bridges\SymfonyConsole\ResetCommand') - ->setArguments([$driver, $configuration]) - ->addTag('kdyby.console.command'); + if ($enableResetCommand) { + $builder->addDefinition($this->prefix('resetCommand')) + ->setClass('Nextras\Migrations\Bridges\SymfonyConsole\ResetCommand') + ->setArguments([$driver, $configuration]) + ->addTag('kdyby.console.command'); + } } } diff --git a/tests/cases/integration/MigrationsExtension.configA.neon b/tests/cases/integration/MigrationsExtension.configA.neon index 48b905f..dd5b55a 100644 --- a/tests/cases/integration/MigrationsExtension.configA.neon +++ b/tests/cases/integration/MigrationsExtension.configA.neon @@ -2,6 +2,7 @@ migrations: dir: migrations driver: mysql dbal: dibi + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.configB.neon b/tests/cases/integration/MigrationsExtension.configB.neon index 8541b6c..04fb257 100644 --- a/tests/cases/integration/MigrationsExtension.configB.neon +++ b/tests/cases/integration/MigrationsExtension.configB.neon @@ -2,6 +2,7 @@ migrations: dir: migrations driver: mysql dbal: Nextras\Migrations\Bridges\Dibi\DibiAdapter(...) + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.configC.neon b/tests/cases/integration/MigrationsExtension.configC.neon index 9f6cb0c..3f2df90 100644 --- a/tests/cases/integration/MigrationsExtension.configC.neon +++ b/tests/cases/integration/MigrationsExtension.configC.neon @@ -1,6 +1,7 @@ migrations: dir: migrations driver: mysql + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.configD.neon b/tests/cases/integration/MigrationsExtension.configD.neon index 7df41d9..72c3f83 100644 --- a/tests/cases/integration/MigrationsExtension.configD.neon +++ b/tests/cases/integration/MigrationsExtension.configD.neon @@ -1,6 +1,7 @@ migrations: dir: migrations driver: Nextras\Migrations\Drivers\MySqlDriver(...) + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.configE.neon b/tests/cases/integration/MigrationsExtension.configE.neon index 258ce19..5663a1c 100644 --- a/tests/cases/integration/MigrationsExtension.configE.neon +++ b/tests/cases/integration/MigrationsExtension.configE.neon @@ -1,5 +1,6 @@ migrations: dir: migrations + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.configF.neon b/tests/cases/integration/MigrationsExtension.configF.neon index 4e102d9..412f2ad 100644 --- a/tests/cases/integration/MigrationsExtension.configF.neon +++ b/tests/cases/integration/MigrationsExtension.configF.neon @@ -2,6 +2,7 @@ migrations: dir: migrations dbal: dibi driver: Nextras\Migrations\Drivers\MySqlDriver(..., m) + enableResetCommand: true services: - DibiConnection(%dibiConfig%) diff --git a/tests/cases/integration/MigrationsExtension.diffGenerator.configA.neon b/tests/cases/integration/MigrationsExtension.diffGenerator.configA.neon index 3d23e9e..6488805 100644 --- a/tests/cases/integration/MigrationsExtension.diffGenerator.configA.neon +++ b/tests/cases/integration/MigrationsExtension.diffGenerator.configA.neon @@ -3,6 +3,7 @@ migrations: dbal: doctrine driver: mysql diffGenerator: doctrine + enableResetCommand: true services: - Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration([%doctrineDir%]) diff --git a/tests/cases/integration/MigrationsExtension.diffGenerator.configB.neon b/tests/cases/integration/MigrationsExtension.diffGenerator.configB.neon index 3f7d760..5a97812 100644 --- a/tests/cases/integration/MigrationsExtension.diffGenerator.configB.neon +++ b/tests/cases/integration/MigrationsExtension.diffGenerator.configB.neon @@ -2,6 +2,7 @@ migrations: dir: migrations dbal: doctrine driver: mysql + enableResetCommand: true services: - Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration([%doctrineDir%]) diff --git a/tests/cases/integration/MigrationsExtension.dynamicParameters.neon b/tests/cases/integration/MigrationsExtension.dynamicParameters.neon index 319f50c..93e06e6 100644 --- a/tests/cases/integration/MigrationsExtension.dynamicParameters.neon +++ b/tests/cases/integration/MigrationsExtension.dynamicParameters.neon @@ -2,6 +2,7 @@ migrations: dir: %rootDir%/migrations driver: mysql dbal: dibi + enableResetCommand: true services: - DibiConnection(%dibiConfig%)