Skip to content

Commit 17a889c

Browse files
authored
Merge pull request vyuldashev#228 from vyuldashev/analysis-zEjQ4O
Apply fixes from StyleCI
2 parents 32f9696 + 35815d8 commit 17a889c

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

src/Horizon/RabbitMQQueue.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
namespace VladimirYuldashev\LaravelQueueRabbitMQ\Horizon;
44

5-
use Illuminate\Contracts\Events\Dispatcher;
6-
use Laravel\Horizon\Events\JobDeleted;
7-
use Laravel\Horizon\Events\JobPushed;
8-
use Laravel\Horizon\Events\JobReserved;
95
use Laravel\Horizon\JobId;
106
use Laravel\Horizon\JobPayload;
7+
use Laravel\Horizon\Events\JobPushed;
8+
use Laravel\Horizon\Events\JobDeleted;
9+
use Laravel\Horizon\Events\JobReserved;
10+
use Illuminate\Contracts\Events\Dispatcher;
1111
use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Jobs\RabbitMQJob;
1212
use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue as BaseRabbitMQQueue;
1313

src/Queue/Connectors/RabbitMQConnector.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue\Connectors;
44

5-
use Enqueue\AmqpLib\AmqpConnectionFactory as EnqueueAmqpConnectionFactory;
65
use Illuminate\Support\Arr;
76
use Interop\Amqp\AmqpContext;
7+
use InvalidArgumentException;
88
use Illuminate\Contracts\Queue\Queue;
99
use Interop\Amqp\AmqpConnectionFactory;
1010
use Enqueue\AmqpTools\DelayStrategyAware;
1111
use Illuminate\Contracts\Events\Dispatcher;
1212
use Illuminate\Queue\Events\WorkerStopping;
1313
use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
1414
use Illuminate\Queue\Connectors\ConnectorInterface;
15-
use InvalidArgumentException;
16-
use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
1715
use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
1816
use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
17+
use Enqueue\AmqpLib\AmqpConnectionFactory as EnqueueAmqpConnectionFactory;
18+
use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
1919

2020
class RabbitMQConnector implements ConnectorInterface
2121
{
@@ -41,7 +41,7 @@ public function connect(array $config): Queue
4141
{
4242
$factoryClass = Arr::get($config, 'factory_class', EnqueueAmqpConnectionFactory::class);
4343

44-
if (!class_exists($factoryClass) || !(new \ReflectionClass($factoryClass))->implementsInterface(InteropAmqpConnectionFactory::class)) {
44+
if (! class_exists($factoryClass) || ! (new \ReflectionClass($factoryClass))->implementsInterface(InteropAmqpConnectionFactory::class)) {
4545
throw new \LogicException(sprintf('The factory_class option has to be valid class that implements "%s"', InteropAmqpConnectionFactory::class));
4646
}
4747

src/Queue/Jobs/RabbitMQJob.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use Illuminate\Container\Container;
1212
use Illuminate\Database\DetectsDeadlocks;
1313
use Illuminate\Contracts\Queue\Job as JobContract;
14-
use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
1514
use VladimirYuldashev\LaravelQueueRabbitMQ\Queue\RabbitMQQueue;
15+
use VladimirYuldashev\LaravelQueueRabbitMQ\Horizon\RabbitMQQueue as HorizonRabbitMQQueue;
1616

1717
class RabbitMQJob extends Job implements JobContract
1818
{
@@ -32,8 +32,7 @@ public function __construct(
3232
RabbitMQQueue $connection,
3333
AmqpConsumer $consumer,
3434
AmqpMessage $message
35-
)
36-
{
35+
) {
3736
$this->container = $container;
3837
$this->connection = $connection;
3938
$this->consumer = $consumer;
@@ -103,7 +102,7 @@ public function delete(): void
103102
$this->consumer->acknowledge($this->message);
104103

105104
// required for Laravel Horizon
106-
if($this->connection instanceof HorizonRabbitMQQueue) {
105+
if ($this->connection instanceof HorizonRabbitMQQueue) {
107106
$this->connection->deleteReserved($this->queue, $this);
108107
}
109108
}

src/Queue/RabbitMQQueue.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace VladimirYuldashev\LaravelQueueRabbitMQ\Queue;
44

5-
use Illuminate\Support\Str;
65
use RuntimeException;
76
use Illuminate\Queue\Queue;
7+
use Illuminate\Support\Str;
88
use Interop\Amqp\AmqpQueue;
99
use Interop\Amqp\AmqpTopic;
1010
use Psr\Log\LoggerInterface;
@@ -235,7 +235,8 @@ protected function declareEverything(string $queueName = null): array
235235
return [$queue, $topic];
236236
}
237237

238-
protected function getQueueName($queueName = null) {
238+
protected function getQueueName($queueName = null)
239+
{
239240
return $queueName ?: $this->queueName;
240241
}
241242

tests/Functional/SendAndReceiveMessageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function test()
6767

6868
$queue->getContext()->purgeQueue($queue->getContext()->createQueue('default'));
6969

70-
$expectedPayload = __METHOD__ . microtime(true);
70+
$expectedPayload = __METHOD__.microtime(true);
7171

7272
$queue->pushRaw($expectedPayload);
7373

0 commit comments

Comments
 (0)