feat: allow classes that extends AbstractJob to be placed on a specif…

…ic queue
flarum · Sep 26, 2024 · 7fabbfb · 7fabbfb
1 parent e43530e
commit 7fabbfb
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/extensions/mentions/src/Job/SendMentionsNotificationsJob.php b/extensions/mentions/src/Job/SendMentionsNotificationsJob.php
@@ -47,6 +47,8 @@ class SendMentionsNotificationsJob extends AbstractJob
 
     public function __construct(CommentPost $post, array $userMentions, array $postMentions, array $groupMentions)
     {
+        parent::__construct();
+
         $this->post = $post;
         $this->userMentions = $userMentions;
         $this->postMentions = $postMentions;

diff --git a/extensions/package-manager/src/Job/ComposerCommandJob.php b/extensions/package-manager/src/Job/ComposerCommandJob.php
@@ -32,6 +32,8 @@ class ComposerCommandJob extends AbstractJob implements ShouldBeUnique
 
     public function __construct(AbstractActionCommand $command, string $phpVersion)
     {
+        parent::__construct();
+
         $this->command = $command;
         $this->phpVersion = $phpVersion;
     }

diff --git a/extensions/pusher/src/SendPusherNotificationsJob.php b/extensions/pusher/src/SendPusherNotificationsJob.php
@@ -28,6 +28,8 @@ class SendPusherNotificationsJob extends AbstractJob
 
     public function __construct(BlueprintInterface $blueprint, array $recipients)
     {
+        parent::__construct();
+
         $this->blueprint = $blueprint;
         $this->recipients = $recipients;
     }

diff --git a/framework/core/src/Mail/Job/SendRawEmailJob.php b/framework/core/src/Mail/Job/SendRawEmailJob.php
@@ -21,6 +21,8 @@ class SendRawEmailJob extends AbstractJob
 
     public function __construct(string $email, string $subject, string $body)
     {
+        parent::__construct();
+
         $this->email = $email;
         $this->subject = $subject;
         $this->body = $body;

diff --git a/framework/core/src/Notification/Job/SendEmailNotificationJob.php b/framework/core/src/Notification/Job/SendEmailNotificationJob.php
@@ -28,6 +28,8 @@ class SendEmailNotificationJob extends AbstractJob
 
     public function __construct(MailableInterface $blueprint, User $recipient)
     {
+        parent::__construct();
+
         $this->blueprint = $blueprint;
         $this->recipient = $recipient;
     }

diff --git a/framework/core/src/Notification/Job/SendNotificationsJob.php b/framework/core/src/Notification/Job/SendNotificationsJob.php
@@ -28,6 +28,8 @@ class SendNotificationsJob extends AbstractJob
 
     public function __construct(BlueprintInterface $blueprint, array $recipients = [])
     {
+        parent::__construct();
+
         $this->blueprint = $blueprint;
         $this->recipients = $recipients;
     }

diff --git a/framework/core/src/Queue/AbstractJob.php b/framework/core/src/Queue/AbstractJob.php
@@ -19,4 +19,14 @@ class AbstractJob implements ShouldQueue
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
+
+    public static ?string $onQueue = null;
+
+    public function __construct()
+    {
+        if (static::$onQueue) {
+            $this->onQueue(static::$onQueue);
+        }
+    }
+
 }
diff --git a/framework/core/src/User/Job/RequestPasswordResetJob.php b/framework/core/src/User/Job/RequestPasswordResetJob.php
@@ -27,6 +27,8 @@ class RequestPasswordResetJob extends AbstractJob
 
     public function __construct(string $email)
     {
+        parent::__construct();
+
         $this->email = $email;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ class RequestPasswordResetJob extends AbstractJob @@
         public function __construct(string $email)
         {
+            parent::__construct();
             $this->email = $email;
         }
@@ Expand Down @@