fix config inheritance, refactor and add env

wazabii8 · wazabii8 · commit 98dc3e789954 · 2026-03-06T19:15:22.000+01:00
diff --git a/src/AbstractKernel.php b/src/AbstractKernel.php
@@ -15,11 +15,13 @@
 namespace MaplePHP\Emitron;
 
 use MaplePHP\Container\Reflection;
+use MaplePHP\Emitron\Contracts\AppInterface;
 use MaplePHP\Emitron\Contracts\DispatchConfigInterface;
 use MaplePHP\Emitron\Contracts\EmitterInterface;
 use MaplePHP\Emitron\Contracts\KernelInterface;
 use MaplePHP\Emitron\Emitters\CliEmitter;
 use MaplePHP\Emitron\Emitters\HttpEmitter;
+use MaplePHP\Http\Interfaces\PathInterface;
 use MaplePHP\Http\ResponseFactory;
 use MaplePHP\Http\Stream;
 use Psr\Container\ContainerInterface;
@@ -127,6 +129,7 @@ public function getDispatchConfig(): DispatchConfigInterface
     protected function initRequestHandler(
         ServerRequestInterface $request,
         StreamInterface $stream,
+        PathInterface $path,
         RequestHandlerInterface $finalHandler,
         array $middlewares = []
     ): ResponseInterface {
@@ -136,11 +139,22 @@ protected function initRequestHandler(
             "RequestInterface" => $request,
             "ServerRequestInterface" => $request,
             "StreamInterface" => $stream,
+	        "PathInterface" => $path
         ]);
 
         $middlewares = array_merge($this->userMiddlewares, $middlewares);
         $handler = new RequestHandler($middlewares, $finalHandler);
-        $response = $handler->handle($request);
+	    $app = $this->container->has("app") ? $this->container->get("app") : null;
+
+	    ob_start();
+	    $response = $handler->handle($request);
+	    $output = ob_get_clean();
+
+	    if((string)$output !== "" && ($app instanceof AppInterface && !$app->isProd())) {
+		    throw new \RuntimeException(
+			    'Unexpected output detected during request dispatch. Controllers must write to the response body instead of using echo.'
+		    );
+	    }
 
         return $response;
     }
diff --git a/src/Configs/ConfigPropsFactory.php b/src/Configs/ConfigPropsFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Configs;
 
 use MaplePHP\Emitron\AbstractConfigProps;
@@ -13,19 +15,17 @@ class ConfigPropsFactory
      * @param array $props
      * @return ConfigPropsInterface
      */
-    public static function create(array $props): ConfigPropsInterface
+    public static function create(array $props, ?string $configProps = null): ConfigPropsInterface
     {
-        $override = '\\Configs\\ConfigProps';
+        $override = ($configProps !== null) ? $configProps : '\\Configs\\ConfigProps';
         $default  = \MaplePHP\Unitary\Config\ConfigProps::class;
-        $name = class_exists($override) ? $override : $default;
+        $name = (class_exists($override)) ? $override : $default;
         if (!is_subclass_of($name, ConfigPropsInterface::class)) {
             $name = $default;
         }
-
         if (!class_exists($name)) {
             return self::resolver($props);
         }
-
         return new $name($props);
     }
 
diff --git a/src/Contracts/AppInterface.php b/src/Contracts/AppInterface.php
@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MaplePHP\Emitron\Contracts;
+
+use MaplePHP\Core\Support\Dir;
+
+interface AppInterface
+{
+
+	/**
+	 * This is a single to set App globals
+	 *
+	 * @param Dir $dir
+	 * @param array $config
+	 * @return self
+	 */
+	public static function boot(Dir $dir, array $config = []): self;
+
+	/**
+	 * Get App singleton instance
+	 *
+	 * @return self
+	 */
+	public static function get(): self;
+
+	/**
+	 * Check if the environment is in prod
+	 *
+	 * @return bool
+	 */
+	public function isProd(): bool;
+
+	/**
+	 * Check if the environment is in stage
+	 *
+	 * @return bool
+	 */
+	public function isStage(): bool;
+
+	/**
+	 * Check if the environment is in test
+	 *
+	 * @return bool
+	 */
+	public function isTest(): bool;
+
+	/**
+	 * Check if the environment is in dev
+	 *
+	 * @return bool
+	 */
+	public function isDev(): bool;
+
+	/**
+	 * Get current Environment
+	 *
+	 * @return string
+	 */
+	public function env(): string;
+
+	/**
+	 * Get core/boot dir where code app boot originate
+	 *
+	 * @return string
+	 */
+	public function coreDir(): string;
+
+	/**
+	 * Get the app core Dir instance
+	 *
+	 * @return Dir
+	 */
+	public function dir(): Dir;
+
+}
diff --git a/src/Contracts/ConfigPropsInterface.php b/src/Contracts/ConfigPropsInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 interface ConfigPropsInterface
diff --git a/src/Contracts/ControllerResponseInterface.php b/src/Contracts/ControllerResponseInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/src/Contracts/DispatchConfigInterface.php b/src/Contracts/DispatchConfigInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 use Exception;
diff --git a/src/Contracts/KernelInterface.php b/src/Contracts/KernelInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 use Psr\Http\Message\ServerRequestInterface;
diff --git a/src/Contracts/MiddlewareInterface.php b/src/Contracts/MiddlewareInterface.php
@@ -1,5 +1,8 @@
 <?php
 
+declare(strict_types=1);
+
+
 namespace MaplePHP\Emitron\Contracts;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/src/Contracts/RequestHandlerInterface.php b/src/Contracts/RequestHandlerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/src/Contracts/RouterDispatchInterface.php b/src/Contracts/RouterDispatchInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 interface RouterDispatchInterface
diff --git a/src/Contracts/RouterInterface.php b/src/Contracts/RouterInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Contracts;
 
 interface RouterInterface extends RouterDispatchInterface
diff --git a/src/ControllerRequestHandler.php b/src/ControllerRequestHandler.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron;
 
 use MaplePHP\Container\Reflection;
diff --git a/src/DispatchConfig.php b/src/DispatchConfig.php
@@ -28,18 +28,31 @@ class DispatchConfig implements DispatchConfigInterface
     private string $dir;
     private RouterInterface|UnitaryRouterInterface|null $router = null;
     protected ConfigPropsInterface $props;
-
-    /**
-     * @param string|ConfigPropsInterface|null $props
-     * @throws Exception
-     */
-    public function __construct(string|null|ConfigPropsInterface $props = null)
+	protected ?string $configPropClass = null;
+
+	/**
+	 * @param string|ConfigPropsInterface|null $props
+	 * @param string|null $configPropClass
+	 * @throws Exception
+	 */
+    public function __construct(string|null|ConfigPropsInterface $props = null, ?string $configPropClass = null)
     {
+	    $this->configPropClass = $configPropClass;
         if (!($props instanceof ConfigPropsInterface)) {
             $this->loadConfigFile(($props === null) ? __DIR__ . '/../emitron.config.php' : $props);
         }
     }
 
+	/**
+	 * Get used config prop class as string
+	 *
+	 * @return string|null
+	 */
+	public function getConfigPropsClass(): ?string
+	{
+		return $this->configPropClass;
+	}
+
     /**
      * Get config value
      *
@@ -155,9 +168,9 @@ public function loadConfigFile(string $path): void
         if (!is_array($config)) {
             throw new Exception('The config file do not return a array');
         }
-
+		
         //$this->dir = realpath(dirname($path));
         $this->dir = AbstractKernel::getRouterFilePath();
-        $this->props = ConfigPropsFactory::create($config);
+        $this->props = ConfigPropsFactory::create($config, $this->configPropClass);
     }
 }
diff --git a/src/Enums/DispatchCodes.php b/src/Enums/DispatchCodes.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron\Enums;
 
 enum DispatchCodes: int
diff --git a/src/Kernel.php b/src/Kernel.php
@@ -14,6 +14,7 @@
 
 namespace MaplePHP\Emitron;
 
+use MaplePHP\Http\Path;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
@@ -34,7 +35,10 @@ public function run(ServerRequestInterface $request, ?StreamInterface $stream =
         $this->dispatchConfig->getRouter()->dispatch(function ($data, $args, $middlewares) use ($request, $stream) {
 
 
+	        $parts = isset($data[2]) && is_array($data[2]) ? $data[2] : [];
 	        $dispatchCode = (int)($data[0] ?? DispatchCodes::FOUND->value);
+
+
 	        if($dispatchCode !== DispatchCodes::FOUND->value) {
 		        $data['handler'] = function (ServerRequestInterface $req, ResponseInterface $res): ResponseInterface
 		        {
@@ -51,14 +55,16 @@ public function run(ServerRequestInterface $request, ?StreamInterface $stream =
             $bodyStream = $this->getBody($stream);
             $factory = new ResponseFactory($bodyStream);
             $finalHandler = new ControllerRequestHandler($factory, $data['handler'] ?? []);
+			$path = new Path($parts, $request);
+
 
             $response = $this->initRequestHandler(
                 request: $request,
                 stream: $bodyStream,
+				path: $path,
                 finalHandler: $finalHandler,
                 middlewares: $middlewares
             );
-
             $this->createEmitter()->emit($response, $request);
         });
     }
diff --git a/src/RequestHandler.php b/src/RequestHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Emitron;
 
 use MaplePHP\Container\Reflection;
