Merge pull request #2 from TheDragonCode/1.x

Corrected names in singular and plural

Author: andrey-helldar

src/Macroses/Macros.php renamed to src/Macros/Macro.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace DragonCode\LaravelHttpMacros\Macroses;
+namespace DragonCode\LaravelHttpMacros\Macros;
 
 use Closure;
 
 /** @mixin \Illuminate\Http\Client\Response */
-abstract class Macros
+abstract class Macro
 {
     abstract public static function callback(): Closure;
 

src/Macroses/ToDataCollectionMacros.php renamed to src/Macros/ToDataCollectionMacro.php

@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace DragonCode\LaravelHttpMacros\Macroses;
+namespace DragonCode\LaravelHttpMacros\Macros;
 
 use Closure;
 use Illuminate\Support\Collection;
 
 /**
  * Get the JSON decoded body of the response as a collection.
  */
-class ToDataCollectionMacros extends Macros
+class ToDataCollectionMacro extends Macro
 {
     public static function callback(): Closure
     {

src/Macroses/ToDataMacros.php renamed to src/Macros/ToDataMacro.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace DragonCode\LaravelHttpMacros\Macroses;
+namespace DragonCode\LaravelHttpMacros\Macros;
 
 use Closure;
 
 /**
  * Get the JSON decoded body of the response as a class instance.
  */
-class ToDataMacros extends Macros
+class ToDataMacro extends Macro
 {
     public static function callback(): Closure
     {

src/ServiceProvider.php

@@ -4,28 +4,28 @@
 
 namespace DragonCode\LaravelHttpMacros;
 
-use DragonCode\LaravelHttpMacros\Macroses\Macros;
-use DragonCode\LaravelHttpMacros\Macroses\ToDataCollectionMacros;
-use DragonCode\LaravelHttpMacros\Macroses\ToDataMacros;
+use DragonCode\LaravelHttpMacros\Macros\Macro;
+use DragonCode\LaravelHttpMacros\Macros\ToDataCollectionMacro;
+use DragonCode\LaravelHttpMacros\Macros\ToDataMacro;
 use Illuminate\Http\Client\Response;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 
 class ServiceProvider extends BaseServiceProvider
 {
-    /** @var array<string|Macros> */
-    protected array $macroses = [
-        ToDataMacros::class,
-        ToDataCollectionMacros::class,
+    /** @var array<string|Macro> */
+    protected array $macros = [
+        ToDataMacro::class,
+        ToDataCollectionMacro::class,
     ];
 
     public function boot(): void
     {
-        foreach ($this->macroses as $macros) {
+        foreach ($this->macros as $macros) {
             $this->bootMacros($macros);
         }
     }
 
-    protected function bootMacros(Macros|string $macros): void
+    protected function bootMacros(Macro|string $macros): void
     {
         Response::macro($macros::name(), $macros::callback());
     }