remove horizon

Author: vyuldashev

README.md

@@ -25,11 +25,6 @@ Setup connection in `config/queue.php`
 
         'driver' => 'rabbitmq',
 
-        /*
-         * Set to "horizon" if you wish to use Laravel Horizon.
-         */
-        'worker' => env('RABBITMQ_WORKER', 'default'),
-    
         'dsn' => env('RABBITMQ_DSN', null),
 
         /*
@@ -129,10 +124,6 @@ Setup connection in `config/queue.php`
 
 Once you completed the configuration you can use Laravel Queue API. If you used other queue drivers you do not need to change anything else. If you do not know how to use Queue API, please refer to the official Laravel documentation: http://laravel.com/docs/queues
 
-## Laravel Horizon Usage
-
-Starting with 7.4, this package supports [Laravel Horizon](http://horizon.laravel.com) out of the box. Firstly, install Horizon and then set `RABBITMQ_WORKER` to `horizon`.
-
 ## Lumen Usage
 
 For Lumen usage the service provider should be registered manually as follow in `bootstrap/app.php`:

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "vladimir-yuldashev/laravel-queue-rabbitmq",
-  "description": "RabbitMQ driver for Laravel Queue. Supports Laravel Horizon",
+  "description": "RabbitMQ driver for Laravel Queue",
   "license": "MIT",
   "authors": [
     {
@@ -20,8 +20,7 @@
   "require-dev": {
     "phpunit/phpunit": "^7.0",
     "illuminate/events": "5.6.*|5.7.*|5.8.*",
-    "mockery/mockery": "^1.0",
-    "laravel/horizon": "^3.0"
+    "mockery/mockery": "^1.0"
   },
   "autoload": {
     "psr-4": {

config/rabbitmq.php

@@ -9,11 +9,6 @@
 
     'driver' => 'rabbitmq',
 
-    /*
-     * Set to "horizon" if you wish to use Laravel Horizon.
-     */
-    'worker' => env('RABBITMQ_WORKER', 'default'),
-
     'dsn' => env('RABBITMQ_DSN', null),
 
     /*

src/Horizon/Listeners/RabbitMQFailedEvent.php

@@ -4,9 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Interop\Amqp\AmqpContext;
-use InvalidArgumentException;
 use Illuminate\Contracts\Queue\Queue;
-use Illuminate\Queue\Events\JobFailed;
 use Interop\Amqp\AmqpConnectionFactory;
 use Enqueue\AmqpTools\DelayStrategyAware;
 use Illuminate\Contracts\Events\Dispatcher;
@@ -16,8 +14,6 @@
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
 use Enqueue\AmqpLib\AmqpConnectionFactory as EnqueueAmqpConnectionFactory;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\Listeners\RabbitMQFailedEvent;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
 {
@@ -74,18 +70,6 @@ public function connect(array $config): Queue
             $context->close();
         });
 
-        $worker = Arr::get($config, 'worker', 'default');
-
-        if ($worker === 'default') {
-            return new RabbitMQQueue($context, $config);
-        }
-
-        if ($worker === 'horizon') {
-            $this->dispatcher->listen(JobFailed::class, RabbitMQFailedEvent::class);
-
-            return new HorizonRabbitMQQueue($context, $config);
-        }
-
-        throw new InvalidArgumentException('Invalid worker.');
+        return new RabbitMQQueue($context, $config);
     }
 }

src/Horizon/RabbitMQQueue.php

@@ -12,7 +12,6 @@
 use Illuminate\Database\DetectsDeadlocks;
 use Illuminate\Contracts\Queue\Job as JobContract;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
 
 class RabbitMQJob extends Job implements JobContract
 {
@@ -100,11 +99,6 @@ public function delete(): void
         parent::delete();
 
         $this->consumer->acknowledge($this->message);
-
-        // required for Laravel Horizon
-        if ($this->connection instanceof HorizonRabbitMQQueue) {
-            $this->connection->deleteReserved($this->queue, $this);
-        }
     }
 
     /** {@inheritdoc}

src/Queue/Connectors/RabbitMQConnector.php

@@ -4,7 +4,6 @@
 
 use RuntimeException;
 use Illuminate\Queue\Queue;
-use Illuminate\Support\Str;
 use Interop\Amqp\AmqpQueue;
 use Interop\Amqp\AmqpTopic;
 use Psr\Log\LoggerInterface;
@@ -240,16 +239,6 @@ protected function getQueueName($queueName = null)
         return $queueName ?: $this->queueName;
     }
 
-    /**
-     * Get a random ID string.
-     *
-     * @return string
-     */
-    protected function getRandomId(): string
-    {
-        return Str::random(32);
-    }
-
     /**
      * @param string $action
      * @param \Throwable $e