use resultsetinterface instead of resultset for serializing collections (#115)

Author: cnizzardini

plugins/hal-view/src/JsonSerializer.php

@@ -5,9 +5,9 @@
 
 use Cake\Collection\CollectionInterface;
 use Cake\Datasource\EntityInterface;
+use Cake\Datasource\ResultSetInterface;
 use Cake\Http\ServerRequest;
 use Cake\ORM\Entity;
-use Cake\ORM\ResultSet;
 use Cake\Utility\Inflector;
 use Cake\View\Helper\PaginatorHelper;
 use MixerApi\Core\View\SerializableAssociation;
@@ -45,7 +45,7 @@ public function __construct(mixed $serialize, ?ServerRequest $request = null, ?P
 
         $hal = $this->recursion($serialize);
 
-        if ($hal instanceof ResultSet) {
+        if ($hal instanceof ResultSetInterface) {
             $this->data = $this->collection($hal);
         } elseif (is_subclass_of($hal, Entity::class)) {
             $this->data = $this->item($hal);
@@ -87,20 +87,20 @@ public function getData(): ?array
      * HAL resources, but does not serialize the data.
      *
      * @param mixed $mixed data to be serialized
-     * @return array|\Cake\Datasource\EntityInterface|\Cake\ORM\ResultSet
+     * @return array|\Cake\Datasource\EntityInterface|\Cake\Datasource\ResultSetInterface
      */
     private function recursion(mixed &$mixed): mixed
     {
-        if ($mixed instanceof ResultSet || is_array($mixed)) {
-            foreach ($mixed as $x => $item) {
+        if ($mixed instanceof ResultSetInterface || is_array($mixed)) {
+            foreach ($mixed as $item) {
                 $this->recursion($item);
             }
         } elseif ($mixed instanceof EntityInterface) {
             $serializableAssociation = new SerializableAssociation($mixed);
 
             $mixed = $this->resource($mixed, $serializableAssociation);
 
-            foreach ($serializableAssociation->getAssociations() as $property => $value) {
+            foreach ($serializableAssociation->getAssociations() as $value) {
                 $this->recursion($value);
             }
         }

plugins/json-ld-view/src/JsonSerializer.php

@@ -5,9 +5,9 @@
 
 use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
+use Cake\Datasource\ResultSetInterface;
 use Cake\Http\ServerRequest;
 use Cake\ORM\Entity;
-use Cake\ORM\ResultSet;
 use Cake\View\Helper\PaginatorHelper;
 use MixerApi\Core\View\SerializableAssociation;
 use ReflectionException;
@@ -63,7 +63,7 @@ public function __construct(mixed $serialize, ?ServerRequest $request = null, ?P
             $this->hydra = 'hydra:';
         }
 
-        if ($jsonLd instanceof ResultSet) {
+        if ($jsonLd instanceof ResultSetInterface) {
             $this->data = $this->collection($jsonLd);
         } elseif (is_subclass_of($jsonLd, Entity::class)) {
             $this->data = $this->item($jsonLd);
@@ -105,20 +105,20 @@ public function getData(): ?array
      * JSON-LD resources, but does not serialize the data.
      *
      * @param mixed $mixed data to be serialized
-     * @return array|\Cake\Datasource\EntityInterface|\Cake\ORM\ResultSet
+     * @return array|\Cake\Datasource\EntityInterface|\Cake\Datasource\ResultSetInterface
      */
     private function recursion(mixed &$mixed): mixed
     {
-        if ($mixed instanceof ResultSet || is_array($mixed)) {
-            foreach ($mixed as $x => $item) {
+        if ($mixed instanceof ResultSetInterface || is_array($mixed)) {
+            foreach ($mixed as $item) {
                 $this->recursion($item);
             }
         } elseif ($mixed instanceof EntityInterface) {
             $serializableAssocation = new SerializableAssociation($mixed);
 
             $mixed = $this->resource($mixed, $serializableAssocation);
 
-            foreach ($serializableAssocation->getAssociations() as $property => $value) {
+            foreach ($serializableAssocation->getAssociations() as $value) {
                 $this->recursion($value);
             }
         }