minor #21965 [DependencyInjection Remove duplicated code (GuilhemN)

fabpot · fabpot · commit dd7c72728a02 · 2017-03-10T11:07:15.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DependencyInjection Remove duplicated code | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no  | BC breaks? | no | Deprecations? | no  | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR |  Arrays are already supported by `YamlFileLoader::resolveServices()` so there's no need to duplicate code. Commits ------- 1bac3d7 [DependencyInjection Remove duplicated code
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -666,7 +666,7 @@ private function resolveServices($value)
                     throw new InvalidArgumentException('"!iterator" tag only accepts sequences.');
                 }
 
-                return new IteratorArgument(array_map(array($this, 'resolveServices'), $argument));
+                return new IteratorArgument($this->resolveServices($argument));
             }
             if ('service_locator' === $value->getTag()) {
                 if (!is_array($argument)) {
@@ -679,7 +679,7 @@ private function resolveServices($value)
                     }
                 }
 
-                return new ServiceLocatorArgument(array_map(array($this, 'resolveServices'), $argument));
+                return new ServiceLocatorArgument($this->resolveServices($argument));
             }
             if ('closure_proxy' === $value->getTag()) {
                 if (!is_array($argument) || array(0, 1) !== array_keys($argument) || !is_string($argument[0]) || !is_string($argument[1]) || 0 !== strpos($argument[0], '@') || 0 === strpos($argument[0], '@@')) {

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ private function resolveServices($value)`
`666`	`666`	`throw new InvalidArgumentException('"!iterator" tag only accepts sequences.');`
`667`	`667`	`}`
`668`	`668`
`669`		`- return new IteratorArgument(array_map(array($this, 'resolveServices'), $argument));`
	`669`	`+ return new IteratorArgument($this->resolveServices($argument));`
`670`	`670`	`}`
`671`	`671`	`if ('service_locator' === $value->getTag()) {`
`672`	`672`	`if (!is_array($argument)) {`
`@@ -679,7 +679,7 @@ private function resolveServices($value)`
`679`	`679`	`}`
`680`	`680`	`}`
`681`	`681`
`682`		`- return new ServiceLocatorArgument(array_map(array($this, 'resolveServices'), $argument));`
	`682`	`+ return new ServiceLocatorArgument($this->resolveServices($argument));`
`683`	`683`	`}`
`684`	`684`	`if ('closure_proxy' === $value->getTag()) {`
`685`	`685`	`if (!is_array($argument) \|\| array(0, 1) !== array_keys($argument) \|\| !is_string($argument[0]) \|\| !is_string($argument[1]) \|\| 0 !== strpos($argument[0], '@') \|\| 0 === strpos($argument[0], '@@')) {`