build: apply linters

Author: hex7c0

config/rabbitmq.php

@@ -9,9 +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

@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ;
 
@@ -15,9 +15,7 @@ class LaravelQueueRabbitMQServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/rabbitmq.php', 'queue.connections.rabbitmq'
-        );
+        $this->mergeConfigFrom(__DIR__ . '/../config/rabbitmq.php', 'queue.connections.rabbitmq');
     }
 
     /**
@@ -30,7 +28,7 @@ public function boot(): void
         /** @var QueueManager $queue */
         $queue = $this->app['queue'];
 
-        $queue->addConnector('rabbitmq', function () {
+        $queue->addConnector('rabbitmq', function (): RabbitMQConnector {
             return new RabbitMQConnector($this->app['events']);
         });
     }

src/Horizon/RabbitMQQueue.php

@@ -1,28 +1,25 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors;
 
-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\AmqpLib\AmqpConnectionFactory as EnqueueAmqpConnectionFactory;
 use Enqueue\AmqpTools\DelayStrategyAware;
-use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Queue\Events\WorkerStopping;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
+use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Contracts\Queue\Queue;
 use Illuminate\Queue\Connectors\ConnectorInterface;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use Illuminate\Queue\Events\WorkerStopping;
+use Illuminate\Support\Arr;
+use Interop\Amqp\AmqpConnectionFactory;
 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;
+use Interop\Amqp\AmqpContext;
+use InvalidArgumentException;
+use LogicException;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
 {
-    private const WORKER_DEFAULT='default';
-    private const WORKER_HORIZON='horizon';
+    private const WORKER_DEFAULT = 'default';
 
     /**
      * @var Dispatcher
@@ -39,15 +36,16 @@ public function __construct(Dispatcher $dispatcher)
      *
      * @param array $config
      *
+     * @throws LogicException
+     *
      * @return Queue
-     * @throws \ReflectionException
      */
     public function connect(array $config): Queue
     {
         $factoryClass = Arr::get($config, 'factory_class', EnqueueAmqpConnectionFactory::class);
 
-        if (! class_exists($factoryClass) || ! (new \ReflectionClass($factoryClass))->implementsInterface(InteropAmqpConnectionFactory::class)) {
-            throw new \LogicException(sprintf('The factory_class option has to be valid class that implements "%s"', InteropAmqpConnectionFactory::class));
+        if (!class_exists($factoryClass) || !(new \ReflectionClass($factoryClass))->implementsInterface(InteropAmqpConnectionFactory::class)) {
+            throw new LogicException(sprintf('The factory_class option has to be valid class that implements "%s"', InteropAmqpConnectionFactory::class));
         }
 
         /** @var AmqpConnectionFactory $factory */
@@ -83,12 +81,6 @@ public function connect(array $config): Queue
             return new RabbitMQQueue($context, $config);
         }
 
-        if ($worker === self::WORKER_HORIZON) {
-            $this->dispatcher->listen(JobFailed::class, RabbitMQFailedEvent::class);
-
-            return new HorizonRabbitMQQueue($context, $config);
-        }
-
         if (class_exists($worker)) {
             return new $worker($context, $config);
         }

src/LaravelQueueRabbitMQServiceProvider.php

@@ -3,16 +3,15 @@
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs;
 
 use Exception;
-use Illuminate\Support\Str;
-use Interop\Amqp\AmqpMessage;
-use Illuminate\Queue\Jobs\Job;
-use Interop\Amqp\AmqpConsumer;
-use Illuminate\Queue\Jobs\JobName;
 use Illuminate\Container\Container;
-use Illuminate\Database\DetectsConcurrencyErrors;
 use Illuminate\Contracts\Queue\Job as JobContract;
+use Illuminate\Database\DetectsConcurrencyErrors;
+use Illuminate\Queue\Jobs\Job;
+use Illuminate\Queue\Jobs\JobName;
+use Illuminate\Support\Str;
+use Interop\Amqp\AmqpConsumer;
+use Interop\Amqp\AmqpMessage;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
 
 class RabbitMQJob extends Job implements JobContract
 {
@@ -23,8 +22,13 @@ class RabbitMQJob extends Job implements JobContract
      */
     public const ATTEMPT_COUNT_HEADERS_KEY = 'attempts_count';
 
+    /** @var RabbitMQQueue */
     protected $connection;
+
+    /** @var AmqpConsumer */
     protected $consumer;
+
+    /** @var AmqpMessage */
     protected $message;
 
     public function __construct(
@@ -100,11 +104,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}
@@ -140,7 +139,7 @@ public function release($delay = 0): void
      */
     public function getJobId(): string
     {
-        return $this->message->getCorrelationId();
+        return (string) $this->message->getCorrelationId();
     }
 
     /**
@@ -150,7 +149,7 @@ public function getJobId(): string
      *
      * @return void
      */
-    public function setJobId($id): void
+    public function setJobId(string $id): void
     {
         $this->connection->setCorrelationId($id);
     }

src/Queue/Connectors/RabbitMQConnector.php

@@ -21,13 +21,17 @@
 
 class RabbitMQQueue extends Queue implements QueueContract
 {
-    private const SLEEP_ON_ERROR=5;
+    private const SLEEP_ON_ERROR = 5;
+
+    /** @var int */
     protected $sleepOnError;
 
+    /** @var string */
     protected $queueName;
+
     protected $queueOptions;
-    protected $exchangeOptions;
 
+    protected $exchangeOptions;
 
     /**
      * Alternative exchange options to use by producer.
@@ -37,6 +41,7 @@ class RabbitMQQueue extends Queue implements QueueContract
     protected $altExchangeOptions;
 
     protected $declaredExchanges = [];
+
     protected $declaredQueues = [];
 
     /**
@@ -161,9 +166,9 @@ public function later($delay, $job, $data = '', $queue = null): ?string
     /**
      * Release a reserved job back onto the queue.
      *
-     * @param  \DateTimeInterface|\DateInterval|int $delay
-     * @param  string|object $job
-     * @param  mixed $data
+     * @param \DateTimeInterface|\DateInterval|int $delay
+     * @param string|object $job
+     * @param mixed $data
      * @param string $queue
      * @param int $attempts
      *
@@ -376,11 +381,11 @@ protected function reportConnectionError(string $action, Throwable $e): void
         /** @var LoggerInterface $logger */
         $logger = $this->container['log'];
 
-        $logger->error('AMQP error while attempting '.$action.': '.$e->getMessage());
+        $logger->error("AMQP error while attempting {$action}: {$e->getMessage()}");
 
         // If it's set to false, throw an error rather than waiting
         if ($this->sleepOnError === false) {
-            throw new RuntimeException('Error writing data to the connection with RabbitMQ', null, $e);
+            throw new RuntimeException('Error writing data to the connection with RabbitMQ', 0, $e);
         }
 
         // Sleep so that we don't flood the log file