Skip to content

Commit e144689

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: fix code style [Uid] Hardcode UuidV3 & UuidV5 TYPE conditional constants [Uid] Use the Uuid constructor when reconstructing an Ulid from its RFC-4122 version stop using void in test files parse cookie values containing the equal sign make some time dependent tests more resilient fix code style Remove full head content in HTML to text converter do not break when loading schemas from network paths on Windows apply the sort callback on the whole search result
2 parents 8a9dea4 + 0f0ebfd commit e144689

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Tests/Transport/TransportsTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
class TransportsTest extends TestCase
2323
{
24-
public function testSendToTransportDefinedByMessage(): void
24+
public function testSendToTransportDefinedByMessage()
2525
{
2626
$transports = new Transports([
2727
'one' => $one = $this->createMock(TransportInterface::class),
@@ -39,7 +39,7 @@ public function testSendToTransportDefinedByMessage(): void
3939
$this->assertSame('one', $sentMessage->getTransport());
4040
}
4141

42-
public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport(): void
42+
public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATransport()
4343
{
4444
$transports = new Transports([
4545
'one' => $one = $this->createMock(TransportInterface::class),
@@ -63,7 +63,7 @@ public function testSendToFirstSupportedTransportIfMessageDoesNotDefineATranspor
6363
$this->assertSame('two', $sentMessage->getTransport());
6464
}
6565

66-
public function testThrowExceptionIfNoSupportedTransportWasFound(): void
66+
public function testThrowExceptionIfNoSupportedTransportWasFound()
6767
{
6868
$transports = new Transports([
6969
'one' => $one = $this->createMock(TransportInterface::class),
@@ -79,7 +79,7 @@ public function testThrowExceptionIfNoSupportedTransportWasFound(): void
7979
$transports->send($message);
8080
}
8181

82-
public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported(): void
82+
public function testThrowExceptionIfTransportDefinedByMessageIsNotSupported()
8383
{
8484
$transports = new Transports([
8585
'one' => $one = $this->createMock(TransportInterface::class),

Tests/TransportFactoryTestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function incompleteDsnProvider(): iterable
5555
/**
5656
* @dataProvider supportsProvider
5757
*/
58-
public function testSupports(bool $expected, string $dsn): void
58+
public function testSupports(bool $expected, string $dsn)
5959
{
6060
$factory = $this->createFactory();
6161

@@ -65,7 +65,7 @@ public function testSupports(bool $expected, string $dsn): void
6565
/**
6666
* @dataProvider createProvider
6767
*/
68-
public function testCreate(string $expected, string $dsn): void
68+
public function testCreate(string $expected, string $dsn)
6969
{
7070
$factory = $this->createFactory();
7171
$transport = $factory->create(Dsn::fromString($dsn));
@@ -76,7 +76,7 @@ public function testCreate(string $expected, string $dsn): void
7676
/**
7777
* @dataProvider unsupportedSchemeProvider
7878
*/
79-
public function testUnsupportedSchemeException(string $dsn, string $message = null): void
79+
public function testUnsupportedSchemeException(string $dsn, string $message = null)
8080
{
8181
$factory = $this->createFactory();
8282

@@ -93,7 +93,7 @@ public function testUnsupportedSchemeException(string $dsn, string $message = nu
9393
/**
9494
* @dataProvider incompleteDsnProvider
9595
*/
96-
public function testIncompleteDsnException(string $dsn, string $message = null): void
96+
public function testIncompleteDsnException(string $dsn, string $message = null)
9797
{
9898
$factory = $this->createFactory();
9999

Tests/TransportTestCase.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ abstract public function unsupportedMessagesProvider(): iterable;
4747
/**
4848
* @dataProvider toStringProvider
4949
*/
50-
public function testToString(string $expected, TransportInterface $transport): void
50+
public function testToString(string $expected, TransportInterface $transport)
5151
{
5252
$this->assertSame($expected, (string) $transport);
5353
}
5454

5555
/**
5656
* @dataProvider supportedMessagesProvider
5757
*/
58-
public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void
58+
public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
5959
{
6060
if (null === $transport) {
6161
$transport = $this->createTransport();
@@ -67,7 +67,7 @@ public function testSupportedMessages(MessageInterface $message, ?TransportInter
6767
/**
6868
* @dataProvider unsupportedMessagesProvider
6969
*/
70-
public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null): void
70+
public function testUnsupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
7171
{
7272
if (null === $transport) {
7373
$transport = $this->createTransport();
@@ -79,7 +79,7 @@ public function testUnsupportedMessages(MessageInterface $message, ?TransportInt
7979
/**
8080
* @dataProvider unsupportedMessagesProvider
8181
*/
82-
public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null): void
82+
public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, ?TransportInterface $transport = null)
8383
{
8484
if (null === $transport) {
8585
$transport = $this->createTransport();
@@ -90,7 +90,7 @@ public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSe
9090
$transport->send($message);
9191
}
9292

93-
public function testCanSetCustomHost(): void
93+
public function testCanSetCustomHost()
9494
{
9595
$transport = $this->createTransport();
9696

@@ -99,7 +99,7 @@ public function testCanSetCustomHost(): void
9999
$this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);
100100
}
101101

102-
public function testCanSetCustomPort(): void
102+
public function testCanSetCustomPort()
103103
{
104104
$transport = $this->createTransport();
105105

@@ -111,7 +111,7 @@ public function testCanSetCustomPort(): void
111111
$this->assertMatchesRegularExpression(sprintf('/^.*\/\/.*\:%s.*$/', $customPort), (string) $transport);
112112
}
113113

114-
public function testCanSetCustomHostAndPort(): void
114+
public function testCanSetCustomHostAndPort()
115115
{
116116
$transport = $this->createTransport();
117117

0 commit comments

Comments
 (0)