Skip to content

Commit e970038

Browse files
Merge branch '5.2' into 5.3
* 5.2: CS fix CS fix CS fixes Bump Symfony version to 5.2.12 Update VERSION for 5.2.11 Update CHANGELOG for 5.2.11 Bump Symfony version to 4.4.27 Update VERSION for 4.4.26 Update CONTRIBUTORS for 4.4.26 Update CHANGELOG for 4.4.26
2 parents 5306fd5 + ae04bfe commit e970038

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Exception/IncompleteDsnException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class IncompleteDsnException extends InvalidArgumentException
1818
{
1919
private $dsn;
2020

21-
public function __construct(string $message, string $dsn = null, ?\Throwable $previous = null)
21+
public function __construct(string $message, string $dsn = null, \Throwable $previous = null)
2222
{
2323
$this->dsn = $dsn;
2424
if ($dsn) {

Exception/MissingRequiredOptionException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
class MissingRequiredOptionException extends IncompleteDsnException
1818
{
19-
public function __construct(string $option, string $dsn = null, ?\Throwable $previous = null)
19+
public function __construct(string $option, string $dsn = null, \Throwable $previous = null)
2020
{
2121
$message = sprintf('The option "%s" is required but missing.', $option);
2222

Test/TransportTestCase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ abstract class TransportTestCase extends TestCase
2727
protected const CUSTOM_HOST = 'host.test';
2828
protected const CUSTOM_PORT = 42;
2929

30-
abstract public function createTransport(?HttpClientInterface $client = null): TransportInterface;
30+
abstract public function createTransport(HttpClientInterface $client = null): TransportInterface;
3131

3232
/**
3333
* @return iterable<array{0: string, 1: TransportInterface}>
@@ -55,7 +55,7 @@ public function testToString(string $expected, TransportInterface $transport)
5555
/**
5656
* @dataProvider supportedMessagesProvider
5757
*/
58-
public function testSupportedMessages(MessageInterface $message, ?TransportInterface $transport = null)
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)
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)
82+
public function testUnsupportedMessagesTrowUnsupportedMessageTypeExceptionWhenSend(MessageInterface $message, TransportInterface $transport = null)
8383
{
8484
if (null === $transport) {
8585
$transport = $this->createTransport();

Tests/Transport/DsnTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class DsnTest extends TestCase
2121
/**
2222
* @dataProvider constructProvider
2323
*/
24-
public function testConstruct(string $dsnString, string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [], ?string $path = null)
24+
public function testConstruct(string $dsnString, string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [], string $path = null)
2525
{
2626
$dsn = new Dsn($dsnString);
2727
$this->assertSame($dsnString, $dsn->getOriginalDsn());
@@ -172,7 +172,7 @@ public function invalidDsnProvider(): iterable
172172
/**
173173
* @dataProvider getOptionProvider
174174
*/
175-
public function testGetOption($expected, string $dsnString, string $option, ?string $default = null)
175+
public function testGetOption($expected, string $dsnString, string $option, string $default = null)
176176
{
177177
$dsn = new Dsn($dsnString);
178178

0 commit comments

Comments
 (0)