Skip to content

Commit 2395981

Browse files
committed
Running php-cs-fixer
Running php-cs-fixer to fix CS drift
1 parent 9a9aa5d commit 2395981

19 files changed

+40
-47
lines changed

SqsClient.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,6 @@ private function resolveClient(): void
148148
}
149149
}
150150

151-
throw new \LogicException(sprintf(
152-
'The input client must be an instance of "%s" or "%s" or a callable that returns one of those. Got "%s"',
153-
AwsSqsClient::class,
154-
MultiRegionClient::class,
155-
is_object($client) ? get_class($client) : gettype($client)
156-
));
151+
throw new \LogicException(sprintf('The input client must be an instance of "%s" or "%s" or a callable that returns one of those. Got "%s"', AwsSqsClient::class, MultiRegionClient::class, is_object($client) ? $client::class : gettype($client)));
157152
}
158153
}

SqsConsumer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function getVisibilityTimeout(): ?int
5353
* The duration (in seconds) that the received messages are hidden from subsequent retrieve
5454
* requests after being retrieved by a ReceiveMessage request.
5555
*/
56-
public function setVisibilityTimeout(int $visibilityTimeout = null): void
56+
public function setVisibilityTimeout(?int $visibilityTimeout = null): void
5757
{
5858
$this->visibilityTimeout = $visibilityTimeout;
5959
}

SqsContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function getSqsClient(): SqsClient
134134
*/
135135
public function getClient(): AwsSqsClient
136136
{
137-
@trigger_error('The method is deprecated since 0.9.2. SqsContext::getAwsSqsClient() method should be used.', E_USER_DEPRECATED);
137+
@trigger_error('The method is deprecated since 0.9.2. SqsContext::getAwsSqsClient() method should be used.', \E_USER_DEPRECATED);
138138

139139
return $this->getAwsSqsClient();
140140
}

SqsDestination.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getAttributes(): array
6262
* The number of seconds for which the delivery of all messages in the queue is delayed.
6363
* Valid values: An integer from 0 to 900 seconds (15 minutes). The default is 0 (zero).
6464
*/
65-
public function setDelaySeconds(int $seconds = null): void
65+
public function setDelaySeconds(?int $seconds = null): void
6666
{
6767
if (null == $seconds) {
6868
unset($this->attributes['DelaySeconds']);
@@ -76,7 +76,7 @@ public function setDelaySeconds(int $seconds = null): void
7676
* Valid values: An integer from 1,024 bytes (1 KiB) to 262,144 bytes (256 KiB).
7777
* The default is 262,144 (256 KiB).
7878
*/
79-
public function setMaximumMessageSize(int $bytes = null): void
79+
public function setMaximumMessageSize(?int $bytes = null): void
8080
{
8181
if (null == $bytes) {
8282
unset($this->attributes['MaximumMessageSize']);
@@ -90,7 +90,7 @@ public function setMaximumMessageSize(int $bytes = null): void
9090
* Valid values: An integer from 60 seconds (1 minute) to 1,209,600 seconds (14 days).
9191
* The default is 345,600 (4 days).
9292
*/
93-
public function setMessageRetentionPeriod(int $seconds = null): void
93+
public function setMessageRetentionPeriod(?int $seconds = null): void
9494
{
9595
if (null == $seconds) {
9696
unset($this->attributes['MessageRetentionPeriod']);
@@ -103,7 +103,7 @@ public function setMessageRetentionPeriod(int $seconds = null): void
103103
* The queue's policy. A valid AWS policy. For more information about policy structure,
104104
* see http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html.
105105
*/
106-
public function setPolicy(string $policy = null): void
106+
public function setPolicy(?string $policy = null): void
107107
{
108108
if (null == $policy) {
109109
unset($this->attributes['Policy']);
@@ -116,7 +116,7 @@ public function setPolicy(string $policy = null): void
116116
* The number of seconds for which a ReceiveMessage action waits for a message to arrive.
117117
* Valid values: An integer from 0 to 20 (seconds). The default is 0 (zero).
118118
*/
119-
public function setReceiveMessageWaitTimeSeconds(int $seconds = null): void
119+
public function setReceiveMessageWaitTimeSeconds(?int $seconds = null): void
120120
{
121121
if (null == $seconds) {
122122
unset($this->attributes['ReceiveMessageWaitTimeSeconds']);
@@ -145,7 +145,7 @@ public function setRedrivePolicy(int $maxReceiveCount, string $deadLetterTargetA
145145
* The default is 30. For more information about the visibility timeout,
146146
* see http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html.
147147
*/
148-
public function setVisibilityTimeout(int $seconds = null): void
148+
public function setVisibilityTimeout(?int $seconds = null): void
149149
{
150150
if (null == $seconds) {
151151
unset($this->attributes['VisibilityTimeout']);
@@ -208,7 +208,7 @@ public function setQueueOwnerAWSAccountId(?string $queueOwnerAWSAccountId): void
208208
$this->queueOwnerAWSAccountId = $queueOwnerAWSAccountId;
209209
}
210210

211-
public function setRegion(string $region = null): void
211+
public function setRegion(?string $region = null): void
212212
{
213213
$this->region = $region;
214214
}

SqsMessage.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function setRedelivered(bool $redelivered): void
144144
$this->redelivered = $redelivered;
145145
}
146146

147-
public function setReplyTo(string $replyTo = null): void
147+
public function setReplyTo(?string $replyTo = null): void
148148
{
149149
$this->setHeader('reply_to', $replyTo);
150150
}
@@ -154,7 +154,7 @@ public function getReplyTo(): ?string
154154
return $this->getHeader('reply_to');
155155
}
156156

157-
public function setCorrelationId(string $correlationId = null): void
157+
public function setCorrelationId(?string $correlationId = null): void
158158
{
159159
$this->setHeader('correlation_id', $correlationId);
160160
}
@@ -164,7 +164,7 @@ public function getCorrelationId(): ?string
164164
return $this->getHeader('correlation_id');
165165
}
166166

167-
public function setMessageId(string $messageId = null): void
167+
public function setMessageId(?string $messageId = null): void
168168
{
169169
$this->setHeader('message_id', $messageId);
170170
}
@@ -181,7 +181,7 @@ public function getTimestamp(): ?int
181181
return null === $value ? null : (int) $value;
182182
}
183183

184-
public function setTimestamp(int $timestamp = null): void
184+
public function setTimestamp(?int $timestamp = null): void
185185
{
186186
$this->setHeader('timestamp', $timestamp);
187187
}
@@ -211,7 +211,7 @@ public function getDelaySeconds(): int
211211
* any messages sent with the same MessageDeduplicationId are accepted successfully but aren't delivered during the 5-minute
212212
* deduplication interval. For more information, see http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues.html#FIFO-queues-exactly-once-processing.
213213
*/
214-
public function setMessageDeduplicationId(string $id = null): void
214+
public function setMessageDeduplicationId(?string $id = null): void
215215
{
216216
$this->messageDeduplicationId = $id;
217217
}
@@ -230,7 +230,7 @@ public function getMessageDeduplicationId(): ?string
230230
* for multiple users). In this scenario, multiple readers can process the queue, but the session data
231231
* of each user is processed in a FIFO fashion.
232232
*/
233-
public function setMessageGroupId(string $id = null): void
233+
public function setMessageGroupId(?string $id = null): void
234234
{
235235
$this->messageGroupId = $id;
236236
}
@@ -247,7 +247,7 @@ public function getMessageGroupId(): ?string
247247
* If you receive a message more than once, each time you receive it, you get a different receipt handle.
248248
* You must provide the most recently received receipt handle when you request to delete the message (otherwise, the message might not be deleted).
249249
*/
250-
public function setReceiptHandle(string $receipt = null): void
250+
public function setReceiptHandle(?string $receipt = null): void
251251
{
252252
$this->receiptHandle = $receipt;
253253
}

SqsProducer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function send(Destination $destination, Message $message): void
8181
/**
8282
* @return SqsProducer
8383
*/
84-
public function setDeliveryDelay(int $deliveryDelay = null): Producer
84+
public function setDeliveryDelay(?int $deliveryDelay = null): Producer
8585
{
8686
$this->deliveryDelay = $deliveryDelay;
8787

@@ -96,7 +96,7 @@ public function getDeliveryDelay(): ?int
9696
/**
9797
* @return SqsProducer
9898
*/
99-
public function setPriority(int $priority = null): Producer
99+
public function setPriority(?int $priority = null): Producer
100100
{
101101
if (null === $priority) {
102102
return $this;
@@ -113,7 +113,7 @@ public function getPriority(): ?int
113113
/**
114114
* @return SqsProducer
115115
*/
116-
public function setTimeToLive(int $timeToLive = null): Producer
116+
public function setTimeToLive(?int $timeToLive = null): Producer
117117
{
118118
if (null === $timeToLive) {
119119
return $this;

Tests/Spec/CreateSqsQueueTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ trait CreateSqsQueueTrait
1111

1212
protected function createSqsQueue(SqsContext $context, string $queueName): SqsDestination
1313
{
14-
$queueName = $queueName.time();
14+
$queueName .= time();
1515

1616
$this->queue = $context->createQueue($queueName);
1717
$context->declareQueue($this->queue);

Tests/Spec/SqsMessageTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
class SqsMessageTest extends MessageSpec
99
{
10-
/**
11-
* {@inheritdoc}
12-
*/
1310
protected function createMessage()
1411
{
1512
return new SqsMessage();

Tests/Spec/SqsProducerTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ class SqsProducerTest extends ProducerSpec
1212
{
1313
use SqsExtension;
1414

15-
/**
16-
* {@inheritdoc}
17-
*/
1815
protected function createProducer()
1916
{
2017
return $this->buildSqsContext()->createProducer();

Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendAndReceiveDelayedMessageFromQueueTest extends SendAndReceiveDelayedMessageFromQueueSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToAndReceiveFromQueueTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToAndReceiveFromTopicTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToAndReceiveFromTopicTest extends SendToAndReceiveFromTopicSpec
1718
{
18-
use SqsExtension;
19-
use RetryTrait;
2019
use CreateSqsQueueTrait;
20+
use RetryTrait;
21+
use SqsExtension;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToAndReceiveNoWaitFromQueueTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToAndReceiveNoWaitFromTopicTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToAndReceiveNoWaitFromTopicTest extends SendToAndReceiveNoWaitFromTopicSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToTopicAndReceiveFromQueueTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/Spec/SqsSendToTopicAndReceiveNoWaitFromQueueTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111

1212
/**
1313
* @group functional
14+
*
1415
* @retry 5
1516
*/
1617
class SqsSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec
1718
{
19+
use CreateSqsQueueTrait;
1820
use RetryTrait;
1921
use SqsExtension;
20-
use CreateSqsQueueTrait;
2122

2223
/**
2324
* @var SqsContext

Tests/SqsConnectionFactoryConfigTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ public function testThrowIfDsnCouldNotBeParsed()
4141

4242
/**
4343
* @dataProvider provideConfigs
44-
*
45-
* @param mixed $config
46-
* @param mixed $expectedConfig
4744
*/
4845
public function testShouldParseConfigurationAsExpected($config, $expectedConfig)
4946
{

examples/consume.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if ($autoload) {
1313
require_once $autoload;
1414
} else {
15-
throw new \LogicException('Composer autoload was not found');
15+
throw new LogicException('Composer autoload was not found');
1616
}
1717

1818
use Enqueue\Sqs\SqsConnectionFactory;
@@ -26,7 +26,7 @@
2626
while (true) {
2727
if ($m = $consumer->receive(20000)) {
2828
$consumer->acknowledge($m);
29-
echo 'Received message: '.$m->getBody().PHP_EOL;
29+
echo 'Received message: '.$m->getBody().\PHP_EOL;
3030
}
3131
}
3232

examples/produce.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if ($autoload) {
1313
require_once $autoload;
1414
} else {
15-
throw new \LogicException('Composer autoload was not found');
15+
throw new LogicException('Composer autoload was not found');
1616
}
1717

1818
use Enqueue\Sqs\SqsConnectionFactory;
@@ -27,7 +27,7 @@
2727

2828
while (true) {
2929
$context->createProducer()->send($queue, $message);
30-
echo 'Sent message: '.$message->getBody().PHP_EOL;
30+
echo 'Sent message: '.$message->getBody().\PHP_EOL;
3131
sleep(1);
3232
}
3333

0 commit comments

Comments
 (0)