Skip to content

Commit 573c0a4

Browse files
committed
Use is_iterable function where possible
1 parent 15d505f commit 573c0a4

File tree

6 files changed

+9
-11
lines changed

6 files changed

+9
-11
lines changed

src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ private function addTagsFor($value)
133133
return;
134134
}
135135

136-
if (!\is_array($value) && !$value instanceof \Traversable) {
136+
if (!is_iterable($value)) {
137137
$this->addTagForItem($value);
138138

139139
return;

src/GraphQl/Type/Definition/IterableType.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public function __construct()
4646
*/
4747
public function serialize($value)
4848
{
49-
// is_iterable
50-
if (!(\is_array($value) || $value instanceof \Traversable)) {
49+
if (!is_iterable($value)) {
5150
throw new Error(sprintf('Iterable cannot represent non iterable value: %s', Utils::printSafe($value)));
5251
}
5352

@@ -59,8 +58,7 @@ public function serialize($value)
5958
*/
6059
public function parseValue($value)
6160
{
62-
// is_iterable
63-
if (!(\is_array($value) || $value instanceof \Traversable)) {
61+
if (!is_iterable($value)) {
6462
throw new Error(sprintf('Iterable cannot represent non iterable value: %s', Utils::printSafeJson($value)));
6563
}
6664

src/Hydra/Serializer/CollectionNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function __construct(ContextBuilderInterface $contextBuilder, ResourceCla
5656
*/
5757
public function supportsNormalization($data, $format = null)
5858
{
59-
return self::FORMAT === $format && (\is_array($data) || ($data instanceof \Traversable));
59+
return self::FORMAT === $format && is_iterable($data);
6060
}
6161

6262
/**

src/Serializer/AbstractCollectionNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function __construct(ResourceClassResolverInterface $resourceClassResolve
5050
*/
5151
public function supportsNormalization($data, $format = null)
5252
{
53-
return static::FORMAT === $format && (\is_array($data) || $data instanceof \Traversable);
53+
return static::FORMAT === $format && is_iterable($data);
5454
}
5555

5656
/**

src/Serializer/AbstractItemNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ protected function getAttributeValue($object, $attribute, $format = null, array
403403
$type = $propertyMetadata->getType();
404404

405405
if (
406-
(\is_array($attributeValue) || $attributeValue instanceof \Traversable) &&
406+
is_iterable($attributeValue) &&
407407
$type &&
408408
$type->isCollection() &&
409409
($collectionValueType = $type->getCollectionValueType()) &&

tests/DataProvider/ChainCollectionDataProviderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testGetCollectionNotSupported()
6969

7070
$collection = (new ChainCollectionDataProvider([$firstDataProvider->reveal()]))->getCollection('notfound', 'op');
7171

72-
$this->assertContains(true, [\is_array($collection), $collection instanceof \Traversable]);
72+
$this->assertTrue(is_iterable($collection));
7373
$this->assertEmpty($collection);
7474
}
7575

@@ -109,15 +109,15 @@ public function testLegacyGetCollectionExceptions()
109109

110110
$collection = (new ChainCollectionDataProvider([$firstDataProvider->reveal()]))->getCollection('notfound', 'op');
111111

112-
$this->assertContains(true, [\is_array($collection), $collection instanceof \Traversable]);
112+
$this->assertTrue(is_iterable($collection));
113113
$this->assertEmpty($collection);
114114
}
115115

116116
public function testGetCollectionWithEmptyDataProviders()
117117
{
118118
$collection = (new ChainCollectionDataProvider([]))->getCollection(Dummy::class);
119119

120-
$this->assertContains(true, [\is_array($collection), $collection instanceof \Traversable]);
120+
$this->assertTrue(is_iterable($collection));
121121
$this->assertEmpty($collection);
122122
}
123123
}

0 commit comments

Comments
 (0)