The 'config' variable is already used as an array expression less...

tecnocat · fabpot · commit f15d179fbd44 · 2015-10-01T15:23:50.000+02:00
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 {
-            $config = $this->yamlParser->parse(file_get_contents($path));
+            $parsedConfig = $this->yamlParser->parse(file_get_contents($path));
         } catch (ParseException $e) {
             throw new \InvalidArgumentException(sprintf('The file "%s" does not contain valid YAML.', $path), 0, $e);
         }
@@ -67,16 +67,16 @@ public function load($file, $type = null)
         $collection->addResource(new FileResource($path));
 
         // empty file
-        if (null === $config) {
+        if (null === $parsedConfig) {
             return $collection;
         }
 
         // not an array
-        if (!is_array($config)) {
+        if (!is_array($parsedConfig)) {
             throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));
         }
 
-        foreach ($config as $name => $config) {
+        foreach ($parsedConfig as $name => $config) {
             if (isset($config['pattern'])) {
                 if (isset($config['path'])) {
                     throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));

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`		`- $config = $this->yamlParser->parse(file_get_contents($path));`
	`61`	`+ $parsedConfig = $this->yamlParser->parse(file_get_contents($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`	`}`
`@@ -67,16 +67,16 @@ public function load($file, $type = null)`
`67`	`67`	`$collection->addResource(new FileResource($path));`
`68`	`68`
`69`	`69`	`// empty file`
`70`		`- if (null === $config) {`
	`70`	`+ if (null === $parsedConfig) {`
`71`	`71`	`return $collection;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// not an array`
`75`		`- if (!is_array($config)) {`
	`75`	`+ if (!is_array($parsedConfig)) {`
`76`	`76`	`throw new \InvalidArgumentException(sprintf('The file "%s" must contain a YAML array.', $path));`
`77`	`77`	`}`
`78`	`78`
`79`		`- foreach ($config as $name => $config) {`
	`79`	`+ foreach ($parsedConfig as $name => $config) {`
`80`	`80`	`if (isset($config['pattern'])) {`
`81`	`81`	`if (isset($config['path'])) {`
`82`	`82`	`throw new \InvalidArgumentException(sprintf('The file "%s" cannot define both a "path" and a "pattern" attribute. Use only "path".', $path));`