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

Merge pull request #142 from fenom-template/develop 

2.5
This commit is contained in:
Ivan Shalganov 2015-02-01 01:16:58 +03:00
parent 1ec97221f5 5d87060f42
commit feb3a51884
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Fenom/Compiler.php
View File

@ -648,10 +648,10 @@ class Compiler
public static function stdFuncParser(Tokenizer $tokens, Tag $tag)
{
if(is_string($tag->callback)) {
return $tag->out($tag->callback . "(" . self::toArray($tag->tpl->parseParams($tokens)) . ', $tpl)');
return $tag->out($tag->callback . "(" . self::toArray($tag->tpl->parseParams($tokens)) . ', $tpl, $var)');
} else {
return '$info = $tpl->getStorage()->getTag('.var_export($tag->name, true).');'.PHP_EOL.
$tag->out('call_user_func($info["function"], '.self::toArray($tag->tpl->parseParams($tokens)).', $tpl)');
$tag->out('call_user_func_array($info["function"], array('.self::toArray($tag->tpl->parseParams($tokens)).', $tpl, &$var))');
}
}
@ -709,10 +709,10 @@ class Compiler
{
$tag->restore(\Fenom::AUTO_ESCAPE);
if(is_string($tag->callback)) {
return $tag->out($tag->callback . "(" . $tag["params"] . ', ob_get_clean(), $tpl)');
return $tag->out($tag->callback . "(" . $tag["params"] . ', ob_get_clean(), $tpl, $var)');
} else {
return '$info = $tpl->getStorage()->getTag('.var_export($tag->name, true).');'.PHP_EOL.
$tag->out('call_user_func($info["function"], ' . $tag["params"] . ', ob_get_clean(), $tpl)');
$tag->out('call_user_func_array($info["function"], array(' . $tag["params"] . ', ob_get_clean(), $tpl, &$var))');
}
}

16
src/Fenom/Modifier.php
View File

@ -107,9 +107,9 @@ class Modifier
if (preg_match('#^(.{' . $length . '}).*?(.{' . $length . '})?$#usS', $string, $match)) {
if (count($match) == 3) {
if ($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]) .
return preg_replace('#\s\S*$#usS', "", $match[1]) .
$etc .
preg_replace('#.*\s#usS', "", $match[2]);
preg_replace('#\S*\s#usS', "", $match[2]);
} else {
return $match[1] . $etc . $match[2];
}
@ -118,7 +118,7 @@ class Modifier
} else {
if (preg_match('#^(.{' . $length . '})#usS', $string, $match)) {
if ($by_words) {
return preg_replace('#\s.*$#usS', "", $match[1]) . $etc;
return preg_replace('#\s\S*$#usS', "", $match[1]) . $etc;
} else {
return $match[1] . $etc;
}
@ -170,10 +170,12 @@ class Modifier
*/
public static function in($value, $haystack)
{
if (is_array($haystack)) {
return in_array($value, $haystack) || array_key_exists($value, $haystack);
} elseif (is_string($haystack)) {
return strpos($haystack, $value) !== false;
if(is_scalar($value)) {
if (is_array($haystack)) {
return in_array($value, $haystack) || array_key_exists($value, $haystack);
} elseif (is_string($haystack)) {
return strpos($haystack, $value) !== false;
}
}
return false;
}

6
tests/TestCase.php
View File

@ -29,6 +29,12 @@ class TestCase extends \PHPUnit_Framework_TestCase
"b" => 2,
"two" => 2
),
"level1" => array(
"level2" => array(
"one" => 1,
"two" => 2
)
),
"num" => array(
1 => "one",
2 => "two",

3
tests/cases/Fenom/TemplateTest.php
View File

@ -1184,6 +1184,9 @@ class TemplateTest extends TestCase
array('{if $one in ["one", "two", "three"]} block1 {else} block2 {/if}', 'block2'),
array('{if $one in keys [1 => "one", 2 => "two", 3 => "three"]} block1 {else} block2 {/if}', 'block1'),
array('{if $one in $two} block1 {else} block2 {/if}', 'block2'),
array('{if $one in $list} block1 {else} block2 {/if}', 'block1'),
array('{if "one" in $num} block1 {else} block2 {/if}', 'block1'),
array('{if "one" in $level1.level2} block1 {else} block2 {/if}', 'block1'),
);
}