mirror
/
fenom
mirror of https://github.com/fenom-template/fenom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 0b8dd86c30 into e0224aa18b

This commit is contained in:
evseevnn 2014-01-31 01:25:39 -08:00
parent e0224aa18b 0b8dd86c30
commit 62bf92476a
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Fenom/Compiler.php
View File

@ -41,7 +41,7 @@ class Compiler
$tpl->addDepend($inc);
$var = $tpl->tmpVar();
if($p) {
return $var.' = $var; $var = ' . self::toArray($p) . ' + $var; ?>' . $inc->getBody() . '<?php $var = '.$var.'; unset('.$var.');';
return $var.' = $var; $var = ' . var_export($p, true) . ' + $var; ?>' . $inc->getBody() . '<?php $var = '.$var.'; unset('.$var.');';
} else {
return $var.' = $var; ?>' . $inc->getBody() . '<?php $var = '.$var.'; unset('.$var.');';
}
@ -50,7 +50,7 @@ class Compiler
}
}
if($p) {
return '$tpl->getStorage()->getTemplate(' . $cname . ')->display(' . self::toArray($p) . ' + $var);';
return '$tpl->getStorage()->getTemplate(' . $cname . ')->display(' . var_export($p, true) . ' + $var);';
} else {
return '$tpl->getStorage()->getTemplate(' . $cname . ')->display($var);';
}
@ -687,7 +687,7 @@ class Compiler
*/
public static function stdFuncParser($function, Tokenizer $tokens, Template $tpl)
{
return "$function(" . self::toArray($tpl->parseParams($tokens)) . ', $tpl)';
return "$function(" . var_export($tpl->parseParams($tokens), true) . ', $tpl)';
}
/**
@ -731,7 +731,7 @@ class Compiler
*/
public static function stdFuncOpen(Tokenizer $tokens, Scope $scope)
{
$scope["params"] = self::toArray($scope->tpl->parseParams($tokens));
$scope["params"] = var_export($scope->tpl->parseParams($tokens), true);
return 'ob_start();';
}
@ -750,6 +750,7 @@ class Compiler
/**
* Convert array of code to string array
* @deprecated
* @param $params
* @return string
*/

6
src/Fenom/Template.php
View File

@ -1307,10 +1307,10 @@ class Template extends Render
}
if ($recursive) {
$recursive['recursive'] = true;
return '$tpl->getMacro("' . $name . '")->__invoke('.Compiler::toArray($args).', $tpl);';
return '$tpl->getMacro("' . $name . '")->__invoke(' . var_export($args, true) . ', $tpl);';
} else {
$vars = $this->tmpVar();
return $vars . ' = $var; $var = ' . Compiler::toArray($args) . ';' . PHP_EOL . '?>' .
return $vars . ' = $var; $var = ' . var_export($args, true) . ';' . PHP_EOL . '?>' .
$macro["body"] . '<?php' . PHP_EOL . '$var = '.$vars.'; unset(' . $vars . ');';
}
}
@ -1440,4 +1440,4 @@ class Template extends Render
return $params;
}
}
}