From 4e0e5e5fdb1e5c521042f90838ead96f534386f6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 8 Sep 2018 08:36:06 +0200 Subject: [PATCH] [Messenger] changed exceptions to use component's one --- src/Symfony/Component/Messenger/Handler/ChainHandler.php | 4 +++- .../Component/Messenger/Transport/AmqpExt/Connection.php | 4 +++- .../Messenger/Transport/Serialization/Serializer.php | 5 +++-- .../Component/Messenger/Transport/TransportFactory.php | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/Messenger/Handler/ChainHandler.php b/src/Symfony/Component/Messenger/Handler/ChainHandler.php index f73f928381..c21d492e03 100644 --- a/src/Symfony/Component/Messenger/Handler/ChainHandler.php +++ b/src/Symfony/Component/Messenger/Handler/ChainHandler.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Messenger\Handler; +use Symfony\Component\Messenger\Exception\InvalidArgumentException; + /** * Represents a collection of message handlers. * @@ -29,7 +31,7 @@ class ChainHandler public function __construct(array $handlers) { if (empty($handlers)) { - throw new \InvalidArgumentException('A collection of message handlers requires at least one handler.'); + throw new InvalidArgumentException('A collection of message handlers requires at least one handler.'); } $this->handlers = $handlers; diff --git a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php index 6f50bd76d5..5fef71cd39 100644 --- a/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php +++ b/src/Symfony/Component/Messenger/Transport/AmqpExt/Connection.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Messenger\Transport\AmqpExt; +use Symfony\Component\Messenger\Exception\InvalidArgumentException; + /** * An AMQP connection. * @@ -51,7 +53,7 @@ class Connection public static function fromDsn(string $dsn, array $options = array(), bool $debug = false, AmqpFactory $amqpFactory = null): self { if (false === $parsedUrl = parse_url($dsn)) { - throw new \InvalidArgumentException(sprintf('The given AMQP DSN "%s" is invalid.', $dsn)); + throw new InvalidArgumentException(sprintf('The given AMQP DSN "%s" is invalid.', $dsn)); } $pathParts = isset($parsedUrl['path']) ? explode('/', trim($parsedUrl['path'], '/')) : array(); diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php index 45665473f7..0e32887ad3 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php @@ -12,6 +12,7 @@ namespace Symfony\Component\Messenger\Transport\Serialization; use Symfony\Component\Messenger\Envelope; +use Symfony\Component\Messenger\Exception\InvalidArgumentException; use Symfony\Component\Serializer\SerializerInterface; /** @@ -36,11 +37,11 @@ class Serializer implements DecoderInterface, EncoderInterface public function decode(array $encodedEnvelope): Envelope { if (empty($encodedEnvelope['body']) || empty($encodedEnvelope['headers'])) { - throw new \InvalidArgumentException('Encoded envelope should have at least a `body` and some `headers`.'); + throw new InvalidArgumentException('Encoded envelope should have at least a "body" and some "headers".'); } if (empty($encodedEnvelope['headers']['type'])) { - throw new \InvalidArgumentException('Encoded envelope does not have a `type` header.'); + throw new InvalidArgumentException('Encoded envelope does not have a "type" header.'); } $envelopeItems = $this->decodeEnvelopeItems($encodedEnvelope); diff --git a/src/Symfony/Component/Messenger/Transport/TransportFactory.php b/src/Symfony/Component/Messenger/Transport/TransportFactory.php index 2c20533bfb..76615d4a20 100644 --- a/src/Symfony/Component/Messenger/Transport/TransportFactory.php +++ b/src/Symfony/Component/Messenger/Transport/TransportFactory.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Messenger\Transport; +use Symfony\Component\Messenger\Exception\InvalidArgumentException; + /** * @author Samuel Roze */ @@ -34,7 +36,7 @@ class TransportFactory implements TransportFactoryInterface } } - throw new \InvalidArgumentException(sprintf('No transport supports the given DSN "%s".', $dsn)); + throw new InvalidArgumentException(sprintf('No transport supports the given DSN "%s".', $dsn)); } public function supports(string $dsn, array $options): bool