Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 7 additions & 14 deletions src/Model/ModelPropertyFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,27 @@ public function __construct(
*/
public function create(): ModelProperty
{
$vars = $this->schema->__debugInfo();
$default = $vars['columns'][$this->columnName]['default'] ?? '';
$column = $this->schema->getColumn($this->columnName);
$default = $column['default'] ?? '';

return (new ModelProperty())
->setName($this->columnName)
->setType($this->schema->getColumnType($this->columnName))
->setDefault((string)$default)
->setIsPrimaryKey($this->isPrimaryKey($vars, $this->columnName))
->setIsPrimaryKey($this->isPrimaryKey())
->setIsHidden(in_array($this->columnName, $this->entity->getHidden()))
->setIsAccessible($this->isAccessible())
->setValidationSet($this->table->validationDefault(new Validator())->field($this->columnName));
}

/**
* @param array $schemaDebugInfo debug array from TableSchema
* @param string $columnName column name
* Checks if this column is part of the primary key.
*
* @return bool
*/
private function isPrimaryKey(array $schemaDebugInfo, string $columnName): bool
private function isPrimaryKey(): bool
{
// ignore coverage since this condition should not be met
if (!isset($schemaDebugInfo['constraints']['primary']['columns'])) {
// @codeCoverageIgnoreStart
return false;
// @codeCoverageIgnoreEnd
}

return in_array($columnName, $schemaDebugInfo['constraints']['primary']['columns']);
return in_array($this->columnName, $this->schema->getPrimaryKey());
}

/**
Expand Down