Merge pull request #13 from matthiasnoback/12-validator-trips-over-symfony-2-5-form-type-guesser-validator-service

merge #13 Factory service definitions can have a class that actually is an interface (matthiasnoback)

This PR was merged into matthiasnoback:master branch.

Discussion
----------

|Q            |A  |
|---          |---|
|Bug Fix?     |y  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |y  |
|Fixed Tickets| #12 |
|License      |MIT|
|Doc PR       |   |
                   


 Sent using [Gush](https://github.com/gushphp/gush)

Commits
-------

d110f7d Start working with Gush (matthiasnoback)
7faebc4 Fix bug: factory services are allowed to have an interface as class (matthiasnoback)
29601fc Add compiler pass to fix Symfony validator definition bug (matthiasnoback)

Author: matthiasnoback

.gush.yml

@@ -0,0 +1,2 @@
+adapter: github
+issue_tracker: github

Compiler/Compatibility/FixSymfonyValidatorDefinitionPass.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Compiler\Compatibility;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class FixSymfonyValidatorDefinitionPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if ($container->hasDefinition('validator')) {
+            $container->getDefinition('validator')->setClass('Symfony\Component\Validator\Validator');
+        }
+    }
+}

ServiceDefinitionValidator.php

@@ -61,6 +61,7 @@ private function validateClass(Definition $definition)
         if ($class) {
             $class = $this->containerBuilder->getParameterBag()->resolveValue($class);
 
+            // TODO only services created using a factory can have an interface
             if (!class_exists($class) && !interface_exists($class)) {
                 throw new ClassNotFoundException($class);
             }
@@ -113,7 +114,7 @@ private function validateFactoryService(Definition $definition)
 
     private function validateFactoryClassAndMethod($factoryClass, $factoryMethod)
     {
-        if (!class_exists($factoryClass)) {
+        if (!class_exists($factoryClass) && !interface_exists($factoryClass)) {
             throw new ClassNotFoundException($factoryClass);
         }
 

Tests/Functional/Fixtures/Validator.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Tests\Functional\Fixtures;
+
+class Validator 
+{
+}

Tests/Functional/Fixtures/ValidatorBuilderInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Matthias\SymfonyServiceDefinitionValidator\Tests\Functional\Fixtures;
+
+interface ValidatorBuilderInterface
+{
+    public function build();
+}

Tests/Functional/Fixtures/reported_problems.yml

@@ -7,3 +7,13 @@ services:
             password: "password"
         calls:
             - [setAttribute, [3, 2]]
+
+    # Issue 12: https://github.com/matthiasnoback/symfony-service-definition-validator/issues/12
+    # A service created by a factory might itself be created by another factory, in which case it should be possible to
+    # supply an interface, not a class
+    validator_builder:
+        class: Matthias\SymfonyServiceDefinitionValidator\Tests\Functional\Fixtures\ValidatorBuilderInterface
+    validator:
+        class: Matthias\SymfonyServiceDefinitionValidator\Tests\Functional\Fixtures\Validator
+        factory_service: validator_builder
+        factory_method: build