From a841a3e52c9899886ed031870b180a005454c09a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Feb 2020 11:10:55 +0100 Subject: [PATCH] Fix CS --- src/Symfony/Component/Lock/Store/MongoDbStore.php | 2 +- .../Doctrine/Tests/Transport/DoctrineReceiverTest.php | 6 +++--- .../Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php | 4 ++-- .../Doctrine/Tests/Transport/DoctrineTransportTest.php | 2 +- .../Bridge/Redis/Tests/Transport/RedisReceiverTest.php | 2 +- .../Bridge/Redis/Tests/Transport/RedisSenderTest.php | 2 +- .../Bridge/Redis/Tests/Transport/RedisTransportTest.php | 2 +- .../Middleware/RejectRedeliveredMessageMiddleware.php | 1 - .../Tests/DependencyInjection/MessengerPassTest.php | 2 +- .../Component/Messenger/Transport/AmqpExt/AmqpSender.php | 1 - .../Component/Messenger/Transport/TransportFactory.php | 6 +++--- .../Component/VarDumper/Tests/Caster/RdKafkaCasterTest.php | 2 +- 12 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php index 85ce203e5c..9306a86060 100644 --- a/src/Symfony/Component/Lock/Store/MongoDbStore.php +++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php @@ -19,6 +19,7 @@ use MongoDB\Driver\Exception\WriteException; use MongoDB\Exception\DriverRuntimeException; use MongoDB\Exception\InvalidArgumentException as MongoInvalidArgumentException; use MongoDB\Exception\UnsupportedException; +use Symfony\Component\Lock\BlockingStoreInterface; use Symfony\Component\Lock\Exception\InvalidArgumentException; use Symfony\Component\Lock\Exception\InvalidTtlException; use Symfony\Component\Lock\Exception\LockAcquiringException; @@ -27,7 +28,6 @@ use Symfony\Component\Lock\Exception\LockExpiredException; use Symfony\Component\Lock\Exception\LockStorageException; use Symfony\Component\Lock\Exception\NotSupportedException; use Symfony\Component\Lock\Key; -use Symfony\Component\Lock\BlockingStoreInterface; /** * MongoDbStore is a StoreInterface implementation using MongoDB as a storage diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php index cc2c969a28..0df72b390f 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php @@ -15,13 +15,13 @@ use Doctrine\DBAL\Driver\PDOException; use Doctrine\DBAL\Exception\DeadlockException; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceivedStamp; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceiver; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; use Symfony\Component\Messenger\Exception\TransportException; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceivedStamp; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineReceiver; use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Serializer as SerializerComponent; diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php index c2953a524d..8505e3dee0 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineSenderTest.php @@ -13,11 +13,11 @@ namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineSender; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Stamp\DelayStamp; use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineSender; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; class DoctrineSenderTest extends TestCase diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php index f04764dded..b1f89fc03d 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineTransportTest.php @@ -13,9 +13,9 @@ namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport; use PHPUnit\Framework\TestCase; use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage; -use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection; use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport; +use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; use Symfony\Component\Messenger\Transport\TransportInterface; diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php index ec12e37d5f..79eee616ec 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisReceiverTest.php @@ -12,10 +12,10 @@ namespace Symfony\Component\Messenger\Bridge\Redis\Tests\Transport; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; use Symfony\Component\Messenger\Bridge\Redis\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Bridge\Redis\Transport\Connection; use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisReceiver; +use Symfony\Component\Messenger\Exception\MessageDecodingFailedException; use Symfony\Component\Messenger\Transport\Serialization\PhpSerializer; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Serializer as SerializerComponent; diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisSenderTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisSenderTest.php index 26231a1c3e..5a162cebdf 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisSenderTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisSenderTest.php @@ -12,10 +12,10 @@ namespace Symfony\Component\Messenger\Bridge\Redis\Tests\Transport; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Bridge\Redis\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Bridge\Redis\Transport\Connection; use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisSender; +use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; class RedisSenderTest extends TestCase diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php index 16e022f68c..59ae90d72c 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/RedisTransportTest.php @@ -12,10 +12,10 @@ namespace Symfony\Component\Messenger\Bridge\Redis\Tests\Transport; use PHPUnit\Framework\TestCase; -use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Bridge\Redis\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Bridge\Redis\Transport\Connection; use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisTransport; +use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface; use Symfony\Component\Messenger\Transport\TransportInterface; diff --git a/src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php index 33e5d427fa..9e994ddd1e 100644 --- a/src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/RejectRedeliveredMessageMiddleware.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Messenger\Middleware; - use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceivedStamp; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\Exception\RejectRedeliveredMessageException; diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php index c127163994..c1c5148fd7 100644 --- a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php +++ b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php @@ -17,6 +17,7 @@ use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\ServiceLocator; +use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceiver; use Symfony\Component\Messenger\Command\ConsumeMessagesCommand; use Symfony\Component\Messenger\Command\DebugCommand; use Symfony\Component\Messenger\Command\SetupTransportsCommand; @@ -38,7 +39,6 @@ use Symfony\Component\Messenger\Tests\Fixtures\DummyQueryHandler; use Symfony\Component\Messenger\Tests\Fixtures\MultipleBusesMessage; use Symfony\Component\Messenger\Tests\Fixtures\MultipleBusesMessageHandler; use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage; -use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpReceiver; use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface; class MessengerPassTest extends TestCase diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php index c247a67f91..864a6f5bb8 100644 --- a/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/AmqpSender.php @@ -25,4 +25,3 @@ if (false) { { } } - diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php index ae62f7ab9b..4e4fa58c5a 100644 --- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php +++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php @@ -39,11 +39,11 @@ class TransportFactory implements TransportFactoryInterface // Help the user to select Symfony packages based on protocol. $packageSuggestion = ''; - if (substr($dsn, 0, 7) === 'amqp://') { + if ('amqp://' === substr($dsn, 0, 7)) { $packageSuggestion = ' Run "composer require symfony/amqp-messenger" to install AMQP transport.'; - } elseif (substr($dsn, 0, 11) === 'doctrine://') { + } elseif ('doctrine://' === substr($dsn, 0, 11)) { $packageSuggestion = ' Run "composer require symfony/doctrine-messenger" to install Doctrine transport.'; - } elseif (substr($dsn, 0, 8) === 'redis://') { + } elseif ('redis://' === substr($dsn, 0, 8)) { $packageSuggestion = ' Run "composer require symfony/redis-messenger" to install Redis transport.'; } diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/RdKafkaCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/RdKafkaCasterTest.php index e14e0f927d..501c269407 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/RdKafkaCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/RdKafkaCasterTest.php @@ -251,7 +251,7 @@ EODUMP; $producer->addBrokers($this->broker); $topic = $producer->newTopic('test'); - $topic->produce(\RD_KAFKA_PARTITION_UA, 0, '{}'); + $topic->produce(RD_KAFKA_PARTITION_UA, 0, '{}'); $expectedDump = <<