[DX] Show the ParseException message in YAML file loaders

fancyweb · fancyweb · commit fc6cf3d3c690 · 2020-04-23T16:16:02.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -660,7 +660,7 @@ protected function loadFile($file)
         try {
             $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
         } catch (ParseException $e) {
-            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: '.$e->getMessage(), $file), 0, $e);
+            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $file).': '.$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -66,7 +66,7 @@ public function load($file, $type = null)
         try {
             $parsedConfig = $this->yamlParser->parseFile($path);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -47,7 +47,7 @@ protected function loadResource($resource)
         try {
             $messages = $this->yamlParser->parseFile($resource);
         } catch (ParseException $e) {
-            throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s".', $resource), 0, $e);
+            throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML', $resource).': '.$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -124,7 +124,7 @@ private function parseFile($path)
         try {
             $classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);
         } catch (ParseException $e) {
-            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
+            throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);
         } finally {
             restore_error_handler();
         }

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ protected function loadFile($file)`
`660`	`660`	`try {`
`661`	`661`	`$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT \| Yaml::PARSE_CUSTOM_TAGS);`
`662`	`662`	`} catch (ParseException $e) {`
`663`		`- throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: '.$e->getMessage(), $file), 0, $e);`
	`663`	`+ throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $file).': '.$e->getMessage(), 0, $e);`
`664`	`664`	`} finally {`
`665`	`665`	`restore_error_handler();`
`666`	`666`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function load($file, $type = null)`
`66`	`66`	`try {`
`67`	`67`	`$parsedConfig = $this->yamlParser->parseFile($path);`
`68`	`68`	`} catch (ParseException $e) {`
`69`		`- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);`
	`69`	`+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);`
`70`	`70`	`} finally {`
`71`	`71`	`restore_error_handler();`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function loadResource($resource)`
`47`	`47`	`try {`
`48`	`48`	`$messages = $this->yamlParser->parseFile($resource);`
`49`	`49`	`} catch (ParseException $e) {`
`50`		`- throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s".', $resource), 0, $e);`
	`50`	`+ throw new InvalidResourceException(sprintf('The file "%s" does not contain valid YAML', $resource).': '.$e->getMessage(), 0, $e);`
`51`	`51`	`} finally {`
`52`	`52`	`restore_error_handler();`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private function parseFile($path)`
`124`	`124`	`try {`
`125`	`125`	`$classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);`
`126`	`126`	`} catch (ParseException $e) {`
`127`		`- throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);`
	`127`	`+ throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML', $path).': '.$e->getMessage(), 0, $e);`
`128`	`128`	`} finally {`
`129`	`129`	`restore_error_handler();`
`130`	`130`	`}`