Skip to content

Commit 19e2dac

Browse files
authored
Merge pull request #516 from php-enqueue/add-declare-strict
Add declare strict
2 parents 3cf596f + 735746f commit 19e2dac

File tree

107 files changed

+223
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+223
-135
lines changed

bin/subtree-split

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ remote test git@github.com:php-enqueue/test.git
6565
remote async-event-dispatcher git@github.com:php-enqueue/async-event-dispatcher.git
6666
remote async-command git@github.com:php-enqueue/async-command.git
6767
remote mongodb git@github.com:php-enqueue/mongodb.git
68+
remote dsn git@github.com:php-enqueue/dsn.git
6869

6970
split 'pkg/enqueue' enqueue
7071
split 'pkg/simple-client' simple-client
@@ -88,3 +89,4 @@ split 'pkg/test' test
8889
split 'pkg/async-event-dispatcher' async-event-dispatcher
8990
split 'pkg/async-command' async-command
9091
split 'pkg/mongodb' mongodb
92+
split 'pkg/dsn' dsn

pkg/amqp-bunny/AmqpConnectionFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Enqueue\AmqpTools\ConnectionConfig;

pkg/amqp-bunny/AmqpConsumer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Bunny\Channel;

pkg/amqp-bunny/AmqpContext.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Bunny\Channel;
@@ -45,11 +47,6 @@ class AmqpContext implements InteropAmqpContext, DelayStrategyAware
4547
*/
4648
private $config;
4749

48-
/**
49-
* @var AmqpSubscriptionConsumer
50-
*/
51-
private $bcSubscriptionConsumer;
52-
5350
/**
5451
* Callable must return instance of \Bunny\Channel once called.
5552
*
@@ -330,7 +327,7 @@ public function convertMessage(Message $bunnyMessage): InteropAmqpMessage
330327
}
331328

332329
$message = new AmqpMessage($bunnyMessage->content, $properties, $headers);
333-
$message->setDeliveryTag($bunnyMessage->deliveryTag);
330+
$message->setDeliveryTag((int) $bunnyMessage->deliveryTag);
334331
$message->setRedelivered($bunnyMessage->redelivered);
335332
$message->setRoutingKey($bunnyMessage->routingKey);
336333

pkg/amqp-bunny/AmqpProducer.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Bunny\Channel;
@@ -136,7 +138,7 @@ private function doSend(InteropAmqpDestination $destination, InteropAmqpMessage
136138
$amqpProperties = $message->getHeaders();
137139

138140
if (array_key_exists('timestamp', $amqpProperties) && null !== $amqpProperties['timestamp']) {
139-
$amqpProperties['timestamp'] = \DateTime::createFromFormat('U', $amqpProperties['timestamp']);
141+
$amqpProperties['timestamp'] = \DateTime::createFromFormat('U', (string) $amqpProperties['timestamp']);
140142
}
141143

142144
if ($appProperties = $message->getProperties()) {

pkg/amqp-bunny/AmqpSubscriptionConsumer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Bunny\Channel;

pkg/amqp-bunny/BunnyClient.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpBunny;
46

57
use Bunny\Client;

pkg/amqp-bunny/Tests/AmqpConsumerTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
6868
->method('ack')
6969
->with($this->isInstanceOf(Message::class))
7070
->willReturnCallback(function (Message $message) {
71-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
71+
$this->assertSame(145, $message->deliveryTag);
7272
});
7373

7474
$context = $this->createContextMock();
@@ -81,7 +81,7 @@ public function testOnAcknowledgeShouldAcknowledgeMessage()
8181
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
8282

8383
$message = new AmqpMessage();
84-
$message->setDeliveryTag('theDeliveryTag');
84+
$message->setDeliveryTag(145);
8585

8686
$consumer->acknowledge($message);
8787
}
@@ -94,7 +94,7 @@ public function testOnRejectShouldRejectMessage()
9494
->method('reject')
9595
->with($this->isInstanceOf(Message::class), false)
9696
->willReturnCallback(function (Message $message) {
97-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
97+
$this->assertSame(167, $message->deliveryTag);
9898
});
9999

100100
$context = $this->createContextMock();
@@ -107,7 +107,7 @@ public function testOnRejectShouldRejectMessage()
107107
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
108108

109109
$message = new AmqpMessage();
110-
$message->setDeliveryTag('theDeliveryTag');
110+
$message->setDeliveryTag(167);
111111

112112
$consumer->reject($message, false);
113113
}
@@ -120,7 +120,7 @@ public function testOnRejectShouldRequeueMessage()
120120
->method('reject')
121121
->with($this->isInstanceOf(Message::class), true)
122122
->willReturnCallback(function (Message $message) {
123-
$this->assertSame('theDeliveryTag', $message->deliveryTag);
123+
$this->assertSame(178, $message->deliveryTag);
124124
});
125125

126126
$context = $this->createContextMock();
@@ -133,7 +133,7 @@ public function testOnRejectShouldRequeueMessage()
133133
$consumer = new AmqpConsumer($context, new AmqpQueue('aName'));
134134

135135
$message = new AmqpMessage();
136-
$message->setDeliveryTag('theDeliveryTag');
136+
$message->setDeliveryTag(178);
137137

138138
$consumer->reject($message, true);
139139
}

pkg/amqp-lib/AmqpConnectionFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpLib;
46

57
use Enqueue\AmqpTools\ConnectionConfig;

pkg/amqp-lib/AmqpConsumer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
namespace Enqueue\AmqpLib;
46

57
use Interop\Amqp\AmqpConsumer as InteropAmqpConsumer;

0 commit comments

Comments
 (0)