Merge pull request #536 from php-enqueue/amqp-set-delay-strategy-if-r…

…abbitmq-scheme-extension [amqp] Set delay strategy if rabbitmq scheme extension present.
php-enqueue · Sep 17, 2018 · b9c49c6 · b9c49c6
2 parents e5dcdc5 + 3725995
commit b9c49c6
Show file tree

Hide file tree

Showing 25 changed files with 182 additions and 229 deletions.
diff --git a/pkg/amqp-bunny/AmqpConnectionFactory.php b/pkg/amqp-bunny/AmqpConnectionFactory.php
@@ -7,6 +7,7 @@
 use Enqueue\AmqpTools\ConnectionConfig;
 use Enqueue\AmqpTools\DelayStrategyAware;
 use Enqueue\AmqpTools\DelayStrategyAwareTrait;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
 use Interop\Queue\PsrContext;
 
@@ -33,10 +34,13 @@ public function __construct($config = 'amqp:')
     {
         $this->config = (new ConnectionConfig($config))
             ->addSupportedScheme('amqp+bunny')
-            ->addDefaultOption('receive_method', 'basic_get')
             ->addDefaultOption('tcp_nodelay', null)
             ->parse()
         ;
+
+        if (in_array('rabbitmq', $this->config->getSchemeExtensions(), true)) {
+            $this->setDelayStrategy(new RabbitMqDlxDelayStrategy());
+        }
     }
 
     /**

diff --git a/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php
@@ -3,6 +3,7 @@
 namespace Enqueue\AmqpBunny\Tests;
 
 use Enqueue\AmqpBunny\AmqpConnectionFactory;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Queue\PsrConnectionFactory;
 use PHPUnit\Framework\TestCase;
@@ -16,13 +17,10 @@ public function testShouldImplementConnectionFactoryInterface()
         $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class);
     }
 
-    public function testShouldSupportAmqpLibScheme()
+    public function testShouldSetRabbitMqDlxDelayStrategyIfRabbitMqSchemeExtensionPresent()
     {
-        // no exception here
-        new AmqpConnectionFactory('amqp+bunny:');
+        $factory = new AmqpConnectionFactory('amqp+rabbitmq:');
 
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('The given DSN scheme "amqp+foo" is not supported. Could be one of "amqp", "amqps", "amqp+bunny" only.');
-        new AmqpConnectionFactory('amqp+foo:');
+        $this->assertAttributeInstanceOf(RabbitMqDlxDelayStrategy::class, 'delayStrategy', $factory);
     }
 }
diff --git a/...eceiveFromQueueWithBasicGetMethodTest.php → ...mqpSendToTopicAndReceiveFromQueueTest.php b/...eceiveFromQueueWithBasicGetMethodTest.php → ...mqpSendToTopicAndReceiveFromQueueTest.php
@@ -12,7 +12,7 @@
 /**
  * @group functional
  */
-class AmqpSendToTopicAndReceiveFromQueueWithBasicGetMethodTest extends SendToTopicAndReceiveFromQueueSpec
+class AmqpSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec
 {
     /**
      * {@inheritdoc}

diff --git a/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueWithBasicConsumeMethodTest.php b/pkg/amqp-bunny/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueWithBasicConsumeMethodTest.php
diff --git a/pkg/amqp-ext/AmqpConnectionFactory.php b/pkg/amqp-ext/AmqpConnectionFactory.php
@@ -5,6 +5,7 @@
 use Enqueue\AmqpTools\ConnectionConfig;
 use Enqueue\AmqpTools\DelayStrategyAware;
 use Enqueue\AmqpTools\DelayStrategyAwareTrait;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
 use Interop\Queue\PsrContext;
 
@@ -34,6 +35,10 @@ public function __construct($config = 'amqp:')
             ->addSupportedScheme('amqps+ext')
             ->parse()
         ;
+
+        if (in_array('rabbitmq', $this->config->getSchemeExtensions(), true)) {
+            $this->setDelayStrategy(new RabbitMqDlxDelayStrategy());
+        }
     }
 
     /**

diff --git a/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Enqueue\AmqpExt\AmqpContext;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Queue\PsrConnectionFactory;
 use PHPUnit\Framework\TestCase;
@@ -17,15 +18,11 @@ public function testShouldImplementConnectionFactoryInterface()
         $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class);
     }
 
-    public function testShouldSupportAmqpExtScheme()
+    public function testShouldSetRabbitMqDlxDelayStrategyIfRabbitMqSchemeExtensionPresent()
     {
-        // no exception here
-        new AmqpConnectionFactory('amqp+ext:');
-        new AmqpConnectionFactory('amqps+ext:');
+        $factory = new AmqpConnectionFactory('amqp+rabbitmq:');
 
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('The given DSN scheme "amqp+foo" is not supported. Could be one of "amqp", "amqps", "amqp+ext", "amqps+ext" only.');
-        new AmqpConnectionFactory('amqp+foo:');
+        $this->assertAttributeInstanceOf(RabbitMqDlxDelayStrategy::class, 'delayStrategy', $factory);
     }
 
     public function testShouldCreateLazyContext()

diff --git a/pkg/amqp-lib/AmqpConnectionFactory.php b/pkg/amqp-lib/AmqpConnectionFactory.php
@@ -7,6 +7,7 @@
 use Enqueue\AmqpTools\ConnectionConfig;
 use Enqueue\AmqpTools\DelayStrategyAware;
 use Enqueue\AmqpTools\DelayStrategyAwareTrait;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Interop\Amqp\AmqpConnectionFactory as InteropAmqpConnectionFactory;
 use Interop\Queue\PsrContext;
 use PhpAmqpLib\Connection\AbstractConnection;
@@ -48,6 +49,10 @@ public function __construct($config = 'amqp:')
             ->addDefaultOption('keepalive', false)
             ->parse()
         ;
+
+        if (in_array('rabbitmq', $this->config->getSchemeExtensions(), true)) {
+            $this->setDelayStrategy(new RabbitMqDlxDelayStrategy());
+        }
     }
 
     /**

diff --git a/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php b/pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php
@@ -3,6 +3,7 @@
 namespace Enqueue\AmqpLib\Tests;
 
 use Enqueue\AmqpLib\AmqpConnectionFactory;
+use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Queue\PsrConnectionFactory;
 use PHPUnit\Framework\TestCase;
@@ -16,14 +17,10 @@ public function testShouldImplementConnectionFactoryInterface()
         $this->assertClassImplements(PsrConnectionFactory::class, AmqpConnectionFactory::class);
     }
 
-    public function testShouldSupportAmqpLibScheme()
+    public function testShouldSetRabbitMqDlxDelayStrategyIfRabbitMqSchemeExtensionPresent()
     {
-        // no exception here
-        new AmqpConnectionFactory('amqp+lib:');
-        new AmqpConnectionFactory('amqps+lib:');
+        $factory = new AmqpConnectionFactory('amqp+rabbitmq:');
 
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('The given DSN scheme "amqp+foo" is not supported. Could be one of "amqp", "amqps", "amqp+lib');
-        new AmqpConnectionFactory('amqp+foo:');
+        $this->assertAttributeInstanceOf(RabbitMqDlxDelayStrategy::class, 'delayStrategy', $factory);
     }
 }
diff --git a/...eceiveFromQueueWithBasicGetMethodTest.php → ...mqpSendToTopicAndReceiveFromQueueTest.php b/...eceiveFromQueueWithBasicGetMethodTest.php → ...mqpSendToTopicAndReceiveFromQueueTest.php
@@ -12,7 +12,7 @@
 /**
  * @group functional
  */
-class AmqpSendToTopicAndReceiveFromQueueWithBasicGetMethodTest extends SendToTopicAndReceiveFromQueueSpec
+class AmqpSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec
 {
     /**
      * {@inheritdoc}

diff --git a/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueWithBasicConsumeMethodTest.php b/pkg/amqp-lib/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueWithBasicConsumeMethodTest.php
diff --git a/pkg/amqp-lib/tutorial/receive.php b/pkg/amqp-lib/tutorial/receive.php
@@ -10,7 +10,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 $connection = new AmqpConnectionFactory($config);

diff --git a/pkg/amqp-lib/tutorial/receive_logs.php b/pkg/amqp-lib/tutorial/receive_logs.php
@@ -12,7 +12,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 $connection = new AmqpConnectionFactory($config);

diff --git a/pkg/amqp-lib/tutorial/receive_logs_direct.php b/pkg/amqp-lib/tutorial/receive_logs_direct.php
@@ -12,7 +12,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 $connection = new AmqpConnectionFactory($config);

diff --git a/pkg/amqp-lib/tutorial/receive_logs_topic.php b/pkg/amqp-lib/tutorial/receive_logs_topic.php
@@ -12,7 +12,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 $connection = new AmqpConnectionFactory($config);

diff --git a/pkg/amqp-lib/tutorial/rpc_client.php b/pkg/amqp-lib/tutorial/rpc_client.php
@@ -9,7 +9,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 class FibonacciRpcClient

diff --git a/pkg/amqp-lib/tutorial/rpc_server.php b/pkg/amqp-lib/tutorial/rpc_server.php
@@ -9,7 +9,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 function fib($n)

diff --git a/pkg/amqp-lib/tutorial/worker.php b/pkg/amqp-lib/tutorial/worker.php
@@ -10,7 +10,6 @@
     'port' => 5672,
     'user' => 'guest',
     'pass' => 'guest',
-    'receive_method' => 'basic_consume',
 ];
 
 $connection = new AmqpConnectionFactory($config);