refactor for re-use

Author: mevdschee

src/Tqdev/PhpCrudApi/Api.php

@@ -10,9 +10,9 @@
 use Tqdev\PhpCrudApi\Controller\CacheController;
 use Tqdev\PhpCrudApi\Controller\ColumnController;
 use Tqdev\PhpCrudApi\Controller\GeoJsonController;
+use Tqdev\PhpCrudApi\Controller\JsonResponder;
 use Tqdev\PhpCrudApi\Controller\OpenApiController;
 use Tqdev\PhpCrudApi\Controller\RecordController;
-use Tqdev\PhpCrudApi\Controller\Responder;
 use Tqdev\PhpCrudApi\Database\GenericDB;
 use Tqdev\PhpCrudApi\GeoJson\GeoJsonService;
 use Tqdev\PhpCrudApi\Middleware\AuthorizationMiddleware;
@@ -51,9 +51,10 @@ public function __construct(Config $config)
             $config->getUsername(),
             $config->getPassword()
         );
-        $cache = CacheFactory::create($config);
+        $prefix = sprintf('phpcrudapi-%s-%s-%s-', $config->getDriver(), $config->getDatabase(), substr(md5(__FILE__), 0, 8));
+        $cache = CacheFactory::create($config->getCacheType(), $prefix, $config->getCachePath());
         $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
-        $responder = new Responder();
+        $responder = new JsonResponder();
         $router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime(), $config->getDebug());
         foreach ($config->getMiddlewares() as $middleware => $properties) {
             switch ($middleware) {

src/Tqdev/PhpCrudApi/Cache/CacheFactory.php

@@ -1,34 +1,22 @@
 <?php
 namespace Tqdev\PhpCrudApi\Cache;
 
-use Tqdev\PhpCrudApi\Config;
-
 class CacheFactory
 {
-    const PREFIX = 'phpcrudapi-%s-%s-%s-';
-
-    private static function getPrefix(Config $config): string
-    {
-        $driver = $config->getDriver();
-        $database = $config->getDatabase();
-        $filehash = substr(md5(__FILE__), 0, 8);
-        return sprintf(self::PREFIX, $driver, $database, $filehash);
-    }
-
-    public static function create(Config $config): Cache
+    public static function create(string $type, string $prefix, string $config): Cache
     {
-        switch ($config->getCacheType()) {
+        switch ($type) {
             case 'TempFile':
-                $cache = new TempFileCache(self::getPrefix($config), $config->getCachePath());
+                $cache = new TempFileCache($prefix, $config);
                 break;
             case 'Redis':
-                $cache = new RedisCache(self::getPrefix($config), $config->getCachePath());
+                $cache = new RedisCache($prefix, $config);
                 break;
             case 'Memcache':
-                $cache = new MemcacheCache(self::getPrefix($config), $config->getCachePath());
+                $cache = new MemcacheCache($prefix, $config);
                 break;
             case 'Memcached':
-                $cache = new MemcachedCache(self::getPrefix($config), $config->getCachePath());
+                $cache = new MemcachedCache($prefix, $config);
                 break;
             default:
                 $cache = new NoCache();

src/Tqdev/PhpCrudApi/Controller/JsonResponder.php

@@ -0,0 +1,24 @@
+<?php
+namespace Tqdev\PhpCrudApi\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use Tqdev\PhpCrudApi\Record\Document\ErrorDocument;
+use Tqdev\PhpCrudApi\Record\ErrorCode;
+use Tqdev\PhpCrudApi\ResponseFactory;
+
+class JsonResponder implements Responder
+{
+    public function error(int $error, string $argument, $details = null): ResponseInterface
+    {
+        $errorCode = new ErrorCode($error);
+        $status = $errorCode->getStatus();
+        $document = new ErrorDocument($errorCode, $argument, $details);
+        return ResponseFactory::fromObject($status, $document);
+    }
+
+    public function success($result): ResponseInterface
+    {
+        return ResponseFactory::fromObject(ResponseFactory::OK, $result);
+    }
+
+}

src/Tqdev/PhpCrudApi/Controller/Responder.php

@@ -2,23 +2,11 @@
 namespace Tqdev\PhpCrudApi\Controller;
 
 use Psr\Http\Message\ResponseInterface;
-use Tqdev\PhpCrudApi\Record\Document\ErrorDocument;
-use Tqdev\PhpCrudApi\Record\ErrorCode;
-use Tqdev\PhpCrudApi\ResponseFactory;
 
-class Responder
+interface Responder
 {
-    public function error(int $error, string $argument, $details = null): ResponseInterface
-    {
-        $errorCode = new ErrorCode($error);
-        $status = $errorCode->getStatus();
-        $document = new ErrorDocument($errorCode, $argument, $details);
-        return ResponseFactory::fromObject($status, $document);
-    }
+    public function error(int $error, string $argument, $details = null): ResponseInterface;
 
-    public function success($result): ResponseInterface
-    {
-        return ResponseFactory::fromObject(ResponseFactory::OK, $result);
-    }
+    public function success($result): ResponseInterface;
 
 }

src/Tqdev/PhpCrudApi/ResponseFactory.php

@@ -15,15 +15,25 @@ class ResponseFactory
     const UNPROCESSABLE_ENTITY = 422;
     const INTERNAL_SERVER_ERROR = 500;
 
+    public static function fromHtml(int $status, string $html): ResponseInterface
+    {
+        return self::from($status, 'text/html', $html);
+    }
+
     public static function fromObject(int $status, $body): ResponseInterface
+    {
+        $content = json_encode($body, JSON_UNESCAPED_UNICODE);
+        return self::from($status, 'application/json', $content);
+    }
+
+    private static function from(int $status, string $contentType, string $content): ResponseInterface
     {
         $psr17Factory = new Psr17Factory();
         $response = $psr17Factory->createResponse($status);
-        $content = json_encode($body, JSON_UNESCAPED_UNICODE);
         $stream = $psr17Factory->createStream($content);
         $stream->rewind();
         $response = $response->withBody($stream);
-        $response = $response->withHeader('Content-Type', 'application/json');
+        $response = $response->withHeader('Content-Type', $contentType);
         $response = $response->withHeader('Content-Length', strlen($content));
         return $response;
     }