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

Merge branch 'origin/master'

Browse Source 
Conflicts:
	src/Fenom/Template.php
	tests/cases/Fenom/SandboxTest.php
This commit is contained in:
bzick
2015-02-22 11:32:11 +03:00
parent ed860a49cb fdc6caeb20
commit 83fbfb1fca
9 changed files with 1319 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Fenom/Template.php
View File

@@ -674,6 +674,7 @@ class Template extends Render
if($cond) {
$term = array_pop($exp) . ' ' . $term;
$term = '('. array_pop($exp) . ' ' . $term . ')';
$var = false;
}
$term = $this->parseTernary($tokens, $term, $var);
$var = false;
@@ -820,11 +821,16 @@ class Template extends Render
if ($tokens->isSpecialVal()) {
$code = $unary . $tokens->getAndNext();
} elseif ($tokens->isNext("(") && !$tokens->getWhitespace()) {
$func = $this->_fenom->getModifier($tokens->current(), $this);
$func = $this->_fenom->getModifier($modifier = $tokens->current(), $this);
if (!$func) {
throw new \Exception("Function " . $tokens->getAndNext() . " not found");
}
$code = $unary . $this->parseChain($tokens, $func . $this->parseArgs($tokens->next()));
if (!is_string($func)) { // dynamic modifier
$call = 'call_user_func_array($tpl->getStorage()->getModifier("' . $modifier . '"), array'.$this->parseArgs($tokens->next()).')'; // @todo optimize
} else {
$call = $func . $this->parseArgs($tokens->next());
}
$code = $unary . $this->parseChain($tokens, $call);
} elseif ($tokens->isNext(T_NS_SEPARATOR, T_DOUBLE_COLON)) {
$method = $this->parseStatic($tokens);
$args = $this->parseArgs($tokens);
@@ -1401,7 +1407,7 @@ class Template extends Render
* (1 + 2.3, 'string', $var, [2,4])
*
* @param Tokenizer $tokens
* @throws TokenizeException
* @param bool $as_string
* @return string
*/
public function parseArgs(Tokenizer $tokens)