docs/99-dependency-injection.md

@@ -10,7 +10,7 @@ use function DI\autowire, DI\create, DI\get;
 use Laminas\Diactoros\Response\HtmlResponse;
 
 use Picea\{ Picea, Caching\Cache, Caching\Opcache, Compiler, Compiler\Context, Compiler\BaseContext, FileFetcher, Language\DefaultRegistrations, Method\Request };
-use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
+use Picea\Extension\{ LanguageHandler, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
 use Picea\Ui\{ Method, Ui };
 
 return [
@@ -49,10 +49,10 @@ return [
 
     Method\Pagination::class => autowire(Method\Pagination::class),
 
-    LanguageExtension::class => create(LanguageExtension::class)->constructor(get(LanguageHandlerInterface::class)),
+    LanguageExtension::class => create(LanguageExtension::class)->constructor(get(LanguageHandler::class)),
 
-    LanguageHandlerInterface::class => function($c) {
+    LanguageHandler::class => function($c) {
-        return new class( $c->get(Tell\I18n::class) ) implements LanguageHandlerInterface {
+        return new class( $c->get(Tell\I18n::class) ) implements LanguageHandler {
             public Tell\I18n $tell;
 
             public function __construct(Tell\I18n $tell) {

src/Builder/ClassTemplate.php

@@ -50,21 +50,15 @@ if (! class_exists("%NAMESPACE%\%CLASSNAME%", false) ) {
 
             $__event->eventExecute(\Picea\Event\Builder\ClassTemplateOutputing::class, $variablesList);
 
-            try {
+            ( function($___class__template, $___global_variables, $___variables, $__event, $picea) {
-                ( function($___class__template, $___global_variables, $___variables, $__event, $picea) {
+                extract($___global_variables);
-                    extract($___global_variables);
+                extract($___variables, \EXTR_OVERWRITE);
-                    extract($___variables, \EXTR_OVERWRITE);
+                ?>%CONTENT%<?php
-                    ?>%CONTENT%<?php
+            } )->call($this->thisProxy ?? new class() {}, $this, $this->variableList, $variablesList, $__event, $this->picea);
-                } )->call($this->thisProxy ?? new class() {}, $this, $this->variableList, $variablesList, $__event, $this->picea);
-            } catch (\Throwable $error) {
-                throw $this->errorHandler($error);
-            }
 
             $__event->eventExecute(\Picea\Event\Builder\ClassTemplateOutputDone::class, $variablesList);
 
-            try { %PARENT_OUTPUT% } catch (\Throwable $error) {
+            %PARENT_OUTPUT%
-                throw $this->errorHandler($error);
-            }
 
             $this->depth--;
 
@@ -144,32 +138,6 @@ if (! class_exists("%NAMESPACE%\%CLASSNAME%", false) ) {
             $this->output($variablesList);
             return ob_get_clean();
         }
-
-        public static function isTemplateError(\Throwable $error) : bool
-        {
-            $class = substr(static::class, strripos(static::class, '\\') + 1) . ".php";
-
-            return substr($error->getFile(), -strlen($class)) === $class;
-        }
-
-        protected function errorHandler(\Throwable $error) : \Throwable
-        {
-            $class = substr(static::class, strrpos(static::class, '\\') + 1) . ".php";
-
-            #dump( __NAMESPACE__, basename($error->getFile()), $class );
-            $basename = basename($error->getFile());
-
-            #dump(is_subclass_of(sprintf("\\%s\\%s", __NAMESPACE__, substr($basename,0 , strrpos($basename, '.'))), static::class, true));
-
-            if (str_ends_with($error->getFile(), $class)) {
-                $error = new \Picea\Exception\RenderHtmlException($this, $error->getMessage(), $error->getCode(), $error);
-            }
-            #elseif (is_subclass_of(sprintf("\\%s\\%s", __NAMESPACE__, substr($basename,0 , strrpos($basename, '.'))), static::class, true)) {
-             #   $error = new \Picea\Exception\RenderHtmlException($this, $error->getMessage(), $error->getCode(), $error);
-            #}
-
-            return $error;
-        }
     }
 
 }

src/Compiler.php

@@ -2,17 +2,12 @@
 
 namespace Picea;
 
-use Picea\Event\Compiler\CompileTokenExtension;
-use Picea\Event\Compiler\CompileTokenExtensionEvent;
-use Picea\Event\Compiler\CompileTokenTagEvent;
 use Picea\Exception\RegisterExtensionToken;
 use Picea\Extension\FunctionExtension;
 use Picea\Language\LanguageRegistration;
 
 class Compiler
 {
-    use EventTrait;
-
     protected string $sourceCode = "";
 
     protected array $syntaxObjectList = [];
@@ -25,10 +20,11 @@ class Compiler
 
     public array $extensionList = [];
 
-    public function __construct(
+    public ? LanguageRegistration $languageRegistration;
-        public LanguageRegistration $languageRegistration
+
-    )
+    public function __construct(?LanguageRegistration $languageRegistration = null)
     {
+        $this->languageRegistration = $languageRegistration;
         $this->languageRegistration->registerAll($this);
     }
 
@@ -56,15 +52,12 @@ class Compiler
             $token = strtolower(trim($token));
             $tokenName = $context->tokenName($token);
             $tokenOptions = $context->tokenOptions($token);
-
+            
+            # @TODO Refractor this parts to allows registration to the tag's name
             if ( $this->tagList[$tokenName] ?? false ) {
-                $this->eventExecute(CompileTokenTagEvent::class, $context, $arguments, $tokenName, $tokenOptions);
-
                 return $this->tagList[$tokenName]->parse($context, $arguments, $tokenName, $tokenOptions);
             }
             elseif ( $this->extensionList[$tokenName] ?? false ) {
-                $this->eventExecute(CompileTokenExtensionEvent::class, $context, $arguments, $tokenName, $tokenOptions);
-
                 return $this->extensionList[$tokenName]->parse($context, $arguments, $tokenName, $tokenOptions);
             }
             else {
@@ -142,7 +135,7 @@ class Compiler
 
     public function __toString() : string
     {
-        return "???";
+        return "WHATAFAK";
     }
 
     public function getExtensionFromToken(string $name) : Extension\Extension
@@ -157,7 +150,7 @@ class Compiler
 
         return $this->extensionList[$tokenName];
     }
-
+    
     public function exportFunctions() : void
     {
         static $caching = [];

src/ControlStructure/SectionToken.php

@@ -63,9 +63,9 @@ class SectionToken implements ControlStructure {
         $order = $options['order'] ?? "count(\$___class__template->sectionList[$name]['$action'])";
 
         return "<?php \$___class__template->sectionList[$name] ??= [ 'prepend' => [], 'append' => [], 'default' => [] ];" .
-                      "\$___class__template->sectionList[$name]['$action'][] = [ ".
+                      "\$___class__template->sectionList[$name]['$action'][] = [ 
-                      "'order' => $order, " .
+                      'order' => $order, 
-                      "'callback' => function() use (\$picea, \$___class__template, \$___global_variables, \$___variables, \$__event) {" .
+                      'callback' => function() use (\$picea, \$___class__template, \$___global_variables, \$___variables, \$__event) {" .
                           "extract(\$___global_variables); extract(\$___variables, \EXTR_OVERWRITE);" .
                           "\$___class__template->sectionStack[] = $name;" .
                           "\$__event->eventExecute(\Picea\Event\Builder\ClassTemplateRenderSection::class, $name);?>";

src/Event/Compiler/CompileTokenExtensionEvent.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Picea\Event\Compiler;
-
-use Picea\Compiler\Context;
-
-interface CompileTokenExtensionEvent
-{
-    public function execute(Context $context, ?string $arguments, string $token, array $options = []);
-}

src/Event/Compiler/CompileTokenTagEvent.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Picea\Event\Compiler;
-
-use Picea\Compiler\Context;
-
-interface CompileTokenTagEvent
-{
-    public function execute(Context &$context, ?string $arguments, string $token, array $options = []);
-}

src/Event/Extension/UrlBuildAssetEvent.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Picea\Event\Extension;
-
-interface UrlBuildAssetEvent
-{
-    public function execute(string $uri, array $parameters = [], bool $appendVersion) : void;
-}

src/Event/Extension/UrlBuildRouteEvent.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Picea\Event\Extension;
-
-interface UrlBuildRouteEvent
-{
-    public function execute(string $uri, array $parameters = [], bool $appendVersion) : void;
-}

src/Event/Extension/UrlBuildUrlEvent.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Picea\Event\Extension;
-
-interface UrlBuildUrlEvent
-{
-    public function execute(string $uri, array $parameters = [], bool $appendVersion) : void;
-}

src/Event/Extension/UrlRegisterRouteEvent.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Picea\Event\Extension;
-
-interface UrlRegisterRouteEvent
-{
-    public function execute(string $name, array $route) : void;
-}

src/EventTrait.php

@@ -4,26 +4,26 @@ namespace Picea;
 
 trait EventTrait
 {
-    protected $eventTraitMethod = "execute";
+    protected $_eventTraitMethod = "execute";
 
-    public array $eventTraitList = [];
+    public array $_eventList = [];
 
-    protected array $eventTraitReturnList = [];
+    protected array $_returnList = [];
 
     public function eventRegister(object $event) : void 
     {
-        $this->eventTraitList[] = $event;
+        $this->_eventList[] = $event;
     }
     
     public function eventFromType(string $type) : array 
     {
-        return array_filter($this->eventTraitList, fn($ev) => $ev instanceof $type);
+        return array_filter($this->_eventList, fn($ev) => $ev instanceof $type);
     }
-
+    
     public function eventExecute(string $type, ...$arguments) : void 
     {
         foreach($this->eventFromType($type) as $event) {
-            $this->eventTraitReturnList[$event::class][] = call_user_func_array([ $event, $this->eventTraitMethod ], $arguments);
+            $this->_returnList[$event::class][] = call_user_func_array([ $event, $this->_eventTraitMethod ], $arguments);
         }
     }
 }

src/Exception/RenderHtmlException.php

@@ -10,20 +10,33 @@ use Picea\Picea;
  */
 class RenderHtmlException extends \Exception
 {
+    protected Picea $picea;
 
-    public function __construct(object $template, string $message, int $code, \Throwable $previous)
+    public function __construct(object $compiledObject, Picea $picea, string $message, int $code, \Throwable $previous)
     {
         parent::__construct($message, $code, $previous);
 
-        $this->defineError($previous, $template);
+        $this->picea = $picea;
+
+        $this->defineError($previous, $compiledObject);
     }
 
-    protected function defineError(\Throwable $previous, object $template) : void
+    protected function defineError(\Throwable $previous, object $compiledObject) : void
     {
-        /*$loadedTemplates = array_flip($this->picea->loadedTemplateFile);*/
+        $loadedTemplates = array_flip($this->picea->loadedTemplateFile);
 
-        $this->file = $template::getParam('view');
+        foreach($previous->getTrace() as $trace) {
-        $this->line = $template::getSourceLineFromException($previous->getLine());
+            if ( isset($trace['file'], $loadedTemplates[$trace['file']]) ) {
+                $class = $loadedTemplates[ $trace['file'] ];
+
+                $content = include($trace['file']);
+
+                $this->file = $content['view'];
+                $this->line = $class::getSourceLineFromException($trace['line']);
+
+                return;
+            }
+        }
     }
 
     protected function getTemplateFile(string $filePath) : ? array

src/Extension/LanguageExtension.php

@@ -11,9 +11,9 @@ class LanguageExtension implements Extension, FunctionExtension {
 
     public string $currentLanguage = "";
 
-    protected LanguageHandlerInterface $languageHandler;
+    protected LanguageHandler $languageHandler;
 
-    public function __construct(LanguageHandlerInterface $handler) {
+    public function __construct(LanguageHandler $handler) {
         $this->languageHandler = $handler;
     }
 

src/Extension/LanguageHandler.php

@@ -2,7 +2,7 @@
 
 namespace Picea\Extension;
 
-interface LanguageHandlerInterface
+interface LanguageHandler
 {
     public function languageFromKey(string $key, array $variables = []); #: array|string;
 }

src/Extension/TitleExtension.php

@@ -17,10 +17,13 @@ class TitleExtension implements Extension, FunctionExtension {
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        return "<?php ".
+        return <<<PHP
-                "if ( null !== \$title = title($arguments) ) {".
+            <?php 
-                "echo \$title;".
+                if ( null !== \$title = title($arguments) ) {
-                "} ?>";
+                    echo \$title;
+                }    
+            ?>
+        PHP;
     }
     
     public function handleTitle(? string $set = null, ...$arguments) : ? string

src/Extension/UrlExtension.php

@@ -3,15 +3,9 @@
 namespace Picea\Extension;
 
 use Notes\Route\Attribute\Object\Route;
-use Picea\EventTrait;
 use Picea\Compiler\Context;
 
-use Picea\Event\Extension\{ UrlBuildAssetEvent, UrlBuildUrlEvent, UrlBuildRouteEvent, UrlRegisterRouteEvent };
-
 class UrlExtension implements Extension, FunctionExtension {
-    use \Picea\EventTrait;
-
-    use EventTrait;
 
     public const URLIZE_PATTERN_URL = <<<PATTERN
         ~(?<!href=['"])https?://[\w/._\-&?]*(?!</a>)(?=[^\w/._\-&])~s
@@ -111,15 +105,11 @@ PATTERN;
 
     public function buildUrl(string $uri = "", array $parameters = [], bool $appendVersion = false) : string
     {
-        $this->eventExecute(UrlBuildUrlEvent::class, $uri, $parameters, $appendVersion);
-
         return $this->setUrlParameters($this->url() . "/" . ltrim($uri, "/"), $appendVersion ? array_replace([ 'v' => $this->assetToken ], $parameters) : $parameters);
     }
     
     public function buildAssetUrl(string $uri, array $parameters = [], bool $appendVersion = true) : string
     {
-        $this->eventExecute(UrlBuildAssetEvent::class, $uri, $parameters, $appendVersion);
-
         return $this->buildUrl($uri, $parameters, $appendVersion);
     }
 
@@ -160,8 +150,6 @@ PATTERN;
             'class' => $class,
             'classMethod' => $method,
         ];
-
-        $this->eventExecute(UrlRegisterRouteEvent::class, $name, $this->routes[$name]);
     }
 
     /**
@@ -207,7 +195,7 @@ PATTERN;
 
     protected function domain() : string
     {
-        if ( ! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) ) {
+         if ( ! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) ) {
             $port = "";
         }
         else {
@@ -286,6 +274,7 @@ PATTERN;
                 }
 
                 $search[$item[0]] = $value ?? "";
+
             }
 
             $route = str_replace(array_keys($search), array_values($search), $route);

src/Language/DefaultRegistrations.php

@@ -6,11 +6,18 @@ use Picea\Compiler;
 
 class DefaultRegistrations implements LanguageRegistration
 {
-    public function __construct(
+    protected array $extensions;
-        protected array $extensions,
+    
-        protected array $syntaxes,
+    protected array $syntaxes;
-        protected array $controlStructures,
+    
-    ) { }
+    protected array $controlStructures;
+
+    public function __construct(array $extensions = [], array $syntaxes = [], array $controlStructure = [])
+    {
+        $this->extensions = $extensions;
+        $this->syntaxes = $syntaxes;
+        $this->controlStructures = $controlStructure;
+    }
     
     public function registerAll(Compiler $compiler) : void
     {

src/Picea.php

@@ -43,7 +43,7 @@ class Picea implements LanguageRegistration
     ){
         $this->cache = $cache ?? new Caching\Memory("");
         $this->context = $context ?? new Compiler\BaseContext();
-        $this->languageRegistration = $languageRegistration ?? new Language\DefaultRegistrations([], [], []);
+        $this->languageRegistration = $languageRegistration ?? new Language\DefaultRegistrations();
         $this->builderTemplatePath = $builderTemplatePath ?? dirname(__FILE__) . static::DEFAULT_BUILDER_TEMPLATE;
         $this->compiler = $compiler ?? $this->instanciateCompiler();
         $this->fileFetcher = $fileFetcher ?? $this->instanciateFileFetcher();
@@ -75,11 +75,11 @@ class Picea implements LanguageRegistration
               # throw new Exception\RenderHtmlException($object, $this, "An error occurred trying to render HTML view `$viewPath` : " . $ex->getMessage(), 911, $ex);
             #}
             #else {
-            throw $ex;
+                throw $ex;
             #}
         }
 
-        return null;
+        exit();
     }
 
     /**