Fix issue with single entity when ResultSetDecorators are used

FriendsOfCake · Apr 23, 2020 · 0e7b21c · 0e7b21c
1 parent f4edb8a
commit 0e7b21c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Listener/JsonApiListener.php b/src/Listener/JsonApiListener.php
@@ -874,7 +874,7 @@ protected function _getSingleEntity(Subject $subject): ?EntityInterface
             return (clone $subject->entities)->first();
         }
 
-        if (!empty($subject->entities) && $subject->entities instanceof ResultSet) {
+        if (!empty($subject->entities) && $subject->entities instanceof ResultSetInterface) {
             if ($subject->entities->first() === null) {
                 $repository = $subject->query->getRepository();
                 $entity = $repository->getEntityClass();

diff --git a/tests/TestCase/Listener/JsonApiListenerTest.php b/tests/TestCase/Listener/JsonApiListenerTest.php
@@ -5,6 +5,7 @@
 
 use Cake\Controller\Controller;
 use Cake\Core\Plugin;
+use Cake\Datasource\ResultSetDecorator;
 use Cake\Event\Event;
 use Cake\Filesystem\File;
 use Cake\Http\Exception\BadRequestException;
@@ -848,6 +849,18 @@ public function testGetSingleEntity()
         $result = $this->callProtectedMethod('_getSingleEntity', [$subject], $listener);
         $this->assertSame($entity, $result);
 
+        $subject->entities = $this->getMockBuilder(ResultSetDecorator::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['first'])
+            ->getMock();
+
+        $subject->entities->method('first')
+            ->willReturn($entity);
+
+        $this->setReflectionClassInstance($listener);
+        $result = $this->callProtectedMethod('_getSingleEntity', [$subject], $listener);
+        $this->assertSame($entity, $result);
+
         unset($subject->entities);
 
         $subject->entity = $entity;