PSR-12 compatibility

Author: mevdschee

README.md

@@ -50,5 +50,5 @@
     },
     "autoload": {
         "psr-4": { "Tqdev\\PhpCrudApi\\": "src/Tqdev/PhpCrudApi" }
-    }   
+    }
 }

composer.json

@@ -25,9 +25,9 @@
 use Tqdev\PhpCrudApi\Middleware\IpAddressMiddleware;
 use Tqdev\PhpCrudApi\Middleware\JoinLimitsMiddleware;
 use Tqdev\PhpCrudApi\Middleware\JwtAuthMiddleware;
-use Tqdev\PhpCrudApi\Middleware\ReconnectMiddleware;
 use Tqdev\PhpCrudApi\Middleware\MultiTenancyMiddleware;
 use Tqdev\PhpCrudApi\Middleware\PageLimitsMiddleware;
+use Tqdev\PhpCrudApi\Middleware\ReconnectMiddleware;
 use Tqdev\PhpCrudApi\Middleware\Router\SimpleRouter;
 use Tqdev\PhpCrudApi\Middleware\SanitationMiddleware;
 use Tqdev\PhpCrudApi\Middleware\ValidationMiddleware;

src/Tqdev/PhpCrudApi/Api.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 interface Cache

src/Tqdev/PhpCrudApi/Cache/Cache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class CacheFactory

src/Tqdev/PhpCrudApi/Cache/CacheFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class MemcacheCache implements Cache

src/Tqdev/PhpCrudApi/Cache/MemcacheCache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class MemcachedCache extends MemcacheCache

src/Tqdev/PhpCrudApi/Cache/MemcachedCache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class NoCache implements Cache

src/Tqdev/PhpCrudApi/Cache/NoCache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class RedisCache implements Cache

src/Tqdev/PhpCrudApi/Cache/RedisCache.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Cache;
 
 class TempFileCache implements Cache
 {
-    const SUFFIX = 'cache';
+    public const SUFFIX = 'cache';
 
     private $path;
     private $segments;

src/Tqdev/PhpCrudApi/Cache/TempFileCache.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Column;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
@@ -97,7 +98,7 @@ public function updateColumn(string $tableName, string $columnName, /* object */
         return true;
     }
 
-    public function addTable( /* object */$definition)
+    public function addTable(/* object */$definition)
     {
         $newTable = ReflectedTable::fromJson($definition);
         if (!$this->db->definition()->addTable($newTable)) {
@@ -154,5 +155,4 @@ public function removeColumn(string $tableName, string $columnName)
         }
         return true;
     }
-
 }

src/Tqdev/PhpCrudApi/Column/DefinitionService.php

@@ -1,13 +1,14 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Column\Reflection;
 
 use Tqdev\PhpCrudApi\Database\GenericReflection;
 
 class ReflectedColumn implements \JsonSerializable
 {
-    const DEFAULT_LENGTH = 255;
-    const DEFAULT_PRECISION = 19;
-    const DEFAULT_SCALE = 4;
+    public const DEFAULT_LENGTH = 255;
+    public const DEFAULT_PRECISION = 19;
+    public const DEFAULT_SCALE = 4;
 
     private $name;
     private $type;
@@ -44,7 +45,7 @@ public static function fromReflection(GenericReflection $reflection, array $colu
         return new ReflectedColumn($name, $type, $length, $precision, $scale, $nullable, $pk, $fk);
     }
 
-    public static function fromJson( /* object */$json): ReflectedColumn
+    public static function fromJson(/* object */$json): ReflectedColumn
     {
         $name = $json->name;
         $type = $json->type;

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Column\Reflection;
 
 use Tqdev\PhpCrudApi\Database\GenericReflection;
@@ -26,7 +27,7 @@ public static function fromReflection(GenericReflection $reflection): ReflectedD
         return new ReflectedDatabase($tableTypes);
     }
 
-    public static function fromJson( /* object */$json): ReflectedDatabase
+    public static function fromJson(/* object */$json): ReflectedDatabase
     {
         $tableTypes = (array) $json->tables;
         return new ReflectedDatabase($tableTypes);

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Column\Reflection;
 
 use Tqdev\PhpCrudApi\Database\GenericReflection;
@@ -64,7 +65,7 @@ public static function fromReflection(GenericReflection $reflection, string $nam
         return new ReflectedTable($name, $type, array_values($columns));
     }
 
-    public static function fromJson( /* object */$json): ReflectedTable
+    public static function fromJson(/* object */$json): ReflectedTable
     {
         $name = $json->name;
         $type = $json->type;

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

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi;
 
 class Config

src/Tqdev/PhpCrudApi/Config.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -22,5 +23,4 @@ public function clear(ServerRequestInterface $request): ResponseInterface
     {
         return $this->responder->success($this->cache->clear());
     }
-
 }

src/Tqdev/PhpCrudApi/Controller/CacheController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Controller/ColumnController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -58,5 +59,4 @@ public function read(ServerRequestInterface $request): ResponseInterface
             return $this->responder->success($response);
         }
     }
-
 }

src/Tqdev/PhpCrudApi/Controller/GeoJsonController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -20,5 +21,4 @@ public function success($result): ResponseInterface
     {
         return ResponseFactory::fromObject(ResponseFactory::OK, $result);
     }
-
 }

src/Tqdev/PhpCrudApi/Controller/JsonResponder.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -22,5 +23,4 @@ public function openapi(ServerRequestInterface $request): ResponseInterface
     {
         return $this->responder->success($this->openApi->get());
     }
-
 }

src/Tqdev/PhpCrudApi/Controller/OpenApiController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -175,5 +176,4 @@ public function increment(ServerRequestInterface $request): ResponseInterface
             return $this->responder->success($this->service->increment($table, $id, $record, $params));
         }
     }
-
 }

src/Tqdev/PhpCrudApi/Controller/RecordController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
@@ -8,5 +9,4 @@ interface Responder
     public function error(int $error, string $argument, $details = null): ResponseInterface;
 
     public function success($result): ResponseInterface;
-
 }

src/Tqdev/PhpCrudApi/Controller/Responder.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
@@ -60,5 +61,4 @@ public function convertColumnName(ReflectedColumn $column, $value): string
         }
         return $value;
     }
-
 }

src/Tqdev/PhpCrudApi/Database/ColumnConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
@@ -105,5 +106,4 @@ public function getIncrement(ReflectedTable $table, array $columnValues): string
         }
         return implode(',', $results);
     }
-
 }

src/Tqdev/PhpCrudApi/Database/ColumnsBuilder.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;

src/Tqdev/PhpCrudApi/Database/ConditionsBuilder.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;

src/Tqdev/PhpCrudApi/Database/DataConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
@@ -35,9 +36,9 @@ public function getColumnType(ReflectedColumn $column, bool $update): string
         $type = $this->typeConverter->fromJdbc($column->getType());
         if ($column->hasPrecision() && $column->hasScale()) {
             $size = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';
-        } else if ($column->hasPrecision()) {
+        } elseif ($column->hasPrecision()) {
             $size = '(' . $column->getPrecision() . ')';
-        } else if ($column->hasLength()) {
+        } elseif ($column->hasLength()) {
             $size = '(' . $column->getLength() . ')';
         } else {
             $size = '';

src/Tqdev/PhpCrudApi/Database/GenericDefinition.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 use Tqdev\PhpCrudApi\Database\LazyPdo;

src/Tqdev/PhpCrudApi/Database/GenericReflection.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Database;
 
 class TypeConverter

src/Tqdev/PhpCrudApi/Database/TypeConverter.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\GeoJson;
 
 class Feature implements \JsonSerializable

src/Tqdev/PhpCrudApi/GeoJson/Feature.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\GeoJson;
 
 class FeatureCollection implements \JsonSerializable

src/Tqdev/PhpCrudApi/GeoJson/FeatureCollection.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\GeoJson;
 
 use Tqdev\PhpCrudApi\Column\ReflectionService;
@@ -78,7 +79,7 @@ private function convertTileToLatLonOfUpperLeftCorner($z, $x, $y): array
         return [$lon, $lat];
     }
 
-    private function convertRecordToFeature( /*object*/$record, string $primaryKeyColumnName, string $geometryColumnName)
+    private function convertRecordToFeature(/*object*/$record, string $primaryKeyColumnName, string $geometryColumnName)
     {
         $id = null;
         if ($primaryKeyColumnName) {

src/Tqdev/PhpCrudApi/GeoJson/GeoJsonService.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\GeoJson;
 
 class Geometry implements \JsonSerializable

src/Tqdev/PhpCrudApi/GeoJson/Geometry.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Middleware/AjaxOnlyMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware\Base;
 
 use Psr\Http\Server\MiddlewareInterface;

src/Tqdev/PhpCrudApi/Middleware/Base/Middleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Middleware/BasicAuthMiddleware.php

@@ -1,9 +1,10 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware\Communication;
 
 class VariableStore
 {
-    static $values = array();
+    public static $values = array();
 
     public static function get(string $key)
     {

src/Tqdev/PhpCrudApi/Middleware/Communication/VariableStore.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;

src/Tqdev/PhpCrudApi/Middleware/CustomizationMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Tqdev\PhpCrudApi\Middleware;
 
 use Psr\Http\Message\ResponseInterface;