Skip to content

Commit f93e4ba

Browse files
Merge branch '3.4' into 4.4
* 3.4: [Filesystem] Handle paths on different drives [WebProfiler] Do not add src-elem CSP directives if they do not exist [Yaml] fix parse error when unindented collections contain a comment [3.4][Inflector] Improve testSingularize() argument name [PhpUnitBridge] fix PHP 5.3 compat again Skip validation when email is an empty object fix sr_Latn translation [Validator] fix lazy property usage. Fix annotation [PhpUnitBridge] fix compat with PHP 5.3 [DX] Show the ParseException message in YAML file loaders
2 parents 9d0c280 + 801d058 commit f93e4ba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ protected function loadFile($file)
690690
try {
691691
$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
692692
} catch (ParseException $e) {
693-
throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: '.$e->getMessage(), $file), 0, $e);
693+
throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $file).': '.$e->getMessage(), 0, $e);
694694
}
695695

696696
return $this->validate($configuration, $file);

0 commit comments

Comments
 (0)