minor #29928 [DependencyInjection] forward the parse error to the calling code (xabbuh)

fabpot · fabpot · commit 333b544d8b62 · 2019-01-20T09:19:46.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DependencyInjection] forward the parse error to the calling code | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #29891 | License | MIT | Doc PR | This change does not fully solve the linked issue, but improves the exception a bit by providing a bit more context. The error page will no start like this: ![bildschirmfoto 2019-01-18 um 12 28 14](https://user-images.githubusercontent.com/1957048/51384558-f7af3600-1b1c-11e9-9744-a40c41c821ce.png) Commits ------- c5c2d31 forward the parse error to the calling code
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -383,7 +383,7 @@ private function parseFileToDOM($file)
         try {
             $dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);
         } catch (\InvalidArgumentException $e) {
-            throw new InvalidArgumentException(sprintf('Unable to parse file "%s".', $file), $e->getCode(), $e);
+            throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s', $file, $e->getMessage()), $e->getCode(), $e);
         }
 
         $this->validateExtensions($dom, $file);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -666,7 +666,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.', $file), 0, $e);
+            throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s', $file, $e->getMessage()), 0, $e);
         } finally {
             restore_error_handler();
         }

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ private function parseFileToDOM($file)`
`383`	`383`	`try {`
`384`	`384`	`$dom = XmlUtils::loadFile($file, [$this, 'validateSchema']);`
`385`	`385`	`} catch (\InvalidArgumentException $e) {`
`386`		`- throw new InvalidArgumentException(sprintf('Unable to parse file "%s".', $file), $e->getCode(), $e);`
	`386`	`+ throw new InvalidArgumentException(sprintf('Unable to parse file "%s": %s', $file, $e->getMessage()), $e->getCode(), $e);`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`$this->validateExtensions($dom, $file);`
Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ protected function loadFile($file)`
`666`	`666`	`try {`
`667`	`667`	`$configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT \| Yaml::PARSE_CUSTOM_TAGS);`
`668`	`668`	`} catch (ParseException $e) {`
`669`		`- throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);`
	`669`	`+ throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML: %s', $file, $e->getMessage()), 0, $e);`
`670`	`670`	`} finally {`
`671`	`671`	`restore_error_handler();`
`672`	`672`	`}`