[Messenger] Rename Adapters to Transports

sroze · nicolas-grekas · commit 10dd1e07aa85 · 2018-05-03T17:09:35.000-07:00
diff --git a/Asynchronous/Middleware/SendMessageMiddleware.php b/Asynchronous/Middleware/SendMessageMiddleware.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Messenger\Asynchronous\Routing\SenderLocatorInterface;
 use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
-use Symfony\Component\Messenger\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
diff --git a/Handler/Locator/ContainerHandlerLocator.php b/Handler/Locator/ContainerHandlerLocator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger;
+namespace Symfony\Component\Messenger\Handler\Locator;
 
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
diff --git a/Handler/Locator/HandlerLocator.php b/Handler/Locator/HandlerLocator.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger;
+namespace Symfony\Component\Messenger\Handler\Locator;
 
 use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
 
diff --git a/Handler/Locator/HandlerLocatorInterface.php b/Handler/Locator/HandlerLocatorInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger;
+namespace Symfony\Component\Messenger\Handler\Locator;
 
 use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
 
diff --git a/MessageBus.php b/MessageBus.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Messenger;
 
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  * @author Matthias Noback <matthiasnoback@gmail.com>
diff --git a/Middleware/HandleMessageMiddleware.php b/Middleware/HandleMessageMiddleware.php
@@ -11,8 +11,7 @@
 
 namespace Symfony\Component\Messenger\Middleware;
 
-use Symfony\Component\Messenger\MiddlewareInterface;
-use Symfony\Component\Messenger\HandlerLocatorInterface;
+use Symfony\Component\Messenger\Handler\Locator\HandlerLocatorInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
diff --git a/Middleware/LoggingMiddleware.php b/Middleware/LoggingMiddleware.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Messenger\Middleware;
 
 use Symfony\Component\Messenger\Asynchronous\Transport\ReceivedMessage;
-use Symfony\Component\Messenger\MiddlewareInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/Middleware/MiddlewareInterface.php b/Middleware/MiddlewareInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger;
+namespace Symfony\Component\Messenger\Middleware;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
diff --git a/Middleware/TolerateNoHandler.php b/Middleware/TolerateNoHandler.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Messenger\Middleware;
 
 use Symfony\Component\Messenger\Exception\NoHandlerForMessageException;
-use Symfony\Component\Messenger\MiddlewareInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
diff --git a/Middleware/ValidationMiddleware.php b/Middleware/ValidationMiddleware.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\Messenger\Middleware;
 
 use Symfony\Component\Messenger\Exception\ValidationFailedException;
-use Symfony\Component\Messenger\MiddlewareInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
diff --git a/Tests/DependencyInjection/MessengerPassTest.php b/Tests/DependencyInjection/MessengerPassTest.php
@@ -16,16 +16,16 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
-use Symfony\Component\Messenger\ContainerHandlerLocator;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
+use Symfony\Component\Messenger\Handler\Locator\ContainerHandlerLocator;
 use Symfony\Component\Messenger\DataCollector\MessengerDataCollector;
 use Symfony\Component\Messenger\DependencyInjection\MessengerPass;
 use Symfony\Component\Messenger\Handler\ChainHandler;
 use Symfony\Component\Messenger\Handler\MessageSubscriberInterface;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\TolerateNoHandler;
-use Symfony\Component\Messenger\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Tests\Fixtures\SecondMessage;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
diff --git a/Tests/MessageBusTest.php b/Tests/MessageBusTest.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
-use Symfony\Component\Messenger\MiddlewareInterface;
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 
 class MessageBusTest extends TestCase
diff --git a/Tests/Middleware/HandleMessageMiddlewareTest.php b/Tests/Middleware/HandleMessageMiddlewareTest.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Messenger\Tests\Middleware;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\HandlerLocator;
+use Symfony\Component\Messenger\Handler\Locator\HandlerLocator;
 use Symfony\Component\Messenger\Middleware\HandleMessageMiddleware;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 
diff --git a/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php b/Tests/Transport/AmqpExt/AmqpExtIntegrationTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
+use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Process\PhpProcess;
diff --git a/Tests/Transport/AmqpExt/AmqpReceiverTest.php b/Tests/Transport/AmqpExt/AmqpReceiverTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
+use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
+use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Serializer as SerializerComponent;
@@ -51,7 +51,7 @@ public function testItSendTheDecodedMessageToTheHandlerAndAcknowledgeIt()
     }
 
     /**
-     * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\InterruptException
+     * @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\InterruptException
      */
     public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
     {
@@ -77,7 +77,7 @@ public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
     }
 
     /**
-     * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\WillNeverWorkException
+     * @expectedException \Symfony\Component\Messenger\Tests\Transport\AmqpExt\WillNeverWorkException
      */
     public function testItRejectsTheMessageIfTheExceptionIsARejectMessageExceptionInterface()
     {
diff --git a/Tests/Transport/AmqpExt/AmqpSenderTest.php b/Tests/Transport/AmqpExt/AmqpSenderTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
 
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
+use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;
diff --git a/Tests/Transport/AmqpExt/ConnectionTest.php b/Tests/Transport/AmqpExt/ConnectionTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Tests\Transport\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpFactory;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpFactory;
+use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
 
 /**
  * @requires extension amqp
diff --git a/Tests/Transport/AmqpExt/Fixtures/long_receiver.php b/Tests/Transport/AmqpExt/Fixtures/long_receiver.php
@@ -12,9 +12,9 @@
 
 require_once $autoload;
 
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
-use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpReceiver;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpSender;
+use Symfony\Component\Messenger\Transport\AmqpExt\Connection;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Worker;
diff --git a/Transport/AmqpExt/AmqpFactory.php b/Transport/AmqpExt/AmqpFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
 class AmqpFactory
 {
diff --git a/Transport/AmqpExt/AmqpReceiver.php b/Transport/AmqpExt/AmqpReceiver.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
-use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface;
+use Symfony\Component\Messenger\Transport\AmqpExt\Exception\RejectMessageExceptionInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface;
 
diff --git a/Transport/AmqpExt/AmqpSender.php b/Transport/AmqpExt/AmqpSender.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
 use Symfony\Component\Messenger\Transport\SenderInterface;
 use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;
diff --git a/Transport/AmqpExt/AmqpTransportFactory.php b/Transport/AmqpExt/AmqpTransportFactory.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
-use Symfony\Component\Messenger\Adapter\Factory\AdapterFactoryInterface;
+use Symfony\Component\Messenger\Transport\Factory\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\SenderInterface;
 use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface;
@@ -20,7 +20,7 @@
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-class AmqpAdapterFactory implements AdapterFactoryInterface
+class AmqpTransportFactory implements TransportFactoryInterface
 {
     private $encoder;
     private $decoder;
diff --git a/Transport/AmqpExt/Connection.php b/Transport/AmqpExt/Connection.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt;
+namespace Symfony\Component\Messenger\Transport\AmqpExt;
 
 /**
  * An AMQP connection.
diff --git a/Transport/AmqpExt/Exception/RejectMessageExceptionInterface.php b/Transport/AmqpExt/Exception/RejectMessageExceptionInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\AmqpExt\Exception;
+namespace Symfony\Component\Messenger\Transport\AmqpExt\Exception;
 
 /**
  * If something goes wrong while consuming and handling a message from the AMQP broker, there are two choices: rejecting
diff --git a/Transport/Factory/ChainTransportFactory.php b/Transport/Factory/ChainTransportFactory.php
@@ -9,20 +9,20 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\Factory;
+namespace Symfony\Component\Messenger\Transport\Factory;
 
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\SenderInterface;
 
 /**
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-class ChainAdapterFactory implements AdapterFactoryInterface
+class ChainTransportFactory implements TransportFactoryInterface
 {
     private $factories;
 
     /**
-     * @param iterable|AdapterFactoryInterface[] $factories
+     * @param iterable|TransportFactoryInterface[] $factories
      */
     public function __construct(iterable $factories)
     {
@@ -37,7 +37,7 @@ public function createReceiver(string $dsn, array $options): ReceiverInterface
             }
         }
 
-        throw new \InvalidArgumentException(sprintf('No adapter supports the given DSN "%s".', $dsn));
+        throw new \InvalidArgumentException(sprintf('No transport supports the given DSN "%s".', $dsn));
     }
 
     public function createSender(string $dsn, array $options): SenderInterface
@@ -48,7 +48,7 @@ public function createSender(string $dsn, array $options): SenderInterface
             }
         }
 
-        throw new \InvalidArgumentException(sprintf('No adapter 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
diff --git a/Transport/Factory/TransportFactoryInterface.php b/Transport/Factory/TransportFactoryInterface.php
@@ -9,17 +9,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\Factory;
+namespace Symfony\Component\Messenger\Transport\Factory;
 
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\SenderInterface;
 
 /**
- * Creates a Messenger adapter.
+ * Creates a Messenger transport.
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
  */
-interface AdapterFactoryInterface
+interface TransportFactoryInterface
 {
     public function createReceiver(string $dsn, array $options): ReceiverInterface;
 
diff --git a/Transport/Serialization/DecoderInterface.php b/Transport/Serialization/DecoderInterface.php
@@ -22,7 +22,7 @@ interface DecoderInterface
      * Decodes the message from an encoded-form.
      *
      * The `$encodedMessage` parameter is a key-value array that
-     * describes the message, that will be used by the different adapters.
+     * describes the message, that will be used by the different transports.
      *
      * The most common keys are:
      * - `body` (string) - the message body
diff --git a/Transport/Serialization/EncoderInterface.php b/Transport/Serialization/EncoderInterface.php
@@ -19,7 +19,7 @@
 interface EncoderInterface
 {
     /**
-     * Encodes a message to a common format understandable by adapters. The encoded array should only
+     * Encodes a message to a common format understandable by transports. The encoded array should only
      * contain scalar and arrays.
      *
      * The most common keys of the encoded array are:
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "symfony/var-dumper": "~3.4|~4.0"
     },
     "suggest": {
-        "sroze/enqueue-bridge": "For using the php-enqueue library as an adapter."
+        "sroze/enqueue-bridge": "For using the php-enqueue library as a transport."
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Messenger\\": "" },

-Original file line number
+Diff line change
 namespace Symfony\Component\Messenger;
 +use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
++
 /**
  * @author Samuel Roze <[email protected]>
  * @author Matthias Noback <[email protected]>