refactor: Clean up and code refeactor

Author: wazabii8

src/AbstractConfigProps.php

@@ -14,6 +14,9 @@ abstract class AbstractConfigProps implements ConfigPropsInterface
     public ?string $path = null;
     public ?string $test = null;
 
+	private array $propDesc = [];
+	private static array $childPropCache = [];
+
     /**
      * Hydrate the properties/object with expected data, and handle unexpected data
      *
@@ -66,6 +69,32 @@ public function setProp(string $key, mixed $value): self
         return $this;
     }
 
+
+	/**
+	 * Add description to prop
+	 *
+	 * @param string $key
+	 * @param string $desc
+	 * @return $this
+	 */
+	protected function setPropDesc(string $key, string $desc): self
+	{
+		$this->propDesc[$key] = $desc;
+		return $this;
+	}
+
+	/**
+	 * Get description to prop
+	 *
+	 * @param string $key
+	 * @param string $desc
+	 * @return string
+	 */
+	public function getPropDesc(string $key): string
+	{
+		return $this->propDesc[$key] ?? "";
+	}
+
     /**
      * Set multiple config props
      *
@@ -101,15 +130,22 @@ public function get(string $key): mixed
         return ($newKey !== false) ? $this->{$newKey} : null;
     }
 
-    /**
-     * Return props object as array
-     *
-     * @return array
-     */
-    public function toArray(): array
-    {
-        return get_object_vars($this);
-    }
+	/**
+	 * Return public properties defined on the concrete class
+	 */
+	public function toArray(): array
+	{
+		$vars = get_object_vars($this);
+
+		if (!isset(self::$childPropCache[static::class])) {
+			$childDefaults = get_class_vars(static::class);
+			$baseDefaults = get_class_vars(self::class);
+
+			self::$childPropCache[static::class] = array_diff_key($childDefaults, $baseDefaults);
+		}
+
+		return array_intersect_key($vars, self::$childPropCache[static::class]);
+	}
 
     /**
      * Get value as bool value

src/Emitters/HttpEmitter.php

@@ -22,23 +22,23 @@ class HttpEmitter implements EmitterInterface
      */
     public function emit(ResponseInterface $response, ServerRequestInterface $request): void
     {
-
         $body = $response->getBody();
         $status = $response->getStatusCode();
         $method = strtoupper($request->getMethod());
-        $skipBody = in_array($status, [204, 304]) || ($status >= 100 && $status < 200) || $method === 'HEAD';
-
-        // Default to 204 No Content if nobody was written
-        if (!$response->getBody()->getSize() && $this->isSuccessfulResponse($response)) {
-            $response = $response->withStatus(204);
-            $response->getBody()->write("No Content\n");
-        }
+        $skipBody = in_array($status, [204, 304], true)
+	        || ($status >= 100 && $status < 200)
+	        || $method === 'HEAD';
 
+	    // Create headers
         $this->createHeaders($response);
-        if (!$skipBody && $body->isSeekable()) {
-            $body->rewind();
-        }
-        echo $skipBody ? '' : $body->getContents();
+
+	    // Detach body if HEAD or other detachable status code
+	    if (!$skipBody) {
+		    if ($body->isSeekable()) {
+			    $body->rewind();
+		    }
+		    echo $body->getContents();
+	    }
     }
 
     /**

src/Enums/DispatchCodes.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MaplePHP\Emitron\Enums;
+
+enum DispatchCodes: int
+{
+	case FOUND = 1;
+	case NOT_FOUND = 0;
+	case METHOD_NOT_ALLOWED = 2;
+}

src/Kernel.php

@@ -14,10 +14,11 @@
 
 namespace MaplePHP\Emitron;
 
-use MaplePHP\Http\ResponseFactory;
+use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
-use MaplePHP\Log\InvalidArgumentException;
+use MaplePHP\Emitron\Enums\DispatchCodes;
+use MaplePHP\Http\ResponseFactory;
 
 class Kernel extends AbstractKernel
 {
@@ -30,18 +31,19 @@ class Kernel extends AbstractKernel
      */
     public function run(ServerRequestInterface $request, ?StreamInterface $stream = null): void
     {
-
         $this->dispatchConfig->getRouter()->dispatch(function ($data, $args, $middlewares) use ($request, $stream) {
 
-            //$dispatchCode = $data[0] ?? RouterDispatcher::FOUND;
 
+	        $dispatchCode = (int)($data[0] ?? DispatchCodes::FOUND->value);
+	        if($dispatchCode !== DispatchCodes::FOUND->value) {
+		        $data['handler'] = function (ServerRequestInterface $req, ResponseInterface $res): ResponseInterface
+		        {
+			        return $res->withStatus(404);
+		        };
+	        }
+            //$dispatchCode = $data[0] ?? RouterDispatcher::FOUND;
             [$data, $args, $middlewares] = $this->reMap($data, $args, $middlewares);
 
-            if (!isset($data['handler'])) {
-                throw new InvalidArgumentException("Missing 'handler' key.");
-            }
-
-
             $this->container->set("request", $request);
             $this->container->set("args", $args);
             $this->container->set("configuration", $this->getDispatchConfig());
@@ -50,24 +52,13 @@ public function run(ServerRequestInterface $request, ?StreamInterface $stream =
             $factory = new ResponseFactory($bodyStream);
             $finalHandler = new ControllerRequestHandler($factory, $data['handler'] ?? []);
 
-
             $response = $this->initRequestHandler(
                 request: $request,
                 stream: $bodyStream,
                 finalHandler: $finalHandler,
                 middlewares: $middlewares
             );
 
-            /*
-            if ($dispatchCode === Dispatcher::NOT_FOUND) {
-                $response = $response->withStatus(404);
-            }
-
-            if ($dispatchCode === Dispatcher::METHOD_NOT_ALLOWED) {
-                $response = $response->withStatus(405);
-            }
-             */
-
             $this->createEmitter()->emit($response, $request);
         });
     }
@@ -84,6 +75,10 @@ function reMap($data, $args, $middlewares)
         if (!is_array($middlewares)) {
             $middlewares = [];
         }
+
+	    if (!is_array($args)) {
+		    $args = [];
+	    }
         return [$data, $args, $middlewares];
     }
 }

src/Middlewares/HeadRequestMiddleware.php

@@ -4,6 +4,7 @@
 
 namespace MaplePHP\Emitron\Middlewares;
 
+use MaplePHP\Http\StreamFactory;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -12,27 +13,19 @@
 class HeadRequestMiddleware implements MiddlewareInterface
 {
     /**
-     * Set cache control if it does not exist
-     *
-     * Note: Clearing cache on dynamic content is a good standard to make sure that no
-     * sensitive content will be cached.
+     * Detach body on HEAD
      *
      * @param ServerRequestInterface $request
      * @param RequestHandlerInterface $handler
      * @return ResponseInterface
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $response = $handler->handle($request);
-
-        if (strtoupper($request->getMethod()) === 'HEAD') {
-            $body = $response->getBody();
-            if ($body->isWritable() && $body->isSeekable()) {
-                $body->rewind();
-                $body->write('');
-            }
-        }
-
-        return $response;
-    }
+	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+	{
+		$response = $handler->handle($request);
+		if (strtoupper($request->getMethod()) !== 'HEAD') {
+			return $response;
+		}
+		$streamFactory = new StreamFactory();
+		return $response->withBody($streamFactory->createStream());
+	}
 }