fix check miss on variadic

alcalyn · alcalyn · commit 83d05b8acf94 · 2018-07-04T17:39:34.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php
@@ -82,12 +82,8 @@ private function checkArgumentsTypeHints(\ReflectionFunctionAbstract $reflection
         $reflectionParameters = $reflectionFunction->getParameters();
         $checksCount = min($reflectionFunction->getNumberOfParameters(), count($configurationArguments));
 
-        if ($reflectionFunction->isVariadic()) {
-            --$checksCount;
-        }
-
         for ($i = 0; $i < $checksCount; ++$i) {
-            if (!$reflectionParameters[$i]->hasType()) {
+            if (!$reflectionParameters[$i]->hasType() || $reflectionParameters[$i]->isVariadic()) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php
@@ -145,6 +145,24 @@ public function testProcessVariadicFails()
         (new CheckTypeHintsPass(true))->process($container);
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid definition for service "bar": argument 0 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeHintsPass\BarMethodCall::setFoosVariadic" requires a "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeHintsPass\Foo", "stdClass" passed
+     */
+    public function testProcessVariadicFailsOnPassingBadTypeOnAnotherArgument()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('stdClass', \stdClass::class);
+        $container->register('foo', Foo::class);
+        $container->register('bar', BarMethodCall::class)
+            ->addMethodCall('setFoosVariadic', array(
+                new Reference('stdClass'),
+            ));
+
+        (new CheckTypeHintsPass(true))->process($container);
+    }
+
     public function testProcessVariadicSuccess()
     {
         $container = new ContainerBuilder();
