diff --git a/bin/subtree-split b/bin/subtree-split
index 54af4ad41..222574f13 100755
--- 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
index a50c4224a..14942c860 100644
--- 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
index bb162875c..52cded16f 100644
--- 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
index feb3cf9b3..824245067 100644
--- 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
index 86facecc6..e98b2839d 100644
--- 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
index 4da820e6f..6aea17c42 100644
--- 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
index 8697b9de4..19a76013a 100644
--- 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
index 3be930bec..35c7221e0 100644
--- 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
index 4a780c156..505f753d5 100644
--- 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
index b16dd60db..70071fb07 100644
--- 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
index 4e24fe995..c7f90014a 100644
--- 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
index 346c07af2..6d7f2ded0 100644
--- 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
index efb4d3258..45feda5c9 100644
--- 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
deleted file mode 100644
index 27732806e..000000000
--- a/pkg/amqp-lib/Buffer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Enqueue\AmqpLib;
-
-use Interop\Amqp\AmqpMessage;
-
-class Buffer
-{
-    /**
-     * @var array ['aTag' => [AmqpMessage, AmqpMessage ...]]
-     */
-    private $messages;
-
-    public function __construct()
-    {
-        $this->messages = [];
-    }
-
-    /**
-     * @param string      $consumerTag
-     * @param AmqpMessage $message
-     */
-    public function push($consumerTag, AmqpMessage $message)
-    {
-        if (false == array_key_exists($consumerTag, $this->messages)) {
-            $this->messages[$consumerTag] = [];
-        }
-
-        $this->messages[$consumerTag][] = $message;
-    }
-
-    /**
-     * @param string $consumerTag
-     *
-     * @return AmqpMessage|null
-     */
-    public function pop($consumerTag)
-    {
-        if (false == empty($this->messages[$consumerTag])) {
-            return array_shift($this->messages[$consumerTag]);
-        }
-    }
-}
diff --git a/pkg/amqp-lib/StopBasicConsumptionException.php b/pkg/amqp-lib/StopBasicConsumptionException.php
index 14d6848e0..99c9ea162 100644
--- 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
index 7388248ed..81dc43fcc 100644
--- 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
deleted file mode 100644
index bebe435cb..000000000
--- a/pkg/amqp-lib/Tests/BufferTest.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Enqueue\AmqpLib\Tests;
-
-use Enqueue\AmqpLib\Buffer;
-use Interop\Amqp\Impl\AmqpMessage;
-use PHPUnit\Framework\TestCase;
-
-class BufferTest extends TestCase
-{
-    public function testCouldBeConstructedWithoutAnyArguments()
-    {
-        new Buffer();
-    }
-
-    public function testShouldSetEmptyArrayToMessagesPropertyOnConstruct()
-    {
-        $buffer = new Buffer();
-
-        $this->assertAttributeSame([], 'messages', $buffer);
-    }
-
-    public function testShouldReturnNullIfNoMessagesInBuffer()
-    {
-        $buffer = new Buffer();
-
-        $this->assertNull($buffer->pop('aConsumerTag'));
-        $this->assertNull($buffer->pop('anotherConsumerTag'));
-    }
-
-    public function testShouldPushMessageToBuffer()
-    {
-        $fooMessage = new AmqpMessage();
-        $barMessage = new AmqpMessage();
-        $bazMessage = new AmqpMessage();
-
-        $buffer = new Buffer();
-
-        $buffer->push('aConsumerTag', $fooMessage);
-        $buffer->push('aConsumerTag', $barMessage);
-
-        $buffer->push('anotherConsumerTag', $bazMessage);
-
-        $this->assertAttributeSame([
-            'aConsumerTag' => [$fooMessage, $barMessage],
-            'anotherConsumerTag' => [$bazMessage],
-        ], 'messages', $buffer);
-    }
-
-    public function testShouldPopMessageFromBuffer()
-    {
-        $fooMessage = new AmqpMessage();
-        $barMessage = new AmqpMessage();
-
-        $buffer = new Buffer();
-
-        $buffer->push('aConsumerTag', $fooMessage);
-        $buffer->push('aConsumerTag', $barMessage);
-
-        $this->assertSame($fooMessage, $buffer->pop('aConsumerTag'));
-        $this->assertSame($barMessage, $buffer->pop('aConsumerTag'));
-        $this->assertNull($buffer->pop('aConsumerTag'));
-    }
-}
diff --git a/pkg/amqp-tools/ConnectionConfig.php b/pkg/amqp-tools/ConnectionConfig.php
index d4deb1620..27582e051 100644
--- 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
index a30f9f046..791bc5519 100644
--- 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
index 2cbcfd608..f41a856a1 100644
--- 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
index 83581e377..785f12895 100644
--- 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
index a9fea553f..0c6702228 100644
--- 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
index 6c17542ec..d36613923 100644
--- 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;
diff --git a/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php b/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php
index 4368c210d..d1a81362b 100644
--- a/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php
+++ b/pkg/amqp-tools/RabbitMqDlxDelayStrategy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 use Interop\Amqp\AmqpContext;
diff --git a/pkg/amqp-tools/SignalSocketHelper.php b/pkg/amqp-tools/SignalSocketHelper.php
index 6c458d5d4..0767b2817 100644
--- a/pkg/amqp-tools/SignalSocketHelper.php
+++ b/pkg/amqp-tools/SignalSocketHelper.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\AmqpTools;
 
 class SignalSocketHelper
diff --git a/pkg/dbal/DbalConnectionFactory.php b/pkg/dbal/DbalConnectionFactory.php
index 74039b671..10a760f46 100644
--- a/pkg/dbal/DbalConnectionFactory.php
+++ b/pkg/dbal/DbalConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Doctrine\DBAL\Connection;
diff --git a/pkg/dbal/DbalConsumer.php b/pkg/dbal/DbalConsumer.php
index 22d46a27f..f0ad8dc5f 100644
--- a/pkg/dbal/DbalConsumer.php
+++ b/pkg/dbal/DbalConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Doctrine\DBAL\Connection;
diff --git a/pkg/dbal/DbalContext.php b/pkg/dbal/DbalContext.php
index f4f64a014..cf1477dea 100644
--- a/pkg/dbal/DbalContext.php
+++ b/pkg/dbal/DbalContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Doctrine\DBAL\Connection;
diff --git a/pkg/dbal/DbalDestination.php b/pkg/dbal/DbalDestination.php
index a9729e0b1..33c1c0495 100644
--- a/pkg/dbal/DbalDestination.php
+++ b/pkg/dbal/DbalDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/dbal/DbalMessage.php b/pkg/dbal/DbalMessage.php
index ce1d2802c..9183eca22 100644
--- a/pkg/dbal/DbalMessage.php
+++ b/pkg/dbal/DbalMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/dbal/DbalProducer.php b/pkg/dbal/DbalProducer.php
index 14c7def1e..9d2bfc09a 100644
--- a/pkg/dbal/DbalProducer.php
+++ b/pkg/dbal/DbalProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Doctrine\DBAL\Types\Type;
diff --git a/pkg/dbal/ManagerRegistryConnectionFactory.php b/pkg/dbal/ManagerRegistryConnectionFactory.php
index 3788f3d19..f6dcdb587 100644
--- a/pkg/dbal/ManagerRegistryConnectionFactory.php
+++ b/pkg/dbal/ManagerRegistryConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dbal;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
diff --git a/pkg/dsn/Dsn.php b/pkg/dsn/Dsn.php
index 48b117779..82c433c40 100644
--- a/pkg/dsn/Dsn.php
+++ b/pkg/dsn/Dsn.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Dsn;
 
 class Dsn
diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
index d328e329f..b588b1ede 100644
--- a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
+++ b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -379,10 +379,7 @@ protected function customSetUp(array $enqueueConfig)
         $driver->setupBroker();
 
         try {
-            if (method_exists($context, 'purgeQueue')) {
-                $queue = $this->getTestQueue();
-                $context->purgeQueue($queue);
-            }
+            $context->purgeQueue($this->getTestQueue());
         } catch (\Exception $e) {
         }
     }
diff --git a/pkg/fs/CannotObtainLockException.php b/pkg/fs/CannotObtainLockException.php
index 854d726f8..d1f842c60 100644
--- a/pkg/fs/CannotObtainLockException.php
+++ b/pkg/fs/CannotObtainLockException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\Exception;
diff --git a/pkg/fs/FsConnectionFactory.php b/pkg/fs/FsConnectionFactory.php
index 55f922376..a4c3a0d60 100644
--- a/pkg/fs/FsConnectionFactory.php
+++ b/pkg/fs/FsConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/fs/FsConsumer.php b/pkg/fs/FsConsumer.php
index bf7937e9b..af96513dc 100644
--- a/pkg/fs/FsConsumer.php
+++ b/pkg/fs/FsConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/fs/FsContext.php b/pkg/fs/FsContext.php
index 6d2f8bbc0..03ac25c27 100644
--- a/pkg/fs/FsContext.php
+++ b/pkg/fs/FsContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\InvalidDestinationException;
@@ -88,9 +90,9 @@ public function declareDestination(FsDestination $destination): void
         });
 
         try {
-            if (false == file_exists($destination->getFileInfo())) {
-                touch($destination->getFileInfo());
-                chmod($destination->getFileInfo(), $this->chmod);
+            if (false == file_exists((string) $destination->getFileInfo())) {
+                touch((string) $destination->getFileInfo());
+                chmod((string) $destination->getFileInfo(), $this->chmod);
             }
         } finally {
             restore_error_handler();
@@ -106,7 +108,7 @@ public function workWithFile(FsDestination $destination, string $mode, callable
         });
 
         try {
-            $file = fopen($destination->getFileInfo(), $mode);
+            $file = fopen((string) $destination->getFileInfo(), $mode);
             $this->lock->lock($destination);
 
             return call_user_func($callback, $destination, $file);
diff --git a/pkg/fs/FsDestination.php b/pkg/fs/FsDestination.php
index d3ca86035..065442543 100644
--- a/pkg/fs/FsDestination.php
+++ b/pkg/fs/FsDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/fs/FsMessage.php b/pkg/fs/FsMessage.php
index 66a624d91..fdacc7321 100644
--- a/pkg/fs/FsMessage.php
+++ b/pkg/fs/FsMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/fs/FsProducer.php b/pkg/fs/FsProducer.php
index 2918c2a2d..465983670 100644
--- a/pkg/fs/FsProducer.php
+++ b/pkg/fs/FsProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 use Interop\Queue\DeliveryDelayNotSupportedException;
@@ -39,7 +41,7 @@ public function send(PsrDestination $destination, PsrMessage $message): void
 
         $this->context->workWithFile($destination, 'a+', function (FsDestination $destination, $file) use ($message) {
             $fileInfo = $destination->getFileInfo();
-            if ($fileInfo instanceof TempFile && false == file_exists($fileInfo)) {
+            if ($fileInfo instanceof TempFile && false == file_exists((string) $fileInfo)) {
                 return;
             }
 
diff --git a/pkg/fs/Lock.php b/pkg/fs/Lock.php
index 02c2fbb76..91125faa8 100644
--- a/pkg/fs/Lock.php
+++ b/pkg/fs/Lock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Fs;
 
 interface Lock
diff --git a/pkg/gearman/GearmanConnectionFactory.php b/pkg/gearman/GearmanConnectionFactory.php
index 8ca078f7d..1102e6cc4 100644
--- a/pkg/gearman/GearmanConnectionFactory.php
+++ b/pkg/gearman/GearmanConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/gearman/GearmanConsumer.php b/pkg/gearman/GearmanConsumer.php
index 09ff45c45..4d4b883ca 100644
--- a/pkg/gearman/GearmanConsumer.php
+++ b/pkg/gearman/GearmanConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\PsrConsumer;
diff --git a/pkg/gearman/GearmanContext.php b/pkg/gearman/GearmanContext.php
index 9125a0bc2..ec7fb46d0 100644
--- a/pkg/gearman/GearmanContext.php
+++ b/pkg/gearman/GearmanContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/gearman/GearmanDestination.php b/pkg/gearman/GearmanDestination.php
index 9c9e9d443..e982cd788 100644
--- a/pkg/gearman/GearmanDestination.php
+++ b/pkg/gearman/GearmanDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/gearman/GearmanMessage.php b/pkg/gearman/GearmanMessage.php
index 7c6928bad..486ca523a 100644
--- a/pkg/gearman/GearmanMessage.php
+++ b/pkg/gearman/GearmanMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/gearman/GearmanProducer.php b/pkg/gearman/GearmanProducer.php
index b5a299e43..3d6f24df3 100644
--- a/pkg/gearman/GearmanProducer.php
+++ b/pkg/gearman/GearmanProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gearman;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/gps/GpsConnectionFactory.php b/pkg/gps/GpsConnectionFactory.php
index 9dec784b5..d2fcb235a 100644
--- a/pkg/gps/GpsConnectionFactory.php
+++ b/pkg/gps/GpsConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Google\Cloud\PubSub\PubSubClient;
diff --git a/pkg/gps/GpsConsumer.php b/pkg/gps/GpsConsumer.php
index 8e6a19dfe..3d4875257 100644
--- a/pkg/gps/GpsConsumer.php
+++ b/pkg/gps/GpsConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Google\Cloud\Core\Exception\ServiceException;
diff --git a/pkg/gps/GpsContext.php b/pkg/gps/GpsContext.php
index 9e035c9ff..368e259ef 100644
--- a/pkg/gps/GpsContext.php
+++ b/pkg/gps/GpsContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Google\Cloud\Core\Exception\ConflictException;
diff --git a/pkg/gps/GpsMessage.php b/pkg/gps/GpsMessage.php
index 62e3fde4a..5fae4da08 100644
--- a/pkg/gps/GpsMessage.php
+++ b/pkg/gps/GpsMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Google\Cloud\PubSub\Message;
diff --git a/pkg/gps/GpsProducer.php b/pkg/gps/GpsProducer.php
index 9747b978f..a6c7f1742 100644
--- a/pkg/gps/GpsProducer.php
+++ b/pkg/gps/GpsProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Google\Cloud\PubSub\Topic;
diff --git a/pkg/gps/GpsQueue.php b/pkg/gps/GpsQueue.php
index e0b8e555b..b11279e82 100644
--- a/pkg/gps/GpsQueue.php
+++ b/pkg/gps/GpsQueue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/gps/GpsTopic.php b/pkg/gps/GpsTopic.php
index cf7b116f6..4f694f7bb 100644
--- a/pkg/gps/GpsTopic.php
+++ b/pkg/gps/GpsTopic.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Gps;
 
 use Interop\Queue\PsrTopic;
diff --git a/pkg/mongodb/MongodbConnectionFactory.php b/pkg/mongodb/MongodbConnectionFactory.php
index 45502eae5..280f359d0 100644
--- a/pkg/mongodb/MongodbConnectionFactory.php
+++ b/pkg/mongodb/MongodbConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/mongodb/MongodbConsumer.php b/pkg/mongodb/MongodbConsumer.php
index 1c0876ef9..12ddfbeff 100644
--- a/pkg/mongodb/MongodbConsumer.php
+++ b/pkg/mongodb/MongodbConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/mongodb/MongodbContext.php b/pkg/mongodb/MongodbContext.php
index 2ff941349..bbfa82a16 100644
--- a/pkg/mongodb/MongodbContext.php
+++ b/pkg/mongodb/MongodbContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/mongodb/MongodbDestination.php b/pkg/mongodb/MongodbDestination.php
index aff977a80..93853320b 100644
--- a/pkg/mongodb/MongodbDestination.php
+++ b/pkg/mongodb/MongodbDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/mongodb/MongodbMessage.php b/pkg/mongodb/MongodbMessage.php
index 29fd9f2a0..3f3bb8105 100644
--- a/pkg/mongodb/MongodbMessage.php
+++ b/pkg/mongodb/MongodbMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/mongodb/MongodbProducer.php b/pkg/mongodb/MongodbProducer.php
index ea8100266..42eb77b65 100644
--- a/pkg/mongodb/MongodbProducer.php
+++ b/pkg/mongodb/MongodbProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Mongodb;
 
 use Interop\Queue\Exception;
diff --git a/pkg/null/NullConnectionFactory.php b/pkg/null/NullConnectionFactory.php
index e8c500f52..fd9c1c517 100644
--- a/pkg/null/NullConnectionFactory.php
+++ b/pkg/null/NullConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/null/NullConsumer.php b/pkg/null/NullConsumer.php
index 166cd3850..71bc74ec6 100644
--- a/pkg/null/NullConsumer.php
+++ b/pkg/null/NullConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrConsumer;
diff --git a/pkg/null/NullContext.php b/pkg/null/NullContext.php
index 71a11c86d..d9bb812ce 100644
--- a/pkg/null/NullContext.php
+++ b/pkg/null/NullContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrConsumer;
diff --git a/pkg/null/NullMessage.php b/pkg/null/NullMessage.php
index 63fa05e8a..c9a3dfca3 100644
--- a/pkg/null/NullMessage.php
+++ b/pkg/null/NullMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/null/NullProducer.php b/pkg/null/NullProducer.php
index 923e75046..fc36aa8d7 100644
--- a/pkg/null/NullProducer.php
+++ b/pkg/null/NullProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrDestination;
diff --git a/pkg/null/NullQueue.php b/pkg/null/NullQueue.php
index 4449f1d95..0950bb7e8 100644
--- a/pkg/null/NullQueue.php
+++ b/pkg/null/NullQueue.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/null/NullSubscriptionConsumer.php b/pkg/null/NullSubscriptionConsumer.php
index 263d4bd16..a7940a040 100644
--- a/pkg/null/NullSubscriptionConsumer.php
+++ b/pkg/null/NullSubscriptionConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Null;
 
 use Interop\Queue\PsrConsumer;
diff --git a/pkg/pheanstalk/PheanstalkConnectionFactory.php b/pkg/pheanstalk/PheanstalkConnectionFactory.php
index e770fc1cf..2b99bd5a3 100644
--- a/pkg/pheanstalk/PheanstalkConnectionFactory.php
+++ b/pkg/pheanstalk/PheanstalkConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/pheanstalk/PheanstalkConsumer.php b/pkg/pheanstalk/PheanstalkConsumer.php
index 727a5bf76..5e250bf24 100644
--- a/pkg/pheanstalk/PheanstalkConsumer.php
+++ b/pkg/pheanstalk/PheanstalkConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/pheanstalk/PheanstalkContext.php b/pkg/pheanstalk/PheanstalkContext.php
index 698d0d7a4..defaf95ec 100644
--- a/pkg/pheanstalk/PheanstalkContext.php
+++ b/pkg/pheanstalk/PheanstalkContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/pheanstalk/PheanstalkDestination.php b/pkg/pheanstalk/PheanstalkDestination.php
index e7e980ee4..3d0275171 100644
--- a/pkg/pheanstalk/PheanstalkDestination.php
+++ b/pkg/pheanstalk/PheanstalkDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/pheanstalk/PheanstalkMessage.php b/pkg/pheanstalk/PheanstalkMessage.php
index a2b2762ec..9667824e7 100644
--- a/pkg/pheanstalk/PheanstalkMessage.php
+++ b/pkg/pheanstalk/PheanstalkMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/pheanstalk/PheanstalkProducer.php b/pkg/pheanstalk/PheanstalkProducer.php
index 9870cc882..87c17c11f 100644
--- a/pkg/pheanstalk/PheanstalkProducer.php
+++ b/pkg/pheanstalk/PheanstalkProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Pheanstalk;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/rdkafka/JsonSerializer.php b/pkg/rdkafka/JsonSerializer.php
index e2f28cc95..ae161ca08 100644
--- a/pkg/rdkafka/JsonSerializer.php
+++ b/pkg/rdkafka/JsonSerializer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 class JsonSerializer implements Serializer
diff --git a/pkg/rdkafka/RdKafkaConnectionFactory.php b/pkg/rdkafka/RdKafkaConnectionFactory.php
index 12289465b..272a40b46 100644
--- a/pkg/rdkafka/RdKafkaConnectionFactory.php
+++ b/pkg/rdkafka/RdKafkaConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/rdkafka/RdKafkaConsumer.php b/pkg/rdkafka/RdKafkaConsumer.php
index 203d87785..a598545a5 100644
--- a/pkg/rdkafka/RdKafkaConsumer.php
+++ b/pkg/rdkafka/RdKafkaConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/rdkafka/RdKafkaContext.php b/pkg/rdkafka/RdKafkaContext.php
index 107d97ab2..fc7a0f794 100644
--- a/pkg/rdkafka/RdKafkaContext.php
+++ b/pkg/rdkafka/RdKafkaContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/rdkafka/RdKafkaMessage.php b/pkg/rdkafka/RdKafkaMessage.php
index 3024852f9..cad2b10a1 100644
--- a/pkg/rdkafka/RdKafkaMessage.php
+++ b/pkg/rdkafka/RdKafkaMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/rdkafka/RdKafkaProducer.php b/pkg/rdkafka/RdKafkaProducer.php
index 6e96c7da8..b11179cfa 100644
--- a/pkg/rdkafka/RdKafkaProducer.php
+++ b/pkg/rdkafka/RdKafkaProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/rdkafka/RdKafkaTopic.php b/pkg/rdkafka/RdKafkaTopic.php
index c4bbbe2c2..8ee1a7707 100644
--- a/pkg/rdkafka/RdKafkaTopic.php
+++ b/pkg/rdkafka/RdKafkaTopic.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/rdkafka/Serializer.php b/pkg/rdkafka/Serializer.php
index 581c49b74..7e2a116ed 100644
--- a/pkg/rdkafka/Serializer.php
+++ b/pkg/rdkafka/Serializer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 interface Serializer
diff --git a/pkg/rdkafka/SerializerAwareTrait.php b/pkg/rdkafka/SerializerAwareTrait.php
index 866d303ff..d640f93cb 100644
--- a/pkg/rdkafka/SerializerAwareTrait.php
+++ b/pkg/rdkafka/SerializerAwareTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\RdKafka;
 
 trait SerializerAwareTrait
diff --git a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php
index 6e0e5d0a2..e35d97fc0 100644
--- a/pkg/rdkafka/Tests/RdKafkaConsumerTest.php
+++ b/pkg/rdkafka/Tests/RdKafkaConsumerTest.php
@@ -132,6 +132,7 @@ public function testShouldSubscribeOnFirstReceiveOnly()
     public function testShouldAssignWhenOffsetIsSet()
     {
         $destination = new RdKafkaTopic('dest');
+        $destination->setPartition(1);
 
         $kafkaMessage = new Message();
         $kafkaMessage->err = RD_KAFKA_RESP_ERR__TIMED_OUT;
diff --git a/pkg/redis/PRedis.php b/pkg/redis/PRedis.php
index a705fd559..799cf53f0 100644
--- a/pkg/redis/PRedis.php
+++ b/pkg/redis/PRedis.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Predis\Client;
diff --git a/pkg/redis/RedisConnectionFactory.php b/pkg/redis/RedisConnectionFactory.php
index 0a06bdb37..bc9a98276 100644
--- a/pkg/redis/RedisConnectionFactory.php
+++ b/pkg/redis/RedisConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/redis/RedisConsumer.php b/pkg/redis/RedisConsumer.php
index 011c5a3de..bfd9a222d 100644
--- a/pkg/redis/RedisConsumer.php
+++ b/pkg/redis/RedisConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/redis/RedisContext.php b/pkg/redis/RedisContext.php
index bb61760ef..67160027e 100644
--- a/pkg/redis/RedisContext.php
+++ b/pkg/redis/RedisContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/redis/RedisDestination.php b/pkg/redis/RedisDestination.php
index b85cae0fb..e4ad9728a 100644
--- a/pkg/redis/RedisDestination.php
+++ b/pkg/redis/RedisDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/redis/RedisMessage.php b/pkg/redis/RedisMessage.php
index 1cb27936b..cfebf1a8a 100644
--- a/pkg/redis/RedisMessage.php
+++ b/pkg/redis/RedisMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/redis/RedisProducer.php b/pkg/redis/RedisProducer.php
index a8a372203..e991af5da 100644
--- a/pkg/redis/RedisProducer.php
+++ b/pkg/redis/RedisProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/redis/RedisResult.php b/pkg/redis/RedisResult.php
index e04698bd9..83a90f576 100644
--- a/pkg/redis/RedisResult.php
+++ b/pkg/redis/RedisResult.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 class RedisResult
diff --git a/pkg/redis/RedisSubscriptionConsumer.php b/pkg/redis/RedisSubscriptionConsumer.php
index 1e5406111..cf7c901dc 100644
--- a/pkg/redis/RedisSubscriptionConsumer.php
+++ b/pkg/redis/RedisSubscriptionConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\PsrConsumer;
@@ -53,7 +55,7 @@ public function consume(int $timeout = 0): void
              * @var PsrConsumer $consumer
              * @var callable    $processor
              */
-            $result = $this->context->getRedis()->brpop($currentQueueNames, $timeout || 5000);
+            $result = $this->context->getRedis()->brpop($currentQueueNames, $timeout ?: 5000);
             if ($result) {
                 $message = RedisMessage::jsonUnserialize($result->getMessage());
                 list($consumer, $callback) = $this->subscribers[$result->getKey()];
diff --git a/pkg/redis/ServerException.php b/pkg/redis/ServerException.php
index 98273adf5..efadf1d1a 100644
--- a/pkg/redis/ServerException.php
+++ b/pkg/redis/ServerException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Redis;
 
 use Interop\Queue\Exception;
diff --git a/pkg/sqs/SqsConnectionFactory.php b/pkg/sqs/SqsConnectionFactory.php
index c67ef35a5..0280a773a 100644
--- a/pkg/sqs/SqsConnectionFactory.php
+++ b/pkg/sqs/SqsConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Aws\Sqs\SqsClient;
diff --git a/pkg/sqs/SqsConsumer.php b/pkg/sqs/SqsConsumer.php
index 3fee9fa36..8a1d72142 100644
--- a/pkg/sqs/SqsConsumer.php
+++ b/pkg/sqs/SqsConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/sqs/SqsContext.php b/pkg/sqs/SqsContext.php
index 16cf16fbd..dd59f5d19 100644
--- a/pkg/sqs/SqsContext.php
+++ b/pkg/sqs/SqsContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Aws\Sqs\SqsClient;
diff --git a/pkg/sqs/SqsDestination.php b/pkg/sqs/SqsDestination.php
index ea1e5ef28..62b8d094e 100644
--- a/pkg/sqs/SqsDestination.php
+++ b/pkg/sqs/SqsDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/sqs/SqsMessage.php b/pkg/sqs/SqsMessage.php
index a10e1df82..2782e901c 100644
--- a/pkg/sqs/SqsMessage.php
+++ b/pkg/sqs/SqsMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/sqs/SqsProducer.php b/pkg/sqs/SqsProducer.php
index 16a65f619..d85bb8fea 100644
--- a/pkg/sqs/SqsProducer.php
+++ b/pkg/sqs/SqsProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Sqs;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php
index 85a71df74..04ac87248 100644
--- a/pkg/stomp/StompConnectionFactory.php
+++ b/pkg/stomp/StompConnectionFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\PsrConnectionFactory;
diff --git a/pkg/stomp/StompConsumer.php b/pkg/stomp/StompConsumer.php
index 7e6226394..a65e4fb89 100644
--- a/pkg/stomp/StompConsumer.php
+++ b/pkg/stomp/StompConsumer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\InvalidMessageException;
diff --git a/pkg/stomp/StompContext.php b/pkg/stomp/StompContext.php
index 04b2499d2..5bd4aebbe 100644
--- a/pkg/stomp/StompContext.php
+++ b/pkg/stomp/StompContext.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\InvalidDestinationException;
diff --git a/pkg/stomp/StompDestination.php b/pkg/stomp/StompDestination.php
index 1c07dc8a0..66346f8e8 100644
--- a/pkg/stomp/StompDestination.php
+++ b/pkg/stomp/StompDestination.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\PsrQueue;
diff --git a/pkg/stomp/StompHeadersEncoder.php b/pkg/stomp/StompHeadersEncoder.php
index bce78aafb..27e637cc3 100644
--- a/pkg/stomp/StompHeadersEncoder.php
+++ b/pkg/stomp/StompHeadersEncoder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 class StompHeadersEncoder
diff --git a/pkg/stomp/StompMessage.php b/pkg/stomp/StompMessage.php
index 0a910af28..e5451b475 100644
--- a/pkg/stomp/StompMessage.php
+++ b/pkg/stomp/StompMessage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\PsrMessage;
diff --git a/pkg/stomp/StompProducer.php b/pkg/stomp/StompProducer.php
index fab5f8707..f5ddbe84c 100644
--- a/pkg/stomp/StompProducer.php
+++ b/pkg/stomp/StompProducer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Enqueue\Stomp;
 
 use Interop\Queue\InvalidDestinationException;