Merge branch '7.1' into 7.2

* 7.1:
  Remove comment about AppVeyor in `phpunit`
  [Webhook][RemoteEvent] fix SendgridPayloadConverter category support
  Update old Appveyor skip conditions
  sync the Dutch translation file with changes from the 7.2 branch
  [Yaml] fix inline notation with inline comment
  fix(property-info): make sure that SerializerExtractor returns null for invalid class metadata
  [RemoteEvent][Webhook] fix SendgridRequestParser & SendgridPayloadConverter in case of missing sg_message_id
  fix_50486 - memory leak

Author: xabbuh

phpunit

@@ -1,10 +1,6 @@
 #!/usr/bin/env php
 <?php
 
-// Cache-Id: 2021-05-27 20:30 UTC
-// For caching to work properly on appveyor, this file
-// must be exactly the same in all maintained branches
-
 if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
     echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\nPlease run `composer update` before running this command.\n";
     exit(1);

src/Symfony/Component/Mailer/Bridge/Sendgrid/RemoteEvent/SendgridPayloadConverter.php

@@ -31,7 +31,7 @@ public function convert(array $payload): AbstractMailerEvent
                 'deferred' => MailerDeliveryEvent::DEFERRED,
                 'bounce' => MailerDeliveryEvent::BOUNCE,
             };
-            $event = new MailerDeliveryEvent($name, $payload['sg_message_id'], $payload);
+            $event = new MailerDeliveryEvent($name, $payload['sg_message_id'] ?? $payload['sg_event_id'], $payload);
             $event->setReason($payload['reason'] ?? '');
         } else {
             $name = match ($payload['event']) {
@@ -41,7 +41,7 @@ public function convert(array $payload): AbstractMailerEvent
                 'spamreport' => MailerEngagementEvent::SPAM,
                 default => throw new ParseException(\sprintf('Unsupported event "%s".', $payload['event'])),
             };
-            $event = new MailerEngagementEvent($name, $payload['sg_message_id'], $payload);
+            $event = new MailerEngagementEvent($name, $payload['sg_message_id'] ?? $payload['sg_event_id'], $payload);
         }
 
         if (!$date = \DateTimeImmutable::createFromFormat('U', $payload['timestamp'])) {
@@ -51,7 +51,7 @@ public function convert(array $payload): AbstractMailerEvent
         $event->setDate($date);
         $event->setRecipientEmail($payload['email']);
         $event->setMetadata([]);
-        $event->setTags($payload['category'] ?? []);
+        $event->setTags((array) ($payload['category'] ?? []));
 
         return $event;
     }

src/Symfony/Component/Mailer/Bridge/Sendgrid/Tests/RemoteEvent/SendgridPayloadConverterTest.php

@@ -97,4 +97,35 @@ public function testInvalidDate()
             'email' => 'test@example.com',
         ]);
     }
+
+    public function testAsynchronousBounce()
+    {
+        $converter = new SendgridPayloadConverter();
+
+        $event = $converter->convert([
+            'event' => 'bounce',
+            'sg_event_id' => '123456',
+            'timestamp' => '123456789',
+            'email' => 'test@example.com',
+        ]);
+
+        $this->assertInstanceOf(MailerDeliveryEvent::class, $event);
+        $this->assertSame('123456', $event->getId());
+    }
+
+    public function testWithStringCategory()
+    {
+        $converter = new SendgridPayloadConverter();
+
+        $event = $converter->convert([
+            'event' => 'processed',
+            'sg_message_id' => '123456',
+            'timestamp' => '123456789',
+            'email' => 'test@example.com',
+            'category' => 'cat facts',
+        ]);
+
+        $this->assertInstanceOf(MailerDeliveryEvent::class, $event);
+        $this->assertSame(['cat facts'], $event->getTags());
+    }
 }

src/Symfony/Component/Mailer/Bridge/Sendgrid/Webhook/SendgridRequestParser.php

@@ -51,7 +51,7 @@ protected function doParse(Request $request, string $secret): array
             !isset($content[0]['email'])
             || !isset($content[0]['timestamp'])
             || !isset($content[0]['event'])
-            || !isset($content[0]['sg_message_id'])
+            || !isset($content[0]['sg_event_id'])
         ) {
             throw new RejectWebhookException(406, 'Payload is malformed.');
         }

src/Symfony/Component/Mailer/Transport/SendmailTransport.php

@@ -114,7 +114,7 @@ protected function doSend(SentMessage $message): void
         $this->stream->setCommand($command);
         $this->stream->initialize();
         foreach ($chunks as $chunk) {
-            $this->stream->write($chunk);
+            $this->stream->write($chunk, false);
         }
         $this->stream->flush();
         $this->stream->terminate();

src/Symfony/Component/PropertyInfo/Extractor/SerializerExtractor.php

@@ -34,7 +34,7 @@ public function getProperties(string $class, array $context = []): ?array
             return null;
         }
 
-        if (!$this->classMetadataFactory->getMetadataFor($class)) {
+        if (!$this->classMetadataFactory->hasMetadataFor($class)) {
             return null;
         }
 

src/Symfony/Component/PropertyInfo/Tests/Extractor/SerializerExtractorTest.php

@@ -49,4 +49,9 @@ public function testGetPropertiesWithAnyGroup()
     {
         $this->assertSame(['analyses', 'feet'], $this->extractor->getProperties(AdderRemoverDummy::class, ['serializer_groups' => null]));
     }
+
+    public function testGetPropertiesWithNonExistentClassReturnsNull()
+    {
+        $this->assertSame(null, $this->extractor->getProperties('NonExistent'));
+    }
 }

src/Symfony/Component/Validator/Resources/translations/validators.nl.xlf

@@ -466,6 +466,10 @@
                 <source>This value should not be after week "{{ max }}".</source>
                 <target>Deze waarde mag niet na week "{{ max }}" liggen.</target>
             </trans-unit>
+            <trans-unit id="120">
+                <source>This value is not a valid slug.</source>
+                <target state="needs-review-translation">Deze waarde is geen geldige slug.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php

@@ -39,8 +39,8 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
 
     public function testDump()
     {
-        if ('True' === getenv('APPVEYOR')) {
-            $this->markTestSkipped('Skip transient test on AppVeyor');
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Skip transient test on Windows');
         }
 
         $wrappedDumper = $this->createMock(DataDumperInterface::class);

src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php

@@ -24,8 +24,8 @@ class ConnectionTest extends TestCase
 
     public function testDump()
     {
-        if ('True' === getenv('APPVEYOR')) {
-            $this->markTestSkipped('Skip transient test on AppVeyor');
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Skip transient test on Windows');
         }
 
         $cloner = new VarCloner();