Migrate amqp tools

makasim · makasim · commit 4ac53dcbaa5c · 2018-08-22T15:57:17.000+03:00
diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
     "ext-mongodb": "^1.3",
     "ext-rdkafka": "^3.0.3",
 
-    "queue-interop/amqp-interop": "^0.7.4",
-    "queue-interop/queue-interop": "^0.6.2",
+    "queue-interop/amqp-interop": "0.8.x-dev",
+    "queue-interop/queue-interop": "0.7.x-dev",
     "bunny/bunny": "^0.2.4|^0.3|^0.4",
     "php-amqplib/php-amqplib": "^2.7",
     "doctrine/dbal": "~2.5",
@@ -33,7 +33,7 @@
   "require-dev": {
     "phpunit/phpunit": "^5.5",
     "phpstan/phpstan": "^0.10",
-    "queue-interop/queue-spec": "^0.5.9@dev",
+    "queue-interop/queue-spec": "0.6.x-dev",
     "symfony/browser-kit": "4.0.*",
     "symfony/config": "4.0.*",
     "symfony/process": "4.0.*",
diff --git a/pkg/amqp-tools/DelayStrategy.php b/pkg/amqp-tools/DelayStrategy.php
@@ -9,10 +9,7 @@
 interface DelayStrategy
 {
     /**
-     * @param AmqpContext     $context
-     * @param AmqpDestination $dest
-     * @param AmqpMessage     $message
-     * @param int             $delayMsec
+     * Delay is in milliseconds.
      */
-    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec);
+    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, int $delay): void;
 }
diff --git a/pkg/amqp-tools/DelayStrategyAware.php b/pkg/amqp-tools/DelayStrategyAware.php
@@ -4,10 +4,5 @@
 
 interface DelayStrategyAware
 {
-    /**
-     * @param DelayStrategy $delayStrategy
-     *
-     * @return self
-     */
-    public function setDelayStrategy(DelayStrategy $delayStrategy = null);
+    public function setDelayStrategy(DelayStrategy $delayStrategy = null): self;
 }
diff --git a/pkg/amqp-tools/DelayStrategyAwareTrait.php b/pkg/amqp-tools/DelayStrategyAwareTrait.php
@@ -9,12 +9,7 @@ trait DelayStrategyAwareTrait
      */
     protected $delayStrategy;
 
-    /**
-     * @param DelayStrategy|null $delayStrategy
-     *
-     * @return self
-     */
-    public function setDelayStrategy(DelayStrategy $delayStrategy = null)
+    public function setDelayStrategy(DelayStrategy $delayStrategy = null): DelayStrategyAware
     {
         $this->delayStrategy = $delayStrategy;
 
diff --git a/pkg/amqp-tools/DelayStrategyTransportFactoryTrait.php b/pkg/amqp-tools/DelayStrategyTransportFactoryTrait.php
@@ -7,10 +7,7 @@
 
 trait DelayStrategyTransportFactoryTrait
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function registerDelayStrategy(ContainerBuilder $container, array $config, $factoryId, $factoryName)
+    public function registerDelayStrategy(ContainerBuilder $container, array $config, string $factoryId, string $factoryName): void
     {
         if ($config['delay_strategy']) {
             $factory = $container->getDefinition($factoryId);
diff --git a/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php b/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php
@@ -12,13 +12,10 @@
 
 class RabbitMqDelayPluginDelayStrategy implements DelayStrategy
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec)
+    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, int $delay): void
     {
         $delayMessage = $context->createMessage($message->getBody(), $message->getProperties(), $message->getHeaders());
-        $delayMessage->setProperty('x-delay', (int) $delayMsec);
+        $delayMessage->setProperty('x-delay', (int) $delay);
         $delayMessage->setRoutingKey($message->getRoutingKey());
 
         if ($dest instanceof AmqpTopic) {
diff --git a/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php b/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php
@@ -14,7 +14,7 @@ class RabbitMqDlxDelayStrategy implements DelayStrategy
     /**
      * {@inheritdoc}
      */
-    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec)
+    public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, int $delay): void
     {
         $properties = $message->getProperties();
 
@@ -28,17 +28,17 @@ public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMe
 
         if ($dest instanceof AmqpTopic) {
             $routingKey = $message->getRoutingKey() ? '.'.$message->getRoutingKey() : '';
-            $name = sprintf('enqueue.%s%s.%s.x.delay', $dest->getTopicName(), $routingKey, $delayMsec);
+            $name = sprintf('enqueue.%s%s.%s.x.delay', $dest->getTopicName(), $routingKey, $delay);
 
             $delayQueue = $context->createQueue($name);
             $delayQueue->addFlag(AmqpTopic::FLAG_DURABLE);
-            $delayQueue->setArgument('x-message-ttl', $delayMsec);
+            $delayQueue->setArgument('x-message-ttl', $delay);
             $delayQueue->setArgument('x-dead-letter-exchange', $dest->getTopicName());
             $delayQueue->setArgument('x-dead-letter-routing-key', (string) $delayMessage->getRoutingKey());
         } elseif ($dest instanceof AmqpQueue) {
-            $delayQueue = $context->createQueue('enqueue.'.$dest->getQueueName().'.'.$delayMsec.'.delayed');
+            $delayQueue = $context->createQueue('enqueue.'.$dest->getQueueName().'.'.$delay.'.delayed');
             $delayQueue->addFlag(AmqpTopic::FLAG_DURABLE);
-            $delayQueue->setArgument('x-message-ttl', $delayMsec);
+            $delayQueue->setArgument('x-message-ttl', $delay);
             $delayQueue->setArgument('x-dead-letter-exchange', '');
             $delayQueue->setArgument('x-dead-letter-routing-key', $dest->getQueueName());
         } else {
diff --git a/pkg/amqp-tools/SignalSocketHelper.php b/pkg/amqp-tools/SignalSocketHelper.php
@@ -19,7 +19,7 @@ public function __construct()
         $this->handlers = [];
     }
 
-    public function beforeSocket()
+    public function beforeSocket(): void
     {
         // PHP 7.1 and higher
         if (false == function_exists('pcntl_signal_get_handler')) {
@@ -51,7 +51,7 @@ public function beforeSocket()
         }
     }
 
-    public function afterSocket()
+    public function afterSocket(): void
     {
         // PHP 7.1 and higher
         if (false == function_exists('pcntl_signal_get_handler')) {
@@ -74,7 +74,7 @@ public function afterSocket()
     /**
      * @return bool
      */
-    public function wasThereSignal()
+    public function wasThereSignal(): bool
     {
         return (bool) $this->wasThereSignal;
     }
diff --git a/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php b/pkg/amqp-tools/Tests/RabbitMqDelayPluginDelayStrategyTest.php
@@ -15,6 +15,7 @@
 use Interop\Queue\InvalidDestinationException;
 use Interop\Queue\PsrDestination;
 use Interop\Queue\PsrMessage;
+use Interop\Queue\PsrProducer;
 use PHPUnit\Framework\TestCase;
 
 class RabbitMqDelayPluginDelayStrategyTest extends TestCase
@@ -183,35 +184,35 @@ private function createProducerMock()
 
 class TestProducer implements AmqpProducer, DelayStrategy
 {
-    public function delayMessage(AmqpContext $context, AmqpDestination $dest, \Interop\Amqp\AmqpMessage $message, $delayMsec)
+    public function delayMessage(AmqpContext $context, AmqpDestination $dest, \Interop\Amqp\AmqpMessage $message, int $delay): void
     {
     }
 
-    public function send(PsrDestination $destination, PsrMessage $message)
+    public function send(PsrDestination $destination, PsrMessage $message): void
     {
     }
 
-    public function setDeliveryDelay($deliveryDelay)
+    public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer
     {
     }
 
-    public function getDeliveryDelay()
+    public function getDeliveryDelay(): ?int
     {
     }
 
-    public function setPriority($priority)
+    public function setPriority(int $priority = null): PsrProducer
     {
     }
 
-    public function getPriority()
+    public function getPriority(): ?int
     {
     }
 
-    public function setTimeToLive($timeToLive)
+    public function setTimeToLive(int $timeToLive = null): PsrProducer
     {
     }
 
-    public function getTimeToLive()
+    public function getTimeToLive(): ?int
     {
     }
 }
diff --git a/pkg/amqp-tools/composer.json b/pkg/amqp-tools/composer.json
@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.1.3",
-        "queue-interop/amqp-interop": "^0.7.4"
+        "queue-interop/amqp-interop": "0.8.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.4.0",

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,7 @@`
`9`	`9`	`interface DelayStrategy`
`10`	`10`	`{`
`11`	`11`	`/**`
`12`		`- * @param AmqpContext $context`
`13`		`- * @param AmqpDestination $dest`
`14`		`- * @param AmqpMessage $message`
`15`		`- * @param int $delayMsec`
	`12`	`+ * Delay is in milliseconds.`
`16`	`13`	`*/`
`17`		`- public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec);`
	`14`	`+ public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, int $delay): void;`
`18`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,5 @@`
`4`	`4`
`5`	`5`	`interface DelayStrategyAware`
`6`	`6`	`{`
`7`		`- /**`
`8`		`- * @param DelayStrategy $delayStrategy`
`9`		`- *`
`10`		`- * @return self`
`11`		`- */`
`12`		`- public function setDelayStrategy(DelayStrategy $delayStrategy = null);`
	`7`	`+ public function setDelayStrategy(DelayStrategy $delayStrategy = null): self;`
`13`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,7 @@`
`7`	`7`
`8`	`8`	`trait DelayStrategyTransportFactoryTrait`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * {@inheritdoc}`
`12`		`- */`
`13`		`- public function registerDelayStrategy(ContainerBuilder $container, array $config, $factoryId, $factoryName)`
	`10`	`+ public function registerDelayStrategy(ContainerBuilder $container, array $config, string $factoryId, string $factoryName): void`
`14`	`11`	`{`
`15`	`12`	`if ($config['delay_strategy']) {`
`16`	`13`	`$factory = $container->getDefinition($factoryId);`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,10 @@`
`12`	`12`
`13`	`13`	`class RabbitMqDelayPluginDelayStrategy implements DelayStrategy`
`14`	`14`	`{`
`15`		`- /**`
`16`		`- * {@inheritdoc}`
`17`		`- */`
`18`		`- public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, $delayMsec)`
	`15`	`+ public function delayMessage(AmqpContext $context, AmqpDestination $dest, AmqpMessage $message, int $delay): void`
`19`	`16`	`{`
`20`	`17`	`$delayMessage = $context->createMessage($message->getBody(), $message->getProperties(), $message->getHeaders());`
`21`		`- $delayMessage->setProperty('x-delay', (int) $delayMsec);`
	`18`	`+ $delayMessage->setProperty('x-delay', (int) $delay);`
`22`	`19`	`$delayMessage->setRoutingKey($message->getRoutingKey());`
`23`	`20`
`24`	`21`	`if ($dest instanceof AmqpTopic) {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct()`
`19`	`19`	`$this->handlers = [];`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function beforeSocket()`
	`22`	`+ public function beforeSocket(): void`
`23`	`23`	`{`
`24`	`24`	`// PHP 7.1 and higher`
`25`	`25`	`if (false == function_exists('pcntl_signal_get_handler')) {`
`@@ -51,7 +51,7 @@ public function beforeSocket()`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function afterSocket()`
	`54`	`+ public function afterSocket(): void`
`55`	`55`	`{`
`56`	`56`	`// PHP 7.1 and higher`
`57`	`57`	`if (false == function_exists('pcntl_signal_get_handler')) {`
`@@ -74,7 +74,7 @@ public function afterSocket()`
`74`	`74`	`/**`
`75`	`75`	`* @return bool`
`76`	`76`	`*/`
`77`		`- public function wasThereSignal()`
	`77`	`+ public function wasThereSignal(): bool`
`78`	`78`	`{`
`79`	`79`	`return (bool) $this->wasThereSignal;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use Interop\Queue\InvalidDestinationException;`
`16`	`16`	`use Interop\Queue\PsrDestination;`
`17`	`17`	`use Interop\Queue\PsrMessage;`
	`18`	`+use Interop\Queue\PsrProducer;`
`18`	`19`	`use PHPUnit\Framework\TestCase;`
`19`	`20`
`20`	`21`	`class RabbitMqDelayPluginDelayStrategyTest extends TestCase`
`@@ -183,35 +184,35 @@ private function createProducerMock()`
`183`	`184`
`184`	`185`	`class TestProducer implements AmqpProducer, DelayStrategy`
`185`	`186`	`{`
`186`		`- public function delayMessage(AmqpContext $context, AmqpDestination $dest, \Interop\Amqp\AmqpMessage $message, $delayMsec)`
	`187`	`+ public function delayMessage(AmqpContext $context, AmqpDestination $dest, \Interop\Amqp\AmqpMessage $message, int $delay): void`
`187`	`188`	`{`
`188`	`189`	`}`
`189`	`190`
`190`		`- public function send(PsrDestination $destination, PsrMessage $message)`
	`191`	`+ public function send(PsrDestination $destination, PsrMessage $message): void`
`191`	`192`	`{`
`192`	`193`	`}`
`193`	`194`
`194`		`- public function setDeliveryDelay($deliveryDelay)`
	`195`	`+ public function setDeliveryDelay(int $deliveryDelay = null): PsrProducer`
`195`	`196`	`{`
`196`	`197`	`}`
`197`	`198`
`198`		`- public function getDeliveryDelay()`
	`199`	`+ public function getDeliveryDelay(): ?int`
`199`	`200`	`{`
`200`	`201`	`}`
`201`	`202`
`202`		`- public function setPriority($priority)`
	`203`	`+ public function setPriority(int $priority = null): PsrProducer`
`203`	`204`	`{`
`204`	`205`	`}`
`205`	`206`
`206`		`- public function getPriority()`
	`207`	`+ public function getPriority(): ?int`
`207`	`208`	`{`
`208`	`209`	`}`
`209`	`210`
`210`		`- public function setTimeToLive($timeToLive)`
	`211`	`+ public function setTimeToLive(int $timeToLive = null): PsrProducer`
`211`	`212`	`{`
`212`	`213`	`}`
`213`	`214`
`214`		`- public function getTimeToLive()`
	`215`	`+ public function getTimeToLive(): ?int`
`215`	`216`	`{`
`216`	`217`	`}`
`217`	`218`	`}`