Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 399f377168f8 · 2020-05-04T17:32:48.000+02:00
* 3.4:
  Fix exception messages containing exception messages
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -62,7 +62,7 @@ public function load($file, $type = null)
         try {
             $parsedConfig = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);
         }
 
         $collection = new RouteCollection();

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function load($file, $type = null)`
`62`	`62`	`try {`
`63`	`63`	`$parsedConfig = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);`
`64`	`64`	`} catch (ParseException $e) {`
`65`		`- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);`
	`65`	`+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$collection = new RouteCollection();`