Skip to content

Commit 3f446f1

Browse files
committed
Run php-cs-fixer fix on whole project
1 parent 44f2989 commit 3f446f1

File tree

282 files changed

+466
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

282 files changed

+466
-174
lines changed

bin/pre-commit

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,10 @@ function runPhpCsFixer()
105105
$output = '';
106106
$returnCode = null;
107107
exec(sprintf(
108-
'%s %s fix %s --config=%s',
108+
'%s %s fix %s',
109109
$phpBin,
110110
$phpCsFixerBin,
111-
$projectRootDir.'/'.$file,
112-
$projectRootDir.'/.php_cs'
111+
$projectRootDir.'/'.$file
113112
), $output, $returnCode);
114113

115114
if ($returnCode) {

pkg/amqp-ext/AmqpConnectionFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\ConnectionFactory;

pkg/amqp-ext/AmqpConsumer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Consumer;

pkg/amqp-ext/AmqpContext.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Context;
@@ -156,9 +157,9 @@ public function createConsumer(Destination $destination)
156157
$this->bind($destination, $queue);
157158

158159
return new AmqpConsumer($this, $queue);
159-
} else {
160-
return new AmqpConsumer($this, $destination);
161160
}
161+
162+
return new AmqpConsumer($this, $destination);
162163
}
163164

164165
public function close()

pkg/amqp-ext/AmqpMessage.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Message;

pkg/amqp-ext/AmqpProducer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Destination;

pkg/amqp-ext/AmqpQueue.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Queue;

pkg/amqp-ext/AmqpTopic.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt;
34

45
use Enqueue\Psr\Topic;

pkg/amqp-ext/Client/AmqpDriver.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Client;
34

45
use Enqueue\AmqpExt\AmqpContext;
56
use Enqueue\AmqpExt\AmqpMessage;
67
use Enqueue\AmqpExt\AmqpQueue;
78
use Enqueue\AmqpExt\AmqpTopic;
8-
use Enqueue\Psr\DeliveryMode;
9-
use Enqueue\Psr\Message as TransportMessage;
109
use Enqueue\Client\Config;
1110
use Enqueue\Client\DriverInterface;
1211
use Enqueue\Client\Message;
1312
use Enqueue\Client\MessagePriority;
1413
use Enqueue\Client\Meta\QueueMetaRegistry;
14+
use Enqueue\Psr\DeliveryMode;
15+
use Enqueue\Psr\Message as TransportMessage;
1516
use Psr\Log\LoggerInterface;
1617
use Psr\Log\NullLogger;
1718

pkg/amqp-ext/Client/RabbitMqDriver.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Client;
34

45
use Enqueue\AmqpExt\AmqpContext;
56
use Enqueue\AmqpExt\AmqpMessage;
67
use Enqueue\AmqpExt\AmqpQueue;
78
use Enqueue\AmqpExt\AmqpTopic;
8-
use Enqueue\Psr\Message as TransportMessage;
99
use Enqueue\Client\Config;
1010
use Enqueue\Client\Message;
1111
use Enqueue\Client\Meta\QueueMetaRegistry;
1212
use Enqueue\Consumption\Exception\LogicException;
13+
use Enqueue\Psr\Message as TransportMessage;
1314
use Psr\Log\LoggerInterface;
1415
use Psr\Log\NullLogger;
1516

@@ -31,8 +32,8 @@ class RabbitMqDriver extends AmqpDriver
3132
private $queueMetaRegistry;
3233

3334
/**
34-
* @param AmqpContext $context
35-
* @param Config $config
35+
* @param AmqpContext $context
36+
* @param Config $config
3637
* @param QueueMetaRegistry $queueMetaRegistry
3738
*/
3839
public function __construct(AmqpContext $context, Config $config, QueueMetaRegistry $queueMetaRegistry)

pkg/amqp-ext/Symfony/AmqpTransportFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Symfony;
34

45
use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/amqp-ext/Symfony/RabbitMqTransportFactory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Symfony;
34

45
use Enqueue\AmqpExt\Client\RabbitMqDriver;

pkg/amqp-ext/Tests/AmqpContextTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests;
34

45
use Enqueue\AmqpExt\AmqpConsumer;

pkg/amqp-ext/Tests/AmqpMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests;
34

45
use Enqueue\AmqpExt\AmqpMessage;
@@ -18,7 +19,7 @@ public function testCouldBeConstructedWithoutArguments()
1819
{
1920
$message = new AmqpMessage();
2021

21-
$this->assertSame(null, $message->getBody());
22+
$this->assertNull($message->getBody());
2223
$this->assertSame([], $message->getProperties());
2324
$this->assertSame([], $message->getHeaders());
2425
}

pkg/amqp-ext/Tests/AmqpQueueTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests;
34

45
use Enqueue\AmqpExt\AmqpQueue;

pkg/amqp-ext/Tests/AmqpTopicTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests;
34

45
use Enqueue\AmqpExt\AmqpTopic;

pkg/amqp-ext/Tests/Client/AmqpDriverTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Client;
34

45
use Enqueue\AmqpExt\AmqpContext;
56
use Enqueue\AmqpExt\AmqpMessage;
67
use Enqueue\AmqpExt\AmqpQueue;
78
use Enqueue\AmqpExt\AmqpTopic;
89
use Enqueue\AmqpExt\Client\AmqpDriver;
9-
use Enqueue\Psr\Producer;
1010
use Enqueue\Client\Config;
1111
use Enqueue\Client\DriverInterface;
1212
use Enqueue\Client\Message;
1313
use Enqueue\Client\MessagePriority;
1414
use Enqueue\Client\Meta\QueueMetaRegistry;
15+
use Enqueue\Psr\Producer;
1516
use Enqueue\Test\ClassExtensionTrait;
1617

1718
class AmqpDriverTest extends \PHPUnit_Framework_TestCase

pkg/amqp-ext/Tests/Client/RabbitMqDriverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Client;
34

45
use Enqueue\AmqpExt\AmqpContext;
@@ -7,12 +8,12 @@
78
use Enqueue\AmqpExt\AmqpTopic;
89
use Enqueue\AmqpExt\Client\AmqpDriver;
910
use Enqueue\AmqpExt\Client\RabbitMqDriver;
10-
use Enqueue\Psr\Producer;
1111
use Enqueue\Client\Config;
1212
use Enqueue\Client\DriverInterface;
1313
use Enqueue\Client\Message;
1414
use Enqueue\Client\MessagePriority;
1515
use Enqueue\Client\Meta\QueueMetaRegistry;
16+
use Enqueue\Psr\Producer;
1617
use Enqueue\Test\ClassExtensionTrait;
1718

1819
class RabbitMqDriverTest extends \PHPUnit_Framework_TestCase
@@ -547,7 +548,6 @@ public function testShouldSetupBroker()
547548

548549
$config = new Config('', '', '', '', '', '', ['delay_plugin_installed' => true]);
549550

550-
551551
$meta = new QueueMetaRegistry($config, ['default' => []]);
552552

553553
$driver = new RabbitMqDriver($context, $config, $meta);

pkg/amqp-ext/Tests/Functional/AmqpCommonUseCasesTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Functional;
34

45
use Enqueue\AmqpExt\AmqpContext;
@@ -156,7 +157,7 @@ public function testConsumerReceiveMessageFromTopicDirectly()
156157

157158
$consumer = $this->amqpContext->createConsumer($topic);
158159
//guard
159-
$this->assertSame(null, $consumer->receive(1));
160+
$this->assertNull($consumer->receive(1));
160161

161162
$message = $this->amqpContext->createMessage(__METHOD__);
162163

pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Functional;
34

45
use Enqueue\AmqpExt\AmqpContext;

pkg/amqp-ext/Tests/Functional/AmqpRpcUseCasesTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Functional;
34

45
use Enqueue\AmqpExt\AmqpContext;

pkg/amqp-ext/Tests/Symfony/AmqpTransportFactoryTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Symfony;
34

45
use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/amqp-ext/Tests/Symfony/RabbitMqTransportFactoryTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Symfony;
34

45
use Enqueue\AmqpExt\AmqpConnectionFactory;

pkg/enqueue-bundle/Consumption/Extension/DoctrineClearIdentityMapExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Consumption\Extension;
34

45
use Enqueue\Consumption\Context;

pkg/enqueue-bundle/Consumption/Extension/DoctrinePingConnectionExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Consumption\Extension;
34

45
use Doctrine\DBAL\Connection;

pkg/enqueue-bundle/DependencyInjection/Compiler/AddTopicMetaPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildClientRoutingPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildExtensionsPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildProcessorRegistryPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildQueueMetaRegistryPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/BuildTopicMetaSubscribersPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;

pkg/enqueue-bundle/DependencyInjection/Compiler/ExtractProcessorTagSubscriptionsTrait.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection\Compiler;
34

45
use Enqueue\Client\TopicSubscriberInterface;

pkg/enqueue-bundle/DependencyInjection/Configuration.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection;
34

45
use Enqueue\Client\Config;

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\DependencyInjection;
34

45
use Enqueue\Client\TraceableMessageProducer;

pkg/enqueue-bundle/EnqueueBundle.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle;
34

45
use Enqueue\AmqpExt\AmqpContext;

pkg/enqueue-bundle/Entity/Job.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Entity;
34

45
use Doctrine\Common\Collections\ArrayCollection;

pkg/enqueue-bundle/Entity/JobUnique.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Entity;
34

45
use Doctrine\ORM\Mapping as ORM;

pkg/enqueue-bundle/Profiler/MessageQueueCollector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Profiler;
34

45
use Enqueue\Client\MessagePriority;

pkg/enqueue-bundle/Tests/Functional/Client/ConsumeMessagesCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Tests\Functional\Client;
34

4-
use Enqueue\Symfony\Client\ConsumeMessagesCommand;
55
use Enqueue\Bundle\Tests\Functional\WebTestCase;
6+
use Enqueue\Symfony\Client\ConsumeMessagesCommand;
67

78
/**
89
* @group functional

pkg/enqueue-bundle/Tests/Functional/Client/DriverTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Tests\Functional\Client;
34

4-
use Enqueue\Client\DriverInterface;
55
use Enqueue\Bundle\Tests\Functional\WebTestCase;
6+
use Enqueue\Client\DriverInterface;
67

78
/**
89
* @group functional

pkg/enqueue-bundle/Tests/Functional/Client/MessageProducerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Tests\Functional\Client;
34

4-
use Enqueue\Client\MessageProducerInterface;
55
use Enqueue\Bundle\Tests\Functional\WebTestCase;
6+
use Enqueue\Client\MessageProducerInterface;
67

78
/**
89
* @group functional

pkg/enqueue-bundle/Tests/Functional/Client/ProduceMessageCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
2+
23
namespace Enqueue\Bundle\Tests\Functional\Client;
34

4-
use Enqueue\Symfony\Client\ProduceMessageCommand;
55
use Enqueue\Bundle\Tests\Functional\WebTestCase;
6+
use Enqueue\Symfony\Client\ProduceMessageCommand;
67

78
/**
89
* @group functional

0 commit comments

Comments
 (0)