Merge pull request #191 from MarcinOrlowski/resource-collection-190

MarcinOrlowski · web-flow · commit 44d8363c2fe6 · 2021-03-05T07:54:58.000+01:00
Resource collection fix
diff --git a/docs/CHANGES.md b/docs/CHANGES.md
@@ -8,6 +8,9 @@
 
 ## CHANGE LOG ##
 
+* @dev
+   * [RB-190] Fixed converting resource and resource collection (reported by @achinkumar121)
+
 * v9.2.1 (2021-01-18)
    * [RB-186] ExceptionHandler now expects `\Throwable` instead of `\Exception`.
 
diff --git a/src/Converters/ToArrayConverter.php b/src/Converters/ToArrayConverter.php
@@ -35,6 +35,6 @@ public function convert(object $obj, /** @scrutinizer ignore-unused */ array $co
     {
         Validator::assertIsObject('obj', $obj);
 
-        return $obj->toArray();
+        return $obj->toArray(null);
     }
 }
diff --git a/tests/Models/TestModelJsonResource.php b/tests/Models/TestModelJsonResource.php
@@ -52,7 +52,7 @@ public function getVal(): ?string
      *
      * @return array
      */
-    public function toArray($request = null): array
+    public function toArray($request): array
     {
         return [
         	self::FIELD_NAME => $this->val,

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public function convert(object $obj, /** @scrutinizer ignore-unused */ array $co`
`35`	`35`	`{`
`36`	`36`	`Validator::assertIsObject('obj', $obj);`
`37`	`37`
`38`		`- return $obj->toArray();`
	`38`	`+ return $obj->toArray(null);`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function getVal(): ?string`
`52`	`52`	`*`
`53`	`53`	`* @return array`
`54`	`54`	`*/`
`55`		`- public function toArray($request = null): array`
	`55`	`+ public function toArray($request): array`
`56`	`56`	`{`
`57`	`57`	`return [`
`58`	`58`	`self::FIELD_NAME => $this->val,`