Skip to content

Commit 3f26a95

Browse files
Merge branch '4.4' into 5.4
* 4.4: CS fixes Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 3e2e593 + 2cf5261 commit 3f26a95

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Tests/Transport/FailoverTransportTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ public function testSendOneDeadButRecover()
142142
$t2 = $this->createMock(TransportInterface::class);
143143
$t2->expects($this->exactly(3))
144144
->method('send')->willReturnOnConsecutiveCalls(
145-
null,
146-
null,
147-
$this->throwException(new TransportException())
148-
);
145+
null,
146+
null,
147+
$this->throwException(new TransportException())
148+
);
149149
$t = new FailoverTransport([$t1, $t2], 1);
150150
$t->send(new RawMessage(''));
151151
sleep(1);

Transport/NativeTransportFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function create(Dsn $dsn): TransportInterface
2929
throw new UnsupportedSchemeException($dsn, 'native', $this->getSupportedSchemes());
3030
}
3131

32-
if ($sendMailPath = ini_get('sendmail_path')) {
32+
if ($sendMailPath = \ini_get('sendmail_path')) {
3333
return new SendmailTransport($sendMailPath, $this->dispatcher, $this->logger);
3434
}
3535

@@ -39,8 +39,8 @@ public function create(Dsn $dsn): TransportInterface
3939

4040
// Only for windows hosts; at this point non-windows
4141
// host have already thrown an exception or returned a transport
42-
$host = ini_get('SMTP');
43-
$port = (int) ini_get('smtp_port');
42+
$host = \ini_get('SMTP');
43+
$port = (int) \ini_get('smtp_port');
4444

4545
if (!$host || !$port) {
4646
throw new TransportException('smtp or smtp_port is not configured in php.ini.');

Transport/Smtp/Stream/SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function setTimeout(float $timeout): self
4343

4444
public function getTimeout(): float
4545
{
46-
return $this->timeout ?? (float) ini_get('default_socket_timeout');
46+
return $this->timeout ?? (float) \ini_get('default_socket_timeout');
4747
}
4848

4949
/**

0 commit comments

Comments
 (0)