10000 [11.x] Supports Symfony 7.2 (#53585) · tibbsa/laravel-framework@f49cba4 · GitHub
[go: up one dir, main page]
Skip to content

Commit f49cba4

Browse files
crynobonecrynobone
authored
[11.x] Supports Symfony 7.2 (laravel#53585)
* [11.x] Supports Symfony 7.2 Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> * Update composer.json * wip Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com> --------- Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
1 parent 8ffd13c commit f49cba4

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

‎src/Illuminate/Mail/MailManager.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,7 @@ protected function createSmtpTransport(array $config)
194194
$scheme = $config['scheme'] ?? null;
195195

196196
if (! $scheme) {
197-
$scheme = ! empty($config['encryption']) && $config['encryption'] === 'tls'
198-
? (($config['port'] == 465) ? 'smtps' : 'smtp')
199-
: '';
197+
$scheme = ($config['port'] == 465) ? 'smtps' : 'smtp';
200198
}
201199

202200
$transport = $factory->create(new Dsn(

‎tests/Mail/MailManagerTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use InvalidArgumentException;
66
use Orchestra\Testbench\TestCase;
77
use PHPUnit\Framework\Attributes\DataProvider;
8+
use PHPUnit\Framework\Attributes\TestWith;
89
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
910

1011
class MailManagerTest extends TestCase
@@ -27,9 +28,12 @@ public function testEmptyTransportConfig($transport)
2728
$this->app['mail.manager']->mailer('custom_smtp');
2829
}
2930

30-
public function testMailUrlConfig()
31+
#[TestWith(['smtp'])]
32+
#[TestWith(['smtps'])]
33+
public function testMailUrlConfig($scheme)
3134
{
3235
$this->app['config']->set('mail.mailers.smtp_url', [
36+
'scheme' => $scheme,
3337
'url' => 'smtp://usr:pwd@127.0.0.2:5876',
3438
]);
3539

0 commit comments

Comments
 (0)
0