diff --git a/src/Fenom/Compiler.php b/src/Fenom/Compiler.php index a871128..d61e5c7 100644 --- a/src/Fenom/Compiler.php +++ b/src/Fenom/Compiler.php @@ -41,7 +41,7 @@ class Compiler $tpl->addDepend($inc); $var = $tpl->tmpVar(); if($p) { - return $var.' = $var; $var = ' . self::toArray($p) . ' + $var; ?>' . $inc->getBody() . '' . $inc->getBody() . '' . $inc->getBody() . '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 */ diff --git a/src/Fenom/Template.php b/src/Fenom/Template.php index e33dfa8..f8a8399 100644 --- a/src/Fenom/Template.php +++ b/src/Fenom/Template.php @@ -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"] . '