mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

Замена Compiler::toArray на var_export($value, true). Функция объявлена @deprecated

Browse Source
This commit is contained in:
evseevnn
2014-01-31 13:43:28 +04:00
parent 6fec661ea7
commit b1adc91911
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Fenom/Compiler.php
View File

@ -40,9 +40,9 @@ class Compiler
$inc = $tpl->getStorage()->compile($name, false); $inc = $tpl->getStorage()->compile($name, false);
$tpl->addDepend($inc); $tpl->addDepend($inc);
$var = $tpl->tmpVar(); $var = $tpl->tmpVar();
return $var.' = (array)$tpl; $tpl->exchangeArray(' . self::toArray($p) . '+'.$var.'); ?>' . $inc->getBody() . '<?php $tpl->exchangeArray('.$var.'); unset('.$var.');'; return $var.' = (array)$tpl; $tpl->exchangeArray(' . var_export($p, true) . '+'.$var.'); ?>' . $inc->getBody() . '<?php $tpl->exchangeArray('.$var.'); unset('.$var.');';
} else { } else {
return '$tpl->getStorage()->getTemplate(' . $cname . ')->display(' . self::toArray($p) . '+(array)$tpl);'; return '$tpl->getStorage()->getTemplate(' . $cname . ')->display(' . var_export($p, true) . '+(array)$tpl);';
} }
} else { } else {
if ($name && ($tpl->getStorage()->getOptions() & \Fenom::FORCE_INCLUDE)) { if ($name && ($tpl->getStorage()->getOptions() & \Fenom::FORCE_INCLUDE)) {
@ -687,7 +687,7 @@ class Compiler
*/ */
public static function stdFuncParser($function, Tokenizer $tokens, Template $tpl) 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) 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();'; return 'ob_start();';
} }
@ -750,6 +750,7 @@ class Compiler
/** /**
* Convert array of code to string array * Convert array of code to string array
* @deprecated
* @param $params * @param $params
* @return string * @return string
*/ */

2
src/Fenom/Template.php
View File

@ -1285,7 +1285,7 @@ class Template extends Render
} else { } else {
$body = '?>' . $macro["body"] . '<?php'; $body = '?>' . $macro["body"] . '<?php';
} }
return '$_tpl' . $n . ' = $tpl->exchangeArray(' . Compiler::toArray($args) . ');' . PHP_EOL . $body . PHP_EOL . '$tpl->exchangeArray($_tpl' . $n . '); /* X */ unset($_tpl' . $n . ');'; return '$_tpl' . $n . ' = $tpl->exchangeArray(' . var_export($args, true) . ');' . PHP_EOL . $body . PHP_EOL . '$tpl->exchangeArray($_tpl' . $n . '); /* X */ unset($_tpl' . $n . ');';
} }
/** /**