Merge pull request #260 from MarcinOrlowski/dev

Release v12.0.1

Author: MarcinOrlowski

.github/workflows/phpunit.yml

@@ -28,8 +28,8 @@ jobs:
       matrix:
         # quotes are needed it is treated as a number and zero at decimal part is gone
         # at runtime i.e. 8.10 -> 8.1, while "8.10" => "8.10".
-        laravel: ["11.0"]
-        php: ["8.2"]
+        laravel: ["12.0"]
+        php: ["8.2", "8.3", "8.4"]
 
     runs-on: ubuntu-latest
 

.gitignore

@@ -5,3 +5,6 @@ vendor/
 *.swp
 *~
 *.bak
+
+.roo
+.roomodes

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016-2020 Marcin Orlowski <mail (#) marcinorlowski (.) com>
+Copyright (c) 2016-2025 Marcin Orlowski <mail (#) marcinorlowski (.) com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
 files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,

README.md

@@ -67,5 +67,5 @@ Development branch:
 
 ## License ##
 
-* Written and copyrighted &copy;2016-2024 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
+* Written and copyrighted &copy;2016-2025 by Marcin Orlowski <mail (#) marcinorlowski (.) com>
 * ResponseBuilder is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT)

composer.json

@@ -2,7 +2,7 @@
   "name": "marcin-orlowski/laravel-api-response-builder",
   "description": "Helps building nice, normalized and easy to consume Laravel REST API.",
   "homepage": "https://github.com/MarcinOrlowski/laravel-api-response-builder",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "keywords": [
     "laravel",
     "laravel10",

docs/CHANGES.md

@@ -18,16 +18,19 @@ should be able to easily backport future new features to older versions rather e
 
 ## CHANGE LOG ##
 
+* v12.0.1 (2025-04-16)
+  * [RB-255] Fixed `ToArrayConverter` using a new Request instance instead of the actual request.
+  * [BR-256] Fixed `ToArrayConverter` potentially causing fatal error if object lacks `toArray` method.
+  * [GH-261] Updated GitHub Actions workflow to test against Laravel 12, PHP 8.3, and PHP 8.4.
+
 * v12.0.0 (2025-04-16)
   * Added support for Laravel v12.
 
 * v11.0.0 (2024-05-06)
-  * **BACKWARD INCOMPATIBLE CHANGES** ([more info](compatibility.md)).
   * Added support for Laravel v11.
   * Corrected documentation (thanks to Ehsan Soleimanian)
 
 * v10.0.0 (2023-02-20)
-  * **BACKWARD INCOMPATIBLE CHANGES** ([more info](compatibility.md)).
   * Added support for Laravel v10.
 
 * v9.4.0 (2023-02-18)

src/Converters/ToArrayConverter.php

@@ -12,7 +12,6 @@
  * @link      https://github.com/MarcinOrlowski/laravel-api-response-builder
  */
 
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Resources\Json\JsonResource;
 use MarcinOrlowski\ResponseBuilder\Contracts\ConverterContract;
 use MarcinOrlowski\ResponseBuilder\Exceptions as Ex;
@@ -38,8 +37,15 @@ public function convert(object $obj, array $config): array
     {
         Validator::assertIsObject('obj', $obj);
 
+        if (!\method_exists($obj, 'toArray')) {
+            $cls = \get_class($obj);
+            throw new \InvalidArgumentException(
+                "Object of class '{$cls}' does not have a 'toArray' method."
+            );
+        }
+
         /** @var JsonResource $obj */
-        $request = new \Illuminate\Http\Request();
+        $request = \request();
         return (array)$obj->toArray($request);
     }
 

tests/phpunit/Converter/ConverterTest.php

@@ -80,4 +80,29 @@ public function testSubclassOfConfiguredClassConversion(): void
         $this->assertEquals($child_val, $result[ TestModel::FIELD_NAME ]);
     }
 
+    /**
+     * Checks if ToArrayConverter throws exception for object without toArray method.
+     */
+    public function testToArrayConverterThrowsExceptionForObjectWithoutToArrayMethod(): void
+    {
+        // GIVEN an object without a toArray method
+        $obj = new \stdClass();
+        $obj->foo = Generator::getRandomString('foo');
+
+        // HAVING configuration mapping stdClass to ToArrayConverter
+        $key = Generator::getRandomString('key');
+        Config::set(RB::CONF_KEY_CONVERTER_CLASSES, [
+            \get_class($obj) => [
+                RB::KEY_HANDLER => ToArrayConverter::class,
+                RB::KEY_KEY     => $key,
+            ],
+        ]);
+
+        // THEN we expect an exception
+        $this->expectException(\InvalidArgumentException::class);
+
+        // WHEN we try to convert the object
+        (new Converter())->convert($obj);
+    }
+
 } // end of class