Fix method alterColumn(), argument type accept `ColumnInterface::cl…

…ass`. (#741)

.github/workflows/active-record.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-active-record-${{ matrix.os }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.1.0
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv-5.10.1
 
     runs-on: ${{ matrix.os }}

.github/workflows/static.yml

@@ -28,4 +28,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2']

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.1.1 under development
 
+- Bug #741: Fix `alterColumn()` method to accept `ColumnInterface::class` in argument `$type` (@terabytesoftw)
 - New #617: Add debug collector for `yiisoft/yii-debug` (@xepozz)
 - Enh #617, #733: Add specific psalm annotation of `$closure` parameter in `ConnectionInterface::transaction()` 
   method (@xepozz, @vjik)

composer.json

@@ -34,7 +34,7 @@
         "rector/rector": "^0.17",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.12.0",
+        "vimeo/psalm": "^4.30|^5.12",
         "yiisoft/aliases": "^3.0",
         "yiisoft/cache-file": "^2.0",
         "yiisoft/di": "^1.0",

phpunit.xml.dist

@@ -15,45 +15,9 @@
         </include>
         <exclude>
             <directory>./src/TestSupport</directory>
+            <directory>./src/Debug</directory>
             <directory>./tests</directory>
             <directory>./vendor</directory>
-            <file>./src/Command/CommandInterface.php</file>
-            <file>./src/Command/ParamInterface.php</file>
-            <file>./src/Connection/ConnectionInterface.php</file>
-            <file>./src/Connection/ConnectionPoolInterface.php</file>
-            <file>./src/Constraint/ConstraintSchemaInterface.php</file>
-            <file>./src/Driver/DriverInterface.php</file>
-            <file>./src/Driver/PDO/CommandPDOInterface.php</file>
-            <file>./src/Driver/PDO/ConnectionPDOInterface.php</file>
-            <file>./src/Driver/PDO/ConnectionPDOPoolInterface.php</file>
-            <file>./src/Driver/PDO/PDODriverInterface.php</file>
-            <file>./src/Expression/ExpressionBuilderInterface.php</file>
-            <file>./src/Expression/ExpressionInterface.php</file>
-            <file>./src/Profiler/ProfilerInterface.php</file>
-            <file>./src/Query/BatchQueryResultInterface.php</file>
-            <file>./src/Query/Data/DataReaderInterface.php</file>
-            <file>./src/Query/QueryFunctionsInterface.php</file>
-            <file>./src/Query/QueryInterface.php</file>
-            <file>./src/Query/QueryPartsInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/BetweenColumnsConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/BetweenConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/ConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/ConjunctionConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/ExistConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/HashConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/InConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/LikeConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/NotConditionInterface.php</file>
-            <file>./src/QueryBuilder/Condition/Interface/SimpleConditionInterface.php</file>
-            <file>./src/QueryBuilder/DDLQueryBuilderInterface.php</file>
-            <file>./src/QueryBuilder/DMLQueryBuilderInterface.php</file>
-            <file>./src/QueryBuilder/DQLQueryBuilderInterface.php</file>
-            <file>./src/QueryBuilder/QueryBuilderInterface.php</file>
-            <file>./src/Schema/ColumnSchemaInterface.php</file>
-            <file>./src/Schema/QuoterInterface.php</file>
-            <file>./src/Schema/SchemaInterface.php</file>
-            <file>./src/Schema/TableSchemaInterface.php</file>
-            <file>./src/Transaction/TransactionInterface.php</file>
         </exclude>
     </source>
     <php>

src/Command/AbstractCommand.php

@@ -11,6 +11,7 @@
 use Yiisoft\Db\Query\Data\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
 use Yiisoft\Db\QueryBuilder\QueryBuilderInterface;
+use Yiisoft\Db\Schema\Builder\ColumnInterface;
 
 use function explode;
 use function get_resource_type;
@@ -188,7 +189,7 @@ public function addUnique(string $table, string $name, array|string $columns): s
         return $this->setSql($sql)->requireTableSchemaRefresh($table);
     }
 
-    public function alterColumn(string $table, string $column, string $type): static
+    public function alterColumn(string $table, string $column, ColumnInterface|string $type): static
     {
         $sql = $this->getQueryBuilder()->alterColumn($table, $column, $type);
         return $this->setSql($sql)->requireTableSchemaRefresh($table);

src/Command/CommandInterface.php

@@ -14,6 +14,7 @@
 use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Query\Data\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
+use Yiisoft\Db\Schema\Builder\ColumnInterface;
 
 /**
  * This interface represents a database command, such as a `SELECT`, `INSERT`, `UPDATE`, or `DELETE` statement.
@@ -138,13 +139,13 @@ public function addPrimaryKey(string $table, string $name, array|string $columns
      *
      * @param string $table The table whose column is to change.
      * @param string $column The name of the column to change.
-     * @param string $type The column type. {@see QueryBuilder::getColumnType()} will be called to convert the give
-     * column type to the physical one. For example, `string` will be converted as `varchar(255)`, and `string not null`
-     * becomes `varchar(255) not null`.
+     * @param ColumnInterface|string $type The column type. {@see QueryBuilder::getColumnType()} will be called to
+     * convert the give column type to the physical one. For example, `string` will be converted as `varchar(255)`, and
+     * `string not null` becomes `varchar(255) not null`.
      *
      * Note: The method will quote the `table` and `column` parameters before using them in the generated SQL.
      */
-    public function alterColumn(string $table, string $column, string $type): static;
+    public function alterColumn(string $table, string $column, ColumnInterface|string $type): static;
 
     /**
      * Creates a batch INSERT command.

src/Debug/CommandInterfaceProxy.php

@@ -9,6 +9,7 @@
 use Yiisoft\Db\Command\CommandInterface;
 use Yiisoft\Db\Query\Data\DataReaderInterface;
 use Yiisoft\Db\Query\QueryInterface;
+use Yiisoft\Db\Schema\Builder\ColumnInterface;
 
 final class CommandInterfaceProxy implements CommandInterface
 {
@@ -92,7 +93,7 @@ public function addUnique(string $table, string $name, array|string $columns): s
     /**
      * @psalm-suppress  MixedArgument
      */
-    public function alterColumn(string $table, string $column, string $type): static
+    public function alterColumn(string $table, string $column, ColumnInterface|string $type): static
     {
         return new self($this->decorated->{__FUNCTION__}(...func_get_args()), $this->collector);
     }