Compare commits

...

4 Commits

5 changed files with 66 additions and 62 deletions

View File

@ -195,7 +195,7 @@ final class core
unset($controller); unset($controller);
if (!isset($route->controller->model)) { if (!isset($route->controller->model)) {
// // Not initialized the model in the controller
// Initializing name if the model class // Initializing name if the model class
$model = $route->model; $model = $route->model;
@ -223,7 +223,7 @@ final class core
// Writing the model to the controller // Writing the model to the controller
$route->controller->model = $route->model; $route->controller->model = $route->model;
} }
} }
// Writing the request to the controller // Writing the request to the controller
$route->controller->request = $request; $route->controller->request = $request;
@ -234,11 +234,11 @@ final class core
try { try {
// Executing method of the controller and exit (success) // Executing method of the controller and exit (success)
return $route->controller->{$route->method}(...($route->parameters + $request->parameters)); return $route->controller->{$route->method}(...($route->parameters + $request->parameters));
} catch (exception $e) { } catch (exception $exception) {
// Catched an exception // Catched an exception
// Exit (fail) // Exit (fail)
throw new exception_runtime(...$e); throw new exception_runtime('Caught an error while processing the route', status::internal_server_error->value, $exception);
} }
} else { } else {

View File

@ -115,6 +115,7 @@ enum content: string
return match ($this) { return match ($this) {
self::jpeg => 'jpg', self::jpeg => 'jpg',
self::png => 'png', self::png => 'png',
self::webp => 'webp',
self::form, self::mixed, self::alternative, self::related => throw new exception_argument('Content can not have file extension', status::internal_server_error->value), self::form, self::mixed, self::alternative, self::related => throw new exception_argument('Content can not have file extension', status::internal_server_error->value),
default => throw new exception_domain('Failed to recognize content: ' . $this->value, status::not_found->value) default => throw new exception_domain('Failed to recognize content: ' . $this->value, status::not_found->value)
}; };

View File

@ -16,8 +16,8 @@ namespace mirzaev\minimal\http\enumerations;
*/ */
enum protocol: string enum protocol: string
{ {
case http_3 = 'HTTP/3'; case http_3 = 'HTTP/3.0';
case http_2 = 'HTTP/2'; case http_2 = 'HTTP/2.0';
case http_1_1 = 'HTTP/1.1'; case http_1_1 = 'HTTP/1.1';
case http_1 = 'hTTP/1.0'; case http_1 = 'hTTP/1.0';
case http_0_9 = 'HTTP/0.9'; case http_0_9 = 'HTTP/0.9';

View File

@ -51,7 +51,7 @@ final class request
*/ */
public method $method { public method $method {
// Write // Write
set (method|string $value) { set(method|string $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -96,7 +96,7 @@ final class request
*/ */
public string $uri { public string $uri {
// Write // Write
set (string $value) { set(string $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -121,7 +121,7 @@ final class request
*/ */
public protocol $protocol { public protocol $protocol {
// Write // Write
set (protocol|string $value) { set(protocol|string $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -187,7 +187,7 @@ final class request
*/ */
public array $parameters { public array $parameters {
// Write // Write
set (array $value) { set(array $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -222,7 +222,7 @@ final class request
*/ */
public array $files { public array $files {
// Write // Write
set (array $value) { set(array $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -270,7 +270,7 @@ final class request
*/ */
public array $options { public array $options {
// Write // Write
set (array $value) { set(array $value) {
if (isset($this->{__PROPERTY__})) { if (isset($this->{__PROPERTY__})) {
// The property is already initialized // The property is already initialized
@ -410,7 +410,7 @@ final class request
unset($buffer); unset($buffer);
} }
if ($this->headers['content-type'] === content::json->value) { if (str_starts_with($this->headers['content-type'], content::json->value)) {
// The body contains "application/json" // The body contains "application/json"
// Initializing data from the input buffer // Initializing data from the input buffer
@ -441,7 +441,10 @@ final class request
} else if ($this->method->body()) { } else if ($this->method->body()) {
// Non POST method and can has body // Non POST method and can has body
if (match($this->headers['content-type']) { content::form->value, content::encoded->value => true, default => false }) { if (
str_starts_with($this->headers['content-type'], content::form->value) ||
str_starts_with($this->headers['content-type'], content::encoded->value)
) {
// Non POST method and the body content type is "multipart/form-data" or "application/x-www-form-urlencoded" // Non POST method and the body content type is "multipart/form-data" or "application/x-www-form-urlencoded"
// Writing parameters and files from environment into the properties // Writing parameters and files from environment into the properties

View File

@ -320,7 +320,7 @@ final class response
*/ */
public function validate(request $request): self|false public function validate(request $request): self|false
{ {
if (str_contains($request->headers['accept'], $this->headers['content-type'] ?? '')) { if (str_contains($request->headers['accept'] ?? '', $this->headers['content-type'] ?? '')) {
// Validated with "accept" and "content-type" // Validated with "accept" and "content-type"
// Exit (success) // Exit (success)
@ -453,10 +453,10 @@ final class response
flush(); flush();
// Deinitializing headers property // Deinitializing headers property
unset($this->headers); $this->headers = [];
// Deinitializing headers // Deinitializing headers
header_remove(); /* header_remove(); */
// Exit (success) // Exit (success)
return $this; return $this;