Merge branch '4.4' into 5.1

derrabus · derrabus · commit 7d846d3e82f4 · 2020-12-12T00:11:02.000+01:00
* 4.4: Use more explicit variable name Fix wrong comment about SES region [Mailer] [Sendgrid] Use $scheme variable to stay consistent [Mailer] [Amazon] Fix @param annotation [Mailer] Rename testsuites Remove void return type from test methods
diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/BodyRendererTest.php
@@ -21,13 +21,13 @@
 
 class BodyRendererTest extends TestCase
 {
-    public function testRenderTextOnly(): void
+    public function testRenderTextOnly()
     {
         $email = $this->prepareEmail('Text', null);
         $this->assertEquals('Text', $email->getBody()->bodyToString());
     }
 
-    public function testRenderHtmlOnly(): void
+    public function testRenderHtmlOnly()
     {
         $html = '<head>head</head><b>HTML</b><style type="text/css">css</style>';
         $email = $this->prepareEmail(null, $html);
@@ -37,7 +37,7 @@ public function testRenderHtmlOnly(): void
         $this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString());
     }
 
-    public function testRenderHtmlOnlyWithTextSet(): void
+    public function testRenderHtmlOnlyWithTextSet()
     {
         $email = $this->prepareEmail(null, '<b>HTML</b>');
         $email->text('Text');
@@ -47,7 +47,7 @@ public function testRenderHtmlOnlyWithTextSet(): void
         $this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());
     }
 
-    public function testRenderTextAndHtml(): void
+    public function testRenderTextAndHtml()
     {
         $email = $this->prepareEmail('Text', '<b>HTML</b>');
         $body = $email->getBody();
@@ -56,7 +56,7 @@ public function testRenderTextAndHtml(): void
         $this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());
     }
 
-    public function testRenderWithContextReservedEmailEntry(): void
+    public function testRenderWithContextReservedEmailEntry()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->prepareEmail('Text', '', ['email' => 'reserved!']);
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -559,7 +559,7 @@ public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
         $this->assertGreaterThan($preReBoot, $kernel->getStartTime());
     }
 
-    public function testAnonymousKernelGeneratesValidContainerClass(): void
+    public function testAnonymousKernelGeneratesValidContainerClass()
     {
         $kernel = new class('test', true) extends Kernel {
             public function registerBundles(): iterable
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php
@@ -35,7 +35,7 @@ class SesApiTransport extends AbstractApiTransport
     private $region;
 
     /**
-     * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)
+     * @param string|null $region Amazon SES region
      */
     public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php
@@ -33,7 +33,7 @@ class SesHttpTransport extends AbstractHttpTransport
     private $region;
 
     /**
-     * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)
+     * @param string|null $region Amazon SES region
      */
     public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php b/src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesSmtpTransport.php
@@ -21,7 +21,7 @@
 class SesSmtpTransport extends EsmtpTransport
 {
     /**
-     * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)
+     * @param string|null $region Amazon SES region
      */
     public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Amazon/phpunit.xml.dist
@@ -13,7 +13,7 @@
     </php>
 
     <testsuites>
-        <testsuite name="Symfony Amazon Mailer Test Suite">
+        <testsuite name="Symfony Amazon Mailer Bridge Test Suite">
             <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridTransportFactory.php
@@ -23,16 +23,17 @@ final class SendgridTransportFactory extends AbstractTransportFactory
 {
     public function create(Dsn $dsn): TransportInterface
     {
+        $scheme = $dsn->getScheme();
         $key = $this->getUser($dsn);
 
-        if ('sendgrid+api' === $dsn->getScheme()) {
+        if ('sendgrid+api' === $scheme) {
             $host = 'default' === $dsn->getHost() ? null : $dsn->getHost();
             $port = $dsn->getPort();
 
             return (new SendgridApiTransport($key, $this->client, $this->dispatcher, $this->logger))->setHost($host)->setPort($port);
         }
 
-        if ('sendgrid+smtp' === $dsn->getScheme() || 'sendgrid+smtps' === $dsn->getScheme() || 'sendgrid' === $dsn->getScheme()) {
+        if ('sendgrid+smtp' === $scheme || 'sendgrid+smtps' === $scheme || 'sendgrid' === $scheme) {
             return new SendgridSmtpTransport($key, $this->dispatcher, $this->logger);
         }
 
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist b/src/Symfony/Component/Mailer/Bridge/Sendgrid/phpunit.xml.dist
@@ -13,7 +13,7 @@
     </php>
 
     <testsuites>
-        <testsuite name="Symfony Sendgrid Mailer Test Suite">
+        <testsuite name="Symfony Sendgrid Mailer Bridge Test Suite">
             <directory>./Tests/</directory>
         </testsuite>
     </testsuites>
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -412,7 +412,7 @@ public function testNullOnPrivateProtectedAccessor()
     /**
      * @requires PHP 7.4
      */
-    public function testTypedProperties(): void
+    public function testTypedProperties()
     {
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));
         $this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));

Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@`
`21`	`21`
`22`	`22`	`class BodyRendererTest extends TestCase`
`23`	`23`	`{`
`24`		`- public function testRenderTextOnly(): void`
	`24`	`+ public function testRenderTextOnly()`
`25`	`25`	`{`
`26`	`26`	`$email = $this->prepareEmail('Text', null);`
`27`	`27`	`$this->assertEquals('Text', $email->getBody()->bodyToString());`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function testRenderHtmlOnly(): void`
	`30`	`+ public function testRenderHtmlOnly()`
`31`	`31`	`{`
`32`	`32`	`$html = '<head>head</head><b>HTML</b><style type="text/css">css</style>';`
`33`	`33`	`$email = $this->prepareEmail(null, $html);`
`@@ -37,7 +37,7 @@ public function testRenderHtmlOnly(): void`
`37`	`37`	`$this->assertEquals(str_replace('=', '=3D', $html), $body->getParts()[1]->bodyToString());`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function testRenderHtmlOnlyWithTextSet(): void`
	`40`	`+ public function testRenderHtmlOnlyWithTextSet()`
`41`	`41`	`{`
`42`	`42`	`$email = $this->prepareEmail(null, '<b>HTML</b>');`
`43`	`43`	`$email->text('Text');`
`@@ -47,7 +47,7 @@ public function testRenderHtmlOnlyWithTextSet(): void`
`47`	`47`	`$this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function testRenderTextAndHtml(): void`
	`50`	`+ public function testRenderTextAndHtml()`
`51`	`51`	`{`
`52`	`52`	`$email = $this->prepareEmail('Text', '<b>HTML</b>');`
`53`	`53`	`$body = $email->getBody();`
`@@ -56,7 +56,7 @@ public function testRenderTextAndHtml(): void`
`56`	`56`	`$this->assertEquals('<b>HTML</b>', $body->getParts()[1]->bodyToString());`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function testRenderWithContextReservedEmailEntry(): void`
	`59`	`+ public function testRenderWithContextReservedEmailEntry()`
`60`	`60`	`{`
`61`	`61`	`$this->expectException(InvalidArgumentException::class);`
`62`	`62`	`$this->prepareEmail('Text', '', ['email' => 'reserved!']);`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()`
`559`	`559`	`$this->assertGreaterThan($preReBoot, $kernel->getStartTime());`
`560`	`560`	`}`
`561`	`561`
`562`		`- public function testAnonymousKernelGeneratesValidContainerClass(): void`
	`562`	`+ public function testAnonymousKernelGeneratesValidContainerClass()`
`563`	`563`	`{`
`564`	`564`	`$kernel = new class('test', true) extends Kernel {`
`565`	`565`	`public function registerBundles(): iterable`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class SesApiTransport extends AbstractApiTransport`
`35`	`35`	`private $region;`
`36`	`36`
`37`	`37`	`/**`
`38`		`- * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)`
	`38`	`+ * @param string\|null $region Amazon SES region`
`39`	`39`	`*/`
`40`	`40`	`public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class SesHttpTransport extends AbstractHttpTransport`
`33`	`33`	`private $region;`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)`
	`36`	`+ * @param string\|null $region Amazon SES region`
`37`	`37`	`*/`
`38`	`38`	`public function __construct(string $accessKey, string $secretKey, string $region = null, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`class SesSmtpTransport extends EsmtpTransport`
`22`	`22`	`{`
`23`	`23`	`/**`
`24`		`- * @param string $region Amazon SES region (currently one of us-east-1, us-west-2, or eu-west-1)`
	`24`	`+ * @param string\|null $region Amazon SES region`
`25`	`25`	`*/`
`26`	`26`	`public function __construct(string $username, string $password, string $region = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,17 @@ final class SendgridTransportFactory extends AbstractTransportFactory`
`23`	`23`	`{`
`24`	`24`	`public function create(Dsn $dsn): TransportInterface`
`25`	`25`	`{`
	`26`	`+ $scheme = $dsn->getScheme();`
`26`	`27`	`$key = $this->getUser($dsn);`
`27`	`28`
`28`		`- if ('sendgrid+api' === $dsn->getScheme()) {`
	`29`	`+ if ('sendgrid+api' === $scheme) {`
`29`	`30`	`$host = 'default' === $dsn->getHost() ? null : $dsn->getHost();`
`30`	`31`	`$port = $dsn->getPort();`
`31`	`32`
`32`	`33`	`return (new SendgridApiTransport($key, $this->client, $this->dispatcher, $this->logger))->setHost($host)->setPort($port);`
`33`	`34`	`}`
`34`	`35`
`35`		`- if ('sendgrid+smtp' === $dsn->getScheme() \|\| 'sendgrid+smtps' === $dsn->getScheme() \|\| 'sendgrid' === $dsn->getScheme()) {`
	`36`	`+ if ('sendgrid+smtp' === $scheme \|\| 'sendgrid+smtps' === $scheme \|\| 'sendgrid' === $scheme) {`
`36`	`37`	`return new SendgridSmtpTransport($key, $this->dispatcher, $this->logger);`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public function testNullOnPrivateProtectedAccessor()`
`412`	`412`	`/**`
`413`	`413`	`* @requires PHP 7.4`
`414`	`414`	`*/`
`415`		`- public function testTypedProperties(): void`
	`415`	`+ public function testTypedProperties()`
`416`	`416`	`{`
`417`	`417`	`$this->assertEquals([new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)], $this->extractor->getTypes(Php74Dummy::class, 'dummy'));`
`418`	`418`	`$this->assertEquals([new Type(Type::BUILTIN_TYPE_BOOL, true)], $this->extractor->getTypes(Php74Dummy::class, 'nullableBoolProp'));`