Merge branch '6.4' into 7.1

* 6.4:
  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

Parser.php

@@ -1201,7 +1201,7 @@ private function lexInlineStructure(int &$cursor, string $closingTag, bool $cons
                         $value .= $this->currentLine[$cursor];
                         ++$cursor;
 
-                        if ($consumeUntilEol && isset($this->currentLine[$cursor]) && (strspn($this->currentLine, ' ', $cursor) + $cursor) < strlen($this->currentLine)) {
+                        if ($consumeUntilEol && isset($this->currentLine[$cursor]) && ($whitespaces = strspn($this->currentLine, ' ', $cursor) + $cursor) < strlen($this->currentLine) && '#' !== $this->currentLine[$whitespaces]) {
                             throw new ParseException(sprintf('Unexpected token "%s".', trim(substr($this->currentLine, $cursor))));
                         }
 

Tests/ParserTest.php

@@ -2158,6 +2158,19 @@ public static function inlineNotationSpanningMultipleLinesProvider(): array
                 <<<YAML
 map: {key: "value", a: "b"}
 param: "some"
+YAML
+            ],
+            'mixed mapping with inline notation on one line with a comment' => [
+                [
+                    'map' => [
+                        'key' => 'value',
+                        'a' => 'b',
+                    ],
+                    'param' => 'some',
+                ],
+                <<<YAML
+map: {key: "value", a: "b"} # comment
+param: "some"
 YAML
             ],
             'mixed mapping with compact inline notation on one line' => [