Merge pull request #9 from TheDragonCode/1.x

Added the ability to specify macros for a request object

README.md

@@ -66,7 +66,17 @@ Http::get()->toData(...); // will be method not found exception
 
 ## Usage
 
-### As Class
+### Available Methods
+
+
+#### Response
+
+- [toData](#todata)
+- [toDataCollection](#todatacollection)
+
+### Method Listing
+
+#### toData()
 
 The class instance will be returned.
 
@@ -117,7 +127,7 @@ class SomeData
 return Http::get()->toData(SomeData::class);
 ```
 
-### As Collection
+#### toDataCollection()
 
 The `Illuminate\Support\Collection` object or an object inherited from it will be returned.
 

config/http.php

@@ -2,11 +2,16 @@
 
 declare(strict_types=1);
 
-use DragonCode\LaravelHttpMacros\Macros\ToDataCollectionMacro;
-use DragonCode\LaravelHttpMacros\Macros\ToDataMacro;
+use DragonCode\LaravelHttpMacros\Macros\Responses\ToDataCollectionMacro;
+use DragonCode\LaravelHttpMacros\Macros\Responses\ToDataMacro;
 
 return [
     'macros' => [
+        'request' => [
+            // CustomMacro::class,
+            // 'toFoo' => CustomMacro::class,
+        ],
+
         'response' => [
             ToDataMacro::class,
             ToDataCollectionMacro::class,

src/Macros/ToDataCollectionMacro.php → src/Macros/Responses/ToDataCollectionMacro.php

@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DragonCode\LaravelHttpMacros\Macros;
+namespace DragonCode\LaravelHttpMacros\Macros\Responses;
 
 use Closure;
+use DragonCode\LaravelHttpMacros\Macros\Macro;
 use Illuminate\Support\Collection;
 
 use function collect;

src/Macros/ToDataMacro.php → src/Macros/Responses/ToDataMacro.php

@@ -2,9 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DragonCode\LaravelHttpMacros\Macros;
+namespace DragonCode\LaravelHttpMacros\Macros\Responses;
 
 use Closure;
+use DragonCode\LaravelHttpMacros\Macros\Macro;
 
 use function is_callable;
 use function is_null;

src/ServiceProvider.php

@@ -5,6 +5,8 @@
 namespace DragonCode\LaravelHttpMacros;
 
 use DragonCode\LaravelHttpMacros\Commands\GenerateHelperCommand;
+use DragonCode\LaravelHttpMacros\Macros\Macro;
+use Illuminate\Http\Client\Request;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
@@ -22,8 +24,10 @@ public function register(): void
     public function boot(): void
     {
         $this->publishConfig();
-        $this->bootMacros();
         $this->bootCommands();
+
+        $this->bootRequestMacros();
+        $this->bootResponseMacros();
     }
 
     protected function bootCommands(): void
@@ -35,17 +39,37 @@ protected function bootCommands(): void
         }
     }
 
-    protected function bootMacros(): void
+    protected function bootRequestMacros(): void
+    {
+        foreach ($this->requestMacros() as $name => $macro) {
+            Request::macro($this->resolveName($name, $macro), $macro::callback());
+        }
+    }
+
+    protected function bootResponseMacros(): void
     {
-        foreach ($this->macros() as $name => $macro) {
-            Response::macro(
-                name : is_string($name) ? $name : $macro::name(),
-                macro: $macro::callback()
-            );
+        foreach ($this->responseMacros() as $name => $macro) {
+            Response::macro($this->resolveName($name, $macro), $macro::callback());
         }
     }
 
-    protected function macros(): array
+    protected function resolveName(int|string $name, Macro|string $macro): string
+    {
+        return is_string($name) ? $name : $macro::name();
+    }
+
+    /**
+     * @return array<class-string|Macro>
+     */
+    protected function requestMacros(): array
+    {
+        return config('http.macros.request', []);
+    }
+
+    /**
+     * @return array<class-string|Macro>
+     */
+    protected function responseMacros(): array
     {
         return config('http.macros.response', []);
     }

tests/TestCase.php

@@ -2,8 +2,8 @@
 
 namespace Tests;
 
-use DragonCode\LaravelHttpMacros\Macros\ToDataCollectionMacro;
-use DragonCode\LaravelHttpMacros\Macros\ToDataMacro;
+use DragonCode\LaravelHttpMacros\Macros\Responses\ToDataCollectionMacro;
+use DragonCode\LaravelHttpMacros\Macros\Responses\ToDataMacro;
 use DragonCode\LaravelHttpMacros\ServiceProvider;
 use Illuminate\Config\Repository;
 use Orchestra\Testbench\TestCase as BaseTestCase;