Fix message handler generator for Laravel > v5.7

Vinelab · Dec 11, 2020 · ee98bd5 · ee98bd5
1 parent ffc49e3
commit ee98bd5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Console/Commands/QueueCommand.php b/src/Console/Commands/QueueCommand.php
@@ -3,6 +3,7 @@
 namespace Vinelab\Bowler\Console\Commands;
 
 use Exception;
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Vinelab\Bowler\Generators\HandlerGenerator;
@@ -43,7 +44,7 @@ public function handle()
         $handlerGenerator = new HandlerGenerator();
 
         $queue = $this->argument('queueName');
-        $handler = studly_case(preg_replace('/Handler(\.php)?$/', '', $this->argument('handler')).'Handler');
+        $handler = Str::studly(preg_replace('/Handler(\.php)?$/', '', $this->argument('handler')).'Handler');
 
         try {
             $handlerGenerator->generate($queue, $handler, self::TYPE);

diff --git a/src/Console/Commands/SubscriberCommand.php b/src/Console/Commands/SubscriberCommand.php
@@ -3,6 +3,7 @@
 namespace Vinelab\Bowler\Console\Commands;
 
 use Exception;
+use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use Vinelab\Bowler\Generators\HandlerGenerator;
 
@@ -43,7 +44,7 @@ public function handle()
             $queue = $queue.'-pub-sub';
         }
 
-        $handler = studly_case(preg_replace('/Handler(\.php)?$/', '', $this->argument('handler')).'Handler');
+        $handler = Str::studly(preg_replace('/Handler(\.php)?$/', '', $this->argument('handler')).'Handler');
 
         try {
             $handlerGenerator->generate($queue, $handler, self::TYPE);

diff --git a/src/Generators/stubs/handler.stub b/src/Generators/stubs/handler.stub
@@ -15,15 +15,15 @@ class {{handler}}
      *
      * @return void
      */
-    public function handle($msg)
+    public function handle(AMQPMessage $msg)
     {
         //
     }
 
     /**
      * Handle error
      *
-     * @param Exception $e
+     * @param Exception|Throwable $e
      * @param MessageBroker $broker
      *
      * @return void