Merge branch 'master' of github.com:mevdschee/php-crud-api

Author: mevdschee

api.php

@@ -648,7 +648,7 @@ public function getType(): String
         return $this->type;
     }
 
-    public function columnNames(): array
+    public function getColumnNames(): array
     {
         return array_keys($this->columns);
     }
@@ -2286,7 +2286,7 @@ private function getAddTableSQL(ReflectedTable $newTable): String
         $p1 = $this->quote($tableName);
         $fields = [];
         $constraints = [];
-        foreach ($newTable->columnNames() as $columnName) {
+        foreach ($newTable->getColumnNames() as $columnName) {
             $newColumn = $newTable->getColumn($columnName);
             $f1 = $this->quote($columnName);
             $f2 = $this->getColumnType($newColumn, false);
@@ -2933,7 +2933,7 @@ private function handleColumns(String $operation, String $tableName) /*: void*/
         $columnHandler = $this->getProperty('columnHandler', '');
         if ($columnHandler) {
             $table = $this->reflection->getTable($tableName);
-            foreach ($table->columnNames() as $columnName) {
+            foreach ($table->getColumnNames() as $columnName) {
                 $allowed = call_user_func($columnHandler, $operation, $tableName, $columnName);
                 if (!$allowed) {
                     $table->removeColumn($columnName);
@@ -3781,7 +3781,7 @@ private function setComponentSchema(String $tableName) /*: void*/
                 $prefix = "components|schemas|$operation-$tableName";
             }
             $this->openapi->set("$prefix|type", "object");
-            foreach ($table->columnNames() as $columnName) {
+            foreach ($table->getColumnNames() as $columnName) {
                 if (!$this->isOperationOnColumnAllowed($operation, $tableName, $columnName)) {
                     continue;
                 }
@@ -4236,7 +4236,7 @@ private function select(String $tableName, bool $primaryTable, array $params, St
     public function getNames(ReflectedTable $table, bool $primaryTable, array $params): array
     {
         $tableName = $table->getName();
-        $results = $table->columnNames();
+        $results = $table->getColumnNames();
         $results = $this->select($tableName, $primaryTable, $params, 'include', $results, true);
         $results = $this->select($tableName, $primaryTable, $params, 'exclude', $results, false);
         return $results;
@@ -4431,7 +4431,7 @@ public function getColumnOrdering(ReflectedTable $table, array $params): array
             if ($pk) {
                 $fields[] = [$pk->getName(), 'ASC'];
             } else {
-                foreach ($table->columnNames() as $columnName) {
+                foreach ($table->getColumnNames() as $columnName) {
                     $fields[] = [$columnName, 'ASC'];
                 }
 
@@ -4606,7 +4606,7 @@ private function sanitizeRecord(String $tableName, /* object */ $record, String
         }
         if ($id != '') {
             $pk = $this->reflection->getTable($tableName)->getPk();
-            foreach ($this->reflection->getTable($tableName)->columnNames() as $key) {
+            foreach ($this->reflection->getTable($tableName)->getColumnNames() as $key) {
                 $field = $this->reflection->getTable($tableName)->getColumn($key);
                 if ($field->getName() == $pk->getName()) {
                     unset($record->$key);

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

@@ -102,7 +102,7 @@ public function getType(): String
         return $this->type;
     }
 
-    public function columnNames(): array
+    public function getColumnNames(): array
     {
         return array_keys($this->columns);
     }

src/Tqdev/PhpCrudApi/Database/GenericDefinition.php

@@ -260,7 +260,7 @@ private function getAddTableSQL(ReflectedTable $newTable): String
         $p1 = $this->quote($tableName);
         $fields = [];
         $constraints = [];
-        foreach ($newTable->columnNames() as $columnName) {
+        foreach ($newTable->getColumnNames() as $columnName) {
             $newColumn = $newTable->getColumn($columnName);
             $f1 = $this->quote($columnName);
             $f2 = $this->getColumnType($newColumn, false);

src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php

@@ -27,7 +27,7 @@ private function handleColumns(String $operation, String $tableName) /*: void*/
         $columnHandler = $this->getProperty('columnHandler', '');
         if ($columnHandler) {
             $table = $this->reflection->getTable($tableName);
-            foreach ($table->columnNames() as $columnName) {
+            foreach ($table->getColumnNames() as $columnName) {
                 $allowed = call_user_func($columnHandler, $operation, $tableName, $columnName);
                 if (!$allowed) {
                     $table->removeColumn($columnName);

src/Tqdev/PhpCrudApi/OpenApi/OpenApiBuilder.php

@@ -163,7 +163,7 @@ private function setComponentSchema(String $tableName) /*: void*/
                 $prefix = "components|schemas|$operation-$tableName";
             }
             $this->openapi->set("$prefix|type", "object");
-            foreach ($table->columnNames() as $columnName) {
+            foreach ($table->getColumnNames() as $columnName) {
                 if (!$this->isOperationOnColumnAllowed($operation, $tableName, $columnName)) {
                     continue;
                 }

src/Tqdev/PhpCrudApi/Record/ColumnIncluder.php

@@ -45,7 +45,7 @@ private function select(String $tableName, bool $primaryTable, array $params, St
     public function getNames(ReflectedTable $table, bool $primaryTable, array $params): array
     {
         $tableName = $table->getName();
-        $results = $table->columnNames();
+        $results = $table->getColumnNames();
         $results = $this->select($tableName, $primaryTable, $params, 'include', $results, true);
         $results = $this->select($tableName, $primaryTable, $params, 'exclude', $results, false);
         return $results;

src/Tqdev/PhpCrudApi/Record/OrderingInfo.php

@@ -30,7 +30,7 @@ public function getColumnOrdering(ReflectedTable $table, array $params): array
             if ($pk) {
                 $fields[] = [$pk->getName(), 'ASC'];
             } else {
-                foreach ($table->columnNames() as $columnName) {
+                foreach ($table->getColumnNames() as $columnName) {
                     $fields[] = [$columnName, 'ASC'];
                 }
 

src/Tqdev/PhpCrudApi/Record/RecordService.php

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