Cast result to int before adding to it

alcaeus · alcaeus · commit 9f9e8ab8cc41 · 2016-11-17T10:58:11.000+01:00
This fixes the occasional warning about non-numeric values when using PHP 7.1
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -347,7 +347,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)
             }
 
             if (!$arg->hasAttribute('key')) {
-                $key = !$arguments ? 0 : max(array_keys($arguments)) + 1;
+                $key = !$arguments ? 0 : (int) max(array_keys($arguments)) + 1;
             } else {
                 $key = $arg->getAttribute('key');
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/with_key_outside_collection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="Foo">
+      <argument key="type">foo</argument>
+      <argument>bar</argument>
+    </service>
+  </services>
+</container>
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -542,4 +542,13 @@ public function testLoadInlinedServices()
         $this->assertSame('Baz', $barConfigurator[0]->getClass());
         $this->assertSame('configureBar', $barConfigurator[1]);
     }
+
+    public function testArgumentWithKeyOutsideCollection()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('with_key_outside_collection.xml');
+
+        $this->assertSame(array('type' => 'foo', 1 => 'bar'), $container->getDefinition('foo')->getArguments());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $lowercase = true)`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`if (!$arg->hasAttribute('key')) {`
`350`		`- $key = !$arguments ? 0 : max(array_keys($arguments)) + 1;`
	`350`	`+ $key = !$arguments ? 0 : (int) max(array_keys($arguments)) + 1;`
`351`	`351`	`} else {`
`352`	`352`	`$key = $arg->getAttribute('key');`
`353`	`353`	`}`
Original file line number	Diff line number	Diff line change
`@@ -542,4 +542,13 @@ public function testLoadInlinedServices()`
`542`	`542`	`$this->assertSame('Baz', $barConfigurator[0]->getClass());`
`543`	`543`	`$this->assertSame('configureBar', $barConfigurator[1]);`
`544`	`544`	`}`
	`545`	`+`
	`546`	`+ public function testArgumentWithKeyOutsideCollection()`
	`547`	`+ {`
	`548`	`+ $container = new ContainerBuilder();`
	`549`	`+ $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));`
	`550`	`+ $loader->load('with_key_outside_collection.xml');`
	`551`	`+`
	`552`	`+ $this->assertSame(array('type' => 'foo', 1 => 'bar'), $container->getDefinition('foo')->getArguments());`
	`553`	`+ }`
`545`	`554`	`}`