Merge branch '4.x' into 4.next

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
- <phar name="phpstan" version="1.10.56" installed="1.10.56" location="./tools/phpstan" copy="false"/>
- <phar name="psalm" version="5.20.0" installed="5.20.0" location="./tools/psalm" copy="false"/>
+ <phar name="phpstan" version="1.11.9" installed="1.11.9" location="./tools/phpstan" copy="false"/>
+ <phar name="psalm" version="5.25.0" installed="5.25.0" location="./tools/psalm" copy="false"/>
 </phive>

docs/en/upgrading-to-builtin-backend.rst

@@ -1,7 +1,7 @@
 Upgrading to the builtin backend
 ################################
 
-As of migrations XXX there is a new migrations backend that uses CakePHP's
+As of migrations 4.3 there is a new migrations backend that uses CakePHP's
 database abstractions and ORM. Longer term this will allow for phinx to be
 removed as a dependency. This greatly reduces the dependency footprint of
 migrations.

phpstan.neon

@@ -3,9 +3,11 @@ includes:
 
 parameters:
  level: 7
- checkMissingIterableValueType: false
- checkGenericClassInNonGenericObjectType: false
  paths:
  - src/
  bootstrapFiles:
  - tests/bootstrap.php
+ ignoreErrors:
+ - identifier: missingType.iterableValue
+ - identifier: missingType.generics
+

psalm-baseline.xml

@@ -169,8 +169,5 @@
  <code><![CDATA[$this->regexpParseColumn]]></code>
  <code><![CDATA[$this->regexpParseField]]></code>
  </ArgumentTypeCoercion>
- <TypeDoesNotContainType>
- <code>empty($indexes[$indexName])</code>
- </TypeDoesNotContainType>
  </file>
 </files>

src/Command/MigrationsCommand.php

@@ -61,7 +61,7 @@ public static function defaultName(): string
  /**
  * Array of arguments to run the shell with.
  *
- * @var array<string>
+ * @var list<string>
  */
  public array $argv = [];
 
@@ -198,6 +198,7 @@ public function run(array $argv, ConsoleIo $io): ?int
  $name = explode(' ', $name);
 
  array_unshift($argv, ...$name);
+ /** @var list<string> $argv */
  $this->argv = $argv;
 
  return parent::run($argv, $io);

src/Db/Adapter/PdoAdapter.php

@@ -176,6 +176,16 @@ public function getConnection(): Connection
  return $this->connection;
  }
 
+ /**
+ * Backwards compatibility shim for migrations 3.x
+ *
+ * @return \Cake\Database\Connection
+ */
+ public function getDecoratedConnection(): Connection
+ {
+ return $this->getConnection();
+ }
+
  /**
  * @inheritDoc
  */

src/Db/Adapter/SqliteAdapter.php

@@ -1098,8 +1098,8 @@ protected function calculateNewTableColumns(string $tableName, string|false $col
  }
  }
 
- $selectColumns = array_filter($selectColumns, 'strlen');
- $writeColumns = array_filter($writeColumns, 'strlen');
+ $selectColumns = array_filter($selectColumns, fn ($value) => $value !== '');
+ $writeColumns = array_filter($writeColumns, fn ($value) => $value !== '');
  $selectColumns = array_map([$this, 'quoteColumnName'], $selectColumns);
  $writeColumns = array_map([$this, 'quoteColumnName'], $writeColumns);
 

tests/TestCase/Db/Adapter/SqliteAdapterTest.php

@@ -78,9 +78,11 @@ protected function tearDown(): void
  unset($this->adapter, $this->out, $this->io);
  }
 
- public function testConnection()
+ public function testGetConnection()
  {
- $this->assertInstanceOf(Connection::class, $this->adapter->getConnection());
+ $connection = $this->adapter->getConnection();
+ $this->assertInstanceOf(Connection::class, $connection);
+ $this->assertSame($connection, $this->adapter->getDecoratedConnection());
  }
 
  public function testBeginTransaction()