- WIP on supporting multiple contexts, better handling of caching for methods / functions (instead of in every files, etc...

composer.json

@@ -15,7 +15,7 @@
         }
     },
     "require": {
-        "psr/http-message": "^2.0"
+        "psr/http-message": "^1.0"
     },
     "extra": {
         "lean": {

docs/02-control-structure-view-include-block.md

@@ -96,9 +96,9 @@ You can do so by using `define` and `slot`.
 ```html
 {% arguments string $name, string $anchor, int $index = 0 %}
 
-{% define "attributes" %}
+{% define slot %}
 
-<a {% slot "attributes" %}{% endslot %} href="{{ $anchor }}" tabindex="{{ $index }}"{% endslot %}>{{ $name }}"</a>
+<a {% slot "attributes" %}href="{{ $anchor }}" tabindex="{{ $index }}"{% endslot %}>{{ $name }}"</a>
 ```
 
 **[HTML]** Would render the same as the `view` example :

meta/definitions.php

@@ -12,7 +12,7 @@ use Picea\{
     Method\Request
 };
 
-use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension, DiExtension };
+use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
 
 return [
     Picea\Picea::class => function($c) {
@@ -20,10 +20,7 @@ return [
     },
 
     Context::class => function($c) {
-        return new BaseContext(
+        return new BaseContext($c->get(Lean\Lean::class)->getPiceaContext());
-            defaultNamespace: $c->get(Lean\Lean::class)->getPiceaContext(),
-            declare: getenv('PICEA_DECLARE') ?? 'declare(strict_types=1)'
-        );
     },
 
     Compiler::class => autowire(Compiler::class),
@@ -41,7 +38,6 @@ return [
             $c->get(LanguageExtension::class),
             $c->get(TitleExtension::class),
             $c->get(NumberExtension::class),
-            $c->get(DiExtension::class),
             $c->get(UrlExtension::class),
             $c->get(Request::class),
         ], class_exists(\Taxus\Picea\Extension::class) ? [ $c->get(\Taxus\Picea\Extension::class) ] : [],
@@ -53,8 +49,6 @@ return [
 
     NumberExtension::class => autowire(NumberExtension::class),
 
-    DiExtension::class => autowire(DiExtension::class),
-
     UrlExtension::class => create(UrlExtension::class)->constructor(getenv("URL_BASE"), get('git.commit'), explode(',', getenv('APP_URL')), (bool) getenv('FORCE_SSL')),
 
     Cache::class => create(Opcache::class)->constructor(getenv("CACHE_PATH"), get(Context::class)),

src/Builder.php

@@ -21,8 +21,7 @@ class Builder
 
         $replace = [
             '%NAMESPACE%' => $context->namespace,
-            '%USE%' => ( $uses = $context->renderUses() ) ? $uses : false,
+            '%USE%' => ( $uses = $context->renderUses() ) ? "use $uses;" : false,
-            '%DECLARE%' => $context->declare ? rtrim($context->declare, ';') . ';' : "",
             '%CLASSNAME%' => $context->className,
             '%PATHNAME%' => $path($context->viewPath),
             '%FULLPATH%' => $path($context->filePath),

src/Builder/ClassTemplate.php

@@ -1,4 +1,4 @@
-<?php %DECLARE%
+<?php
 
 namespace %NAMESPACE%;
 

src/Compiler/BaseContext.php

@@ -4,25 +4,7 @@ namespace Picea\Compiler;
 
 class BaseContext extends Context {
 
-    public function __construct(
+    public function __construct(array|string|null $defaultNamespace = null) {
-        ?string $defaultNamespace = null,
-        public string $namespace = "",
-        public string $extendFrom = "",
-        public string $className = "",
-        public string $compiledSource = "",
-        public ? string $sectionAction = null,
-        public string $viewPath = "",
-        public string $filePath = "",
-        public string $classPath = "",
-        public string $declare = "declare(strict_types=1);",
-        public array $switchStack = [],
-        public array $iterationStack = [],
-        public array $useStack = [],
-        public array $sections = [],
-        public int $functions = 0,
-        public array $functionStack = [],
-        public array $hooks = []
-    ) {
         if ( $defaultNamespace !== null ) {
             $this->namespace = $defaultNamespace;
         }

src/Compiler/Context.php

@@ -6,6 +6,36 @@ use Picea\Compiler;
 
 abstract class Context {
 
+    public string|array $namespace = "";
+
+    public string $extendFrom = "";
+
+    public string $className = "";
+
+    public string $compiledSource = "";
+
+    public ? string $sectionAction = null;
+
+    public string $viewPath = "";
+    
+    public string $filePath = "";
+
+    public string $classPath = "";
+
+    public array $switchStack = [];
+
+    public array $iterationStack = [];
+
+    public array $useStack = [];
+
+    public array $sections = [];
+
+    public int $functions = 0;
+    
+    public array $functionStack = [];
+
+    public array $hooks = [];
+
     public Compiler $compiler;
 
     public function hook(string $path, Callable $callback) : self
@@ -27,7 +57,7 @@ abstract class Context {
 
     public function renderUses() : string
     {
-        return implode(PHP_EOL, array_map(fn($use) => "use $use;", $this->useStack ?? []));
+        return implode(",", $this->useStack ?? []);
     }
 
     public function renderFunctions() : string

src/ControlStructure/AbstractLoop.php

@@ -4,8 +4,11 @@ namespace Picea\ControlStructure;
 
 abstract class AbstractLoop implements ControlStructure {
 
-    protected function openLoop(\Picea\Compiler\Context &$context, ?string $arguments, string $token,) : string
+    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
+        switch($token) {
+            case "while":
+            case "foreach":
                 $name = "$".uniqid("{$token}_");
                 
                 $stack = array_filter($context->iterationStack ?? [], function($item) {
@@ -24,11 +27,10 @@ abstract class AbstractLoop implements ControlStructure {
                     'token' => "end{$token}",
                 ];
 
-        return "<?php $token ($arguments): \$__loop_index = $name = ( $name ?? 0 ) + 1; ?>";
+                return "<?php $token ($arguments): $name = ( $name ?? 0 ) + 1; ?>";
-    }
 
-    protected function closeLoop(\Picea\Compiler\Context &$context, ?string $arguments, string $token,) : string
+            case "endwhile":
-    {
+            case "endforeach":
                 $last = end($context->iterationStack);
 
                 if ( $last['or'] === false ) {
@@ -43,4 +45,4 @@ abstract class AbstractLoop implements ControlStructure {
                 return $output;
         }
     }
- 
+}

src/ControlStructure/BlockToken.php

@@ -2,35 +2,26 @@
 
 namespace Picea\ControlStructure;
 
-use http\Exception\InvalidArgumentException;
-
 class BlockToken implements ControlStructure {
 
-    public array $token = [ "arguments", "block", "endblock", "/block", "define", "slot", "endslot", "/slot", "using", "public", "private", "protected", "set" ];
+    public array $token = [ "arguments", "block", "endblock", "define", "slot", "endslot", "using" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {
-        static $depth = 0;
-        static $slotDepth = 0;
         static $slotDefinitions = [];
-        static $slotName = [];
-        $class= static::class;
-
-         # dump($slotDepth, $token, $arguments, $slotDefinitions);
 
         switch($token) {
             case "block":
                 $slotDefinitions[] = $this->slotDefinitions();
-                $depth++;
                 
                 return "<?php \$___block = \Picea\ControlStructure\BlockToken::instanciateBlock($arguments); ?>";
             
-            case "/block":
             case "endblock":
-                $depth--;
                 return "<?php echo \$___block->render(\$___class__template); unset(\$___block); ?>";
             
             case "arguments":
+                $class = static::class;
+
                 return <<<PHP
                     <?php 
                         try {
@@ -39,10 +30,8 @@ class BlockToken implements ControlStructure {
                             unset(\$inlineVariables);
                         } 
                         catch(\TypeError \$ex) {
-                            \$showArgs = fn(\$e) => (\$type = gettype(\$e)) === 'object' ? \$e::class : \$type;
-                            
                             throw new \Exception(
-                                sprintf('A block awaiting arguments (%s) instead received (%s) with values (%s)', '$arguments', implode(', ', array_map(\$showArgs, \$inlineVariables ?? [])), json_encode(\$inlineVariables))
+                                sprintf('A block awaiting arguments `%s` instead received `%s` with values `%s`', '$arguments', implode(', ', array_map('gettype', \$inlineVariables ?? [])), json_encode(\$inlineVariables))
                             );
                         }
                     /*%EXCEPTION_LINE_BASE%*/?>
@@ -51,33 +40,32 @@ class BlockToken implements ControlStructure {
             case "define":
                 list($name, $definition) = array_pad(explode(',', $arguments, 2), 2, "");
                 
-                ( $slotDefinitions[$depth] ?? end($slotDefinitions) )->setDefinition(eval("return $name;"), $definition);
+                end($slotDefinitions)->setDefinition(eval("return $name;"), $definition);
                 
                 return <<<PHP
                     <?php \$this->defineSlot($name, function($definition) {}); ?>
                 PHP;
                     
             case "slot":
-                $def = ( $slotDefinitions[$depth] ?? end($slotDefinitions) );
+                $def = end($slotDefinitions);
                 
                 list($name, $definition) = array_pad(explode(',', $arguments, 2), 2, "");
 
                 $loops = count($context->iterationStack ?? []) ? ",". implode(', ', array_filter(array_column($context->iterationStack, 'uid'), fn($e) => strpos($e, '[') === false)) : null;
-                $slotDepth++;
 
                 if ($def->hasDefinitions() ) {
-                    $slotName[] = eval("return $name;");
+                    $slotName = eval("return $name;");
-                    $def->currentSlot = end($slotName);
+                    $def->currentSlot = $slotName;
-                    $def->setDefinitionVars(end($slotName), $definition);
+                    $def->setDefinitionVars($slotName, $definition);
                     
-                    $definition = $def->printDefinition(end($slotName));
+                    $definition = $def->printDefinition($slotName);
 
                     if ($definition) {
                         $definition .= ",";
                     }
 
                     return <<<PHP
-                    <?php \$this->printSlot($name, function($definition array \$___using = []) use (\$picea, \$___class__template $loops) { extract(\$___using, \EXTR_SKIP); ?>
+                        <?php \$this->printSlot($name, function($definition array \$___using = []) use (\$picea $loops) { extract(\$___using, \EXTR_SKIP); ?>
                     PHP;
                 }
                 else {
@@ -86,17 +74,14 @@ class BlockToken implements ControlStructure {
                     }
                     
                     return <<<PHP
-                    <?php (\$___block ?? \$this)->slotIsSet($name) || (\$___block ?? \$this)->setSlot($name, function($definition array \$___using = []) use (\$picea, \$___class__template $loops) { extract(\$___using, \EXTR_SKIP); ?>
+                        <?php (\$___block ?? \$this)->slotIsSet($name) || \$___block->setSlot($name, function($definition array \$___using = []) use (\$picea $loops) { extract(\$___using, \EXTR_SKIP); ?>
                     PHP;
                 }
                     
-            case "/slot":
             case "endslot":
-                $slotDepth--;
+                $def =end($slotDefinitions);
-                $def = ( $slotDefinitions[$depth] ?? end($slotDefinitions) );
                 
                 if ($def->hasDefinitions() ) {
-                    $def->currentSlot = array_pop($slotName);
                     $definition = $def->getCurrentSlotDefinitionVars();
                     
                     if ($definition) {
@@ -111,23 +96,12 @@ class BlockToken implements ControlStructure {
                     return "<?php }); ?>";
                 }
                 
-            case "public":
-            case "private":
-            case "protected":
-                $arguments = rtrim($arguments, ';');
-                return "<?php \$this->createProperty(\\$class::parseProperty('$token', fn($arguments) => func_get_arg(0))) ?>";
-
-            case "set":
-                return "<?php \$___block->setPropertyValue({$arguments}); ?>";
-
-            # DEPRECATED ; should be removed, to be superseded by 'set' instead
             case "using":
                 return "<?php \$___block->setUsing($arguments); ?>";
         }
-
-        throw new \LogicException("Unhandled token ? Should never have been here !");
     }
     
+    
     public function inlineHtml(? object $proxy, string $viewPath, ... $variables) {
         return $this->renderHtml($viewPath, [ 'inlineVariables' => $variables ], $proxy);
     }
@@ -137,6 +111,7 @@ class BlockToken implements ControlStructure {
         #return 
     }
         
+        
     public static function parseArguments(Callable $method, array $arguments) : array
     {
         try{
@@ -149,51 +124,23 @@ class BlockToken implements ControlStructure {
         $parameters = [];
         
         foreach((new \ReflectionFunction($method))->getParameters() as $key => $value) {
-            $name = $value->getName();
-
-            # Ordered arguments
             if ( isset($arguments[$key]) ) {
-                $parameters[ $name ] = $arguments[$key];
+                $parameters[ $value->getName() ] = $arguments[$key];
             }
-            # Named arguments
-            elseif (isset($arguments[$name])) {
-                $parameters[ $name ] = $arguments[$name];
-            }
-            # Using default value
             elseif ( $value->isDefaultValueAvailable() ) {
-                $parameters[ $name ] = $value->getDefaultValue();
+                $parameters[ $value->getName() ] = $value->getDefaultValue();
             }
             elseif ( $value->isVariadic() ) {
-                $parameters[ $name ] = [];
+                $parameters[ $value->getName() ] = [];
             }
             else {
-                $parameters[ $name ] = null;
+                $parameters[ $value->getName() ] = null;
             }
         }
         
         return $parameters;
     }
     
-    public static function parseProperty(string $token, \Closure $method) : BlockToken\Property
-    {
-        foreach((new \ReflectionFunction($method))->getParameters() as $value) {
-            $property = new BlockToken\Property(
-                name: $value->getName(),
-                scope: BlockToken\PropertyScopeEnum::from($token),
-                setter: $method,
-            );
-
-            if ($value->isDefaultValueAvailable()) {
-                $property->value = $value->getDefaultValue();
-            }
-
-            # For now, we only allow one declaration per token, might be revised at another moment...
-            break;
-        }
-
-        return $property ?? throw new \LogicException("No parameters found in property declaration.");
-    }
-
     public static function slotDefinitions() {
         return new class() {
             
@@ -237,7 +184,7 @@ class BlockToken implements ControlStructure {
             public function printDefinition(string $name) : string
             {
                 if ( ! isset($this->definitions[$name]) ) {
-                    throw new \Exception("Slot definition for `$name` was not found. Have you defined it in your block header using something like '{% define \"$name\", ...\$arguments %}' ?");
+                    throw new \Exception("Slot definition for `$name` was not found. Have you defined it in your block header ?");
                 }
                 
                 return $this->definitions[$name];
@@ -247,6 +194,7 @@ class BlockToken implements ControlStructure {
             {
                 $this->rendering = true;
             }
+            
         };
     }
     
@@ -266,10 +214,6 @@ class BlockToken implements ControlStructure {
             
             public array $definition = [];
             
-            protected array $properties = [];
-
-            private array $definedPropertyValues = [];
-
             public function __construct(string $viewPath, ...$arguments) {
                 $this->viewPath = $viewPath;
                 $this->arguments = $arguments;
@@ -279,10 +223,6 @@ class BlockToken implements ControlStructure {
             {
                 $this->rendering = true;
 
-                if ($this->using['this'] ?? false) {
-                    throw new \InvalidArgumentException("Block '{$this->viewPath}' cannot overwrite 'this' variable.");
-                }
-
                 return $classTemplate->picea->inlineBlock($this, $this->viewPath, ...$this->arguments);
             }
             
@@ -301,51 +241,14 @@ class BlockToken implements ControlStructure {
                 return ! empty($this->slots[$name]);
             }
             
-            public function printSlot(string $name, Callable $default) : mixed
+            public function printSlot(string $name, Callable $default)
             {
                 return $this->slotIsSet($name) ? $this->slots[$name] : $default;
             }
             
-            public function setUsing(array $variables) : void
+            public function setUsing(array $variables) {
-            {
                 $this->using = $variables;
             }
-
-            public function setPropertyValue(array $vars) : void
-            {
-                foreach($vars as $key => $value) {
-                    $this->definedPropertyValues[$key] = $value;
-                }
-            }
-
-            public function createProperty(BlockToken\Property $property) : void
-            {
-                if (isset($this->properties[$property->name])) {
-                    throw new \InvalidArgumentException("Given property '{$property->name}' is already defined somewhere else in this block.");
-                }
-
-                $this->properties[$property->name] = $property;
-
-                if (isset($this->definedPropertyValues[$property->name])) {
-                    if ($property->scope !== BlockToken\PropertyScopeEnum::Public) {
-                        throw new \InvalidArgumentException(
-                            sprintf("Trying to set property %s but it's scope (%s) makes it impossible", $property->name, $property->scope->name)
-                        );
-                    }
-
-                    $this->__set($property->name, $this->definedPropertyValues[$property->name]);
-                }
-            }
-
-            public function __set(string $name, mixed $value) : void
-            {
-                $this->properties[$name]->value = call_user_func($this->properties[$name]->setter, $value);
-            }
-
-            public function __get(string $name) : mixed
-            {
-                return $this->properties[$name]->value;
-            }
         };
     }
 }

src/ControlStructure/BlockToken/Property.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Picea\ControlStructure\BlockToken;
-
-class Property
-{
-    public mixed $value;
-
-    public function __construct(
-        public readonly string $name,
-        public readonly PropertyScopeEnum $scope,
-        public readonly \Closure $setter,
-    ) {}
-}

src/ControlStructure/BlockToken/PropertyScopeEnum.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Picea\ControlStructure\BlockToken;
-
-enum PropertyScopeEnum: string
-{
-    case Private = "private";
-    case Protected = "protected";
-    case Public = "public";
-}

src/ControlStructure/BreakToken.php

@@ -4,7 +4,7 @@ namespace Picea\ControlStructure;
 
 class BreakToken implements ControlStructure {
 
-    public array $token = [ "break", "/case" ];
+    public string $token = "break";
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
     {

src/ControlStructure/ForToken.php

@@ -4,7 +4,7 @@ namespace Picea\ControlStructure;
 
 class ForToken implements ControlStructure {
 
-    public array $token = [ "for", "endfor", "/for" ];
+    public array $token = [ "for", "endfor" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -19,7 +19,6 @@ class ForToken implements ControlStructure {
 
                 return "<?php for ($arguments): {$uid} = 1; ?>";
                 
-            case "/for":
             case "endfor":
                 $last = end($context->iterationStack);
 

src/ControlStructure/ForeachToken.php

@@ -5,17 +5,5 @@ namespace Picea\ControlStructure;
 use DI\Definition\Source\AnnotationBasedAutowiring;
 
 class ForeachToken extends AbstractLoop {
-    public array $token = [ "foreach", "endforeach", "/foreach" ];
+    public array $token = [ "foreach", "endforeach" ];
-
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
-    {
-        switch($token) {
-            case "foreach":
-                return $this->openLoop($context, $arguments, $token);
-
-            case "endforeach":
-            case "/foreach":
-                return $this->closeLoop($context, $arguments, $token);
-        }
-    }
 }

src/ControlStructure/FunctionToken.php

@@ -33,9 +33,7 @@ class FunctionToken implements ControlStructure {
 
     protected function printFunction($context, ?string $arguments) : string
     {
-        $name = trim(explode('(', $arguments, 2)[0]);
+        return "<?php function $arguments { ?>";
-
-        return "<?php if (! function_exists(__NAMESPACE__ . '\\$name')) { function $arguments { ?>";
     }
 
     protected function printReturn($context, ?string $arguments) : string
@@ -45,6 +43,6 @@ class FunctionToken implements ControlStructure {
 
     protected function printEndFunction($context) : string
     {
-        return "<?php } } ?>";
+        return "<?php } ?>";
     }
 }

src/ControlStructure/IfToken.php

@@ -4,7 +4,7 @@ namespace Picea\ControlStructure;
 
 class IfToken implements ControlStructure {
 
-    public array $token = [ "if", "else", "elseif", "endif", "/if" ];
+    public array $token = [ "if", "else", "elseif", "endif" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -17,7 +17,6 @@ class IfToken implements ControlStructure {
             case "elseif":
                 return "<?php elseif ($arguments): ?>";
                 
-            case "/if":
             case "endif":
                 return "<?php endif ?>";
         }

src/ControlStructure/SectionToken.php

@@ -11,7 +11,7 @@ enum PrintActionEnum : string {
 
 class SectionToken implements ControlStructure {
 
-    public array $token = [ "section", "endsection", "/section" ];
+    public array $token = [ "section", "endsection" ];
 
     protected PrintActionEnum $action = PrintActionEnum::default;
 
@@ -29,7 +29,6 @@ class SectionToken implements ControlStructure {
                 return $this->printSection($context, $arguments);
 
             case "endsection":
-            case "/endsection":
                 if ( empty($context->sections) ) {
                     throw new \RuntimeException("A section closing tag {% endsection %} was found without an opening {% section %} tag");
                 }

src/ControlStructure/SwitchToken.php

@@ -4,7 +4,7 @@ namespace Picea\ControlStructure;
 
 class SwitchToken implements ControlStructure {
 
-    public array $token = [ "switch", "case", "endcase", "endswitch", "/switch" ];
+    public array $token = [ "switch", "case", "endswitch" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -25,11 +25,9 @@ class SwitchToken implements ControlStructure {
                 return ( $output ?? "" ) . "case $arguments: ?>";
             
             case "endcase":
-            case "/case":
                 return "<?php break; ?>";
                 
             case "endswitch":
-            case "/switch":
                 return "<?php endswitch; ?>"; 
         }
     }

src/ControlStructure/TryCatchToken.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Picea\ControlStructure;
-
-class TryCatchToken implements ControlStructure {
-
-    public array $token = [ "try", "catch", "finally", "endtry", "/try" ];
-
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
-        switch($token) {
-            case "try":
-                return "<?php try { ?>";
-                
-            case "catch":
-                return "<?php } catch($arguments) { ?>";
-
-            case "finally":
-                return "<?php } finally { ?>";
-
-            case "endtry":
-            case "/try":
-                return "<?php } ?>";
-        }
-    }
-}

src/ControlStructure/WhileToken.php

@@ -3,7 +3,7 @@
 namespace Picea\ControlStructure;
 
 class WhileToken extends AbstractLoop {
-    public array $token = [ "do", "while", "endwhile", "/while" ];
+    public array $token = [ "do", "while", "endwhile", ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -23,13 +23,10 @@ class WhileToken extends AbstractLoop {
                         return "<?php } while($arguments); ?>";
                     }
                 }
-
-                return $this->openLoop($context, $arguments, $token);
-
-            case "endwhile":
-            case "/while":
-                return $this->closeLoop($context, $arguments, $token);
         }
 
+        return parent::parse($context, $arguments, $token);
     }
 }
+
+

src/Extension/DiExtension.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Picea\Extension;
-
-use Picea\Compiler\Context;
-use Psr\Container\ContainerInterface;
-
-class DiExtension implements Extension, FunctionExtension {
-
-    public array $token = [ "di:has", "di:get" ];
-
-    public function __construct(public readonly ContainerInterface $container) {}
-
-    public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
-    {
-        if ( $token === 'di:get' ) {
-            return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->container->get($arguments) ?>";
-        }
-
-        if ( $token === 'di:has' ) {
-            return "<?php echo \$picea->compiler->getExtensionFromToken('$token')->container->has($arguments) ?>";
-        }
-
-        throw new \InvalidArgumentException("You must use di:get/di:has tokens or di_get()/di_has() methods.");
-    }
-
-    public function exportFunctions(): array
-    {
-        return [
-            'di_get' => function(string $classname) {
-                return $this->container->get($classname);
-            },
-
-            'di_has' => function(string $classname) {
-                return $this->container->has($classname);
-            },
-        ];
-    }
-}

src/Extension/Extension.php

@@ -3,5 +3,5 @@
 namespace Picea\Extension;
 
 interface Extension {
-    public function parse(\Picea\Compiler\Context &$context, string $arguments, string $token, array $options = []) : string;
+    public function parse(\Picea\Compiler\Context &$context, string $sourceCode, string $token, array $options = []) : string;
 }

src/Extension/LanguageExtension.php

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

src/Extension/TitleExtension.php

@@ -23,7 +23,7 @@ class TitleExtension implements Extension, FunctionExtension {
                 "} ?>";
     }
     
-    public function handleTitle(null|\Stringable|string $set = null, ...$arguments) : ? string
+    public function handleTitle(? string $set = null, ...$arguments) : ? string
     {
         if ( $set === null ) {
             return $this->title;
@@ -31,7 +31,6 @@ class TitleExtension implements Extension, FunctionExtension {
         else {
             # Fixed a bug where template inheritance was rewriting title
             if ( empty($this->title) ) {
-                $set = (string) $set;
                 $this->title = $arguments ? sprintf($set, ...$arguments) : $set;
             }
         }

src/Extension/UrlExtension.php

@@ -16,22 +16,28 @@ class UrlExtension implements Extension, FunctionExtension {
         /(?:[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+\\/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)\\])/
 PATTERN;
 
+    protected string $urlBase;
+
+    protected array $appUrl;
+
+    protected string $assetToken;
+
     protected array $routes;
 
     protected array $routesTarget;
 
+    protected bool $forceSSL = false;
+
     public array $tokens = [ "url" , "route", "asset", "slug" ];
 
-    ##[\Deprecated]
+    #[\Deprecated]
-    public bool $enforceExistingArguments = true;
+    protected bool $enforceExistingArguments = true;
 
-    public function __construct(
+    public function __construct(string $urlBase = "", string $assetToken = "", array $appUrl = [], bool $forceSSL = false) {
-        protected string $urlBase = "",
-        protected string $assetToken = "",
-        protected array  $appUrl = [],
-        protected bool   $forceSSL = false
-    ) {
         $this->urlBase = trim($urlBase, "/");
+        $this->assetToken = $assetToken;
+        $this->appUrl = $appUrl;
+        $this->forceSSL = $forceSSL;
    }
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string
@@ -114,7 +120,7 @@ PATTERN;
 
     public function buildRouteUrl(string $name, array $parameters = [], bool $appendVersion = false) : string
     {
-        if ( false !== $route = $this->findRoute($name) ) {
+        if ( false !== ( $route = $this->routes[$name] ?? false ) ) {
             return $this->buildUrl($this->prepareRoute($route, $parameters), $parameters, $appendVersion);
         }
 
@@ -132,9 +138,9 @@ PATTERN;
     }
 
     # src: https://stackoverflow.com/a/14550919
-    public static function slug(\Stringable|string $text, string $separator = '-') : string
+    public static function slug(string $text, string $separator = '-') : string
     {
-        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', (string) $text);
+        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $text);
         $clean = preg_replace("/[^a-zA-Z0-9\/_| -]/", '', $clean);
 
         return preg_replace("/[\/_| -]+/", $separator, strtolower(trim($clean, '-')));
@@ -143,28 +149,14 @@ PATTERN;
 
     public function registerRoute(string $name, string $route, string $class, string $method, array $routeMethods) : void
     {
-        $this->routes[] = $array = [
+        $this->routes[$name] = [
-            'name' => $name,
             'route' => $route,
-            'routeMethods' => array_map('strtoupper', $routeMethods),
+            'routeMethods' => $routeMethods,
             'class' => $class,
             'classMethod' => $method,
         ];
 
-        $this->eventExecute(UrlRegisterRouteEvent::class, $name, $array);
+        $this->eventExecute(UrlRegisterRouteEvent::class, $name, $this->routes[$name]);
-    }
-
-    protected function findRoute(string $name, string $method = "*") : false|array
-    {
-        foreach($this->routes as $route) {
-            if ( $route['name'] === $name ) {
-                if ($method === '*' || in_array(strtoupper($method), $route['routeMethods']) ) {
-                    return $route;
-                }
-            }
-        }
-
-        return false;
     }
 
     /**
@@ -283,7 +275,7 @@ PATTERN;
                     if ($default ?? false) {
                         $value = $default;
                     }
-                    elseif ( $this->enforceExistingArguments && ! preg_match(sprintf("/\[\/?%s]/i", $item[0]), $route) ) {
+                    elseif ( strpos($route, "[{$matches[0][0]}]") !== false && $this->enforceExistingArguments) {
                         throw new \RuntimeException(sprintf("Error while preparing route %s : could not match variable '%s' into given arguments ( %s ) from %s::%s", $route, $variable, json_encode($arguments), $routeParam['class'], $routeParam['classMethod']));
                     }
                 }

src/Language/DefaultRegistrations.php

@@ -32,7 +32,6 @@ class DefaultRegistrations implements LanguageRegistration
 
     public function registerControlStructure(Compiler $compiler) : void
     {
-        $compiler->registerControlStructure(new \Picea\ControlStructure\TryCatchToken());
         $compiler->registerControlStructure(new \Picea\ControlStructure\NamespaceToken());
         $compiler->registerControlStructure(new \Picea\ControlStructure\UseToken());
         $compiler->registerControlStructure(new \Picea\ControlStructure\IfToken());

src/Method/Request.php

@@ -5,21 +5,24 @@ namespace Picea\Method;
 use Picea\Extension\Extension,
     Picea\Extension\ExtensionTrait;
 
+use Picea\Compiler\Context;
+
 use Picea\Extension\FunctionExtension;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
-class
+class Request implements Extension, FunctionExtension {
-Request implements Extension, FunctionExtension {
     use ExtensionTrait;
 
     public array $tokens;
 
     public string $token;
     
-    public function __construct(
+    public ServerRequestInterface $request;
-        public ServerRequestInterface $request
+
-    ) { }
+    public function __construct(ServerRequestInterface $request, Context $context) {
+        $this->request = $request;
+    }
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string { }
 
@@ -81,7 +84,7 @@ Request implements Extension, FunctionExtension {
         $post = $this->request->getParsedBody();
 
         if ( ! $post ) {
-            $content = mb_convert_encoding((string)$this->request->getBody(), 'UTF-8', 'ISO-8859-1');
+            $content = utf8_encode((string) $this->request->getBody());
 
             if ( $content && ( $json = json_decode($content, true) ) ) {
                 $post = $json;