Merge pull request #3463 from renaudclosset/2.5

…Do not treat classes implementing \Traversable as collection

Author: soyuka

src/Api/ResourceClassResolver.php

@@ -45,7 +45,8 @@ public function getResourceClass($value, string $resourceClass = null, bool $str
             throw new InvalidArgumentException('Strict checking is only possible when resource class is specified.');
         }
 
-        $actualClass = \is_object($value) && !$value instanceof \Traversable ? $this->getObjectClass($value) : null;
+        $objectClass = \is_object($value) ? $this->getObjectClass($value) : null;
+        $actualClass = ($objectClass && (!$value instanceof \Traversable || $this->isResourceClass($objectClass))) ? $this->getObjectClass($value) : null;
 
         if (null === $actualClass && null === $resourceClass) {
             throw new InvalidArgumentException('Resource type could not be determined. Resource class must be specified.');

src/Serializer/AbstractItemNormalizer.php

@@ -90,7 +90,7 @@ public function __construct(PropertyNameCollectionFactoryInterface $propertyName
      */
     public function supportsNormalization($data, $format = null)
     {
-        if (!\is_object($data) || $data instanceof \Traversable) {
+        if (!\is_object($data)) {
             return false;
         }
 

tests/Api/ResourceClassResolverTest.php

@@ -88,6 +88,18 @@ public function testGetResourceClassWithTraversableAsValue()
         $this->assertEquals(Dummy::class, $resourceClassResolver->getResourceClass($dummies, Dummy::class));
     }
 
+    public function testGetResourceClassWithTraversable()
+    {
+        $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
+        $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection([\ArrayObject::class]));
+
+        $dummy = new \ArrayObject();
+
+        $resourceClassResolver = new ResourceClassResolver($resourceNameCollectionFactoryProphecy->reveal());
+
+        $this->assertEquals(\ArrayObject::class, $resourceClassResolver->getResourceClass($dummy));
+    }
+
     public function testGetResourceClassWithPaginatorInterfaceAsValue()
     {
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
@@ -119,6 +131,7 @@ public function testGetResourceClassWithNoResourceClassName()
         $this->expectExceptionMessage('Resource type could not be determined. Resource class must be specified.');
 
         $resourceNameCollectionFactoryProphecy = $this->prophesize(ResourceNameCollectionFactoryInterface::class);
+        $resourceNameCollectionFactoryProphecy->create()->willReturn(new ResourceNameCollection([]));
 
         $resourceClassResolver = new ResourceClassResolver($resourceNameCollectionFactoryProphecy->reveal());