Skip to content

Allow Table::addColumn() to use type from Column object again #2224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2023
+4 −3
Merged

Allow Table::addColumn() to use type from Column object again #2224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Phinx/Db/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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()
));
}
Expand Down