Add ConfigInterface

mevdschee · Oct 6, 2022 · e7e1431 · e7e1431
1 parent 92a2469
commit e7e1431
Show file tree

Hide file tree

Showing 22 changed files with 539 additions and 504 deletions.
diff --git a/api.include.php b/api.include.php
diff --git a/api.php b/api.php
diff --git a/src/Tqdev/PhpCrudApi/Api.php b/src/Tqdev/PhpCrudApi/Api.php
@@ -8,6 +8,7 @@
 use Tqdev\PhpCrudApi\Cache\CacheFactory;
 use Tqdev\PhpCrudApi\Column\DefinitionService;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\CacheController;
 use Tqdev\PhpCrudApi\Controller\ColumnController;
 use Tqdev\PhpCrudApi\Controller\GeoJsonController;

diff --git a/src/Tqdev/PhpCrudApi/Config/Base/ConfigInterface.php b/src/Tqdev/PhpCrudApi/Config/Base/ConfigInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Tqdev\PhpCrudApi\Config\Base;
+
+interface ConfigInterface
+{
+    public function getMiddlewares();
+}
diff --git a/src/Tqdev/PhpCrudApi/Config.php → src/Tqdev/PhpCrudApi/Config/Config.php b/src/Tqdev/PhpCrudApi/Config.php → src/Tqdev/PhpCrudApi/Config/Config.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace Tqdev\PhpCrudApi;
+namespace Tqdev\PhpCrudApi\Config;
 
-class Config
+use Tqdev\PhpCrudApi\Config\Base\ConfigInterface;
+
+class Config implements ConfigInterface
 {
     private $values = [
         'driver' => null,

diff --git a/src/Tqdev/PhpCrudApi/Middleware/ApiKeyDbAuthMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/ApiKeyDbAuthMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/AuthorizationMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Communication\VariableStore;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/Base/Middleware.php b/src/Tqdev/PhpCrudApi/Middleware/Base/Middleware.php
@@ -3,9 +3,9 @@
 namespace Tqdev\PhpCrudApi\Middleware\Base;
 
 use Psr\Http\Server\MiddlewareInterface;
-use Tqdev\PhpCrudApi\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;
+use Tqdev\PhpCrudApi\Config\Base\ConfigInterface;
 
 abstract class Middleware implements MiddlewareInterface
 {
@@ -14,7 +14,7 @@ abstract class Middleware implements MiddlewareInterface
     private $middleware;
     private $config;
 
-    public function __construct(Router $router, Responder $responder, Config $config, string $middleware)
+    public function __construct(Router $router, Responder $responder, ConfigInterface $config, string $middleware)
     {
         $router->load($this);
         $this->responder = $responder;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/CorsMiddleware.php
@@ -5,7 +5,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/CustomizationMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/CustomizationMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/DbAuthMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/DbAuthMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
@@ -51,7 +51,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $username = isset($body->$usernameFormFieldName) ? $body->$usernameFormFieldName : '';
             $password = isset($body->$passwordFormFieldName) ? $body->$passwordFormFieldName : '';
             $newPassword = isset($body->$newPasswordFormFieldName) ? $body->$newPasswordFormFieldName : '';
-            if($path ==='login')
+            if ($path === 'login')
                 $tableName = $this->getProperty('loginTable', 'users');    //add separate property for login as this could be a view joining users table to other table such as roles, details etc. At a minimum, the view output should include the $usernameColumn and $passwordColumn
             else
                 $tableName = $this->getProperty('usersTable', 'users');

diff --git a/src/Tqdev/PhpCrudApi/Middleware/IpAddressMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/IpAddressMiddleware.php
@@ -7,7 +7,7 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/JoinLimitsMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/JoinLimitsMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Communication\VariableStore;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/MultiTenancyMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/MultiTenancyMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Communication\VariableStore;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/PageLimitsMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/PageLimitsMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/ReconnectMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/ReconnectMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/SanitationMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/SanitationMiddleware.php
@@ -8,7 +8,7 @@
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/TextSearchMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/TextSearchMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/ValidationMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/ValidationMiddleware.php
@@ -8,7 +8,7 @@
 use Tqdev\PhpCrudApi\Column\ReflectionService;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedTable;
 use Tqdev\PhpCrudApi\Column\Reflection\ReflectedColumn;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/Tqdev/PhpCrudApi/Middleware/XmlMiddleware.php b/src/Tqdev/PhpCrudApi/Middleware/XmlMiddleware.php
@@ -6,7 +6,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Tqdev\PhpCrudApi\Column\ReflectionService;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Middleware\Base\Middleware;
 use Tqdev\PhpCrudApi\Middleware\Router\Router;

diff --git a/src/index.php b/src/index.php
@@ -3,7 +3,7 @@
 namespace Tqdev\PhpCrudApi;
 
 use Tqdev\PhpCrudApi\Api;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\RequestFactory;
 use Tqdev\PhpCrudApi\ResponseUtils;
 

diff --git a/test.php b/test.php
@@ -1,7 +1,7 @@
 <?php
 
 use Tqdev\PhpCrudApi\Api;
-use Tqdev\PhpCrudApi\Config;
+use Tqdev\PhpCrudApi\Config\Config;
 use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\RequestFactory;
 use Tqdev\PhpCrudApi\ResponseUtils;