Skip to content

Commit 5d3d6e8

Browse files
committed
refactor columnNames -> getColumnNames rename
1 parent 5f1b708 commit 5d3d6e8

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

api.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ public function getType(): String
653653
return $this->type;
654654
}
655655

656-
public function columnNames(): array
656+
public function getColumnNames(): array
657657
{
658658
return array_keys($this->columns);
659659
}
@@ -2282,7 +2282,7 @@ private function getAddTableSQL(ReflectedTable $newTable): String
22822282
$p1 = $this->quote($tableName);
22832283
$fields = [];
22842284
$constraints = [];
2285-
foreach ($newTable->columnNames() as $columnName) {
2285+
foreach ($newTable->getColumnNames() as $columnName) {
22862286
$newColumn = $newTable->getColumn($columnName);
22872287
$f1 = $this->quote($columnName);
22882288
$f2 = $this->getColumnType($newColumn, false);
@@ -2929,7 +2929,7 @@ private function handleColumns(String $operation, String $tableName) /*: void*/
29292929
$columnHandler = $this->getProperty('columnHandler', '');
29302930
if ($columnHandler) {
29312931
$table = $this->reflection->getTable($tableName);
2932-
foreach ($table->columnNames() as $columnName) {
2932+
foreach ($table->getColumnNames() as $columnName) {
29332933
$allowed = call_user_func($columnHandler, $operation, $tableName, $columnName);
29342934
if (!$allowed) {
29352935
$table->removeColumn($columnName);
@@ -3777,7 +3777,7 @@ private function setComponentSchema(String $tableName) /*: void*/
37773777
$prefix = "components|schemas|$operation-$tableName";
37783778
}
37793779
$this->openapi->set("$prefix|type", "object");
3780-
foreach ($table->columnNames() as $columnName) {
3780+
foreach ($table->getColumnNames() as $columnName) {
37813781
if (!$this->isOperationOnColumnAllowed($operation, $tableName, $columnName)) {
37823782
continue;
37833783
}
@@ -4232,7 +4232,7 @@ private function select(String $tableName, bool $primaryTable, array $params, St
42324232
public function getNames(ReflectedTable $table, bool $primaryTable, array $params): array
42334233
{
42344234
$tableName = $table->getName();
4235-
$results = $table->columnNames();
4235+
$results = $table->getColumnNames();
42364236
$results = $this->select($tableName, $primaryTable, $params, 'include', $results, true);
42374237
$results = $this->select($tableName, $primaryTable, $params, 'exclude', $results, false);
42384238
return $results;
@@ -4427,7 +4427,7 @@ public function getColumnOrdering(ReflectedTable $table, array $params): array
44274427
if ($pk) {
44284428
$fields[] = [$pk->getName(), 'ASC'];
44294429
} else {
4430-
foreach ($table->columnNames() as $columnName) {
4430+
foreach ($table->getColumnNames() as $columnName) {
44314431
$fields[] = [$columnName, 'ASC'];
44324432
}
44334433

@@ -4602,7 +4602,7 @@ private function sanitizeRecord(String $tableName, /* object */ $record, String
46024602
}
46034603
if ($id != '') {
46044604
$pk = $this->reflection->getTable($tableName)->getPk();
4605-
foreach ($this->reflection->getTable($tableName)->columnNames() as $key) {
4605+
foreach ($this->reflection->getTable($tableName)->getColumnNames() as $key) {
46064606
$field = $this->reflection->getTable($tableName)->getColumn($key);
46074607
if ($field->getName() == $pk->getName()) {
46084608
unset($record->$key);

src/Tqdev/PhpCrudApi/Column/Reflection/ReflectedTable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function getType(): String
102102
return $this->type;
103103
}
104104

105-
public function columnNames(): array
105+
public function getColumnNames(): array
106106
{
107107
return array_keys($this->columns);
108108
}

src/Tqdev/PhpCrudApi/Database/GenericDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ private function getAddTableSQL(ReflectedTable $newTable): String
260260
$p1 = $this->quote($tableName);
261261
$fields = [];
262262
$constraints = [];
263-
foreach ($newTable->columnNames() as $columnName) {
263+
foreach ($newTable->getColumnNames() as $columnName) {
264264
$newColumn = $newTable->getColumn($columnName);
265265
$f1 = $this->quote($columnName);
266266
$f2 = $this->getColumnType($newColumn, false);

src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private function handleColumns(String $operation, String $tableName) /*: void*/
2727
$columnHandler = $this->getProperty('columnHandler', '');
2828
if ($columnHandler) {
2929
$table = $this->reflection->getTable($tableName);
30-
foreach ($table->columnNames() as $columnName) {
30+
foreach ($table->getColumnNames() as $columnName) {
3131
$allowed = call_user_func($columnHandler, $operation, $tableName, $columnName);
3232
if (!$allowed) {
3333
$table->removeColumn($columnName);

src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private function setComponentSchema(String $tableName) /*: void*/
163163
$prefix = "components|schemas|$operation-$tableName";
164164
}
165165
$this->openapi->set("$prefix|type", "object");
166-
foreach ($table->columnNames() as $columnName) {
166+
foreach ($table->getColumnNames() as $columnName) {
167167
if (!$this->isOperationOnColumnAllowed($operation, $tableName, $columnName)) {
168168
continue;
169169
}

src/Tqdev/PhpCrudApi/Record/ColumnIncluder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private function select(String $tableName, bool $primaryTable, array $params, St
4545
public function getNames(ReflectedTable $table, bool $primaryTable, array $params): array
4646
{
4747
$tableName = $table->getName();
48-
$results = $table->columnNames();
48+
$results = $table->getColumnNames();
4949
$results = $this->select($tableName, $primaryTable, $params, 'include', $results, true);
5050
$results = $this->select($tableName, $primaryTable, $params, 'exclude', $results, false);
5151
return $results;

src/Tqdev/PhpCrudApi/Record/OrderingInfo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getColumnOrdering(ReflectedTable $table, array $params): array
3030
if ($pk) {
3131
$fields[] = [$pk->getName(), 'ASC'];
3232
} else {
33-
foreach ($table->columnNames() as $columnName) {
33+
foreach ($table->getColumnNames() as $columnName) {
3434
$fields[] = [$columnName, 'ASC'];
3535
}
3636

src/Tqdev/PhpCrudApi/Record/RecordService.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ private function sanitizeRecord(String $tableName, /* object */ $record, String
3636
}
3737
if ($id != '') {
3838
$pk = $this->reflection->getTable($tableName)->getPk();
39-
foreach ($this->reflection->getTable($tableName)->columnNames() as $key) {
39+
foreach ($this->reflection->getTable($tableName)->getColumnNames() as $key) {
4040
$field = $this->reflection->getTable($tableName)->getColumn($key);
4141
if ($field->getName() == $pk->getName()) {
4242
unset($record->$key);

0 commit comments

Comments
 (0)