Merge pull request #282 from vyuldashev/analysis-87p09E

Apply fixes from StyleCI

Author: vyuldashev

src/Horizon/Listeners/RabbitMQFailedEvent.php

@@ -3,8 +3,8 @@
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\Listeners;
 
 use Illuminate\Contracts\Events\Dispatcher;
-use Laravel\Horizon\Events\JobFailed as HorizonJobFailed;
 use Illuminate\Queue\Events\JobFailed as LaravelJobFailed;
+use Laravel\Horizon\Events\JobFailed as HorizonJobFailed;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 
 class RabbitMQFailedEvent

src/Horizon/RabbitMQQueue.php

@@ -2,12 +2,12 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Horizon;
 
-use Laravel\Horizon\JobId;
-use Laravel\Horizon\JobPayload;
-use Laravel\Horizon\Events\JobPushed;
+use Illuminate\Contracts\Events\Dispatcher;
 use Laravel\Horizon\Events\JobDeleted;
+use Laravel\Horizon\Events\JobPushed;
 use Laravel\Horizon\Events\JobReserved;
-use Illuminate\Contracts\Events\Dispatcher;
+use Laravel\Horizon\JobId;
+use Laravel\Horizon\JobPayload;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue as BaseRabbitMQQueue;
 

src/Queue/Connectors/RabbitMQConnector.php

@@ -2,22 +2,22 @@
 
 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\JobFailed;
+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 Interop\Amqp\AmqpContext;
+use InvalidArgumentException;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\Listeners\RabbitMQFailedEvent;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQConnector implements ConnectorInterface
 {

src/Queue/Jobs/RabbitMQJob.php

@@ -3,16 +3,16 @@
 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\DetectsLostConnections;
 use Illuminate\Contracts\Queue\Job as JobContract;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use Illuminate\Database\DetectsLostConnections;
+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\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQJob extends Job implements JobContract
 {

src/Queue/RabbitMQQueue.php

@@ -2,16 +2,16 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue;
 
-use RuntimeException;
+use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue;
 use Illuminate\Support\Str;
-use Interop\Amqp\AmqpQueue;
-use Interop\Amqp\AmqpTopic;
-use Psr\Log\LoggerInterface;
 use Interop\Amqp\AmqpContext;
 use Interop\Amqp\AmqpMessage;
+use Interop\Amqp\AmqpQueue;
+use Interop\Amqp\AmqpTopic;
 use Interop\Amqp\Impl\AmqpBind;
-use Illuminate\Contracts\Queue\Queue as QueueContract;
+use Psr\Log\LoggerInterface;
+use RuntimeException;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 
 class RabbitMQQueue extends Queue implements QueueContract

tests/Functional/SendAndReceiveDelayedMessageTest.php

@@ -2,14 +2,14 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Functional;
 
-use Psr\Log\NullLogger;
-use PHPUnit\Framework\TestCase;
-use Illuminate\Events\Dispatcher;
-use Illuminate\Container\Container;
 use Enqueue\AmqpLib\AmqpConnectionFactory;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+use Illuminate\Container\Container;
+use Illuminate\Events\Dispatcher;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 /**
  * @group functional

tests/Functional/SendAndReceiveMessageTest.php

@@ -2,14 +2,14 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Functional;
 
-use Psr\Log\NullLogger;
-use PHPUnit\Framework\TestCase;
-use Illuminate\Events\Dispatcher;
-use Illuminate\Container\Container;
 use Enqueue\AmqpLib\AmqpConnectionFactory;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+use Illuminate\Container\Container;
+use Illuminate\Events\Dispatcher;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 /**
  * @group functional

tests/Functional/SslConnectionTest.php

@@ -2,13 +2,13 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Functional;
 
-use PHPUnit\Framework\TestCase;
+use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpLib\AmqpContext;
 use Illuminate\Events\Dispatcher;
-use Enqueue\AmqpLib\AmqpConnectionFactory;
 use PhpAmqpLib\Connection\AMQPSSLConnection;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use PHPUnit\Framework\TestCase;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 /**
  * @group functional

tests/Functional/StreamConnectionTest.php

@@ -2,13 +2,13 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Functional;
 
-use PHPUnit\Framework\TestCase;
+use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpLib\AmqpContext;
 use Illuminate\Events\Dispatcher;
-use Enqueue\AmqpLib\AmqpConnectionFactory;
 use PhpAmqpLib\Connection\AMQPStreamConnection;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use PHPUnit\Framework\TestCase;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 /**
  * @group functional

tests/LaravelQueueRabbitMQServiceProviderTest.php

@@ -2,13 +2,13 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests;
 
-use PHPUnit\Framework\TestCase;
-use Illuminate\Queue\QueueManager;
 use Illuminate\Container\Container;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Contracts\Events\Dispatcher;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use Illuminate\Queue\QueueManager;
+use Illuminate\Support\ServiceProvider;
+use PHPUnit\Framework\TestCase;
 use VladimirYuldashev\LaravelQueueRabbitMQ\LaravelQueueRabbitMQServiceProvider;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
 
 class LaravelQueueRabbitMQServiceProviderTest extends TestCase
 {

tests/Mock/AmqpContextMock.php

@@ -2,17 +2,17 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock;
 
-use Interop\Queue\Queue;
-use Interop\Queue\Topic;
 use Interop\Amqp\AmqpBind;
-use Interop\Queue\Message;
+use Interop\Amqp\AmqpContext;
 use Interop\Amqp\AmqpQueue;
 use Interop\Amqp\AmqpTopic;
 use Interop\Queue\Consumer;
-use Interop\Queue\Producer;
-use Interop\Amqp\AmqpContext;
 use Interop\Queue\Destination;
+use Interop\Queue\Message;
+use Interop\Queue\Producer;
+use Interop\Queue\Queue;
 use Interop\Queue\SubscriptionConsumer;
+use Interop\Queue\Topic;
 
 class AmqpContextMock implements AmqpContext
 {

tests/Mock/DelayStrategyAwareAmqpConnectionFactorySpy.php

@@ -2,9 +2,9 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock;
 
-use Interop\Queue\Context;
 use Enqueue\AmqpTools\DelayStrategy;
 use Enqueue\AmqpTools\DelayStrategyAware;
+use Interop\Queue\Context;
 
 class DelayStrategyAwareAmqpConnectionFactorySpy implements \Interop\Amqp\AmqpConnectionFactory, DelayStrategyAware
 {

tests/Queue/Connectors/RabbitMQConnectorTest.php

@@ -2,14 +2,14 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Queue\Connectors;
 
-use Interop\Amqp\AmqpContext;
-use PHPUnit\Framework\TestCase;
-use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Queue\Events\WorkerStopping;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
+use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Queue\Connectors\ConnectorInterface;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use Illuminate\Queue\Events\WorkerStopping;
+use Interop\Amqp\AmqpContext;
+use PHPUnit\Framework\TestCase;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors\RabbitMQConnector;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock\AmqpConnectionFactorySpy;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock\CustomContextAmqpConnectionFactoryMock;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Mock\DelayStrategyAwareAmqpConnectionFactorySpy;

tests/Queue/Jobs/RabbitMQJobTest.php

@@ -2,15 +2,15 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Tests\Queue\Jobs;
 
+use Illuminate\Container\Container;
+use Illuminate\Contracts\Queue\Job as JobContract;
+use Illuminate\Database\DetectsLostConnections;
 use Illuminate\Queue\Jobs\Job;
 use Interop\Amqp\AmqpConsumer;
-use PHPUnit\Framework\TestCase;
 use Interop\Amqp\Impl\AmqpMessage;
-use Illuminate\Container\Container;
-use Illuminate\Database\DetectsLostConnections;
-use Illuminate\Contracts\Queue\Job as JobContract;
-use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
+use PHPUnit\Framework\TestCase;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
+use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
 
 class RabbitMQJobTest extends TestCase
 {

tests/Queue/RabbitMQQueueTest.php

@@ -2,15 +2,15 @@
 
 namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue;
 
-use Interop\Amqp\AmqpQueue;
-use Interop\Amqp\AmqpTopic;
-use Psr\Log\LoggerInterface;
+use Illuminate\Container\Container;
+use Interop\Amqp\AmqpConsumer;
 use Interop\Amqp\AmqpContext;
 use Interop\Amqp\AmqpMessage;
-use Interop\Amqp\AmqpConsumer;
 use Interop\Amqp\AmqpProducer;
+use Interop\Amqp\AmqpQueue;
+use Interop\Amqp\AmqpTopic;
 use PHPUnit\Framework\TestCase;
-use Illuminate\Container\Container;
+use Psr\Log\LoggerInterface;
 use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
 
 class RabbitMQQueueTest extends TestCase