Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 9541c55f45d1 · 2020-01-04T14:00:46.000+01:00
* 4.3:
  [Mailer] Remove line breaks in email attachment content
  Update links to documentation
  [Validator] Add the missing translations for the Arabic (ar) locale
  ensure to expect no validation for the right reasons
  [PhpUnitBridge] Add test case for @expectedDeprecation annotation
  [PhpUnitBridge][SymfonyTestsListenerTrait] Remove $testsWithWarnings stack
  [Mailer][MailchimpBridge] Fix missing attachments when sending via Mandrill API
  [Mailer][MailchimpBridge] Fix incorrect sender address when sender has name
  [HttpClient] fix capturing SSL certificates with NativeHttpClient
  [TwigBridge][Form] Added missing help messages in form themes
  Update year in license files
  Update year in license files
  [HttpClient] fix typo
  [Console][FormatterHelper] Use helper strlen statically and remove duplicated code
  [Routing] Fix i18n routing when the url contains the locale
  Fix BC issue in phpDoc Reflection library
  [Translator] Performance improvement in MessageCatalogue and catalogue operations.
diff --git a/Amazon/LICENSE b/Amazon/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Google/LICENSE b/Google/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Mailchimp/LICENSE b/Mailchimp/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Mailchimp/Transport/MandrillApiTransport.php b/Mailchimp/Transport/MandrillApiTransport.php
@@ -94,10 +94,14 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'type' => $headers->get('Content-Type')->getBody(),
             ];
 
+            if ($name = $headers->getHeaderParameter('Content-Disposition', 'name')) {
+                $att['name'] = $name;
+            }
+
             if ('inline' === $disposition) {
-                $payload['images'][] = $att;
+                $payload['message']['images'][] = $att;
             } else {
-                $payload['attachments'][] = $att;
+                $payload['message']['attachments'][] = $att;
             }
         }
 
diff --git a/Mailgun/LICENSE b/Mailgun/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/MandrillApiTransport.php b/MandrillApiTransport.php
@@ -94,10 +94,14 @@ private function getPayload(Email $email, Envelope $envelope): array
                 'type' => $headers->get('Content-Type')->getBody(),
             ];
 
+            if ($name = $headers->getHeaderParameter('Content-Disposition', 'name')) {
+                $att['name'] = $name;
+            }
+
             if ('inline' === $disposition) {
-                $payload['images'][] = $att;
+                $payload['message']['images'][] = $att;
             } else {
-                $payload['attachments'][] = $att;
+                $payload['message']['attachments'][] = $att;
             }
         }
 
diff --git a/Postmark/LICENSE b/Postmark/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Sendgrid/LICENSE b/Sendgrid/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Fabien Potencier
+Copyright (c) 2019-2020 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Sendgrid/Tests/Transport/SendgridApiTransportTest.php b/Sendgrid/Tests/Transport/SendgridApiTransportTest.php
@@ -97,4 +97,56 @@ public function testSend()
         $mailer = new SendgridApiTransport('foo', $httpClient);
         $mailer->send($email);
     }
+
+    public function testLineBreaksInEncodedAttachment()
+    {
+        $email = new Email();
+        $email->from('foo@example.com')
+            ->to('bar@example.com')
+            // even if content doesn't include new lines, the base64 encoding performed later may add them
+            ->attach('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod', 'lorem.txt');
+
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response
+            ->expects($this->once())
+            ->method('getStatusCode')
+            ->willReturn(202);
+        $response
+            ->expects($this->once())
+            ->method('getHeaders')
+            ->willReturn(['x-message-id' => '1']);
+
+        $httpClient = $this->createMock(HttpClientInterface::class);
+
+        $httpClient
+            ->expects($this->once())
+            ->method('request')
+            ->with('POST', 'https://api.sendgrid.com/v3/mail/send', [
+                'json' => [
+                    'personalizations' => [
+                        [
+                            'to' => [['email' => 'bar@example.com']],
+                            'subject' => null,
+                        ],
+                    ],
+                    'from' => ['email' => 'foo@example.com'],
+                    'content' => [],
+                    'attachments' => [
+                        [
+                            'content' => 'TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2Q=',
+                            'filename' => 'lorem.txt',
+                            'type' => 'application/octet-stream',
+                            'disposition' => 'attachment',
+                        ],
+                    ],
+                ],
+                'auth_bearer' => 'foo',
+            ])
+            ->willReturn($response);
+
+        $mailer = new SendgridApiTransport('foo', $httpClient);
+
+        $mailer->send($email);
+    }
 }
diff --git a/Sendgrid/Transport/SendgridApiTransport.php b/Sendgrid/Transport/SendgridApiTransport.php
@@ -132,7 +132,7 @@ private function getAttachments(Email $email): array
             $disposition = $headers->getHeaderBody('Content-Disposition');
 
             $att = [
-                'content' => $attachment->bodyToString(),
+                'content' => str_replace("\r\n", '', $attachment->bodyToString()),
                 'type' => $headers->get('Content-Type')->getBody(),
                 'filename' => $filename,
                 'disposition' => $disposition,
diff --git a/SendgridApiTransport.php b/SendgridApiTransport.php
@@ -132,7 +132,7 @@ private function getAttachments(Email $email): array
             $disposition = $headers->getHeaderBody('Content-Disposition');
 
             $att = [
-                'content' => $attachment->bodyToString(),
+                'content' => str_replace("\r\n", '', $attachment->bodyToString()),
                 'type' => $headers->get('Content-Type')->getBody(),
                 'filename' => $filename,
                 'disposition' => $disposition,
diff --git a/SendgridApiTransportTest.php b/SendgridApiTransportTest.php
@@ -97,4 +97,56 @@ public function testSend()
         $mailer = new SendgridApiTransport('foo', $httpClient);
         $mailer->send($email);
     }
+
+    public function testLineBreaksInEncodedAttachment()
+    {
+        $email = new Email();
+        $email->from('foo@example.com')
+            ->to('bar@example.com')
+            // even if content doesn't include new lines, the base64 encoding performed later may add them
+            ->attach('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod', 'lorem.txt');
+
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response
+            ->expects($this->once())
+            ->method('getStatusCode')
+            ->willReturn(202);
+        $response
+            ->expects($this->once())
+            ->method('getHeaders')
+            ->willReturn(['x-message-id' => '1']);
+
+        $httpClient = $this->createMock(HttpClientInterface::class);
+
+        $httpClient
+            ->expects($this->once())
+            ->method('request')
+            ->with('POST', 'https://api.sendgrid.com/v3/mail/send', [
+                'json' => [
+                    'personalizations' => [
+                        [
+                            'to' => [['email' => 'bar@example.com']],
+                            'subject' => null,
+                        ],
+                    ],
+                    'from' => ['email' => 'foo@example.com'],
+                    'content' => [],
+                    'attachments' => [
+                        [
+                            'content' => 'TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdCwgc2VkIGRvIGVpdXNtb2Q=',
+                            'filename' => 'lorem.txt',
+                            'type' => 'application/octet-stream',
+                            'disposition' => 'attachment',
+                        ],
+                    ],
+                ],
+                'auth_bearer' => 'foo',
+            ])
+            ->willReturn($response);
+
+        $mailer = new SendgridApiTransport('foo', $httpClient);
+
+        $mailer->send($email);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2019 Fabien Potencier`
	`1`	`+Copyright (c) 2019-2020 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`