Skip to content

Commit 2dfef3b

Browse files
makasimmakasim
committed
php cs fixes
1 parent 0bf1b27 commit 2dfef3b

16 files changed

+56
-306
lines changed

‎pkg/amqp-ext/Tests/AmqpMessageTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,4 @@ public function testShouldClearPreviouslySetFlags()
115115

116116
$this->assertSame(AMQP_NOPARAM, $message->getFlags());
117117
}
118-
119-
/**
120-
* @return PsrMessage
121-
*/
122-
protected function createMessage()
123-
{
124-
return new AmqpMessage();
125-
}
126118
}

‎pkg/amqp-ext/Tests/Spec/AmqpMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\AmqpExt\Tests\Spec;
34

45
use Enqueue\AmqpExt\AmqpMessage;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new AmqpMessage();
1516
}
16-
}
17+
}

‎pkg/dbal/Tests/DbalMessageTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Enqueue\Dbal\Tests;
44

55
use Enqueue\Dbal\DbalMessage;
6-
use Enqueue\Psr\PsrMessage;
76
use Enqueue\Test\ClassExtensionTrait;
87

98
class DbalMessageTest extends \PHPUnit_Framework_TestCase

‎pkg/dbal/Tests/Spec/DbalMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Dbal\Tests\Spec;
34

45
use Enqueue\Dbal\DbalMessage;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new DbalMessage();
1516
}
16-
}
17+
}

‎pkg/fs/Tests/FsMessageTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Enqueue\Fs\Tests;
44

55
use Enqueue\Fs\FsMessage;
6-
use Enqueue\Psr\PsrMessage;
76
use Enqueue\Test\ClassExtensionTrait;
87

98
class FsMessageTest extends \PHPUnit\Framework\TestCase

‎pkg/fs/Tests/Spec/FsMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Fs\Tests\Spec;
34

45
use Enqueue\Fs\FsMessage;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new FsMessage();
1516
}
16-
}
17+
}

‎pkg/null/Tests/Spec/NullMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Null\Tests\Spec;
34

45
use Enqueue\Null\NullMessage;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new NullMessage();
1516
}
16-
}
17+
}

‎pkg/redis/Tests/RedisMessageTest.php

Lines changed: 10 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -2,86 +2,34 @@
22

33
namespace Enqueue\Redis\Tests;
44

5-
use Enqueue\Psr\PsrMessage;
65
use Enqueue\Redis\RedisMessage;
76
use Enqueue\Test\ClassExtensionTrait;
87

98
class RedisMessageTest extends \PHPUnit\Framework\TestCase
109
{
1110
use ClassExtensionTrait;
1211

13-
public function testShouldImplementMessageInterface()
14-
{
15-
$this->assertClassImplements(PsrMessage::class, RedisMessage::class);
16-
}
17-
1812
public function testShouldImplementJsonSerializableInterface()
1913
{
2014
$this->assertClassImplements(\JsonSerializable::class, RedisMessage::class);
2115
}
2216

23-
public function testCouldConstructMessageWithBody()
24-
{
25-
$message = new RedisMessage('body');
26-
27-
$this->assertSame('body', $message->getBody());
28-
}
29-
30-
public function testCouldConstructMessageWithProperties()
31-
{
32-
$message = new RedisMessage('', ['key' => 'value']);
33-
34-
$this->assertSame(['key' => 'value'], $message->getProperties());
35-
}
36-
37-
public function testCouldConstructMessageWithHeaders()
38-
{
39-
$message = new RedisMessage('', [], ['key' => 'value']);
40-
41-
$this->assertSame(['key' => 'value'], $message->getHeaders());
42-
}
43-
44-
public function testCouldSetGetBody()
45-
{
46-
$message = new RedisMessage();
47-
$message->setBody('body');
48-
49-
$this->assertSame('body', $message->getBody());
50-
}
51-
52-
public function testCouldSetGetProperties()
53-
{
54-
$message = new RedisMessage();
55-
$message->setProperties(['key' => 'value']);
56-
57-
$this->assertSame(['key' => 'value'], $message->getProperties());
58-
}
59-
60-
public function testCouldSetGetHeaders()
61-
{
62-
$message = new RedisMessage();
63-
$message->setHeaders(['key' => 'value']);
64-
65-
$this->assertSame(['key' => 'value'], $message->getHeaders());
66-
}
67-
68-
public function testCouldSetGetRedelivered()
17+
public function testCouldConstructMessageWithoutArguments()
6918
{
7019
$message = new RedisMessage();
7120

72-
$message->setRedelivered(true);
73-
$this->assertTrue($message->isRedelivered());
74-
75-
$message->setRedelivered(false);
76-
$this->assertFalse($message->isRedelivered());
21+
$this->assertSame('', $message->getBody());
22+
$this->assertSame([], $message->getProperties());
23+
$this->assertSame([], $message->getHeaders());
7724
}
7825

79-
public function testCouldSetGetCorrelationId()
26+
public function testCouldBeConstructedWithOptionalArguments()
8027
{
81-
$message = new RedisMessage();
82-
$message->setCorrelationId('the-correlation-id');
28+
$message = new RedisMessage('theBody', ['barProp' => 'barPropVal'], ['fooHeader' => 'fooHeaderVal']);
8329

84-
$this->assertSame('the-correlation-id', $message->getCorrelationId());
30+
$this->assertSame('theBody', $message->getBody());
31+
$this->assertSame(['barProp' => 'barPropVal'], $message->getProperties());
32+
$this->assertSame(['fooHeader' => 'fooHeaderVal'], $message->getHeaders());
8533
}
8634

8735
public function testShouldSetCorrelationIdAsHeader()
@@ -92,14 +40,6 @@ public function testShouldSetCorrelationIdAsHeader()
9240
$this->assertSame(['correlation_id' => 'the-correlation-id'], $message->getHeaders());
9341
}
9442

95-
public function testCouldSetGetMessageId()
96-
{
97-
$message = new RedisMessage();
98-
$message->setMessageId('the-message-id');
99-
100-
$this->assertSame('the-message-id', $message->getMessageId());
101-
}
102-
10343
public function testCouldSetMessageIdAsHeader()
10444
{
10545
$message = new RedisMessage();
@@ -108,14 +48,6 @@ public function testCouldSetMessageIdAsHeader()
10848
$this->assertSame(['message_id' => 'the-message-id'], $message->getHeaders());
10949
}
11050

111-
public function testCouldSetGetTimestamp()
112-
{
113-
$message = new RedisMessage();
114-
$message->setTimestamp(12345);
115-
116-
$this->assertSame(12345, $message->getTimestamp());
117-
}
118-
11951
public function testCouldSetTimestampAsHeader()
12052
{
12153
$message = new RedisMessage();
@@ -124,22 +56,7 @@ public function testCouldSetTimestampAsHeader()
12456
$this->assertSame(['timestamp' => 12345], $message->getHeaders());
12557
}
12658

127-
public function testShouldReturnNullAsDefaultReplyTo()
128-
{
129-
$message = new RedisMessage();
130-
131-
$this->assertSame(null, $message->getReplyTo());
132-
}
133-
134-
public function testShouldAllowGetPreviouslySetReplyTo()
135-
{
136-
$message = new RedisMessage();
137-
$message->setReplyTo('theQueueName');
138-
139-
$this->assertSame('theQueueName', $message->getReplyTo());
140-
}
141-
142-
public function testShouldAllowGetPreviouslySetReplyToAsHeader()
59+
public function testShouldSetReplyToAsHeader()
14360
{
14461
$message = new RedisMessage();
14562
$message->setReplyTo('theQueueName');

‎pkg/redis/Tests/RedisProducerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testShouldCallLPushOnSend()
5454
$redisMock
5555
->expects($this->once())
5656
->method('lpush')
57-
->with('aDestination', '{"body":null,"properties":[],"headers":[]}')
57+
->with('aDestination', '{"body":"","properties":[],"headers":[]}')
5858
;
5959

6060
$producer = new RedisProducer($redisMock);

‎pkg/redis/Tests/Spec/RedisMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Redis\Tests\Spec;
34

45
use Enqueue\Psr\Spec\PsrMessageSpec;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new RedisMessage();
1516
}
16-
}
17+
}

‎pkg/sqs/SqsMessage.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class SqsMessage implements PsrMessage
5151
* @param array $properties
5252
* @param array $headers
5353
*/
54-
public function __construct($body = null, array $properties = [], array $headers = [])
54+
public function __construct($body = '', array $properties = [], array $headers = [])
5555
{
5656
$this->body = $body;
5757
$this->properties = $properties;
@@ -185,7 +185,7 @@ public function setCorrelationId($correlationId)
185185
*/
186186
public function getCorrelationId()
187187
{
188-
return $this->getHeader('correlation_id', '');
188+
return $this->getHeader('correlation_id');
189189
}
190190

191191
/**
@@ -201,23 +201,25 @@ public function setMessageId($messageId)
201201
*/
202202
public function getMessageId()
203203
{
204-
return $this->getHeader('message_id', '');
204+
return $this->getHeader('message_id');
205205
}
206206

207207
/**
208208
* {@inheritdoc}
209209
*/
210210
public function getTimestamp()
211211
{
212-
return $this->getHeader('timestamp');
212+
$value = $this->getHeader('timestamp');
213+
214+
return $value === null ? null : (int) $value;
213215
}
214216

215217
/**
216218
* {@inheritdoc}
217219
*/
218220
public function setTimestamp($timestamp)
219221
{
220-
$this->setHeader('timestamp', (int) $timestamp);
222+
$this->setHeader('timestamp', $timestamp);
221223
}
222224

223225
/**

‎pkg/sqs/Tests/Spec/SqsMessageTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
namespace Enqueue\Sqs\Tests\Spec;
34

45
use Enqueue\Psr\Spec\PsrMessageSpec;
@@ -13,4 +14,4 @@ protected function createMessage()
1314
{
1415
return new SqsMessage();
1516
}
16-
}
17+
}

0 commit comments

Comments
 (0)