symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/CheckTypeHintsPass.php
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php
+30Lines changed: 30 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/CheckTypeHintsPassTest.php
+30Lines changed: 30 additions & 0 deletions
@@ -129,12 +129,14 @@ private function checkTypeHint($configurationArgument, \ReflectionParameter $par
             if (!\is_a($class, $parameter->getType()->getName(), true)) {
                 throw new InvalidParameterTypeHintException($this->currentId, $class, $parameter);
             }
-        } else {
+        } elseif ($parameter->getType()->isBuiltin()) {
             $checkFunction = 'is_'.$parameter->getType()->getName();
 
             if (!$checkFunction($configurationArgument)) {
                 throw new InvalidParameterTypeHintException($this->currentId, gettype($configurationArgument), $parameter);
             }
+        } else {
+            throw new InvalidParameterTypeHintException($this->currentId, gettype($configurationArgument), $parameter);
         }
     }
 
 
@@ -199,6 +199,36 @@ public function testProcessSuccessScalarType()
         $this->assertInstanceOf(BarMethodCall::class, $container->get('bar'));
     }
 
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage In service declaration "bar". Trying to inject a "integer" as argument 0 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeHintsPass\Bar::__construct", but the type hint expects a "stdClass"
+     */
+    public function testProcessFailsOnPassingScalarTypeToConstructorTypeHintedWithClass()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', Bar::class)
+            ->addArgument(1);
+
+        (new CheckTypeHintsPass(true))->process($container);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
+     * @expectedExceptionMessage In service declaration "bar". Trying to inject a "string" as argument 0 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeHintsPass\BarMethodCall::setFoo", but the type hint expects a "stdClass"
+     */
+    public function testProcessFailsOnPassingScalarTypeToMethodTypeHintedWithClass()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register('bar', BarMethodCall::class)
+            ->addMethodCall('setFoo', array(
+                'builtin type instead of class',
+            ));
+
+        (new CheckTypeHintsPass(true))->process($container);
+    }
+
     /**
      * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
      * @expectedExceptionMessage In service declaration "bar". Trying to inject a "string" as argument 0 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeHintsPass\BarMethodCall::setScalars", but the type hint expects a "int"
Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,14 @@ private function checkTypeHint($configurationArgument, \ReflectionParameter $par`
`129`	`129`	`if (!\is_a($class, $parameter->getType()->getName(), true)) {`
`130`	`130`	`throw new InvalidParameterTypeHintException($this->currentId, $class, $parameter);`
`131`	`131`	`}`
`132`		`- } else {`
	`132`	`+ } elseif ($parameter->getType()->isBuiltin()) {`
`133`	`133`	`$checkFunction = 'is_'.$parameter->getType()->getName();`
`134`	`134`
`135`	`135`	`if (!$checkFunction($configurationArgument)) {`
`136`	`136`	`throw new InvalidParameterTypeHintException($this->currentId, gettype($configurationArgument), $parameter);`
`137`	`137`	`}`
	`138`	`+ } else {`
	`139`	`+ throw new InvalidParameterTypeHintException($this->currentId, gettype($configurationArgument), $parameter);`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`