Rename ReflectionClass::isIterateable() to isIterable()

Iterateable is not a word.
Add the correct spelling, but keep the original one around
for BC purposes.

Perhaps we can add ZEND_ACC_DEPRECATED at some later date
and even remove it from PHP 8.

diff --git a/NEWS b/NEWS
index f8b8bf7d82f1aaef8222eb93c7b1b47fe384c85f..c9725592cbd41a193de594261c553f549a3d86af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP                                                                        NEWS
   . Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUNTED). (Dmitry)
   . Removed the sql.safe_mode directive. (Kalle)
   . Removed support for Netware. (Kalle)
+  . Renamed ReflectionClass::isIterateable() to ReflectionClass::isIterable()
+    (alias original name for BC). (Sara)
   . Fixed bug #54535 (WSA cleanup executes before MSHUTDOWN). (Kalle)
   . Implemented FR #69791 (Disallow mail header injections by extra headers)
     (Yasuo)

diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 3e5af0dbb87cbb600b510ff9289600fa2da48fe8..84f4d66aeb8b05961864ce9c9b20addddfeeb490 100644 (file)
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -5117,9 +5117,9 @@ ZEND_METHOD(reflection_class, implementsInterface)
 }
 /* }}} */
 
-/* {{{ proto public bool ReflectionClass::isIterateable()
-   Returns whether this class is iterateable (can be used inside foreach) */
-ZEND_METHOD(reflection_class, isIterateable)
+/* {{{ proto public bool ReflectionClass::isIterable()
+   Returns whether this class is iterable (can be used inside foreach) */
+ZEND_METHOD(reflection_class, isIterable)
 {
        reflection_object *intern;
        zend_class_entry *ce;
@@ -6465,7 +6465,8 @@ static const zend_function_entry reflection_class_functions[] = {
        ZEND_ME(reflection_class, getStaticPropertyValue, arginfo_reflection_class_getStaticPropertyValue, 0)
        ZEND_ME(reflection_class, setStaticPropertyValue, arginfo_reflection_class_setStaticPropertyValue, 0)
        ZEND_ME(reflection_class, getDefaultProperties, arginfo_reflection__void, 0)
-       ZEND_ME(reflection_class, isIterateable, arginfo_reflection__void, 0)
+       ZEND_ME(reflection_class, isIterable, arginfo_reflection__void, 0)
+       ZEND_MALIAS(reflection_class, isIterateable, isIterable, arginfo_reflection__void, 0)
        ZEND_ME(reflection_class, implementsInterface, arginfo_reflection_class_implementsInterface, 0)
        ZEND_ME(reflection_class, getExtension, arginfo_reflection__void, 0)
        ZEND_ME(reflection_class, getExtensionName, arginfo_reflection__void, 0)

diff --git a/ext/reflection/tests/ReflectionClass_toString_001.phpt b/ext/reflection/tests/ReflectionClass_toString_001.phpt
index 2b185db57d7c7990d3388c56a485c5cd91702e5f..5a2b4979058d5d5759df2cd8d4b867f96a256b5f 100644 (file)
--- a/ext/reflection/tests/ReflectionClass_toString_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_toString_001.phpt
@@ -34,7 +34,7 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
     Property [ <default> public $name ]
   }
 
-  - Methods [52] {
+  - Methods [53] {
     Method [ <internal:Reflection> final private method __clone ] {
 
       - Parameters [0] {
@@ -323,6 +323,12 @@ Class [ <internal:Reflection> class ReflectionClass implements Reflector ] {
       }
     }
 
+    Method [ <internal:Reflection> public method isIterable ] {
+
+      - Parameters [0] {
+      }
+    }
+
     Method [ <internal:Reflection> public method isIterateable ] {
 
       - Parameters [0] {