improved fix for #744

src/Tqdev/PhpCrudApi/Api.php

@@ -59,8 +59,8 @@ class Api implements RequestHandlerInterface
         $prefix = sprintf('phpcrudapi-%s-', substr(md5(__FILE__), 0, 8));
         $cache = CacheFactory::create($config->getCacheType(), $prefix, $config->getCachePath());
         $reflection = new ReflectionService($db, $cache, $config->getCacheTime());
-        $responder = new JsonResponder();
-        $router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime(), $config->getDebug());
+        $responder = new JsonResponder($config->getDebug());
+        $router = new SimpleRouter($config->getBasePath(), $responder, $cache, $config->getCacheTime());
         foreach ($config->getMiddlewares() as $middleware => $properties) {
             switch ($middleware) {
                 case 'sslRedirect':

src/Tqdev/PhpCrudApi/Controller/JsonResponder.php

@@ -9,16 +9,56 @@ use Tqdev\PhpCrudApi\ResponseFactory;
 
 class JsonResponder implements Responder
 {
+    private $debug;
+
+    public function __construct(bool $debug)
+    {
+        $this->debug = $debug;
+    }
+
     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);
+        $document = new ErrorDocument(new ErrorCode($error), $argument, $details);
+        return ResponseFactory::fromObject($document->getStatus(), $document);
     }
 
     public function success($result): ResponseInterface
     {
         return ResponseFactory::fromObject(ResponseFactory::OK, $result);
     }
+
+    public function exception($exception): ResponseInterface
+    {
+        $document = ErrorDocument::fromException($exception);
+        $response = ResponseFactory::fromObject($document->getStatus(), $document);
+        if ($this->debug) {
+            $response = ResponseUtils::addExceptionHeaders($response, $exception);
+        }
+        return $response;
+    }
+
+    public function multi($results): ResponseInterface
+    {
+        $document = array();
+        $success = true;
+        foreach ($results as $i=>$result) {
+            if ($result instanceof \Throwable) {
+                $document[$i] = ErrorDocument::fromException($result);
+                $success = false;
+            } else {
+                $document[$i] = $result;
+            }
+        }
+        $status = $success ? ResponseFactory::OK : ResponseFactory::FAILED_DEPENDENCY;
+        $response = ResponseFactory::fromObject($status, $document);
+        foreach ($results as $i=>$result) {
+            if ($result instanceof \Throwable) {
+                if ($this->debug) {
+                    $response = ResponseUtils::addExceptionHeaders($response, $result);
+                }
+            }
+        }
+        return $response;
+    }
+
 }

src/Tqdev/PhpCrudApi/Controller/RecordController.php

@@ -70,7 +70,7 @@ class RecordController
                 $result[] = call_user_func_array($method, $arguments);
             } catch (\Throwable $e) {
                 $success = false;
-                $result[] = null;
+                $result[] = $e;
             }
         }
         if ($success) {
@@ -100,7 +100,7 @@ class RecordController
             foreach ($record as $r) {
                 $argumentLists[] = array($table, $r, $params);
             }
-            return $this->responder->success($this->multiCall([$this->service, 'create'], $argumentLists));
+            return $this->responder->multi($this->multiCall([$this->service, 'create'], $argumentLists));
         } else {
             return $this->responder->success($this->service->create($table, $record, $params));
         }
@@ -130,7 +130,7 @@ class RecordController
             for ($i = 0; $i < count($ids); $i++) {
                 $argumentLists[] = array($table, $ids[$i], $record[$i], $params);
             }
-            return $this->responder->success($this->multiCall([$this->service, 'update'], $argumentLists));
+            return $this->responder->multi($this->multiCall([$this->service, 'update'], $argumentLists));
         } else {
             if (count($ids) != 1) {
                 return $this->responder->error(ErrorCode::ARGUMENT_COUNT_MISMATCH, $id);

src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php

@@ -18,19 +18,17 @@ class SimpleRouter implements Router
     private $responder;
     private $cache;
     private $ttl;
-    private $debug;
     private $registration;
     private $routes;
     private $routeHandlers;
     private $middlewares;
 
-    public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl, bool $debug)
+    public function __construct(string $basePath, Responder $responder, Cache $cache, int $ttl)
     {
         $this->basePath = rtrim($this->detectBasePath($basePath), '/');
         $this->responder = $responder;
         $this->cache = $cache;
         $this->ttl = $ttl;
-        $this->debug = $debug;
         $this->registration = true;
         $this->routes = $this->loadPathTree();
         $this->routeHandlers = [];
@@ -141,23 +139,8 @@ class SimpleRouter implements Router
         }
         try {
             $response = call_user_func($this->routeHandlers[$routeNumbers[0]], $request);
-        } catch (\PDOException $e) {
-            if (strpos(strtolower($e->getMessage()), 'duplicate') !== false) {
-                $response = $this->responder->error(ErrorCode::DUPLICATE_KEY_EXCEPTION, '');
-            } elseif (strpos(strtolower($e->getMessage()), 'unique constraint') !== false) {
-                $response = $this->responder->error(ErrorCode::DUPLICATE_KEY_EXCEPTION, '');
-            } elseif (strpos(strtolower($e->getMessage()), 'default value') !== false) {
-                $response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');
-            } elseif (strpos(strtolower($e->getMessage()), 'allow nulls') !== false) {
-                $response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');
-            } elseif (strpos(strtolower($e->getMessage()), 'constraint') !== false) {
-                $response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');
-            } else {
-                $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, '');
-            }
-            if ($this->debug) {
-                $response = ResponseUtils::addExceptionHeaders($response, $e);
-            }
+        } catch (\Throwable $exception) {
+            $response = $this->responder->exception($exception);
         }
         return $response;
     }

src/Tqdev/PhpCrudApi/Record/Document/ErrorDocument.php

@@ -6,32 +6,37 @@ use Tqdev\PhpCrudApi\Record\ErrorCode;
 
 class ErrorDocument implements \JsonSerializable
 {
-    public $code;
-    public $message;
+    public $errorCode;
+    public $argument;
     public $details;
 
     public function __construct(ErrorCode $errorCode, string $argument, $details)
     {
-        $this->code = $errorCode->getCode();
-        $this->message = $errorCode->getMessage($argument);
+        $this->errorCode = $errorCode;
+        $this->argument = $argument;
         $this->details = $details;
     }
 
+    public function getStatus(): int
+    {
+        return $this->errorCode->getStatus();
+    }
+
     public function getCode(): int
     {
-        return $this->code;
+        return $this->errorCode->getCode();
     }
 
     public function getMessage(): string
     {
-        return $this->message;
+        return $this->errorCode->getMessage($this->argument);
     }
 
     public function serialize()
     {
         return [
-            'code' => $this->code,
-            'message' => $this->message,
+            'code' => $this->getCode(),
+            'message' => $this->getMessage(),
             'details' => $this->details,
         ];
     }
@@ -40,4 +45,25 @@ class ErrorDocument implements \JsonSerializable
     {
         return array_filter($this->serialize());
     }
+
+    public static function fromException(\Throwable $exception)
+    {
+        $document = new ErrorDocument(new ErrorCode(ErrorCode::ERROR_NOT_FOUND), $exception->getMessage(), null);
+        if ($exception instanceof \PDOException) {
+            if (strpos(strtolower($exception->getMessage()), 'duplicate') !== false) {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::DUPLICATE_KEY_EXCEPTION), '', null);
+            } elseif (strpos(strtolower($exception->getMessage()), 'unique constraint') !== false) {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::DUPLICATE_KEY_EXCEPTION), '', null);
+            } elseif (strpos(strtolower($exception->getMessage()), 'default value') !== false) {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::DATA_INTEGRITY_VIOLATION), '', null);
+            } elseif (strpos(strtolower($exception->getMessage()), 'allow nulls') !== false) {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::DATA_INTEGRITY_VIOLATION), '', null);
+            } elseif (strpos(strtolower($exception->getMessage()), 'constraint') !== false) {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::DATA_INTEGRITY_VIOLATION), '', null);
+            } else {
+                $document = new ErrorDocument(new ErrorCode(ErrorCode::ERROR_NOT_FOUND), '', null);
+            }
+        }
+        return $document;
+    }
 }

src/Tqdev/PhpCrudApi/ResponseFactory.php

@@ -16,6 +16,7 @@ class ResponseFactory
     const METHOD_NOT_ALLOWED = 405;
     const CONFLICT = 409;
     const UNPROCESSABLE_ENTITY = 422;
+    const FAILED_DEPENDENCY = 424;
     const INTERNAL_SERVER_ERROR = 500;
 
     public static function fromXml(int $status, string $xml): ResponseInterface

tests/functional/001_records/090_add_multiple_comments.log

@@ -21,11 +21,11 @@ POST /records/comments
 
 [{"user_id":1,"post_id":6,"message":"multi 3","category_id":3},{"user_id":1,"post_id":0,"message":"multi 4","category_id":3}]
 ===
-200
+424
 Content-Type: application/json; charset=utf-8
-Content-Length: 8
+Content-Length: 54
 
-[9,null]
+[9,{"code":1010,"message":"Data integrity violation"}]
 ===
 GET /records/comments?include=id&filter=post_id,eq,6
 ===

tests/functional/001_records/091_edit_multiple_comments.log

@@ -21,11 +21,11 @@ PUT /records/comments/7,8
 
 [{"user_id":1,"post_id":6,"message":"multi 3","category_id":3},{"user_id":1,"post_id":0,"message":"multi 4","category_id":3}]
 ===
-200
+424
 Content-Type: application/json; charset=utf-8
-Content-Length: 8
+Content-Length: 54
 
-[1,null]
+[1,{"code":1010,"message":"Data integrity violation"}]
 ===
 GET /records/comments?include=message&filter=post_id,eq,6
 ===