Skip to content

Commit d4f4a66

Browse files
Merge branch '6.4' into 7.3
* 6.4: [Validator] Skip tests using unavailable timezone on the local host [Yaml] Fix scope resolution operator in flow mapping keys
2 parents b8d7d86 + e54b060 commit d4f4a66

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Inline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private static function parseMapping(string $mapping, int $flags, int &$i = 0, a
459459
}
460460

461461
if ('!php/const' === $key || '!php/enum' === $key) {
462-
$key .= ' '.self::parseScalar($mapping, $flags, [':'], $i, false);
462+
$key .= ' '.self::parseScalar($mapping, $flags, ['(?<!:):(?!:)'], $i, false);
463463
$key = self::evaluateScalar($key, $flags);
464464
}
465465

Tests/InlineTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public static function getTestsForParsePhpConstants()
6363
['{ foo: !php/const PHP_INT_MAX }', ['foo' => \PHP_INT_MAX]],
6464
['{ !php/const PHP_INT_MAX: foo }', [\PHP_INT_MAX => 'foo']],
6565
['!php/const NULL', null],
66+
['{ !php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT: foo }', [Yaml::PARSE_CONSTANT => 'foo']],
6667
];
6768
}
6869

0 commit comments

Comments
 (0)