Merge pull request #45 from zikula/alias-fail-43

correct issue with validator failing on class alias as typehint.

Author: stloyd

ArgumentValidator.php

@@ -152,8 +152,7 @@ private function validateClass($expectedClassName, $actualClassName)
             return;
         }
 
-        $reflectionClass = new \ReflectionClass($actualClassName);
-        if (!$reflectionClass->isSubclassOf($expectedClassName)) {
+        if (!is_a($actualClassName, $expectedClassName, true)) {
             throw new TypeHintMismatchException(sprintf(
                 'Argument for type-hint "%s" points to a service of class "%s"',
                 $expectedClassName,

Tests/ArgumentValidatorTest.php

@@ -197,6 +197,25 @@ public function testContainerReferenceArgumentDoesNotFail()
         $validator->validate($parameter, $argument);
     }
 
+    public function testPassesWhenArgumentIsClassAlias()
+    {
+        class_alias('Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ExpectedClass', 'AliasedExpectedClass');
+        $class = 'Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ClassWithTypeHintedAliasConstructorArgument';
+        $this->containerBuilder = new ContainerBuilder();
+        $definition = new Definition();
+        $this->containerBuilder->setDefinition('referenced_service', $definition);
+        $parameter = new \ReflectionParameter(array($class, '__construct'), 'expected');
+        $argument = new Reference('referenced_service');
+        $resultingClassResolver = $this->createMockResultingClassResolver();
+        $resultingClassResolver
+            ->expects($this->once())
+            ->method('resolve')
+            ->with($definition)
+            ->will($this->returnValue('\AliasedExpectedClass'));
+        $validator = new ArgumentValidator($this->containerBuilder, $resultingClassResolver);
+        $validator->validate($parameter, $argument);
+    }
+
     public function testFailsIfContainerReferenceArgumentIsInjectedForParameterWithIncompatibleTypeHint()
     {
         $class = 'Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ClassWithTypeHintedConstructorArgument';

Tests/Fixtures/ClassWithTypeHintedAliasConstructorArgument.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures;
+
+class ClassWithTypeHintedAliasConstructorArgument
+{
+    public function __construct(\AliasedExpectedClass $expected)
+    {
+    }
+}

Tests/Functional/Fixtures/reported_problems.yml

@@ -2,9 +2,9 @@ services:
     pdo:
         class: PDO
         arguments:
-            dsn: "mysql:dbname=dbname;host=host"
-            user: "user"
-            password: "password"
+            - "mysql:dbname=dbname;host=host"
+            - "user"
+            - "password"
         calls:
             - [setAttribute, [3, 2]]