resolved #21

mirzaev/minimal/system/core.php

@@ -195,36 +195,36 @@ final class core
 		unset($controller);
 
 		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;
 
-		if ($route->model instanceof model) {
+			if ($route->model instanceof model) {
-			// Initialized the model
+				// Initialized the model
-		} else if (class_exists($model = "$this->namespace\\models\\$model")) {
+			} else if (class_exists($model = "$this->namespace\\models\\$model")) {
-			// Found the model by its name
+				// Found the model by its name
 
-			// Initializing the model
+				// Initializing the model
-			$route->model = new $model;
+				$route->model = new $model;
-		} else if (!empty($route->model)) {
+			} else if (!empty($route->model)) {
-			// Not found the model and $route->model has a value
+				// Not found the model and $route->model has a value
 
-			// Exit (fail)
+				// Exit (fail)
-			throw new exception_domain("Failed to find the model: $model", status::not_implemented->value);
+				throw new exception_domain("Failed to find the model: $model", status::not_implemented->value);
+			}
+
+			// Deinitializing name of the model class
+			unset($model);
+
+			if ($route->model instanceof model) {
+				// Initialized the model
+
+				// Writing the model to the controller
+				$route->controller->model = $route->model;
+			}
 		}
 
-		// Deinitializing name of the model class
-		unset($model);
-
-		if ($route->model instanceof model) {
-			// Initialized the model
-
-			// Writing the model to the controller
-			$route->controller->model = $route->model;
-		}
-}
-
 		// Writing the request to the controller
 		$route->controller->request = $request;
 
@@ -234,11 +234,11 @@ final class core
 			try {
 				// Executing method of the controller and exit (success)
 				return $route->controller->{$route->method}(...($route->parameters + $request->parameters));
-			} catch (exception $e) {
+			} catch (exception $exception) {
 				// Catched an exception
 
 				// 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 {

mirzaev/minimal/system/http/enumerations/content.php

@@ -115,6 +115,7 @@ enum content: string
 		return match ($this) {
 			self::jpeg => 'jpg',
 			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),
 			default => throw new exception_domain('Failed to recognize content: ' . $this->value, status::not_found->value)
 		};

mirzaev/minimal/system/http/request.php

@@ -51,7 +51,7 @@ final class request
 	 */
 	public method $method {
 		// Write
-		set (method|string $value) {
+		set(method|string $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -96,7 +96,7 @@ final class request
 	 */
 	public string $uri {
 		// Write
-		set (string $value) {
+		set(string $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -121,7 +121,7 @@ final class request
 	 */
 	public protocol $protocol {
 		// Write
-		set (protocol|string $value) {
+		set(protocol|string $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -187,7 +187,7 @@ final class request
 	 */
 	public array $parameters {
 		// Write
-		set (array $value) {
+		set(array $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -222,7 +222,7 @@ final class request
 	 */
 	public array $files {
 		// Write
-		set (array $value) {
+		set(array $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -233,7 +233,7 @@ final class request
 			if (isset($this->method)) {
 				// Initialized method 
 
-				if ($this->method->body())	{
+				if ($this->method->body()) {
 					// Request with this method can has body
 
 					// Writing
@@ -270,7 +270,7 @@ final class request
 	 */
 	public array $options {
 		// Write
-		set (array $value) {
+		set(array $value) {
 			if (isset($this->{__PROPERTY__})) {
 				// The property is already initialized
 
@@ -410,7 +410,7 @@ final class request
 				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"
 
 				// Initializing data from the input buffer
@@ -438,10 +438,13 @@ final class request
 
 				// Writing files from environment into the property
 				$this->files = $_FILES ?? [];
-			}	else if ($this->method->body())	{
+			} else if ($this->method->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"
 
 					// Writing parameters and files from environment into the properties
@@ -481,7 +484,7 @@ final class request
 		return new response(protocol: $this->protocol, status: status::ok);
 	}
 
-  /**
+	/**
 	 * Header
 	 *
 	 * Write a header to the headers property

mirzaev/minimal/system/http/response.php

@@ -320,7 +320,7 @@ final class response
 	 */
 	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"
 	
 			// Exit (success)
@@ -453,10 +453,10 @@ final class response
 		flush();
 
 		// Deinitializing headers property
-		unset($this->headers);
+		$this->headers = [];
 	
 		// Deinitializing headers
-		header_remove();
+		/* header_remove(); */
 		
 		// Exit (success)
 		return $this;