Some more improvements as per mevdschee#436

StevenJonSmith · Sep 28, 2018 · a0f2a96 · a0f2a96
1 parent e738617
commit a0f2a96
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/api.php b/api.php
@@ -72,7 +72,7 @@ public function __construct(String $prefix, String $config)
         $this->memcache->addServer($address, $port);
     }
 
-    protected function create(): object
+    protected function create(): stdClass
     {
         return new \Memcache();
     }
@@ -97,7 +97,7 @@ public function clear(): bool
 
 class MemcachedCache extends MemcacheCache
 {
-    protected function create(): object
+    protected function create(): stdClass
     {
         return new \Memcached();
     }
@@ -2014,7 +2014,7 @@ public function getColumnType(ReflectedColumn $column, bool $update): String
         if ($this->driver == 'pgsql' && !$update && $column->getPk() && $this->canAutoIncrement($column)) {
             return 'serial';
         }
-        $type = $this->typeConverter->fromJdbc($column->getType(), $column->getPk());
+        $type = $this->typeConverter->fromJdbc($column->getType());
         if ($column->hasPrecision() && $column->hasScale()) {
             $size = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';
         } else if ($column->hasPrecision()) {
@@ -2739,7 +2739,8 @@ class SimpleRouter implements Router
     private $ttl;
     private $registration;
     private $routes;
-    private $midlewares;
+    private $routeHandlers;
+    private $middlewares;
 
     public function __construct(Responder $responder, Cache $cache, int $ttl)
     {
@@ -3276,18 +3277,17 @@ private function set(String $path, String $value) /*: void*/
         $current = $value;
     }
 
-    public function setPaths(DatabaseDefinition $database) /*: void*/
+    public function setPaths(ReflectedDatabase $database) /*: void*/
     {
-        $result = [];
-        foreach ($database->getTables() as $table) {
-            $path = sprintf('/records/%s', $table->getName());
+        foreach ($database->getTableNames() as $tableName) {
+            $path = sprintf('/records/%s', $tableName);
             foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {
                 $this->set("/paths/$path/$method/description", "$method operation");
             }
         }
     }
 
-    private function fillParametersWithPrimaryKey(String $method, TableDefinition $table) /*: void*/
+    private function fillParametersWithPrimaryKey(String $method, ReflectedTable $table) /*: void*/
     {
         if ($table->getPk() != null) {
             $pathWithId = sprintf('/records/%s/{%s}', $table->getName(), $table->getPk()->getName());
@@ -4231,7 +4231,6 @@ private function getFkEmptyValues(ReflectedTable $t1, ReflectedTable $t2, array
 
     private function addFkRecords(ReflectedTable $t2, array $fkValues, array $params, GenericDB $db, array &$records) /*: void*/
     {
-        $pk = $t2->getPk();
         $columnNames = $this->columns->getNames($t2, false, $params);
         $fkIds = array_keys($fkValues);
 

diff --git a/composer.json b/composer.json
@@ -32,7 +32,15 @@
       }
     ],
     "require": {
-      "php": ">=7.0.0"
+      "php": ">=7.0.0",
+      "ext-zlib": "*",
+      "ext-json": "*",
+      "ext-pdo": "*"
+    },
+    "suggest": {
+      "ext-memcache": "*",
+      "ext-memcached": "*",
+      "ext-redis": "*"
     },
     "autoload": {
         "psr-4": { "Tqdev\\PhpCrudApi\\": "src/Tqdev/PhpCrudApi" }

diff --git a/src/Tqdev/PhpCrudApi/Cache/MemcacheCache.php b/src/Tqdev/PhpCrudApi/Cache/MemcacheCache.php
@@ -22,7 +22,7 @@ public function __construct(String $prefix, String $config)
         $this->memcache->addServer($address, $port);
     }
 
-    protected function create(): object
+    protected function create(): stdClass
     {
         return new \Memcache();
     }

diff --git a/src/Tqdev/PhpCrudApi/Cache/MemcachedCache.php b/src/Tqdev/PhpCrudApi/Cache/MemcachedCache.php
@@ -3,7 +3,7 @@
 
 class MemcachedCache extends MemcacheCache
 {
-    protected function create(): object
+    protected function create(): stdClass
     {
         return new \Memcached();
     }

diff --git a/src/Tqdev/PhpCrudApi/Database/GenericDefinition.php b/src/Tqdev/PhpCrudApi/Database/GenericDefinition.php
@@ -31,7 +31,7 @@ public function getColumnType(ReflectedColumn $column, bool $update): String
         if ($this->driver == 'pgsql' && !$update && $column->getPk() && $this->canAutoIncrement($column)) {
             return 'serial';
         }
-        $type = $this->typeConverter->fromJdbc($column->getType(), $column->getPk());
+        $type = $this->typeConverter->fromJdbc($column->getType());
         if ($column->hasPrecision() && $column->hasScale()) {
             $size = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';
         } else if ($column->hasPrecision()) {

diff --git a/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php b/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php
@@ -16,7 +16,8 @@ class SimpleRouter implements Router
     private $ttl;
     private $registration;
     private $routes;
-    private $midlewares;
+    private $routeHandlers;
+    private $middlewares;
 
     public function __construct(Responder $responder, Cache $cache, int $ttl)
     {

diff --git a/src/Tqdev/PhpCrudApi/OpenApi/OpenApiDefinition.php b/src/Tqdev/PhpCrudApi/OpenApi/OpenApiDefinition.php
@@ -17,18 +17,17 @@ private function set(String $path, String $value) /*: void*/
         $current = $value;
     }
 
-    public function setPaths(DatabaseDefinition $database) /*: void*/
+    public function setPaths(ReflectedDatabase $database) /*: void*/
     {
-        $result = [];
-        foreach ($database->getTables() as $table) {
-            $path = sprintf('/records/%s', $table->getName());
+        foreach ($database->getTableNames() as $tableName) {
+            $path = sprintf('/records/%s', $tableName);
             foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {
                 $this->set("/paths/$path/$method/description", "$method operation");
             }
         }
     }
 
-    private function fillParametersWithPrimaryKey(String $method, TableDefinition $table) /*: void*/
+    private function fillParametersWithPrimaryKey(String $method, ReflectedTable $table) /*: void*/
     {
         if ($table->getPk() != null) {
             $pathWithId = sprintf('/records/%s/{%s}', $table->getName(), $table->getPk()->getName());

diff --git a/src/Tqdev/PhpCrudApi/Record/RelationJoiner.php b/src/Tqdev/PhpCrudApi/Record/RelationJoiner.php
@@ -152,7 +152,6 @@ private function getFkEmptyValues(ReflectedTable $t1, ReflectedTable $t2, array
 
     private function addFkRecords(ReflectedTable $t2, array $fkValues, array $params, GenericDB $db, array &$records) /*: void*/
     {
-        $pk = $t2->getPk();
         $columnNames = $this->columns->getNames($t2, false, $params);
         $fkIds = array_keys($fkValues);