diff --git a/resources/views/_addColumns.php b/resources/views/_addColumns.php index ebe1c1c3..71261760 100644 --- a/resources/views/_addColumns.php +++ b/resources/views/_addColumns.php @@ -10,7 +10,7 @@ */ foreach ($columns as $column) { - echo " \$b->addColumn('$table', '{$column->getProperty()}', \$b->{$column->getDecoratorsString()});\n"; + echo " \$b->addColumn('$table', '{$column->getName()}', \$b->{$column->getDecoratorsString()});\n"; } echo $this->render(__DIR__ . '/_addForeignKeys.php', [ diff --git a/resources/views/_createTable.php b/resources/views/_createTable.php index 7361ab81..aa954520 100644 --- a/resources/views/_createTable.php +++ b/resources/views/_createTable.php @@ -14,9 +14,9 @@ echo " \$b->createTable('$table', [\n"; foreach ($columns as $column) { if (!$column->hasDecorators()) { - echo " '{$column->getProperty()}',\n"; + echo " '{$column->getName()}',\n"; } else { - echo " '{$column->getProperty()}' => \$b->{$column->getDecoratorsString()},\n"; + echo " '{$column->getName()}' => \$b->{$column->getDecoratorsString()},\n"; } } echo " ]);\n"; diff --git a/resources/views/_dropColumns.php b/resources/views/_dropColumns.php index f45f4bde..4428847a 100644 --- a/resources/views/_dropColumns.php +++ b/resources/views/_dropColumns.php @@ -15,5 +15,5 @@ ]); foreach ($columns as $column) { - echo " \$b->dropColumn('$table', '{$column->getProperty()}');\n"; + echo " \$b->dropColumn('$table', '{$column->getName()}');\n"; } diff --git a/src/Service/Generate/Column.php b/src/Service/Generate/Column.php index cd84ff0e..48aa1b78 100644 --- a/src/Service/Generate/Column.php +++ b/src/Service/Generate/Column.php @@ -10,14 +10,14 @@ final class Column * @param string[] $decorators */ public function __construct( - private string $property, + private string $name, private array $decorators = [] ) { } - public function getProperty(): string + public function getName(): string { - return $this->property; + return $this->name; } public function getDecorators(): array diff --git a/src/Service/Generate/FieldsParser.php b/src/Service/Generate/FieldsParser.php index cce484d2..860192df 100644 --- a/src/Service/Generate/FieldsParser.php +++ b/src/Service/Generate/FieldsParser.php @@ -40,7 +40,7 @@ public function parse( /** @psalm-var string[] $fields */ foreach ($fields as $field) { $chunks = $this->splitFieldIntoChunks($field); - $column = (string) array_shift($chunks); + $columnName = (string) array_shift($chunks); /** @psalm-var string[] $chunks */ foreach ($chunks as $i => $chunk) { @@ -48,8 +48,8 @@ public function parse( preg_match('/foreignKey\((\w*)\s?(\w*)\)/', $chunk, $matches); $foreignKeys[] = $this->foreignKeyFactory->create( $table, - $column, - $matches[1] ?? preg_replace('/_id$/', '', $column), + $columnName, + $matches[1] ?? preg_replace('/_id$/', '', $columnName), empty($matches[2]) ? null : $matches[2] ); @@ -63,7 +63,7 @@ public function parse( } /** @psalm-var string[] $chunks */ - $columns[] = new Column($column, $chunks); + $columns[] = new Column($columnName, $chunks); } }