Merge pull request #2224 from cakephp/table-nullable-type

Allow Table::addColumn() to use type from Column object again
cakephp · Sep 22, 2023 · 26753bd · 26753bd
2 parents acda135 + b4811d3
commit 26753bd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Phinx/Db/Table.php b/src/Phinx/Db/Table.php
@@ -293,13 +293,14 @@ public function reset(): void
      * Valid options can be: limit, default, null, precision or scale.
      *
      * @param string|\Phinx\Db\Table\Column $columnName Column Name
-     * @param string|\Phinx\Util\Literal $type Column Type
+     * @param string|\Phinx\Util\Literal|null $type Column Type
      * @param array<string, mixed> $options Column Options
      * @throws \InvalidArgumentException
      * @return $this
      */
-    public function addColumn(string|Column $columnName, string|Literal $type, array $options = [])
+    public function addColumn(string|Column $columnName, string|Literal|null $type, array $options = [])
     {
+        assert($columnName instanceof Column || $type !== null);
         if ($columnName instanceof Column) {
             $action = new AddColumn($this->table, $columnName);
         } elseif ($type instanceof Literal) {
@@ -312,7 +313,7 @@ public function addColumn(string|Column $columnName, string|Literal $type, array
         if (!$this->getAdapter()->isValidColumnType($action->getColumn())) {
             throw new InvalidArgumentException(sprintf(
                 'An invalid column type "%s" was specified for column "%s".',
-                $type,
+                $action->getColumn()->getType(),
                 $action->getColumn()->getName()
             ));
         }