Merge branch '5.4' into 6.0

* 5.4:
  Fix nullable parameter doc
  don't try to replace references in quoted strings

Author: fabpot

Inline.php

@@ -365,7 +365,7 @@ private static function parseSequence(string $sequence, int $flags, int &$i = 0,
                         }
                     }
 
-                    if (\is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
+                    if (!$isQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
                         $references[$matches['ref']] = $matches['value'];
                         $value = $matches['value'];
                     }
@@ -497,6 +497,7 @@ private static function parseMapping(string $mapping, int $flags, int &$i = 0, a
                         }
                         break;
                     default:
+                        $isValueQuoted = \in_array($mapping[$i], ['"', "'"]);
                         $value = self::parseScalar($mapping, $flags, [',', '}', "\n"], $i, null === $tag, $references);
                         // Spec: Keys MUST be unique; first one wins.
                         // Parser cannot abort this mapping earlier, since lines
@@ -505,7 +506,7 @@ private static function parseMapping(string $mapping, int $flags, int &$i = 0, a
                         if ('<<' === $key) {
                             $output += $value;
                         } elseif ($allowOverwrite || !isset($output[$key])) {
-                            if (\is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
+                            if (!$isValueQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
                                 $references[$matches['ref']] = $matches['value'];
                                 $value = $matches['value'];
                             }

Tests/InlineTest.php

@@ -923,4 +923,22 @@ public function ideographicSpaceProvider(): array
             ["'a　b'", 'a　b'],
         ];
     }
+
+    public function testParseQuotedReferenceLikeStringsInMapping()
+    {
+        $yaml = <<<YAML
+{foo: '&foo', bar: "&bar"}
+YAML;
+
+        $this->assertSame(['foo' => '&foo', 'bar' => '&bar'], Inline::parse($yaml));
+    }
+
+    public function testParseQuotedReferenceLikeStringsInSequence()
+    {
+        $yaml = <<<YAML
+['&foo', "&bar" ]
+YAML;
+
+        $this->assertSame(['&foo', '&bar'], Inline::parse($yaml));
+    }
 }