Misc fixes

Author: drjamesj

src/Core/Environment.php

@@ -11,6 +11,7 @@
 use Codewithkyrian\Jinja\Runtime\FloatValue;
 use Codewithkyrian\Jinja\Runtime\FunctionValue;
 use Codewithkyrian\Jinja\Runtime\IntegerValue;
+use Codewithkyrian\Jinja\Runtime\KeywordArgumentsValue;
 use Codewithkyrian\Jinja\Runtime\NullValue;
 use Codewithkyrian\Jinja\Runtime\NumericValue;
 use Codewithkyrian\Jinja\Runtime\ObjectValue;
@@ -43,14 +44,12 @@ public function __construct(?Environment $parent = null)
         $this->parent = $parent;
 
         $this->variables = [
-            'namespace' => new FunctionValue(function ($args) {
-                if (count($args) === 0) {
+            'namespace' => new FunctionValue(function (?KeywordArgumentsValue $args = null) {
+                if (!$args) {
                     return new ObjectValue([]);
                 }
-                if (count($args) !== 1 || !($args[0] instanceof ObjectValue)) {
-                    throw new RuntimeException("`namespace` expects either zero arguments or a single object argument");
-                }
-                return $args[0];
+
+                return new ObjectValue($args->value);
             })
         ];
 

src/Runtime/FunctionValue.php

@@ -17,6 +17,6 @@ public function __construct(callable $value)
 
     public function call(array $args, Environment $env): RuntimeValue
     {
-        return call_user_func($this->value, $args, $env);
+        return call_user_func_array($this->value, [...$args, $env]);
     }
 }

tests/Datasets/InterpreterDataset.php

@@ -9,6 +9,7 @@
 const EXAMPLE_FOR_TEMPLATE_4 = "{% for item in seq -%}\n    {{ item }}\n{%- endfor %}";
 const EXAMPLE_COMMENT_TEMPLATE = "    {# comment #}\n  {# {% if true %} {% endif %} #}\n";
 const EXAMPLE_OBJECT_LITERAL_TEMPLATE = "{% set obj = { 'key1': 'value1', 'key2': 'value2' } %}{{ obj.key1 }} - {{ obj.key2 }}";
+const EXAMPLE_OBJECT_GET = "{% set obj = { 'key1': 'value1', 'key2': 'value2' } %}{{ obj.get('key1') }} - {{ obj.get('key3', 'default') }}";
 
 dataset('interpreterTestData', [
     // If tests
@@ -146,4 +147,18 @@
         'trim_blocks' => true,
         'target' => "value1 - value2",
     ],
+    'object get method (no strip or trim)' => [
+        'template' => EXAMPLE_OBJECT_GET,
+        'data' => [],
+        'lstrip_blocks' => false,
+        'trim_blocks' => false,
+        'target' => "value1 - default",
+    ],
+    'object get method (strip and trim)' => [
+        'template' => EXAMPLE_OBJECT_GET,
+        'data' => [],
+        'lstrip_blocks' => true,
+        'trim_blocks' => true,
+        'target' => "value1 - default",
+    ],
 ]);