geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 19:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor test_empty and in_filter

Browse Source
This commit is contained in:
Tobias Schultze
2012-11-18 20:53:43 +01:00
parent ca97c2feff
commit 6deee7681b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+5 -7
View File
@@ -779,18 +779,16 @@ function twig_sort_filter($array)
/* used internally */ /* used internally */
function twig_in_filter($value, $compare) function twig_in_filter($value, $compare)
{ {
$strict = is_object($value);
if (is_array($compare)) { if (is_array($compare)) {
return in_array($value, $compare, $strict); return in_array($value, $compare, is_object($value));
} elseif (is_string($compare)) { } elseif (is_string($compare)) {
if (!strlen((string) $value)) { if (!strlen($value)) {
return empty($compare); return empty($compare);
} }
return false !== strpos($compare, (string) $value); return false !== strpos($compare, (string) $value);
} elseif (is_object($compare) && $compare instanceof Traversable) { } elseif ($compare instanceof Traversable) {
return in_array($value, iterator_to_array($compare, false), $strict); return in_array($value, iterator_to_array($compare, false), is_object($value));
} }
return false; return false;
@@ -1197,7 +1195,7 @@ function twig_test_empty($value)
return 0 == count($value); return 0 == count($value);
} }
return false === $value || (empty($value) && '0' != $value); return '' === $value || false === $value || null === $value || array() === $value;
} }
/** /**