fix:

- renamed WarningMessage to WarningEvent
- moved Events:fake to setup method
- removed getSuccessMessageCallback and getWarningMessageCallback

Author: aizlee

src/Commands/MakeEntityCommand.php

@@ -8,7 +8,7 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Events\WarningMessage;
+use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Exceptions\EntityCreateException;
 use RonasIT\Support\Generators\ControllerGenerator;
@@ -162,15 +162,22 @@ public function __construct()
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $this->validateInput();
         $this->checkConfigs();
 
-        $this->eventDispatcher->listen(SuccessCreateMessage::class, $this->getSuccessMessageCallback());
-        $this->eventDispatcher->listen(WarningMessage::class, $this->getWarningMessageCallback());
+        $this->eventDispatcher->listen(
+            events: SuccessCreateMessage::class,
+            listener: fn (SuccessCreateMessage $event) => $this->info($event->message),
+        );
+
+        $this->eventDispatcher->listen(
+            events: WarningEvent::class,
+            listener: fn (WarningEvent $event) => $this->warn($event->message),
+        );
 
         try {
             $this->generate();
@@ -303,16 +310,6 @@ protected function getRelations()
         ];
     }
 
-    protected function getSuccessMessageCallback(): Closure
-    {
-        return fn (SuccessCreateMessage $event) => $this->info($event->message);
-    }
-
-    protected function getWarningMessageCallback(): Closure
-    {
-        return fn (WarningMessage $event) => $this->warn($event->message);
-    }
-
     protected function getFields()
     {
         return Arr::only($this->options(), EntityGenerator::AVAILABLE_FIELDS);

src/Events/WarningMessage.php renamed to src/Events/WarningEvent.php

@@ -4,19 +4,17 @@
 
 use Illuminate\Queue\SerializesModels;
 
-class WarningMessage
+class WarningEvent
 {
     use SerializesModels;
 
-    public string $message;
-
     /**
      * Create a new event instance.
      *
      * @return void
      */
-    public function __construct($message)
-    {
-        $this->message = $message;
+    public function __construct(
+        public readonly string $message,
+    ) {
     }
 }

src/Generators/SeederGenerator.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Arr;
 use RonasIT\Support\Events\SuccessCreateMessage;
-use RonasIT\Support\Events\WarningMessage;
+use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Exceptions\EntityCreateException;
 
 class SeederGenerator extends EntityGenerator
@@ -51,7 +51,7 @@ protected function createDatabaseSeeder(): void
 
             $message = "You are using the deprecated value for 'entity-generator.stubs.database_empty_seeder' config. Please use 'entity-generator::database_empty_seeder'.";
 
-            event(new WarningMessage($message));
+            event(new WarningEvent($message));
         }
 
         $content = "<?php \n\n" . view($stubPath, [

tests/SeederGeneratorTest.php

@@ -3,14 +3,21 @@
 namespace RonasIT\Support\Tests;
 
 use Illuminate\Support\Facades\Event;
-use RonasIT\Support\Events\WarningMessage;
+use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Generators\SeederGenerator;
 use RonasIT\Support\Tests\Support\SeederGeneratorMockTrait;
 
 class SeederGeneratorTest extends TestCase
 {
     use SeederGeneratorMockTrait;
 
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        Event::fake();
+    }
+
     public function testCreateSeeder()
     {
         $this->mockViewsNamespace();
@@ -35,7 +42,6 @@ public function testCreateSeeder()
 
     public function testCreateSeederWithOldConfig()
     {
-        Event::fake();
         $this->mockViewsNamespace();
         $this->mockConfigurations();
         $this->mockFilesystem();
@@ -56,6 +62,8 @@ public function testCreateSeederWithOldConfig()
 
         $this->rollbackToDefaultBasePath();
 
-        Event::assertDispatched(WarningMessage::class);
+        Event::assertDispatched(WarningEvent::class, function ($event) {
+            return $event->message === "You are using the deprecated value for 'entity-generator.stubs.database_empty_seeder' config. Please use 'entity-generator::database_empty_seeder'.";
+        });
     }
 }