diff --git a/Web.php b/App.php similarity index 97% rename from Web.php rename to App.php index 608ec9c..c4a4007 100644 --- a/Web.php +++ b/App.php @@ -1,6 +1,8 @@ request = new Request(); $this->response = new Response(); diff --git a/Cookies.php b/Cookies.php index f3fd307..0d00e42 100644 --- a/Cookies.php +++ b/Cookies.php @@ -1,5 +1,7 @@ handlers[$status])) { $handler = $this->handlers[$status]; @@ -56,7 +58,7 @@ class ErrorHandler /** * handleException handles uncaught exceptions */ - public function handleException(Context $context, Exception $exception): void + public function handleException(Context $context, \Exception $exception): void { $status = $this->getStatusFromException($exception); $message = $this->debug ? $exception->getMessage() : $this->getDefaultMessage($status); @@ -71,7 +73,7 @@ class ErrorHandler /** * getStatusFromException determines HTTP status from exception type */ - private function getStatusFromException(Exception $exception): int + private function getStatusFromException(\Exception $exception): int { if ($exception instanceof HttpException) { return $exception->getStatusCode(); @@ -106,7 +108,7 @@ class ErrorHandler }); // 500 Internal Server Error - $this->register(500, function(Context $context, int $status, string $message, ?Exception $exception) { + $this->register(500, function(Context $context, int $status, string $message, ?\Exception $exception) { $accept = $context->request->header('accept') ?? ''; if (str_contains($accept, 'application/json')) { @@ -125,7 +127,7 @@ class ErrorHandler /** * renderDefaultError renders a generic error response */ - private function renderDefaultError(Context $context, int $status, string $message, ?Exception $exception): void + private function renderDefaultError(Context $context, int $status, string $message, ?\Exception $exception): void { $message = $message ?: $this->getDefaultMessage($status); $accept = $context->request->header('accept') ?? ''; @@ -228,7 +230,7 @@ HTML; /** * render500Page renders a 500 error page */ - private function render500Page(string $message, ?Exception $exception): string + private function render500Page(string $message, ?\Exception $exception): string { $message = htmlspecialchars($message ?: 'Internal Server Error'); $debugInfo = ''; @@ -320,7 +322,7 @@ HTML; /** * renderErrorPage renders a generic error page */ - private function renderErrorPage(int $status, string $message, ?Exception $exception): string + private function renderErrorPage(int $status, string $message, ?\Exception $exception): string { $message = htmlspecialchars($message); $debugInfo = ''; @@ -408,11 +410,11 @@ HTML; /** * HttpException base class for HTTP exceptions */ -class HttpException extends Exception +class HttpException extends \Exception { protected int $statusCode; - public function __construct(int $statusCode, string $message = '', int $code = 0, Exception $previous = null) + public function __construct(int $statusCode, string $message = '', int $code = 0, \Exception $previous = null) { $this->statusCode = $statusCode; parent::__construct($message, $code, $previous); diff --git a/HTTPMethod.php b/HTTPMethod.php index 491461f..87586b8 100644 --- a/HTTPMethod.php +++ b/HTTPMethod.php @@ -1,5 +1,7 @@ session = $session; $this->cookie = $cookie ?: new Cookies([ diff --git a/auth/AuthMiddleware.php b/auth/AuthMiddleware.php index a7f047b..2a3e23c 100644 --- a/auth/AuthMiddleware.php +++ b/auth/AuthMiddleware.php @@ -1,5 +1,7 @@