Fix errors.

cakephp · Apr 13, 2024 · db45e7e · db45e7e
1 parent 43cbd5f
commit db45e7e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -132,6 +132,11 @@
       <code>$executedVersion</code>
     </ReferenceReusedFromConfusingScope>
   </file>
+  <file src="src/Migration/PhinxBackend.php">
+    <DeprecatedTrait>
+      <code>ConfigurationTrait</code>
+    </DeprecatedTrait>
+  </file>
   <file src="src/Migrations.php">
     <DeprecatedTrait>
       <code>ConfigurationTrait</code>

diff --git a/src/Migration/Manager.php b/src/Migration/Manager.php
@@ -852,8 +852,8 @@ function ($phpFile) {
 
                     $config = $this->getConfig();
                     $input = new ArrayInput([
-                        '--plugin' => $config['plugin'],
-                        '--source' => $config['source'],
+                        '--plugin' => $config['plugin'] ?? null,
+                        '--source' => $config['source'] ?? null,
                         '--connection' => $config->getConnection(),
                     ]);
                     $output = new OutputAdapter($io);
@@ -971,9 +971,9 @@ public function getSeeds(): array
                 new InputOption('source', mode: InputOption::VALUE_OPTIONAL, default: ''),
             ]);
             $input = new ArrayInput([
-                '--plugin' => $config['plugin'],
+                '--plugin' => $config['plugin'] ?? null,
+                '--source' => $config['source'] ?? null,
                 '--connection' => $config->getConnection(),
-                '--source' => $config['source'],
             ], $optionDef);
             $output = new OutputAdapter($this->io);
 

diff --git a/tests/TestCase/Command/Phinx/StatusTest.php b/tests/TestCase/Command/Phinx/StatusTest.php
@@ -185,6 +185,7 @@ public function testExecuteWithInconsistency()
         $migrations = $this->getMigrations();
         $migrations->migrate();
 
+        $migrations = $this->getMigrations();
         $migrationPaths = $migrations->getConfig()->getMigrationPaths();
         $migrationPath = array_pop($migrationPaths);
         $origin = $migrationPath . DS . '20150724233100_update_numbers_table.php';
@@ -248,7 +249,14 @@ protected function getMigrations()
             'connection' => 'test',
             'source' => 'TestsMigrations',
         ];
+        $args = [
+            '--connection' => $params['connection'],
+            '--source' => $params['source'],
+        ];
+        $input = new ArrayInput($args, $this->command->getDefinition());
         $migrations = new Migrations($params);
+        $migrations->setInput($input);
+        $this->command->setInput($input);
 
         $adapter = $migrations
             ->getManager($this->command->getConfig())