summaryrefslogtreecommitdiff
path: root/ext/spl/php_spl.c
diff options
context:
space:
mode:
authorDerick Rethans <github@derickrethans.nl>2019-09-03 09:11:00 +0100
committerDerick Rethans <github@derickrethans.nl>2019-09-03 09:11:00 +0100
commitac356ba81ff2efa90ad50bae3c6b0cf64985b31c (patch)
tree4186f9d66f8e909b62a48a092196ddc1f113c597 /ext/spl/php_spl.c
parentc53da9b631feab753792bda993c9b5e08e39eea7 (diff)
parent4de8503c225ab9f6130d335b21e7646a0142ed5e (diff)
downloadphp-git-ac356ba81ff2efa90ad50bae3c6b0cf64985b31c.tar.gz
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Diffstat (limited to 'ext/spl/php_spl.c')
-rw-r--r--ext/spl/php_spl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index e4e1774bd7..b147a96128 100644
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -237,6 +237,10 @@ PHP_FUNCTION(class_uses)
Return an array containing the names of all clsses and interfaces defined in SPL */
PHP_FUNCTION(spl_classes)
{
+ if (zend_parse_parameters_none() == FAILURE) {
+ return;
+ }
+
array_init(return_value);
SPL_LIST_CLASSES(return_value, 0, 0, 0)
@@ -983,11 +987,9 @@ static const zend_function_entry spl_functions[] = {
PHP_FE(class_uses, arginfo_class_uses)
PHP_FE(spl_object_hash, arginfo_spl_object_hash)
PHP_FE(spl_object_id, arginfo_spl_object_id)
-#ifdef SPL_ITERATORS_H
PHP_FE(iterator_to_array, arginfo_iterator_to_array)
PHP_FE(iterator_count, arginfo_iterator)
PHP_FE(iterator_apply, arginfo_iterator_apply)
-#endif /* SPL_ITERATORS_H */
PHP_FE_END
};
/* }}} */