Merge pull request #542 from sebj54/fix-router-error

mevdschee · web-flow · commit 2df56c085839 · 2019-05-24T13:28:05.000+02:00
Add a default error in SimpleRouter
diff --git a/api.php b/api.php
@@ -4590,6 +4590,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $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);
@@ -7430,7 +7432,7 @@ public static function output(ResponseInterface $response)
     public static function addExceptionHeaders(ResponseInterface $response, \Throwable $e): ResponseInterface
     {
         $response = $response->withHeader('X-Exception-Name', get_class($e));
-        $response = $response->withHeader('X-Exception-Message', $e->getMessage());
+        $response = $response->withHeader('X-Exception-Message', preg_replace('|\n|', ' ', trim($e->getMessage())));
         $response = $response->withHeader('X-Exception-File', $e->getFile() . ':' . $e->getLine());
         return $response;
     }
diff --git a/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php b/src/Tqdev/PhpCrudApi/Middleware/Router/SimpleRouter.php
@@ -125,6 +125,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $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);

Original file line number	Diff line number	Diff line change
`@@ -4590,6 +4590,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface`
`4590`	`4590`	`$response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');`
`4591`	`4591`	`} elseif (strpos(strtolower($e->getMessage()), 'constraint') !== false) {`
`4592`	`4592`	`$response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');`
	`4593`	`+ } else {`
	`4594`	`+ $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, '');`
`4593`	`4595`	`}`
`4594`	`4596`	`if ($this->debug) {`
`4595`	`4597`	`$response = ResponseUtils::addExceptionHeaders($response, $e);`
`@@ -7430,7 +7432,7 @@ public static function output(ResponseInterface $response)`
`7430`	`7432`	`public static function addExceptionHeaders(ResponseInterface $response, \Throwable $e): ResponseInterface`
`7431`	`7433`	`{`
`7432`	`7434`	`$response = $response->withHeader('X-Exception-Name', get_class($e));`
`7433`		`- $response = $response->withHeader('X-Exception-Message', $e->getMessage());`
	`7435`	`+ $response = $response->withHeader('X-Exception-Message', preg_replace('\|\n\|', ' ', trim($e->getMessage())));`
`7434`	`7436`	`$response = $response->withHeader('X-Exception-File', $e->getFile() . ':' . $e->getLine());`
`7435`	`7437`	`return $response;`
`7436`	`7438`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface`
`125`	`125`	`$response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');`
`126`	`126`	`} elseif (strpos(strtolower($e->getMessage()), 'constraint') !== false) {`
`127`	`127`	`$response = $this->responder->error(ErrorCode::DATA_INTEGRITY_VIOLATION, '');`
	`128`	`+ } else {`
	`129`	`+ $response = $this->responder->error(ErrorCode::ERROR_NOT_FOUND, '');`
`128`	`130`	`}`
`129`	`131`	`if ($this->debug) {`
`130`	`132`	`$response = ResponseUtils::addExceptionHeaders($response, $e);`