Merge pull request #37 from xabbuh/issue-36

do not search for service_container references

Author: matthiasnoback

ArgumentValidator.php

@@ -74,8 +74,13 @@ private function validateReferenceArgument($className, Reference $reference)
     {
         // the __toString method of a Reference is the referenced service id
         $referencedServiceId = (string)$reference;
-        $definition = $this->containerBuilder->findDefinition($referencedServiceId);
-        // we don't have to check if the definition exists, since the ContainerBuilder itself does that already
+
+        if ('service_container' !== $referencedServiceId) {
+            $definition = $this->containerBuilder->findDefinition($referencedServiceId);
+            // we don't have to check if the definition exists, since the ContainerBuilder itself does that already
+        } else {
+            $definition = new Definition('Symfony\Component\DependencyInjection\Container');
+        }
 
         $this->validateDefinitionArgument($className, $definition);
     }

Tests/ArgumentValidatorTest.php

@@ -185,6 +185,38 @@ public function testFailsIfExpressionCouldNotBeEvaluated()
         $validator->validate($parameter, $argument);
     }
 
+    public function testContainerReferenceArgumentDoesNotFail()
+    {
+        $class = 'Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ClassWithContainerInterfaceConstructorArgument';
+
+        $parameter = new \ReflectionParameter(array($class, '__construct'), 'container');
+        $argument = new Reference('service_container');
+
+        $validator = new ArgumentValidator(new ContainerBuilder(), $this->createMockResultingClassResolver());
+
+        $validator->validate($parameter, $argument);
+    }
+
+    public function testFailsIfContainerReferenceArgumentIsInjectedForParameterWithIncompatibleTypeHint()
+    {
+        $class = 'Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures\ClassWithTypeHintedConstructorArgument';
+
+        $parameter = new \ReflectionParameter(array($class, '__construct'), 'expected');
+        $argument = new Reference('service_container');
+
+        $classResolver = $this->createMockResultingClassResolver();
+        $classResolver
+            ->expects($this->any())
+            ->method('resolve')
+            ->with(new Definition('Symfony\Component\DependencyInjection\Container'))
+            ->willReturn('Symfony\Component\DependencyInjection\Container');
+        $validator = new ArgumentValidator(new ContainerBuilder(), $classResolver);
+
+        $this->setExpectedException('Matthias\SymfonyServiceDefinitionValidator\Exception\TypeHintMismatchException', 'ExpectedClass');
+
+        $validator->validate($parameter, $argument);
+    }
+
     private function createMockResultingClassResolver()
     {
         return $this->getMock('Matthias\SymfonyServiceDefinitionValidator\ResultingClassResolverInterface');

Tests/Fixtures/ClassWithContainerInterfaceConstructorArgument.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Tests\Fixtures;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class ClassWithContainerInterfaceConstructorArgument
+{
+    public function __construct(ContainerInterface $container)
+    {
+    }
+}