Merge pull request #516 from php-enqueue/add-declare-strict

Add declare strict
php-enqueue · Aug 26, 2018 · 19e2dac · 19e2dac
2 parents 3cf596f + 735746f
commit 19e2dac
Show file tree

Hide file tree

Showing 107 changed files with 223 additions and 135 deletions.
diff --git a/bin/subtree-split b/bin/subtree-split
@@ -65,6 +65,7 @@ remote test git@github.com:php-enqueue/test.git
 remote async-event-dispatcher git@github.com:php-enqueue/async-event-dispatcher.git
 remote async-command git@github.com:php-enqueue/async-command.git
 remote mongodb git@github.com:php-enqueue/mongodb.git
+remote dsn git@github.com:php-enqueue/dsn.git
 
 split 'pkg/enqueue' enqueue
 split 'pkg/simple-client' simple-client
@@ -88,3 +89,4 @@ split 'pkg/test' test
 split 'pkg/async-event-dispatcher' async-event-dispatcher
 split 'pkg/async-command' async-command
 split 'pkg/mongodb' mongodb
+split 'pkg/dsn' dsn
diff --git a/pkg/amqp-bunny/AmqpConnectionFactory.php b/pkg/amqp-bunny/AmqpConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Enqueue\AmqpTools\ConnectionConfig;

diff --git a/pkg/amqp-bunny/AmqpConsumer.php b/pkg/amqp-bunny/AmqpConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Bunny\Channel;

diff --git a/pkg/amqp-bunny/AmqpContext.php b/pkg/amqp-bunny/AmqpContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Bunny\Channel;
@@ -45,11 +47,6 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
      */
     private $config;
 
-    /**
-     * @var AmqpSubscriptionConsumer
-     */
-    private $bcSubscriptionConsumer;
-
     /**
      * Callable must return instance of \Bunny\Channel once called.
      *
@@ -330,7 +327,7 @@ public function convertMessage(Message $bunnyMessage): InteropAmqpMessage
         }
 
         $message = new AmqpMessage($bunnyMessage->content, $properties, $headers);
-        $message->setDeliveryTag($bunnyMessage->deliveryTag);
+        $message->setDeliveryTag((int) $bunnyMessage->deliveryTag);
         $message->setRedelivered($bunnyMessage->redelivered);
         $message->setRoutingKey($bunnyMessage->routingKey);
 

diff --git a/pkg/amqp-bunny/AmqpProducer.php b/pkg/amqp-bunny/AmqpProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Bunny\Channel;
@@ -136,7 +138,7 @@ private function doSend(InteropAmqpDestination $destination, InteropAmqpMessage
         $amqpProperties = $message->getHeaders();
 
         if (array_key_exists('timestamp', $amqpProperties) && null !== $amqpProperties['timestamp']) {
-            $amqpProperties['timestamp'] = \DateTime::createFromFormat('U', $amqpProperties['timestamp']);
+            $amqpProperties['timestamp'] = \DateTime::createFromFormat('U', (string) $amqpProperties['timestamp']);
         }
 
         if ($appProperties = $message->getProperties()) {

diff --git a/pkg/amqp-bunny/AmqpSubscriptionConsumer.php b/pkg/amqp-bunny/AmqpSubscriptionConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Bunny\Channel;

diff --git a/pkg/amqp-bunny/BunnyClient.php b/pkg/amqp-bunny/BunnyClient.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpBunny;
 
 use Bunny\Client;

diff --git a/pkg/amqp-bunny/Tests/AmqpConsumerTest.php b/pkg/amqp-bunny/Tests/AmqpConsumerTest.php
@@ -68,7 +68,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
             ->method('ack')
             ->with($this->isInstanceOf(Message::class))
             ->willReturnCallback(function (Message $message) {
-                $this->assertSame('theDeliveryTag', $message->deliveryTag);
+                $this->assertSame(145, $message->deliveryTag);
             });
 
         $context = $this->createContextMock();
@@ -81,7 +81,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
         $consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
 
         $message = new AmqpMessage();
-        $message->setDeliveryTag('theDeliveryTag');
+        $message->setDeliveryTag(145);
 
         $consumer->acknowledge($message);
     }
@@ -94,7 +94,7 @@ public function testOnRejectShouldRejectMessage()
             ->method('reject')
             ->with($this->isInstanceOf(Message::class), false)
             ->willReturnCallback(function (Message $message) {
-                $this->assertSame('theDeliveryTag', $message->deliveryTag);
+                $this->assertSame(167, $message->deliveryTag);
             });
 
         $context = $this->createContextMock();
@@ -107,7 +107,7 @@ public function testOnRejectShouldRejectMessage()
         $consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
 
         $message = new AmqpMessage();
-        $message->setDeliveryTag('theDeliveryTag');
+        $message->setDeliveryTag(167);
 
         $consumer->reject($message, false);
     }
@@ -120,7 +120,7 @@ public function testOnRejectShouldRequeueMessage()
             ->method('reject')
             ->with($this->isInstanceOf(Message::class), true)
             ->willReturnCallback(function (Message $message) {
-                $this->assertSame('theDeliveryTag', $message->deliveryTag);
+                $this->assertSame(178, $message->deliveryTag);
             });
 
         $context = $this->createContextMock();
@@ -133,7 +133,7 @@ public function testOnRejectShouldRequeueMessage()
         $consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
 
         $message = new AmqpMessage();
-        $message->setDeliveryTag('theDeliveryTag');
+        $message->setDeliveryTag(178);
 
         $consumer->reject($message, true);
     }

diff --git a/pkg/amqp-lib/AmqpConnectionFactory.php b/pkg/amqp-lib/AmqpConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 use Enqueue\AmqpTools\ConnectionConfig;

diff --git a/pkg/amqp-lib/AmqpConsumer.php b/pkg/amqp-lib/AmqpConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 use Interop\Amqp\AmqpConsumer as InteropAmqpConsumer;

diff --git a/pkg/amqp-lib/AmqpContext.php b/pkg/amqp-lib/AmqpContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 use Enqueue\AmqpTools\DelayStrategyAware;
@@ -307,7 +309,7 @@ public function convertMessage(LibAMQPMessage $amqpMessage): InteropAmqpMessage
         unset($headers['application_headers']);
 
         $message = new AmqpMessage($amqpMessage->getBody(), $properties, $headers);
-        $message->setDeliveryTag($amqpMessage->delivery_info['delivery_tag']);
+        $message->setDeliveryTag((int) $amqpMessage->delivery_info['delivery_tag']);
         $message->setRedelivered($amqpMessage->delivery_info['redelivered']);
         $message->setRoutingKey($amqpMessage->delivery_info['routing_key']);
 

diff --git a/pkg/amqp-lib/AmqpProducer.php b/pkg/amqp-lib/AmqpProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 use Enqueue\AmqpTools\DelayStrategyAware;

diff --git a/pkg/amqp-lib/AmqpSubscriptionConsumer.php b/pkg/amqp-lib/AmqpSubscriptionConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 use Enqueue\AmqpTools\SignalSocketHelper;

diff --git a/pkg/amqp-lib/Buffer.php b/pkg/amqp-lib/Buffer.php
diff --git a/pkg/amqp-lib/StopBasicConsumptionException.php b/pkg/amqp-lib/StopBasicConsumptionException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpLib;
 
 class StopBasicConsumptionException extends \LogicException

diff --git a/pkg/amqp-lib/Tests/AmqpConsumerTest.php b/pkg/amqp-lib/Tests/AmqpConsumerTest.php
@@ -67,7 +67,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
         $channel
             ->expects($this->once())
             ->method('basic_ack')
-            ->with('delivery-tag')
+            ->with(167)
         ;
 
         $context = $this->createContextMock();
@@ -80,7 +80,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
         $consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
 
         $message = new AmqpMessage();
-        $message->setDeliveryTag('delivery-tag');
+        $message->setDeliveryTag(167);
 
         $consumer->acknowledge($message);
     }
@@ -91,7 +91,7 @@ public function testOnRejectShouldRejectMessage()
         $channel
             ->expects($this->once())
             ->method('basic_reject')
-            ->with('delivery-tag', $this->isTrue())
+            ->with(125, $this->isTrue())
         ;
 
         $context = $this->createContextMock();
@@ -104,7 +104,7 @@ public function testOnRejectShouldRejectMessage()
         $consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
 
         $message = new AmqpMessage();
-        $message->setDeliveryTag('delivery-tag');
+        $message->setDeliveryTag(125);
 
         $consumer->reject($message, true);
     }

diff --git a/pkg/amqp-lib/Tests/BufferTest.php b/pkg/amqp-lib/Tests/BufferTest.php
diff --git a/pkg/amqp-tools/ConnectionConfig.php b/pkg/amqp-tools/ConnectionConfig.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 /**

diff --git a/pkg/amqp-tools/DelayStrategy.php b/pkg/amqp-tools/DelayStrategy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 use Interop\Amqp\AmqpContext;

diff --git a/pkg/amqp-tools/DelayStrategyAware.php b/pkg/amqp-tools/DelayStrategyAware.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 interface DelayStrategyAware

diff --git a/pkg/amqp-tools/DelayStrategyAwareTrait.php b/pkg/amqp-tools/DelayStrategyAwareTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 trait DelayStrategyAwareTrait

diff --git a/pkg/amqp-tools/DelayStrategyTransportFactoryTrait.php b/pkg/amqp-tools/DelayStrategyTransportFactoryTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

diff --git a/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php b/pkg/amqp-tools/RabbitMqDelayPluginDelayStrategy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 use Interop\Amqp\AmqpContext;