From ef4964cf48e4cb734db6b30fcdbe6bc760bd3330 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Wed, 24 Jan 2024 23:04:13 +0100 Subject: [PATCH] Always run other commands --- src/Command/InstallCommand.php | 10 ---------- tests/Command/InstallCommandTest.php | 9 --------- 2 files changed, 19 deletions(-) diff --git a/src/Command/InstallCommand.php b/src/Command/InstallCommand.php index c943ba0c9..a464507c3 100644 --- a/src/Command/InstallCommand.php +++ b/src/Command/InstallCommand.php @@ -35,7 +35,6 @@ class InstallCommand extends Command 'curl_exec', 'curl_multi_init', ]; - private bool $runOtherCommands = true; private EntityManagerInterface $entityManager; private EventDispatcherInterface $dispatcher; @@ -56,11 +55,6 @@ class InstallCommand extends Command parent::__construct(); } - public function disableRunOtherCommands(): void - { - $this->runOtherCommands = false; - } - protected function configure() { $this @@ -342,10 +336,6 @@ class InstallCommand extends Command */ private function runCommand($command, $parameters = []) { - if (!$this->runOtherCommands) { - return $this; - } - $parameters = array_merge( ['command' => $command], $parameters, diff --git a/tests/Command/InstallCommandTest.php b/tests/Command/InstallCommandTest.php index 1bc0a6413..620985b5e 100644 --- a/tests/Command/InstallCommandTest.php +++ b/tests/Command/InstallCommandTest.php @@ -4,7 +4,6 @@ namespace Tests\Wallabag\Command; use DAMA\DoctrineTestBundle\Doctrine\DBAL\StaticDriver; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; use Doctrine\DBAL\Platforms\SqlitePlatform; use Doctrine\Persistence\ManagerRegistry; @@ -77,11 +76,6 @@ class InstallCommandTest extends WallabagTestCase { $command = $this->getCommand(); - // enable calling other commands for MySQL only because rollback isn't supported - if (!$this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection()->getDatabasePlatform() instanceof MySQLPlatform) { - $command->disableRunOtherCommands(); - } - $tester = new CommandTester($command); $tester->setInputs([ 'y', // dropping database @@ -101,7 +95,6 @@ class InstallCommandTest extends WallabagTestCase public function testRunInstallCommandWithReset() { $command = $this->getCommand(); - $command->disableRunOtherCommands(); $tester = new CommandTester($command); $tester->setInputs([ @@ -170,7 +163,6 @@ class InstallCommandTest extends WallabagTestCase public function testRunInstallCommandChooseResetSchema() { $command = $this->getCommand(); - $command->disableRunOtherCommands(); $tester = new CommandTester($command); $tester->setInputs([ @@ -223,7 +215,6 @@ class InstallCommandTest extends WallabagTestCase public function testRunInstallCommandNoInteraction() { $command = $this->getCommand(); - $command->disableRunOtherCommands(); $tester = new CommandTester($command); $tester->execute([], [