Compare commits

..

1 Commits

Author SHA1 Message Date
3c94da5546
fix archive in pipeline
Some checks are pending
soko-web/pipeline/pr-master Build queued...
2023-04-18 23:11:55 +02:00

View File

@ -1,12 +1,9 @@
<?php namespace SokoWeb\Response; <?php namespace SokoWeb\Response;
use ErrorException;
use Exception;
use SokoWeb\Interfaces\Response\IRedirect; use SokoWeb\Interfaces\Response\IRedirect;
use SokoWeb\Interfaces\Response\IContent; use SokoWeb\Interfaces\Response\IContent;
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired; use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
use SokoWeb\Interfaces\Authorization\ISecured; use SokoWeb\Interfaces\Authorization\ISecured;
use SokoWeb\Interfaces\Database\IConnection;
use SokoWeb\Interfaces\Request\IRequest; use SokoWeb\Interfaces\Request\IRequest;
use SokoWeb\Response\Redirect; use SokoWeb\Response\Redirect;
use SokoWeb\Response\HtmlContent; use SokoWeb\Response\HtmlContent;
@ -17,8 +14,6 @@ class HttpResponse
{ {
private IRequest $request; private IRequest $request;
private IConnection $dbConnection;
private RouteCollection $routeCollection; private RouteCollection $routeCollection;
private array $appConfig; private array $appConfig;
@ -31,16 +26,12 @@ class HttpResponse
public function __construct( public function __construct(
IRequest $request, IRequest $request,
IConnection $dbConnection,
RouteCollection $routeCollection, RouteCollection $routeCollection,
array $appConfig, array $appConfig,
string $requestMethod, string $requestMethod,
string $requestUrl string $requestUrl
) { ) {
set_error_handler([$this, 'exceptionsErrorHandler']);
$this->request = $request; $this->request = $request;
$this->dbConnection = $dbConnection;
$this->routeCollection = $routeCollection; $this->routeCollection = $routeCollection;
$this->appConfig = $appConfig; $this->appConfig = $appConfig;
$this->method = strtolower($requestMethod); $this->method = strtolower($requestMethod);
@ -48,11 +39,6 @@ class HttpResponse
$this->rawUrl = $requestUrl; $this->rawUrl = $requestUrl;
} }
public function exceptionsErrorHandler($severity, $message, $filename, $lineno)
{
throw new ErrorException($message, 0, $severity, $filename, $lineno);
}
public function render(): void public function render(): void
{ {
$match = $this->routeCollection->match($this->method, $this->parsedUrl['path']); $match = $this->routeCollection->match($this->method, $this->parsedUrl['path']);
@ -89,16 +75,7 @@ class HttpResponse
return; return;
} }
$this->dbConnection->startTransaction();
try {
$response = call_user_func([$controller, $handler[1]]); $response = call_user_func([$controller, $handler[1]]);
} catch (Exception $exception) {
$this->dbConnection->rollback();
$this->render500($exception);
return;
}
$this->dbConnection->commit();
if ($response instanceof IContent) { if ($response instanceof IContent) {
header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8'); header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
$response->render(); $response->render();
@ -129,17 +106,4 @@ class HttpResponse
header('Content-Type: text/html; charset=UTF-8', true, 404); header('Content-Type: text/html; charset=UTF-8', true, 404);
$content->render(); $content->render();
} }
private function render500(Exception $exception): void
{
if (empty($_ENV['DEV'])) {
$exceptionToPrint = null;
} else {
$exceptionToPrint = (string)$exception;
}
$content = new HtmlContent($this->appConfig['error500View'], ['exceptionToPrint' => $exceptionToPrint]);
header('Content-Type: text/html; charset=UTF-8', true, 500);
$content->render();
}
} }