Замена Compiler::toArray на var_export

Замена Compiler::toArray на var_export($value, true). Функция объявлена @deprecated
This commit is contained in:
evseevnn 2014-01-31 12:20:12 +03:00
parent e0224aa18b
commit be7f2e6fbc
1 changed files with 5 additions and 4 deletions

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
*/