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

- Implemented TWIG_ARRAY_KEY_EXISTS (for normal arrays only).

Browse Source
This commit is contained in:
Derick Rethans
2011-06-07 09:29:02 +01:00
parent 4de3659c9b
commit 19fbee7ef6
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twig.c
+16 -2
View File
@@ -113,6 +113,20 @@ PHP_MINFO_FUNCTION(twig)
}
int TWIG_ARRAY_KEY_EXISTS(zval *array, zval *key)
{
void *dummy;
if (Z_TYPE_P(array) != IS_ARRAY) {
return 0;
}
convert_to_string(key);
if (zend_hash_find(Z_ARRVAL_P(array), Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &dummy) == SUCCESS) {
return 1;
}
return 0;
}
/* {{{ proto mixed twig_template_get_attributes(TwigTemplate template, mixed object, mixed item, array arguments, string type, boolean isDefinedTest)
A C implementation of TwigTemplate::getAttribute() */
PHP_FUNCTION(twig_template_get_attributes)
@@ -143,7 +157,7 @@ PHP_FUNCTION(twig_template_get_attributes)
}
*/
if (strcmp("method", type) == 0) {
if ((Z_TYPE_P(object) == IS_ARRAY && TWIG_ARRAY_KEY_EXISTS(item, object))
if ((TWIG_ARRAY_KEY_EXISTS(object, item))
|| (TWIG_INSTANCE_OF(object, "ArrayAccess") && TWIG_ISSET_ARRAY_ELEMENT(object, item))
) {
if (isDefinedTest) {
@@ -242,7 +256,7 @@ PHP_FUNCTION(twig_template_get_attributes)
*/
if (strcmp("method", type) != 0) {
if (TWIG_ISSET("self::$cache[$class]['properties'][$item]")
|| TWIG_ISSET(object, item) || TWIG_ARRAY_KEY_EXISTS(item, object)
|| TWIG_ISSET(object, item) || TWIG_ARRAY_KEY_EXISTS(object, item) // FIXME: Array key? is that array access here?
) {
if (isDefinedTest) {
RETURN_TRUE;