minor #24322 [DependencyInjection][Routing][Serializer][Translations][Validator] use the parseFile() method of the YAML parser (xabbuh)

fabpot · fabpot · commit 3f29df408ddc · 2017-09-26T05:05:38.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [DependencyInjection][Routing][Serializer][Translations][Validator] use the parseFile() method of the YAML parser | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24253 (comment) | License | MIT | Doc PR | Commits ------- 8bf465f use the parseFile() method of the YAML parser
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -654,7 +654,7 @@ protected function loadFile($file)
         }
 
         try {
-            $configuration = $this->yamlParser->parse(file_get_contents($file), Yaml::PARSE_CONSTANT | Yaml::PARSE_CUSTOM_TAGS);
+            $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);
         }
diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php
@@ -58,7 +58,7 @@ public function load($file, $type = null)
         }
 
         try {
-            $parsedConfig = $this->yamlParser->parse(file_get_contents($path));
+            $parsedConfig = $this->yamlParser->parseFile($path);
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
         }
diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json
@@ -21,7 +21,7 @@
     "require-dev": {
         "symfony/config": "~2.8|~3.0|~4.0",
         "symfony/http-foundation": "~2.8|~3.0|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
+        "symfony/yaml": "~3.4|~4.0",
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~3.3|~4.0",
         "doctrine/annotations": "~1.0",
@@ -31,7 +31,7 @@
     "conflict": {
         "symfony/config": "<2.8",
         "symfony/dependency-injection": "<3.3",
-        "symfony/yaml": "<3.3"
+        "symfony/yaml": "<3.4"
     },
     "suggest": {
         "symfony/http-foundation": "For using a Symfony Request object",
diff --git a/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Serializer/Mapping/Loader/YamlFileLoader.php
@@ -113,7 +113,7 @@ private function getClassesFromYaml()
             $this->yamlParser = new Parser();
         }
 
-        $classes = $this->yamlParser->parse(file_get_contents($this->file));
+        $classes = $this->yamlParser->parseFile($this->file);
 
         if (empty($classes)) {
             return array();
diff --git a/src/Symfony/Component/Translation/Loader/YamlFileLoader.php b/src/Symfony/Component/Translation/Loader/YamlFileLoader.php
@@ -39,7 +39,7 @@ protected function loadResource($resource)
         }
 
         try {
-            $messages = $this->yamlParser->parse(file_get_contents($resource));
+            $messages = $this->yamlParser->parseFile($resource);
         } catch (ParseException $e) {
             throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
         }
diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json
@@ -23,14 +23,14 @@
         "symfony/config": "~2.8|~3.0|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/intl": "^2.8.18|^3.2.5|~4.0",
-        "symfony/yaml": "~3.3|~4.0",
+        "symfony/yaml": "~3.4|~4.0",
         "symfony/finder": "~2.8|~3.0|~4.0",
         "psr/log": "~1.0"
     },
     "conflict": {
         "symfony/config": "<2.8",
         "symfony/dependency-injection": "<3.4",
-        "symfony/yaml": "<3.3"
+        "symfony/yaml": "<3.4"
     },
     "suggest": {
         "symfony/config": "",
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -116,7 +116,7 @@ protected function parseNodes(array $nodes)
     private function parseFile($path)
     {
         try {
-            $classes = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_CONSTANT);
+            $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);
         }

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,7 @@ protected function loadFile($file)`
`654`	`654`	`}`
`655`	`655`
`656`	`656`	`try {`
`657`		`- $configuration = $this->yamlParser->parse(file_get_contents($file), Yaml::PARSE_CONSTANT \| Yaml::PARSE_CUSTOM_TAGS);`
	`657`	`+ $configuration = $this->yamlParser->parseFile($file, Yaml::PARSE_CONSTANT \| Yaml::PARSE_CUSTOM_TAGS);`
`658`	`658`	`} catch (ParseException $e) {`
`659`	`659`	`throw new InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $file), 0, $e);`
`660`	`660`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function load($file, $type = null)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`try {`
`61`		`- $parsedConfig = $this->yamlParser->parse(file_get_contents($path));`
	`61`	`+ $parsedConfig = $this->yamlParser->parseFile($path);`
`62`	`62`	`} catch (ParseException $e) {`
`63`	`63`	`throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ private function getClassesFromYaml()`
`113`	`113`	`$this->yamlParser = new Parser();`
`114`	`114`	`}`
`115`	`115`
`116`		`- $classes = $this->yamlParser->parse(file_get_contents($this->file));`
	`116`	`+ $classes = $this->yamlParser->parseFile($this->file);`
`117`	`117`
`118`	`118`	`if (empty($classes)) {`
`119`	`119`	`return array();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected function loadResource($resource)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`try {`
`42`		`- $messages = $this->yamlParser->parse(file_get_contents($resource));`
	`42`	`+ $messages = $this->yamlParser->parseFile($resource);`
`43`	`43`	`} catch (ParseException $e) {`
`44`	`44`	`throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ protected function parseNodes(array $nodes)`
`116`	`116`	`private function parseFile($path)`
`117`	`117`	`{`
`118`	`118`	`try {`
`119`		`- $classes = $this->yamlParser->parse(file_get_contents($path), Yaml::PARSE_CONSTANT);`
	`119`	`+ $classes = $this->yamlParser->parseFile($path, Yaml::PARSE_CONSTANT);`
`120`	`120`	`} catch (ParseException $e) {`
`121`	`121`	`throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);`
`122`	`122`	`}`