Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit 119dcdf2c0af · 2020-05-04T17:54:21.000+02:00
* 5.0:
  Use PHP 7.2 minimum in tests run with github actions
  Fix exception messages containing exception messages
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -67,7 +67,7 @@ public function load($file, string $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
`@@ -67,7 +67,7 @@ public function load($file, string $type = null)`
`67`	`67`	`try {`
`68`	`68`	`$parsedConfig = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);`
`69`	`69`	`} catch (ParseException $e) {`
`70`		`- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);`
	`70`	`+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: ', $path).$e->getMessage(), 0, $e);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`$collection = new RouteCollection();`