File size: 3,760 Bytes
4d2a9bf | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | diff --git a/Template.php b/Template.php
index f9a8613..746cb1d 100644
--- a/Template.php
+++ b/Template.php
@@ -24,12 +24,10 @@ static function embrace($content, $array)
$saveClosing = preg_quote(TemplateFunctions::getDelimiters()[1]);
foreach ($flatArray as $flatKey => $value){
$flatKey = preg_replace('/[\/\.\\\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:\-]/', "\\\\$0",$flatKey);
- if(is_callable($value)){
- TemplateFunctions::registerClosure($flatKey,$value);
- } else {
- $content = preg_replace("/$saveOpening\s*$flatKey\s*$saveClosing/", $value, $content);
- $content = TemplateFunctions::tryClosures($flatArray, $content, false);
- }
+ // PATCHED: direct function injection is not allowed anymore
+ $content = preg_replace("/$saveOpening\s*$flatKey\s*$saveClosing/", $value, $content);
+ $content = TemplateFunctions::tryClosures($flatArray, $content, false);
+
}
return $content;
diff --git a/TemplateFunctions.php b/TemplateFunctions.php
index 783dc49..48941eb 100644
--- a/TemplateFunctions.php
+++ b/TemplateFunctions.php
@@ -103,7 +103,7 @@ private static function retrieveClosurePattern($pure, $closureName)
if (!$pure) {
$pattern .= preg_quote(self::$registeredDelimiters[0]) . "\s*";
}
- $pattern .= "$closureName\(([a-z0-9,\.\s]+)\)";
+ $pattern .= "$closureName\(([a-z0-9,\.\s_]+)\)";
if (!$pure) {
$pattern .= "\s*" . preg_quote(self::$registeredDelimiters[1]);
}
@@ -201,7 +201,6 @@ private static function evaluateTypedCondition(array $flatArray, $expression): b
foreach ($flatArray as $key => $value) {
$pattern = '/' . $key . '([^.]|$)/';
if (preg_match($pattern, $expression, $matches)) {
-
switch (gettype($flatArray[$key])) {
case 'boolean':
$expression = str_replace($key, $flatArray[$key] ? 'true' : 'false', $expression);
@@ -241,11 +240,12 @@ static function nIf($content, $array)
return $content;
}
+ $array = Template::flattenArray($array);
+ // important: first try closures
+ $array = array_merge(self::$registeredClosures, $array);
foreach ($hits as $hit) {
$expression = $hit->getAttribute('n-if');
- $array = Template::flattenArray($array);
$bool = self::evaluateTypedCondition($array, $expression);
-
if (!$bool) {
$hit->parentNode->removeChild($hit);
} else {
diff --git a/composer.json b/composer.json
index 97ea57b..dffe8ac 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,12 @@
{
"name": "neoan3-apps/template",
"description": "neoan3 minimal template engine",
- "version": "1.1.0",
+ "version": "1.1.1",
"license": "MIT",
"autoload": {
"psr-4": {
"Neoan3\\Apps\\": "./"
}
-
},
"require": {
"ext-openssl": "*",
diff --git a/tests/TemplateTest.php b/tests/TemplateTest.php
index 20e4e2e..dda1d75 100644
--- a/tests/TemplateTest.php
+++ b/tests/TemplateTest.php
@@ -113,11 +113,11 @@ public function testEmbraceTypes()
public function testCallback()
{
$array = [
- 'myFunc' => function ($x) {
- return strtoupper($x);
- },
'some' => 'value'
];
+ TemplateFunctions::registerClosure('myFunc',function($x){
+ return strtoupper($x);
+ });
$t = Template::embraceFromFile('callback.html', $array);
$this->assertStringContainsString('<p>VALUE</p>', $t);
|