Skip to content

Commit c43dbd3

Browse files
Merge branch '7.4' into 8.0
* 7.4: (31 commits) [Validator] Update Romanian translations fix tests [JsonStreamer] Fix decoding iterable lists [String][Inflector] Fix edge cases [Serializer][Validator] Add JSON schema for validating and autocompleting YAML config files [DependencyInjection] Allow adding resource tags using any config formats Fix merge Add missing Sweego Mailer Bridge webhook events [Security] Fix attribute-based chained user providers [Intl] Fix Intl::getIcuStubVersion() [Intl] Add methods to filter currencies more precisely [Notifier] Add tests for option classes Sync intl scripts [Intl] Add metadata about currencies' validtity dates Bump Symfony version to 7.3.4 Update VERSION for 7.3.3 Update CHANGELOG for 7.3.3 Bump Symfony version to 6.4.26 Update VERSION for 6.4.25 Update CONTRIBUTORS for 6.4.25 ...
2 parents 6c3e8e8 + 87fee1e commit c43dbd3

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
@@ -58,6 +58,7 @@ public static function getTestsForParsePhpConstants()
5858
['{ foo: !php/const PHP_INT_MAX }', ['foo' => \PHP_INT_MAX]],
5959
['{ !php/const PHP_INT_MAX: foo }', [\PHP_INT_MAX => 'foo']],
6060
['!php/const NULL', null],
61+
['{ !php/const Symfony\Component\Yaml\Yaml::PARSE_CONSTANT: foo }', [Yaml::PARSE_CONSTANT => 'foo']],
6162
];
6263
}
6364

0 commit comments

Comments
 (0)