php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20217: ReflectionClass::isIterable() should return false for classes with property hooks (#20241)
This commit is contained in:
Alexandre Daubois
2025-10-22 10:03:00 +02:00
parent 920847efc6 572652e5de
commit 39d5cbb13d
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.5.0RC4
- Reflection:
. Fixed bug GH-20217 (ReflectionClass::isIterable() incorrectly returns true
for classes with property hooks). (alexandre-daubois)
23 Oct 2025, PHP 8.5.0RC3

3
ext/reflection/php_reflection.c
View File

@@ -5589,7 +5589,8 @@ ZEND_METHOD(ReflectionClass, isIterable)
RETURN_FALSE;
}
RETURN_BOOL(ce->get_iterator || instanceof_function(ce, zend_ce_traversable));
RETURN_BOOL((ce->get_iterator && ce->get_iterator != zend_hooked_object_get_iterator)
|| instanceof_function(ce, zend_ce_traversable));
}
/* }}} */

38
ext/reflection/tests/ReflectionClass_isIterable_gh20217.phpt Normal file
View File

@@ -0,0 +1,38 @@
--TEST--
GH-20217 (ReflectionClass::isIterable() should return false for classes with property hooks)
--FILE--
<?php
class ClassWithPropertyHooks
{
public string $name {
get => 'virtual';
}
}
class IterableClassWithPropertyHooks implements IteratorAggregate
{
public string $name {
get => 'virtual';
}
public function getIterator(): Traversable
{
return new ArrayIterator([]);
}
}
$classes = [
'ClassWithPropertyHooks' => false,
'IterableClassWithPropertyHooks' => true,
];
foreach ($classes as $className => $expected) {
$status = (new ReflectionClass($className)->isIterable() === $expected) ? 'PASS' : 'FAIL';
echo "$className: $status\n";
}
?>
--EXPECT--
ClassWithPropertyHooks: PASS
IterableClassWithPropertyHooks: PASS