Review fixes

ogizanagi · ogizanagi · commit cfdc5286a431 · 2017-01-30T10:52:07.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -967,17 +967,6 @@ public function resolveServices($value)
         } elseif ($value instanceof IteratorArgument) {
             $parameterBag = $this->getParameterBag();
 
-            $count = 0;
-            foreach ($value->getValues() as $k => $v) {
-                foreach (self::getServiceConditionals($v) as $s) {
-                    if (!$this->has($s)) {
-                        continue 2;
-                    }
-                }
-
-                ++$count;
-            }
-
             $value = new RewindableGenerator(function () use ($value, $parameterBag) {
                 foreach ($value->getValues() as $k => $v) {
                     foreach (self::getServiceConditionals($v) as $s) {
@@ -988,7 +977,18 @@ public function resolveServices($value)
 
                     yield $k => $this->resolveServices($parameterBag->unescapeValue($parameterBag->resolveValue($v)));
                 }
-            }, $count);
+            }, function () use ($value) {
+                $count = 0;
+                foreach ($value->getValues() as $v) {
+                    foreach (self::getServiceConditionals($v) as $s) {
+                        if (!$this->has($s)) {
+                            continue 2;
+                        }
+                    }
+
+                    ++$count;
+                }
+            });
         } elseif ($value instanceof ClosureProxyArgument) {
             $parameterBag = $this->getParameterBag();
             list($reference, $method) = $value->getValues();
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1409,15 +1409,15 @@ private function dumpValue($value, $interpolate = true)
 
             $code = array();
             $code[] = 'new RewindableGenerator(function() {';
-            foreach ($value->getValues() as $k => $value) {
-                $v = $this->wrapServiceConditionals($value, sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($value, $interpolate)));
-                foreach (explode("\n", $v) as $v) {
-                    if ($v) {
-                        $code[] = '    '.$v;
+            foreach ($value->getValues() as $k => $v) {
+                $y = $this->wrapServiceConditionals($v, sprintf("        yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));
+                foreach (explode("\n", $y) as $y) {
+                    if ($y) {
+                        $code[] = '    '.$y;
                     }
                 }
 
-                ($c = $this->getServiceConditionals($value)) ? $operands[] = "(int) ($c)" : ++$operands[0];
+                ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];
             }
 
             $countCode[] = sprintf('            return %s;', implode(' + ', $operands));

Original file line number	Diff line number	Diff line change
`@@ -1409,15 +1409,15 @@ private function dumpValue($value, $interpolate = true)`
`1409`	`1409`
`1410`	`1410`	`$code = array();`
`1411`	`1411`	`$code[] = 'new RewindableGenerator(function() {';`
`1412`		`- foreach ($value->getValues() as $k => $value) {`
`1413`		`- $v = $this->wrapServiceConditionals($value, sprintf(" yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($value, $interpolate)));`
`1414`		`- foreach (explode("\n", $v) as $v) {`
`1415`		`- if ($v) {`
`1416`		`- $code[] = ' '.$v;`
	`1412`	`+ foreach ($value->getValues() as $k => $v) {`
	`1413`	`+ $y = $this->wrapServiceConditionals($v, sprintf(" yield %s => %s;\n", $this->dumpValue($k, $interpolate), $this->dumpValue($v, $interpolate)));`
	`1414`	`+ foreach (explode("\n", $y) as $y) {`
	`1415`	`+ if ($y) {`
	`1416`	`+ $code[] = ' '.$y;`
`1417`	`1417`	`}`
`1418`	`1418`	`}`
`1419`	`1419`
`1420`		`- ($c = $this->getServiceConditionals($value)) ? $operands[] = "(int) ($c)" : ++$operands[0];`
	`1420`	`+ ($c = $this->getServiceConditionals($v)) ? $operands[] = "(int) ($c)" : ++$operands[0];`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`	`1423`	`$countCode[] = sprintf(' return %s;', implode(' + ', $operands));`