Move the adapter to the AmqpExt namespace instead of PhpAmqp

sroze · sroze · commit 8dc516254e18 · 2018-04-08T11:23:29.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml
@@ -78,7 +78,7 @@
             <argument type="tagged" tag="messenger.adapter_factory" />
         </service>
 
-        <service id="messenger.adapter.amqp.factory" class="Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpAdapterFactory">
+        <service id="messenger.adapter.amqp.factory" class="Symfony\Component\Messenger\Adapter\AmqpExt\AmqpAdapterFactory">
             <argument type="service" id="messenger.transport.default_encoder" />
             <argument type="service" id="messenger.transport.default_decoder" />
             <argument>%kernel.debug%</argument>
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpAdapterFactory.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpAdapterFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt;
 
 use Symfony\Component\Messenger\Adapter\Factory\AdapterFactoryInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpFactory.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpFactory.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt;
 
 class AmqpFactory
 {
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt;
 
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Exception\RejectMessageExceptionInterface;
+use Symfony\Component\Messenger\Adapter\AmqpExt\Exception\RejectMessageExceptionInterface;
 use Symfony\Component\Messenger\Transport\ReceiverInterface;
 use Symfony\Component\Messenger\Transport\Serialization\DecoderInterface;
 
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpSender.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpSender.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt;
 
 use Symfony\Component\Messenger\Transport\SenderInterface;
 use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt;
 
 /**
  * An AMQP connection.
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Exception/RejectMessageExceptionInterface.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Exception/RejectMessageExceptionInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Adapter\PhpAmqp\Exception;
+namespace Symfony\Component\Messenger\Adapter\AmqpExt\Exception;
 
 /**
  * If something goes wrong while consuming and handling a message from the AMQP broker, there are two choices: rejecting
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpSender;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Connection;
+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\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Enhancers\MaximumCountReceiver;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
@@ -27,7 +27,7 @@
 /**
  * @requires extension amqp
  */
-class PhpAmqpIntegrationTest extends TestCase
+class AmqpExtIntegrationTest extends TestCase
 {
     protected function setUp()
     {
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpReceiverTest.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Connection;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Exception\RejectMessageExceptionInterface;
+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\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\PhpAmqp\InterruptException
+     * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\InterruptException
      */
     public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
     {
@@ -77,7 +77,7 @@ public function testItNonAcknowledgeTheMessageIfAnExceptionHappened()
     }
 
     /**
-     * @expectedException \Symfony\Component\Messenger\Tests\Adapter\PhpAmqp\WillNeverWorkException
+     * @expectedException \Symfony\Component\Messenger\Tests\Adapter\AmqpExt\WillNeverWorkException
      */
     public function testItRejectsTheMessageIfTheExceptionIsARejectMessageExceptionInterface()
     {
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpSenderTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpSenderTest.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
 
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpSender;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Connection;
+use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpSender;
+use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Transport\Serialization\EncoderInterface;
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/ConnectionTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Messenger\Tests\Adapter\PhpAmqp;
+namespace Symfony\Component\Messenger\Tests\Adapter\AmqpExt;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpFactory;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Connection;
+use Symfony\Component\Messenger\Adapter\AmqpExt\AmqpFactory;
+use Symfony\Component\Messenger\Adapter\AmqpExt\Connection;
 
 /**
  * @requires extension amqp
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/Fixtures/long_receiver.php
@@ -12,9 +12,9 @@
 
 require_once $autoload;
 
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpReceiver;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\AmqpSender;
-use Symfony\Component\Messenger\Adapter\PhpAmqp\Connection;
+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\MessageBusInterface;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Worker;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Messenger\Adapter\PhpAmqp;`
	`12`	`+namespace Symfony\Component\Messenger\Adapter\AmqpExt;`
`13`	`13`
`14`	`14`	`class AmqpFactory`
`15`	`15`	`{`