Merge branch 'next' into main

vierge-noire · Dec 1, 2020 · dfe8d18 · dfe8d18
2 parents c5f0377 + 116e89f
commit dfe8d18
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/src/ConfigReader.php b/src/ConfigReader.php
@@ -52,23 +52,26 @@ public function readMigrationsInDatasources(FixtureManager $fixtureManager)
                 $this->config = array_merge($this->config, $config);
             }
         }
-        if (empty($this->config)) {
-            $this->config = [['connection' => 'test']];
-        }
         return $this;
     }
 
     /**
      * @param array $config
      * @return $this
      */
-    public function loadConfig(array $config = [])
+    public function prepareConfig(array $config = [])
     {
         $config = array_merge(Configure::read('TestFixtureMigrations', []), $config);
         if (!empty($config)) {
             $this->normalizeArray($config);
             $this->config = array_merge($this->config, $config);
         }
+       foreach ($this->config as $k => $config) {
+           $this->config[$k]['connection'] = $this->config[$k]['connection'] ?? 'test';
+       }
+        if (empty($this->config)) {
+            $this->config = [['connection' => 'test']];
+        }
         return $this;
     }
 

diff --git a/src/Migrator.php b/src/Migrator.php
@@ -47,7 +47,7 @@ public static function migrate(array $config = []): void
         $migrator = new static();
 
         $migrator
-            ->loadConfig($config)
+            ->prepareConfig($config)
             ->dropTablesForMissingMigrations()
             ->runAllMigrations();
     }
@@ -100,9 +100,9 @@ protected function isMigrationMissing(Migrations $migrations): bool
      * @param array $config
      * @return $this
      */
-    protected function loadConfig(array $config)
+    protected function prepareConfig(array $config)
     {
-        $this->getConfigReader()->loadConfig($config);
+        $this->getConfigReader()->prepareConfig($config);
         return $this;
     }
 

diff --git a/tests/TestCase/ConfigReaderTest.php b/tests/TestCase/ConfigReaderTest.php
@@ -39,27 +39,37 @@ public function tearDown(): void
     public function testSetConfigFromInjection()
     {
         $config = [
-            'connection' => 'Foo',
-            'plugin' => 'Bar'
+            ['connection' => 'Foo', 'plugin' => 'Bar',],
+            ['plugin' => 'Bar',]
         ];
 
-        $this->ConfigReader->loadConfig($config);
+        $expect = [
+            ['connection' => 'Foo', 'plugin' => 'Bar',],
+            ['plugin' => 'Bar', 'connection' => 'test',]
+        ];
+
+        $this->ConfigReader->prepareConfig($config);
 
-        $this->assertSame([$config], $this->ConfigReader->getConfig());
+        $this->assertSame($expect, $this->ConfigReader->getConfig());
     }
 
     public function testSetConfigWithConfigure()
     {
         $config = [
-            'connection' => 'FooTestSetConfigWithConfigure',
+            'source' => 'FooTestSetConfigWithConfigure',
             'plugin' => 'BarTestSetConfigWithConfigure'
         ];
+        $expect = [[
+            'source' => 'FooTestSetConfigWithConfigure',
+            'plugin' => 'BarTestSetConfigWithConfigure',
+            'connection' => 'test',
+        ]];
 
         Configure::write('TestFixtureMigrations', $config);
 
-        $this->ConfigReader->loadConfig();
+        $this->ConfigReader->prepareConfig();
 
-        $this->assertSame([$config], $this->ConfigReader->getConfig());
+        $this->assertSame($expect, $this->ConfigReader->getConfig());
 
         Configure::delete('TestFixtureMigrations');
     }
@@ -78,7 +88,7 @@ public function testSetConfigWithConfigureAndInjection()
 
         Configure::write('TestFixtureMigrations', $config2);
 
-        $this->ConfigReader->loadConfig($config1);
+        $this->ConfigReader->prepareConfig($config1);
         $this->assertSame([$config1], $this->ConfigReader->getConfig());
 
         Configure::delete('TestFixtureMigrations');