Some more improvements as per #436

mevdschee · mevdschee · commit a0f2a96235bb · 2018-09-29T00:33:40.000+02:00
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);
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function __construct(String $prefix, String $config)`
`72`	`72`	`$this->memcache->addServer($address, $port);`
`73`	`73`	`}`
`74`	`74`
`75`		`- protected function create(): object`
	`75`	`+ protected function create(): stdClass`
`76`	`76`	`{`
`77`	`77`	`return new \Memcache();`
`78`	`78`	`}`
`@@ -97,7 +97,7 @@ public function clear(): bool`
`97`	`97`
`98`	`98`	`class MemcachedCache extends MemcacheCache`
`99`	`99`	`{`
`100`		`- protected function create(): object`
	`100`	`+ protected function create(): stdClass`
`101`	`101`	`{`
`102`	`102`	`return new \Memcached();`
`103`	`103`	`}`
`@@ -2014,7 +2014,7 @@ public function getColumnType(ReflectedColumn $column, bool $update): String`
`2014`	`2014`	`if ($this->driver == 'pgsql' && !$update && $column->getPk() && $this->canAutoIncrement($column)) {`
`2015`	`2015`	`return 'serial';`
`2016`	`2016`	`}`
`2017`		`- $type = $this->typeConverter->fromJdbc($column->getType(), $column->getPk());`
	`2017`	`+ $type = $this->typeConverter->fromJdbc($column->getType());`
`2018`	`2018`	`if ($column->hasPrecision() && $column->hasScale()) {`
`2019`	`2019`	`$size = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';`
`2020`	`2020`	`} else if ($column->hasPrecision()) {`
`@@ -2739,7 +2739,8 @@ class SimpleRouter implements Router`
`2739`	`2739`	`private $ttl;`
`2740`	`2740`	`private $registration;`
`2741`	`2741`	`private $routes;`
`2742`		`- private $midlewares;`
	`2742`	`+ private $routeHandlers;`
	`2743`	`+ private $middlewares;`
`2743`	`2744`
`2744`	`2745`	`public function __construct(Responder $responder, Cache $cache, int $ttl)`
`2745`	`2746`	`{`
`@@ -3276,18 +3277,17 @@ private function set(String $path, String $value) /: void/`
`3276`	`3277`	`$current = $value;`
`3277`	`3278`	`}`
`3278`	`3279`
`3279`		`- public function setPaths(DatabaseDefinition $database) /: void/`
	`3280`	`+ public function setPaths(ReflectedDatabase $database) /: void/`
`3280`	`3281`	`{`
`3281`		`- $result = [];`
`3282`		`- foreach ($database->getTables() as $table) {`
`3283`		`- $path = sprintf('/records/%s', $table->getName());`
	`3282`	`+ foreach ($database->getTableNames() as $tableName) {`
	`3283`	`+ $path = sprintf('/records/%s', $tableName);`
`3284`	`3284`	`foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {`
`3285`	`3285`	`$this->set("/paths/$path/$method/description", "$method operation");`
`3286`	`3286`	`}`
`3287`	`3287`	`}`
`3288`	`3288`	`}`
`3289`	`3289`
`3290`		`- private function fillParametersWithPrimaryKey(String $method, TableDefinition $table) /: void/`
	`3290`	`+ private function fillParametersWithPrimaryKey(String $method, ReflectedTable $table) /: void/`
`3291`	`3291`	`{`
`3292`	`3292`	`if ($table->getPk() != null) {`
`3293`	`3293`	`$pathWithId = sprintf('/records/%s/{%s}', $table->getName(), $table->getPk()->getName());`
`@@ -4231,7 +4231,6 @@ private function getFkEmptyValues(ReflectedTable $t1, ReflectedTable $t2, array`
`4231`	`4231`
`4232`	`4232`	`private function addFkRecords(ReflectedTable $t2, array $fkValues, array $params, GenericDB $db, array &$records) /: void/`
`4233`	`4233`	`{`
`4234`		`- $pk = $t2->getPk();`
`4235`	`4234`	`$columnNames = $this->columns->getNames($t2, false, $params);`
`4236`	`4235`	`$fkIds = array_keys($fkValues);`
`4237`	`4236`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(String $prefix, String $config)`
`22`	`22`	`$this->memcache->addServer($address, $port);`
`23`	`23`	`}`
`24`	`24`
`25`		`- protected function create(): object`
	`25`	`+ protected function create(): stdClass`
`26`	`26`	`{`
`27`	`27`	`return new \Memcache();`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`class MemcachedCache extends MemcacheCache`
`5`	`5`	`{`
`6`		`- protected function create(): object`
	`6`	`+ protected function create(): stdClass`
`7`	`7`	`{`
`8`	`8`	`return new \Memcached();`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function getColumnType(ReflectedColumn $column, bool $update): String`
`31`	`31`	`if ($this->driver == 'pgsql' && !$update && $column->getPk() && $this->canAutoIncrement($column)) {`
`32`	`32`	`return 'serial';`
`33`	`33`	`}`
`34`		`- $type = $this->typeConverter->fromJdbc($column->getType(), $column->getPk());`
	`34`	`+ $type = $this->typeConverter->fromJdbc($column->getType());`
`35`	`35`	`if ($column->hasPrecision() && $column->hasScale()) {`
`36`	`36`	`$size = '(' . $column->getPrecision() . ',' . $column->getScale() . ')';`
`37`	`37`	`} else if ($column->hasPrecision()) {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ class SimpleRouter implements Router`
`16`	`16`	`private $ttl;`
`17`	`17`	`private $registration;`
`18`	`18`	`private $routes;`
`19`		`- private $midlewares;`
	`19`	`+ private $routeHandlers;`
	`20`	`+ private $middlewares;`
`20`	`21`
`21`	`22`	`public function __construct(Responder $responder, Cache $cache, int $ttl)`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,17 @@ private function set(String $path, String $value) /: void/`
`17`	`17`	`$current = $value;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function setPaths(DatabaseDefinition $database) /: void/`
	`20`	`+ public function setPaths(ReflectedDatabase $database) /: void/`
`21`	`21`	`{`
`22`		`- $result = [];`
`23`		`- foreach ($database->getTables() as $table) {`
`24`		`- $path = sprintf('/records/%s', $table->getName());`
	`22`	`+ foreach ($database->getTableNames() as $tableName) {`
	`23`	`+ $path = sprintf('/records/%s', $tableName);`
`25`	`24`	`foreach (['get', 'post', 'put', 'patch', 'delete'] as $method) {`
`26`	`25`	`$this->set("/paths/$path/$method/description", "$method operation");`
`27`	`26`	`}`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`
`31`		`- private function fillParametersWithPrimaryKey(String $method, TableDefinition $table) /: void/`
	`30`	`+ private function fillParametersWithPrimaryKey(String $method, ReflectedTable $table) /: void/`
`32`	`31`	`{`
`33`	`32`	`if ($table->getPk() != null) {`
`34`	`33`	`$pathWithId = sprintf('/records/%s/{%s}', $table->getName(), $table->getPk()->getName());`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,6 @@ private function getFkEmptyValues(ReflectedTable $t1, ReflectedTable $t2, array`
`152`	`152`
`153`	`153`	`private function addFkRecords(ReflectedTable $t2, array $fkValues, array $params, GenericDB $db, array &$records) /: void/`
`154`	`154`	`{`
`155`		`- $pk = $t2->getPk();`
`156`	`155`	`$columnNames = $this->columns->getNames($t2, false, $params);`
`157`	`156`	`$fkIds = array_keys($fkValues);`
`158`	`157`