symfony
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/ChildDefinition.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ChildDefinition.php
+5-3Lines changed: 5 additions & 3 deletions b/Collapse file
‎src/Symfony/Component/DependencyInjection/ChildDefinition.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ChildDefinition.php
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+3-2Lines changed: 3 additions & 2 deletions b/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
+9-5Lines changed: 9 additions & 5 deletions b/Collapse file
‎src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
+9-5Lines changed: 9 additions & 5 deletions
diff --git a/Collapse file
‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
-1Lines changed: 0 additions & 1 deletion b/Collapse file
‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php‎
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
-1Lines changed: 0 additions & 1 deletion
@@ -213,12 +213,14 @@ public function getArgument($index)
      */
     public function replaceArgument($index, $value)
     {
-        if (!is_int($index)) {
+        if (is_int($index)) {
+            $this->arguments['index_'.$index] = $value;
+        } elseif (0 === strpos($index, '$')) {
+            $this->arguments[$index] = $value;
+        } else {
             throw new InvalidArgumentException('$index must be an integer.');
         }
 
-        $this->arguments['index_'.$index] = $value;
-
         return $this;
     }
 }
 
@@ -145,11 +145,12 @@ private function doResolveDefinition(ChildDefinition $definition)
                 continue;
             }
 
-            if (0 !== strpos($k, 'index_')) {
+            if (0 === strpos($k, 'index_')) {
+                $index = (int) substr($k, strlen('index_'));
+            } elseif (0 !== strpos($k, '$')) {
                 throw new RuntimeException(sprintf('Invalid argument key "%s" found.', $k));
             }
 
-            $index = (int) substr($k, strlen('index_'));
             $def->replaceArgument($index, $v);
         }
 
 
@@ -43,18 +43,22 @@ protected function processValue($value, $isRoot = false)
             list($method, $arguments) = $call;
             $method = $parameterBag->resolveValue($method);
             $parameters = null;
+            $resolvedArguments = array();
 
             foreach ($arguments as $key => $argument) {
                 if (is_int($key) || '' === $key || '$' !== $key[0]) {
+                    if (!is_int($key)) {
+                        @trigger_error(sprintf('Using key "%s" for defining arguments of method "%s" for service "%s" is deprecated since Symfony 3.3 and will throw an exception in 4.0. Use no keys or $named arguments instead.', $key, $method, $this->currentId), E_USER_DEPRECATED);
+                    }
+                    $resolvedArguments[] = $argument;
                     continue;
                 }
 
                 $parameters = null !== $parameters ? $parameters : $this->getParameters($class, $method);
 
                 foreach ($parameters as $j => $p) {
                     if ($key === '$'.$p->name) {
-                        unset($arguments[$key]);
-                        $arguments[$j] = $argument;
+                        $resolvedArguments[$j] = $argument;
 
                         continue 2;
                     }
@@ -63,9 +67,9 @@ protected function processValue($value, $isRoot = false)
                 throw new InvalidArgumentException(sprintf('Unable to resolve service "%s": method "%s::%s" has no argument named "%s". Check your service definition.', $this->currentId, $class, $method, $key));
             }
 
-            if ($arguments !== $call[1]) {
-                ksort($arguments);
-                $calls[$i][1] = $arguments;
+            if ($resolvedArguments !== $call[1]) {
+                ksort($resolvedArguments);
+                $calls[$i][1] = $resolvedArguments;
             }
         }
 
 
@@ -20,7 +20,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Parser as YamlParser;
 use Symfony\Component\Yaml\Tag\TaggedValue;
Original file line number	Diff line number	Diff line change
`@@ -213,12 +213,14 @@ public function getArgument($index)`
`213`	`213`	`*/`
`214`	`214`	`public function replaceArgument($index, $value)`
`215`	`215`	`{`
`216`		`- if (!is_int($index)) {`
	`216`	`+ if (is_int($index)) {`
	`217`	`+ $this->arguments['index_'.$index] = $value;`
	`218`	`+ } elseif (0 === strpos($index, '$')) {`
	`219`	`+ $this->arguments[$index] = $value;`
	`220`	`+ } else {`
`217`	`221`	`throw new InvalidArgumentException('$index must be an integer.');`
`218`	`222`	`}`
`219`	`223`
`220`		`- $this->arguments['index_'.$index] = $value;`
`221`		`-`
`222`	`224`	`return $this;`
`223`	`225`	`}`
`224`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,12 @@ private function doResolveDefinition(ChildDefinition $definition)`
`145`	`145`	`continue;`
`146`	`146`	`}`
`147`	`147`
`148`		`- if (0 !== strpos($k, 'index_')) {`
	`148`	`+ if (0 === strpos($k, 'index_')) {`
	`149`	`+ $index = (int) substr($k, strlen('index_'));`
	`150`	`+ } elseif (0 !== strpos($k, '$')) {`
`149`	`151`	`throw new RuntimeException(sprintf('Invalid argument key "%s" found.', $k));`
`150`	`152`	`}`
`151`	`153`
`152`		`- $index = (int) substr($k, strlen('index_'));`
`153`	`154`	`$def->replaceArgument($index, $v);`
`154`	`155`	`}`
`155`	`156`