fix: unfreeze dependencies after command

nikophil · nikophil · commit f7f8e8cdb6ef · 2025-10-10T13:46:46.000+02:00
diff --git a/src/DependencyFactory.php b/src/DependencyFactory.php
@@ -123,6 +123,11 @@ public function freeze(): void
         $this->frozen = true;
     }
 
+    public function unfreeze(): void
+    {
+        $this->frozen = false;
+    }
+
     private function assertNotFrozen(): void
     {
         if ($this->frozen) {
diff --git a/src/Tools/Console/Command/CurrentCommand.php b/src/Tools/Console/Command/CurrentCommand.php
@@ -29,7 +29,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $aliasResolver = $this->getDependencyFactory()->getVersionAliasResolver();
 
diff --git a/src/Tools/Console/Command/DiffCommand.php b/src/Tools/Console/Command/DiffCommand.php
@@ -98,7 +98,7 @@ protected function configure(): void
     }
 
     /** @throws InvalidOptionUsage */
-    protected function execute(
+    protected function doExecute(
         InputInterface $input,
         OutputInterface $output,
     ): int {
diff --git a/src/Tools/Console/Command/DoctrineCommand.php b/src/Tools/Console/Command/DoctrineCommand.php
@@ -119,6 +119,17 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
         $dependencyFactory->freeze();
     }
 
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        try {
+            return $this->doExecute($input, $output);
+        } finally {
+            $this->dependencyFactory?->unfreeze();
+        }
+    }
+
+    abstract protected function doExecute(InputInterface $input, OutputInterface $output): int;
+
     protected function getDependencyFactory(): DependencyFactory
     {
         if ($this->dependencyFactory === null) {
diff --git a/src/Tools/Console/Command/DumpSchemaCommand.php b/src/Tools/Console/Command/DumpSchemaCommand.php
@@ -79,8 +79,14 @@ protected function configure(): void
             );
     }
 
+    /** keep BC */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        return parent::execute($input, $output);
+    }
+
     /** @throws SchemaDumpRequiresNoMigrations */
-    public function execute(
+    public function doExecute(
         InputInterface $input,
         OutputInterface $output,
     ): int {
diff --git a/src/Tools/Console/Command/ExecuteCommand.php b/src/Tools/Console/Command/ExecuteCommand.php
@@ -111,7 +111,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $migratorConfigurationFactory = $this->getDependencyFactory()->getConsoleInputMigratorConfigurationFactory();
         $migratorConfiguration        = $migratorConfigurationFactory->getMigratorConfiguration($input);
diff --git a/src/Tools/Console/Command/GenerateCommand.php b/src/Tools/Console/Command/GenerateCommand.php
@@ -41,7 +41,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $migrationGenerator = $this->getDependencyFactory()->getMigrationGenerator();
 
diff --git a/src/Tools/Console/Command/LatestCommand.php b/src/Tools/Console/Command/LatestCommand.php
@@ -29,7 +29,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $aliasResolver = $this->getDependencyFactory()->getVersionAliasResolver();
 
diff --git a/src/Tools/Console/Command/ListCommand.php b/src/Tools/Console/Command/ListCommand.php
@@ -41,7 +41,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $versions = $this->getSortedVersions(
             $this->getDependencyFactory()->getMigrationPlanCalculator()->getMigrations(), // available migrations
diff --git a/src/Tools/Console/Command/MigrateCommand.php b/src/Tools/Console/Command/MigrateCommand.php
@@ -139,7 +139,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $migratorConfigurationFactory = $this->getDependencyFactory()->getConsoleInputMigratorConfigurationFactory();
         $migratorConfiguration        = $migratorConfigurationFactory->getMigratorConfiguration($input);
diff --git a/src/Tools/Console/Command/RollupCommand.php b/src/Tools/Console/Command/RollupCommand.php
@@ -37,7 +37,7 @@ protected function configure(): void
 EOT);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $question = sprintf(
             'WARNING! You are about to execute a migration in database "%s" that could result in schema changes and data loss. Are you sure you wish to continue?',
diff --git a/src/Tools/Console/Command/StatusCommand.php b/src/Tools/Console/Command/StatusCommand.php
@@ -32,7 +32,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $infosHelper = $this->getDependencyFactory()->getMigrationStatusInfosHelper();
         $infosHelper->showMigrationsInfo($output);
diff --git a/src/Tools/Console/Command/SyncMetadataCommand.php b/src/Tools/Console/Command/SyncMetadataCommand.php
@@ -31,7 +31,13 @@ protected function configure(): void
 EOT);
     }
 
-    public function execute(
+    /** keep BC */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        return parent::execute($input, $output);
+    }
+
+    public function doExecute(
         InputInterface $input,
         OutputInterface $output,
     ): int {
diff --git a/src/Tools/Console/Command/UpToDateCommand.php b/src/Tools/Console/Command/UpToDateCommand.php
@@ -47,7 +47,7 @@ protected function configure(): void
         parent::configure();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         $statusCalculator = $this->getDependencyFactory()->getMigrationStatusCalculator();
 
diff --git a/src/Tools/Console/Command/VersionCommand.php b/src/Tools/Console/Command/VersionCommand.php
@@ -101,7 +101,7 @@ protected function configure(): void
     }
 
     /** @throws InvalidOptionUsage */
-    protected function execute(InputInterface $input, OutputInterface $output): int
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
     {
         if ($input->getOption('add') === false && $input->getOption('delete') === false) {
             throw InvalidOptionUsage::new('You must specify whether you want to --add or --delete the specified version.');
diff --git a/tests/Tools/Console/Command/DoctrineCommandTest.php b/tests/Tools/Console/Command/DoctrineCommandTest.php
@@ -40,7 +40,7 @@ public function testCommandFreezes(): void
 
         $command       = new class ($dependencyFactory) extends DoctrineCommand
         {
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 return 0;
             }
@@ -67,7 +67,7 @@ public function testCustomConfiguration(): void
 
         $command       = new class ($dependencyFactory) extends DoctrineCommand
         {
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 $migrationDirectories = $this->getDependencyFactory()->getConfiguration()->getMigrationDirectories();
                 DoctrineCommandTest::assertSame(['DoctrineMigrationsTest' => 'bar'], $migrationDirectories);
@@ -88,6 +88,11 @@ public function testDependencyFactoryIsSetFirst(): void
         $dependencyFactory = $this->createMock(DependencyFactory::class);
         $command           = new class ($dependencyFactory) extends DoctrineCommand
         {
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
+            {
+                return 0;
+            }
+
             protected function configure(): void
             {
                 $this->getDependencyFactory();
@@ -122,7 +127,7 @@ public function __construct(EntityManager $entityManager, DependencyFactory $dep
                 $this->expectedEm = $entityManager;
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 $em = $this->getDependencyFactory()->getEntityManager();
                 DoctrineCommandTest::assertSame($this->expectedEm, $em);
@@ -163,7 +168,7 @@ public function __construct(Connection $connection, DependencyFactory $dependenc
                 $this->expectedConnection = $connection;
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 $connection = $this->getDependencyFactory()->getConnection();
                 DoctrineCommandTest::assertSame($this->expectedConnection, $connection);
@@ -196,7 +201,7 @@ public function testCanNotSpecifyBothEmAndConnection(): void
 
         $command       = new class ($dependencyFactory) extends DoctrineCommand
         {
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 return 0;
             }
@@ -239,7 +244,7 @@ protected function configure(): void
                     );
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 DoctrineCommandTest::assertSame($this->getNamespace($input, $output), 'DoctrineMigrations');
 
@@ -282,7 +287,7 @@ protected function configure(): void
                     );
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 $this->getNamespace($input, $output);
 
@@ -327,7 +332,7 @@ protected function configure(): void
                     );
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 DoctrineCommandTest::assertSame($this->getNamespace($input, $output), 'DoctrineMigrations');
 
@@ -368,7 +373,7 @@ protected function configure(): void
                     );
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output): int
+            protected function doExecute(InputInterface $input, OutputInterface $output): int
             {
                 DoctrineCommandTest::assertSame($this->getNamespace($input, $output), 'DoctrineMigrationsTwo');
 

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,11 @@ public function freeze(): void`
`123`	`123`	`$this->frozen = true;`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ public function unfreeze(): void`
	`127`	`+ {`
	`128`	`+ $this->frozen = false;`
	`129`	`+ }`
	`130`	`+`
`126`	`131`	`private function assertNotFrozen(): void`
`127`	`132`	`{`
`128`	`133`	`if ($this->frozen) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function configure(): void`
`29`	`29`	`parent::configure();`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected function execute(InputInterface $input, OutputInterface $output): int`
	`32`	`+ protected function doExecute(InputInterface $input, OutputInterface $output): int`
`33`	`33`	`{`
`34`	`34`	`$aliasResolver = $this->getDependencyFactory()->getVersionAliasResolver();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ protected function configure(): void`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/** @throws InvalidOptionUsage */`
`101`		`- protected function execute(`
	`101`	`+ protected function doExecute(`
`102`	`102`	`InputInterface $input,`
`103`	`103`	`OutputInterface $output,`
`104`	`104`	`): int {`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ protected function configure(): void`
`111`	`111`	`parent::configure();`
`112`	`112`	`}`
`113`	`113`
`114`		`- protected function execute(InputInterface $input, OutputInterface $output): int`
	`114`	`+ protected function doExecute(InputInterface $input, OutputInterface $output): int`
`115`	`115`	`{`
`116`	`116`	`$migratorConfigurationFactory = $this->getDependencyFactory()->getConsoleInputMigratorConfigurationFactory();`
`117`	`117`	`$migratorConfiguration = $migratorConfigurationFactory->getMigratorConfiguration($input);`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected function configure(): void`
`41`	`41`	`parent::configure();`
`42`	`42`	`}`
`43`	`43`
`44`		`- protected function execute(InputInterface $input, OutputInterface $output): int`
	`44`	`+ protected function doExecute(InputInterface $input, OutputInterface $output): int`
`45`	`45`	`{`
`46`	`46`	`$migrationGenerator = $this->getDependencyFactory()->getMigrationGenerator();`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ protected function configure(): void`
`139`	`139`	`parent::configure();`
`140`	`140`	`}`
`141`	`141`
`142`		`- protected function execute(InputInterface $input, OutputInterface $output): int`
	`142`	`+ protected function doExecute(InputInterface $input, OutputInterface $output): int`
`143`	`143`	`{`
`144`	`144`	`$migratorConfigurationFactory = $this->getDependencyFactory()->getConsoleInputMigratorConfigurationFactory();`
`145`	`145`	`$migratorConfiguration = $migratorConfigurationFactory->getMigratorConfiguration($input);`