- Fixed HTTP_X_FORWARDED_HOST provided host

composer.json

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

composer.lock

@@ -1,68 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "9771fcd7256da80520a2d0d0f95bf311",
-    "packages": [
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
-}

meta/definitions.php

@@ -12,7 +12,7 @@ use Picea\{
     Method\Request
 };
 
-use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension };
+use Picea\Extension\{ LanguageHandlerInterface, LanguageExtension, TitleExtension, NumberExtension, UrlExtension, DiExtension };
 
 return [
     Picea\Picea::class => function($c) {
@@ -20,7 +20,10 @@ return [
     },
 
     Context::class => function($c) {
-        return new BaseContext($c->get(Lean\Lean::class)->getPiceaContext());
+        return new BaseContext(
+            defaultNamespace: $c->get(Lean\Lean::class)->getPiceaContext(),
+            declare: getenv('PICEA_DECLARE') ?? 'declare(strict_types=1)'
+        );
     },
 
     Compiler::class => autowire(Compiler::class),
@@ -38,6 +41,7 @@ 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) ] : [],
@@ -49,6 +53,8 @@ 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

@@ -22,6 +22,7 @@ class Builder
         $replace = [
             '%NAMESPACE%' => $context->namespace,
             '%USE%' => ( $uses = $context->renderUses() ) ? $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
+<?php %DECLARE%
 
 namespace %NAMESPACE%;
 

src/Compiler/BaseContext.php

@@ -4,7 +4,25 @@ namespace Picea\Compiler;
 
 class BaseContext extends Context {
 
-    public function __construct(?string $defaultNamespace = null) {
+    public function __construct(
+        ?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,36 +6,6 @@ use Picea\Compiler;
 
 abstract class Context {
 
-    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 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

src/ControlStructure/AbstractLoop.php

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

src/ControlStructure/BlockToken.php

@@ -2,16 +2,21 @@
 
 namespace Picea\ControlStructure;
 
+use http\Exception\InvalidArgumentException;
+
 class BlockToken implements ControlStructure {
 
-    public array $token = [ "arguments", "block", "endblock", "define", "slot", "endslot", "using" ];
+    public array $token = [ "arguments", "block", "endblock", "/block", "define", "slot", "endslot", "/slot", "using", "public", "private", "protected", "set" ];
 
     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($depth, $token, $arguments, $slotDefinitions);
+         # dump($slotDepth, $token, $arguments, $slotDefinitions);
 
         switch($token) {
             case "block":
@@ -20,13 +25,12 @@ class BlockToken implements ControlStructure {
 
                 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 {
@@ -35,8 +39,10 @@ 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('gettype', \$inlineVariables ?? [])), json_encode(\$inlineVariables))
+                                sprintf('A block awaiting arguments (%s) instead received (%s) with values (%s)', '$arguments', implode(', ', array_map(\$showArgs, \$inlineVariables ?? [])), json_encode(\$inlineVariables))
                             );
                         }
                     /*%EXCEPTION_LINE_BASE%*/?>
@@ -57,20 +63,21 @@ class BlockToken implements ControlStructure {
                 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 = $slotName;
+                    $def->currentSlot = end($slotName);
-                    $def->setDefinitionVars($slotName, $definition);
+                    $def->setDefinitionVars(end($slotName), $definition);
 
-                    $definition = $def->printDefinition($slotName);
+                    $definition = $def->printDefinition(end($slotName));
 
                     if ($definition) {
                         $definition .= ",";
                     }
 
                     return <<<PHP
-                    <?php \$this->printSlot($name, function($definition array \$___using = []) use (\$picea $loops) { extract(\$___using, \EXTR_SKIP); ?>
+                    <?php \$this->printSlot($name, function($definition array \$___using = []) use (\$picea, \$___class__template $loops) { extract(\$___using, \EXTR_SKIP); ?>
                     PHP;
                 }
                 else {
@@ -79,14 +86,17 @@ class BlockToken implements ControlStructure {
                     }
 
                     return <<<PHP
-                    <?php (\$___block ?? \$this)->slotIsSet($name) || (\$___block ?? \$this)->setSlot($name, function($definition array \$___using = []) use (\$picea $loops) { extract(\$___using, \EXTR_SKIP); ?>
+                    <?php (\$___block ?? \$this)->slotIsSet($name) || (\$___block ?? \$this)->setSlot($name, function($definition array \$___using = []) use (\$picea, \$___class__template $loops) { extract(\$___using, \EXTR_SKIP); ?>
                     PHP;
                 }
 
+            case "/slot":
             case "endslot":
+                $slotDepth--;
                 $def = ( $slotDefinitions[$depth] ?? end($slotDefinitions) );
 
                 if ($def->hasDefinitions() ) {
+                    $def->currentSlot = array_pop($slotName);
                     $definition = $def->getCurrentSlotDefinitionVars();
 
                     if ($definition) {
@@ -101,11 +111,22 @@ 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);
@@ -116,7 +137,6 @@ class BlockToken implements ControlStructure {
         #return
     }
 
-
     public static function parseArguments(Callable $method, array $arguments) : array
     {
         try{
@@ -129,23 +149,51 @@ class BlockToken implements ControlStructure {
         $parameters = [];
 
         foreach((new \ReflectionFunction($method))->getParameters() as $key => $value) {
+            $name = $value->getName();
+
+            # Ordered arguments
             if ( isset($arguments[$key]) ) {
-                $parameters[ $value->getName() ] = $arguments[$key];
+                $parameters[ $name ] = $arguments[$key];
             }
+            # Named arguments
+            elseif (isset($arguments[$name])) {
+                $parameters[ $name ] = $arguments[$name];
+            }
+            # Using default value
             elseif ( $value->isDefaultValueAvailable() ) {
-                $parameters[ $value->getName() ] = $value->getDefaultValue();
+                $parameters[ $name ] = $value->getDefaultValue();
             }
             elseif ( $value->isVariadic() ) {
-                $parameters[ $value->getName() ] = [];
+                $parameters[ $name ] = [];
             }
             else {
-                $parameters[ $value->getName() ] = null;
+                $parameters[ $name ] = 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() {
 
@@ -218,6 +266,10 @@ 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;
@@ -228,11 +280,10 @@ class BlockToken implements ControlStructure {
                 $this->rendering = true;
 
                 if ($this->using['this'] ?? false) {
-                    $thisProxy = $this->using['this'];
+                    throw new \InvalidArgumentException("Block '{$this->viewPath}' cannot overwrite 'this' variable.");
-                    unset($this->using['this']);
                 }
-                
+
-                return $classTemplate->picea->inlineBlock($thisProxy ?? $this, $this->viewPath, ...$this->arguments);
+                return $classTemplate->picea->inlineBlock($this, $this->viewPath, ...$this->arguments);
             }
 
             public function setSlot(string $name, Callable $method) : void
@@ -250,14 +301,51 @@ class BlockToken implements ControlStructure {
                 return ! empty($this->slots[$name]);
             }
 
-            public function printSlot(string $name, Callable $default)
+            public function printSlot(string $name, Callable $default) : mixed
             {
                 return $this->slotIsSet($name) ? $this->slots[$name] : $default;
             }
 
-            public function setUsing(array $variables) {
+            public function setUsing(array $variables) : void
+            {
                 $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

@@ -0,0 +1,14 @@
+<?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

@@ -0,0 +1,10 @@
+<?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 string $token = "break";
+    public array $token = [ "break", "/case" ];
 
     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" ];
+    public array $token = [ "for", "endfor", "/for" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -18,7 +18,8 @@ class ForToken implements ControlStructure {
                 ];
 
                 return "<?php for ($arguments): {$uid} = 1; ?>";
-                
+
+            case "/for":
             case "endfor":
                 $last = end($context->iterationStack);
 

src/ControlStructure/ForeachToken.php

@@ -5,5 +5,17 @@ namespace Picea\ControlStructure;
 use DI\Definition\Source\AnnotationBasedAutowiring;
 
 class ForeachToken extends AbstractLoop {
-    public array $token = [ "foreach", "endforeach" ];
+    public array $token = [ "foreach", "endforeach", "/foreach" ];
+
+    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/IfToken.php

@@ -4,7 +4,7 @@ namespace Picea\ControlStructure;
 
 class IfToken implements ControlStructure {
 
-    public array $token = [ "if", "else", "elseif", "endif" ];
+    public array $token = [ "if", "else", "elseif", "endif", "/if" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -16,7 +16,8 @@ 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" ];
+    public array $token = [ "section", "endsection", "/section" ];
 
     protected PrintActionEnum $action = PrintActionEnum::default;
 
@@ -29,6 +29,7 @@ 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", "endswitch" ];
+    public array $token = [ "switch", "case", "endcase", "endswitch", "/switch" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -23,11 +23,13 @@ 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

@@ -4,12 +4,11 @@ namespace Picea\ControlStructure;
 
 class TryCatchToken implements ControlStructure {
 
-    public array $token = [ "try", "catch", "finally", "endtry" ];
+    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":
@@ -19,6 +18,7 @@ class TryCatchToken implements ControlStructure {
                 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", ];
+    public array $token = [ "do", "while", "endwhile", "/while" ];
 
     public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token, array $options = []) : string {
         switch($token) {
@@ -23,10 +23,13 @@ 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

@@ -0,0 +1,39 @@
+<?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 $sourceCode, string $token, array $options = []) : string;
+    public function parse(\Picea\Compiler\Context &$context, string $arguments, string $token, array $options = []) : string;
 }

src/Extension/LanguageExtension.php

@@ -11,11 +11,9 @@ class LanguageExtension implements Extension, FunctionExtension {
 
     public string $currentLanguage = "";
 
-    protected LanguageHandlerInterface $languageHandler;
+    public function __construct(
-
+        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(? string $set = null, ...$arguments) : ? string
+    public function handleTitle(null|\Stringable|string $set = null, ...$arguments) : ? string
     {
         if ( $set === null ) {
             return $this->title;
@@ -31,6 +31,7 @@ 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,29 +16,23 @@ 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]
-    protected bool $enforceExistingArguments = true;
+    public bool $enforceExistingArguments = true;
 
-    public function __construct(string $urlBase = "", string $assetToken = "", array $appUrl = [], bool $forceSSL = false) {
+    public function __construct(
+        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
     {
@@ -138,9 +132,9 @@ PATTERN;
     }
 
     # src: https://stackoverflow.com/a/14550919
-    public static function slug(string $text, string $separator = '-') : string
+    public static function slug(\Stringable|string $text, string $separator = '-') : string
     {
-        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', $text);
+        $clean = iconv('UTF-8', 'ASCII//TRANSLIT//IGNORE', (string) $text);
         $clean = preg_replace("/[^a-zA-Z0-9\/_| -]/", '', $clean);
 
         return preg_replace("/[\/_| -]+/", $separator, strtolower(trim($clean, '-')));
@@ -216,9 +210,15 @@ PATTERN;
 
     protected function domain() : string
     {
+        # Forwarded from an SSL connected host
         if ( ! empty($_SERVER['HTTP_X_FORWARDED_PROTO']) || ! empty($_SERVER['HTTP_X_FORWARDED_SSL']) ) {
             $port = "";
         }
+        # Forwarded from another host
+        elseif ( !empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+            $port = explode(':', $_SERVER['HTTP_X_FORWARDED_HOST'])[1] ?? "";
+        }
+        # Default
         else {
             $port = $this->isDefaultPort() ? "" : ":" . $_SERVER['SERVER_PORT'];
         }

src/Method/Request.php

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