better basePath support

Author: mevdschee

api.php

@@ -1690,30 +1690,20 @@ public function clear(): bool;
 
 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();
@@ -2834,6 +2824,25 @@ public function read(ServerRequestInterface $request): ResponseInterface
 
 }
 
+// file: src/Tqdev/PhpCrudApi/Controller/JsonResponder.php
+
+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);
+    }
+
+}
+
 // file: src/Tqdev/PhpCrudApi/Controller/OpenApiController.php
 
 class OpenApiController
@@ -3029,20 +3038,11 @@ public function increment(ServerRequestInterface $request): ResponseInterface
 
 // file: src/Tqdev/PhpCrudApi/Controller/Responder.php
 
-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;
 
 }
 
@@ -4793,7 +4793,7 @@ class SimpleRouter implements Router
 
     public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl, bool $debug)
     {
-        $this->basePath = $basePath;
+        $this->basePath = $this->detectBasePath($basePath);
         $this->responder = $responder;
         $this->cache = $cache;
         $this->ttl = $ttl;
@@ -4804,6 +4804,21 @@ public function __construct(string $basePath, Responder $responder, Cache $cache
         $this->middlewares = array();
     }
 
+    private function detectBasePath(string $basePath): string
+    {
+        if ($basePath) {
+            return $basePath;
+        }
+        if (isset($_SERVER['PATH_INFO'])) {
+            $fullPath = array_shift(explode('?',$_SERVER['REQUEST_URI']));
+            $path = $_SERVER['PATH_INFO'];
+            if (substr($fullPath, -1*strlen($path)) == $path) {
+                return substr($fullPath, 0, -1*strlen($path));
+            }
+        }
+        return '';
+    }
+
     private function loadPathTree(): PathTree
     {
         $data = $this->cache->get('PathTree');
@@ -4869,6 +4884,11 @@ private function removeBasePath(ServerRequestInterface $request): ServerRequestI
         return $request;
     }
 
+    public function getBasePath(): string
+    {
+        return $this->basePath;
+    }
+
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $request = $this->removeBasePath($request);
@@ -7354,9 +7374,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) {
@@ -7784,15 +7805,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;
     }
@@ -7858,7 +7889,6 @@ public static function toString(ResponseInterface $response): string
     'username' => 'php-crud-api',
     'password' => 'php-crud-api',
     'database' => 'php-crud-api',
-    'debug' => false,
 ]);
 $request = RequestFactory::fromGlobals();
 $api = new Api($config);