Merge branch '4.x' into 4.next

cakephp · Oct 19, 2024 · ef65019 · ef65019
2 parents a3f90b9 + 3518c48
commit ef65019
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Migration/ManagerFactory.php b/src/Migration/ManagerFactory.php
@@ -97,6 +97,9 @@ public function createConfig(): ConfigInterface
         if (!$connectionConfig) {
             throw new RuntimeException("Could not find connection `{$connectionName}`");
         }
+        if (!isset($connectionConfig['database'])) {
+            throw new RuntimeException("The `{$connectionName}` connection has no `database` key defined.");
+        }
 
         /** @var array<string, string> $connectionConfig */
         $adapter = $connectionConfig['scheme'] ?? null;

diff --git a/tests/TestCase/Command/MigrateCommandTest.php b/tests/TestCase/Command/MigrateCommandTest.php
@@ -42,6 +42,7 @@ public function tearDown(): void
         foreach ($this->createdFiles as $file) {
             unlink($file);
         }
+        ConnectionManager::drop('invalid');
     }
 
     public function testHelp()
@@ -72,6 +73,18 @@ public function testMigrateNoMigrationSource(): void
         $this->assertFileDoesNotExist($dumpFile);
     }
 
+    /**
+     * Test that source parameter defaults to Migrations
+     */
+    public function testMigrateInvalidConnection(): void
+    {
+        ConnectionManager::setConfig('invalid', [
+            'database' => null,
+        ]);
+        $this->expectExceptionMessage('has no `database` key defined');
+        $this->exec('migrations migrate -c invalid');
+    }
+
     /**
      * Test that source parameter defaults to Migrations
      */