Skip to content

Commit 54a9a08

Browse files
committed
Altering tests to follow is_iterable and isIterable reflection class behaviours to what foreach expects: foreach() argument must be of type array|object, %s given
1 parent 1ee35bb commit 54a9a08

File tree

5 files changed

+7
-26
lines changed

5 files changed

+7
-26
lines changed

ext/opcache/tests/iterable_type_optimization.phpt

Lines changed: 0 additions & 19 deletions
This file was deleted.

ext/reflection/tests/ReflectionClass_isIterateable_001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Is IteratorImpl iterable? bool(true)
4949
Is IteratorAggregateImpl iterable? bool(true)
5050
Is ExtendsIteratorImpl iterable? bool(true)
5151
Is ExtendsIteratorAggregateImpl iterable? bool(true)
52-
Is A iterable? bool(false)
52+
Is A iterable? bool(true)
5353

5454
Test static invocation:
5555

ext/reflection/tests/ReflectionClass_isIterateable_basic.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ class IteratorClass implements Iterator {
1414
function rewind(): void {}
1515
}
1616
class DerivedClass extends IteratorClass {}
17-
class NonIterator {}
17+
class RegularClass {}
1818

1919
function dump_iterateable($class) {
2020
$reflection = new ReflectionClass($class);
2121
var_dump($reflection->isIterateable());
2222
}
2323

24-
$classes = array("ArrayObject", "IteratorClass", "DerivedClass", "NonIterator");
24+
$classes = array("ArrayObject", "IteratorClass", "DerivedClass", "RegularClass");
2525
foreach ($classes as $class) {
2626
echo "Is $class iterateable? ";
2727
dump_iterateable($class);
@@ -31,4 +31,4 @@ foreach ($classes as $class) {
3131
Is ArrayObject iterateable? bool(true)
3232
Is IteratorClass iterateable? bool(true)
3333
Is DerivedClass iterateable? bool(true)
34-
Is NonIterator iterateable? bool(false)
34+
Is RegularClass iterateable? bool(true)

ext/reflection/tests/ReflectionClass_isIterateable_variation1.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ dump_iterateable($stdClass);
2121

2222
?>
2323
--EXPECT--
24-
bool(false)
25-
bool(false)
24+
bool(true)
25+
bool(true)

ext/standard/tests/general_functions/is_iterable.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ bool(true)
2121
bool(true)
2222
bool(false)
2323
bool(false)
24-
bool(false)
24+
bool(true)

0 commit comments

Comments
 (0)