Merge pull request #29 from weierophinney/hotfix/array-object-extraction

Fix ArrayObject extraction on PHP 7.4+
laminas-api-tools · Mar 1, 2021 · e7c38b9 · e7c38b9
2 parents 2d57434 + ac8b67f
commit e7c38b9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/src/Extractor/EntityExtractorHydratorV2.php b/src/Extractor/EntityExtractorHydratorV2.php
@@ -8,6 +8,7 @@
 
 namespace Laminas\ApiTools\Hal\Extractor;
 
+use ArrayObject;
 use JsonSerializable;
 use Laminas\ApiTools\Hal\EntityHydratorManager;
 use Laminas\Hydrator\ExtractionInterface;
@@ -68,6 +69,10 @@ private function extractEntity($entity)
             return $entity->jsonSerialize();
         }
 
+        if ($entity instanceof ArrayObject) {
+            return $entity->getArrayCopy();
+        }
+
         return get_object_vars($entity);
     }
 }
diff --git a/src/Extractor/EntityExtractorHydratorV3.php b/src/Extractor/EntityExtractorHydratorV3.php
@@ -8,6 +8,7 @@
 
 namespace Laminas\ApiTools\Hal\Extractor;
 
+use ArrayObject;
 use JsonSerializable;
 use Laminas\ApiTools\Hal\EntityHydratorManager;
 use Laminas\Hydrator\ExtractionInterface;
@@ -68,6 +69,10 @@ private function extractEntity(object $entity) : array
             return $entity->jsonSerialize();
         }
 
+        if ($entity instanceof ArrayObject) {
+            return $entity->getArrayCopy();
+        }
+
         return get_object_vars($entity);
     }
 }
diff --git a/test/Extractor/EntityExtractorTest.php b/test/Extractor/EntityExtractorTest.php
@@ -8,6 +8,7 @@
 
 namespace LaminasTest\ApiTools\Hal\Extractor;
 
+use ArrayObject;
 use Laminas\ApiTools\Hal\EntityHydratorManager;
 use Laminas\ApiTools\Hal\Extractor\EntityExtractor;
 use Laminas\Hydrator\ObjectProperty;
@@ -70,4 +71,16 @@ public function testExtractTwiceGivenSameEntityShouldProcessExtractionOnceAndRet
 
         $this->assertSame($data1, $data2);
     }
+
+    public function testExtractOfArrayObjectEntityWillExtractCorrectly()
+    {
+        $data   = ['id' => 'foo', 'message' => 'FOO'];
+        $entity = new ArrayObject($data);
+        $entityHydratorManager = $this->prophesize(EntityHydratorManager::class);
+        $entityHydratorManager->getHydratorForEntity($entity)->willReturn(null)->shouldBeCalledTimes(1);
+
+        $extractor = new EntityExtractor($entityHydratorManager->reveal());
+
+        $this->assertSame($data, $extractor->extract($entity));
+    }
 }