diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
index aef68c7b2fa13..0612abfffc54e 100644
--- a/src/Symfony/Component/Yaml/Inline.php
+++ b/src/Symfony/Component/Yaml/Inline.php
@@ -320,7 +320,11 @@ private static function dumpArray($value, $flags)
*/
public static function parseScalar($scalar, $flags = 0, $delimiters = null, &$i = 0, $evaluate = true, $references = [], $legacyOmittedKeySupport = false)
{
- if (\in_array($scalar[$i], ['"', "'"])) {
+ if ('' === $scalar = (string) $scalar) {
+ return '';
+ }
+
+ if (isset($scalar[$i]) && \in_array($scalar[$i], ['"', "'"])) {
// quoted scalar
$output = self::parseQuotedScalar($scalar, $i);
@@ -513,7 +517,7 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = []
}
if (!$isKeyQuoted) {
- $evaluatedKey = self::evaluateScalar($key, $flags, $references);
+ $evaluatedKey = self::evaluateScalar($key, $flags, $references, true);
if ('' !== $key && $evaluatedKey !== $key && !\is_string($evaluatedKey) && !\is_int($evaluatedKey)) {
@trigger_error(self::getDeprecationMessage('Implicit casting of incompatible mapping keys to strings is deprecated since Symfony 3.3 and will throw \Symfony\Component\Yaml\Exception\ParseException in 4.0. Quote your evaluable mapping keys instead.'), E_USER_DEPRECATED);
@@ -611,12 +615,13 @@ private static function parseMapping($mapping, $flags, &$i = 0, $references = []
* @param string $scalar
* @param int $flags
* @param array $references
+ * @param bool $isMappingKey
*
* @return mixed The evaluated YAML string
*
* @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
*/
- private static function evaluateScalar($scalar, $flags, $references = [])
+ private static function evaluateScalar($scalar, $flags, $references = [], $isMappingKey = false)
{
$scalar = trim($scalar);
$scalarLower = strtolower($scalar);
@@ -712,6 +717,10 @@ private static function evaluateScalar($scalar, $flags, $references = [])
return null;
case 0 === strpos($scalar, '!php/const'):
if (self::$constantSupport) {
+ if ($isMappingKey) {
+ throw new ParseException('The !php/const tag is not supported in a mapping key.', self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
+ }
+
$i = 0;
if (\defined($const = self::parseScalar(substr($scalar, 11), 0, null, $i, false))) {
return \constant($const);
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 3f3b913f7b6f1..d44b508b1ebaf 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -797,4 +797,29 @@ public function getTestsForOctalNumbers()
'negative octal number' => [-28, '-034'],
];
}
+
+ public function testParseScalarDoesNotFailWithAnEmptyString()
+ {
+ $this->assertSame('', Inline::parseScalar(''));
+ }
+
+ /**
+ * @dataProvider phpConstTagInAMappingKeyThrowsProvider
+ */
+ public function testPhpConstTagInAMappingKeyThrows($extra)
+ {
+ $this->expectException(ParseException::class);
+ $this->expectExceptionMessage('The !php/const tag is not supported in a mapping key at line 1 (near "!php/const").');
+
+ Inline::parse(sprintf('{!php/const%s: foo}', $extra), Yaml::PARSE_CONSTANT);
+ }
+
+ public function phpConstTagInAMappingKeyThrowsProvider()
+ {
+ return [
+ [''],
+ [' '],
+ [' MyConst'],
+ ];
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy