minor changes

weaverryan · weaverryan · commit 260731b8069c · 2016-02-28T19:33:45.000-05:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -71,16 +71,15 @@ private function completeDefinition($id, Definition $definition)
 
         $arguments = $definition->getArguments();
         foreach ($constructor->getParameters() as $index => $parameter) {
-            $argumentExists = array_key_exists($index, $arguments);
-            if ($argumentExists && '' !== $arguments[$index]) {
+            if (array_key_exists($index, $arguments) && '' !== $arguments[$index]) {
                 continue;
             }
 
             try {
                 if (!$typeHint = $parameter->getClass()) {
                     // no default value? Then fail
                     if (!$parameter->isOptional()) {
-                        throw new RuntimeException(sprintf('Unable to autowire argument index %s ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));
+                        throw new RuntimeException(sprintf('Unable to autowire argument index %d ($%s) for the service "%s". If this is an object, give it a type-hint. Otherwise, specify this argument\'s value explicitly.', $index, $parameter->name, $id));
                     }
 
                     // specifically pass the default value
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -545,4 +545,4 @@ class MultipleArgumentsOptionalScalarNotReallyOptional
     public function __construct(A $a, $foo = 'default_val', Lille $lille)
     {
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -545,4 +545,4 @@ class MultipleArgumentsOptionalScalarNotReallyOptional`
`545`	`545`	`public function __construct(A $a, $foo = 'default_val', Lille $lille)`
`546`	`546`	`{`
`547`	`547`	`}`
`548`		`-}`
	`548`	`+}`