Merge branch '4.4' into 5.1

derrabus · derrabus · commit 205c8bf16ba8 · 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/Tests/Mime/BodyRendererTest.php b/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!']);

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!']);`