From 58e1c6cd995c41e48f46198e3f72c56b62d636c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= <daniel@klabbers.email>
Date: Wed, 11 Sep 2019 11:42:52 +0200
Subject: [PATCH] Fixes the queue listen command. We might need to rectify this
 implementation before stable.

---
 .../core/src/Queue/Console/ListenCommand.php      | 15 +++++++++++++++
 framework/core/src/Queue/Listener.php             | 15 +++++++++++++++
 framework/core/src/Queue/QueueServiceProvider.php |  8 +++++---
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 framework/core/src/Queue/Console/ListenCommand.php
 create mode 100644 framework/core/src/Queue/Listener.php

diff --git a/framework/core/src/Queue/Console/ListenCommand.php b/framework/core/src/Queue/Console/ListenCommand.php
new file mode 100644
index 000000000..69b23713c
--- /dev/null
+++ b/framework/core/src/Queue/Console/ListenCommand.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Flarum\Queue\Console;
+
+use Illuminate\Queue\Listener;
+
+class ListenCommand extends \Illuminate\Queue\Console\ListenCommand
+{
+    public function __construct(Listener $listener)
+    {
+        parent::__construct($listener);
+
+        $this->addOption('env');
+    }
+}
diff --git a/framework/core/src/Queue/Listener.php b/framework/core/src/Queue/Listener.php
new file mode 100644
index 000000000..3a16612b9
--- /dev/null
+++ b/framework/core/src/Queue/Listener.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Flarum\Queue;
+
+use Illuminate\Queue\ListenerOptions;
+
+class Listener extends \Illuminate\Queue\Listener
+{
+    protected function addEnvironment($command, ListenerOptions $options)
+    {
+        $options->environment = null;
+
+        return $command;
+    }
+}
diff --git a/framework/core/src/Queue/QueueServiceProvider.php b/framework/core/src/Queue/QueueServiceProvider.php
index acaa39abb..2701fd175 100644
--- a/framework/core/src/Queue/QueueServiceProvider.php
+++ b/framework/core/src/Queue/QueueServiceProvider.php
@@ -18,8 +18,8 @@ use Illuminate\Contracts\Queue\Factory;
 use Illuminate\Queue\Connectors\ConnectorInterface;
 use Illuminate\Queue\Console as Commands;
 use Illuminate\Queue\Failed\NullFailedJobProvider;
-use Illuminate\Queue\Listener;
 use Illuminate\Queue\SyncQueue;
+use Illuminate\Queue\Listener as QueueListener;
 use Illuminate\Queue\Worker;
 
 class QueueServiceProvider extends AbstractServiceProvider
@@ -27,7 +27,7 @@ class QueueServiceProvider extends AbstractServiceProvider
     protected $commands = [
         Commands\FlushFailedCommand::class,
         Commands\ForgetFailedCommand::class,
-//        Commands\ListenCommand::class,
+        Console\ListenCommand::class,
         Commands\ListFailedCommand::class,
 //        Commands\RestartCommand::class,
         Commands\RetryCommand::class,
@@ -36,6 +36,8 @@ class QueueServiceProvider extends AbstractServiceProvider
 
     public function register()
     {
+        define('ARTISAN_BINARY', 'flarum');
+
         // Register a simple connection factory that always returns the same
         // connection, as that is enough for our purposes.
         $this->app->singleton(Factory::class, function () {
@@ -65,7 +67,7 @@ class QueueServiceProvider extends AbstractServiceProvider
             );
         });
 
-        $this->app->singleton(Listener::class, function ($app) {
+        $this->app->singleton(QueueListener::class, function ($app) {
             return new Listener($app->basePath());
         });