- Type hint in Silex\ConstraintValidatorFactory constructor for container

- Modifed Silex\Provider\ValidatorServiceProvider to accept an optional
  'validator.validator_service_ids' parameter wich allows users to register
  custom validators.
- Added test to verify that if users registered ValidatorServiceProvider
  using optional 'validator.validator_service_ids' parameter then the new
  Silex\ConstraintValidatorFactory will be used instead of the one provided
  in  Symfony.

src/Silex/ConstraintValidatorFactory.php

@@ -11,27 +11,13 @@
 
 namespace Silex;
 
+use Silex\Application;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
 use Symfony\Component\Validator\ConstraintValidator;
 
 /**
- * Uses a service container to create constraint validators.
- *
- * A constraint validator should be tagged as "validator.constraint_validator"
- * in the service container and include an "alias" attribute:
- *
- *     <service id="some_doctrine_validator">
- *         <argument type="service" id="doctrine.orm.some_entity_manager" />
- *         <tag name="validator.constraint_validator" alias="some_alias" />
- *     </service>
- *
- * A constraint may then return this alias in its validatedBy() method:
- *
- *     public function validatedBy()
- *     {
- *         return 'some_alias';
- *     }
+ * Uses a service container to create constraint validators with dependencies.
  *
  * @author Kris Wallsmith <kris@symfony.com>
  */
@@ -43,9 +29,10 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
     /**
      * Constructor.
      *
+     * @param Silex\Application $container  A DI container
      * @param array             $validators An array of validators
      */
-    public function __construct($container, array $validators = array())
+    public function __construct(Application $container, array $validators = array())
     {
         $this->container = $container;
         $this->validators = $validators;

src/Silex/Provider/ValidatorServiceProvider.php

@@ -13,12 +13,13 @@ namespace Silex\Provider;
 
 use Silex\Application;
 use Silex\ServiceProviderInterface;
+use Silex\ConstraintValidatorFactory;
 
 use Symfony\Component\Validator\Validator;
 use Symfony\Component\Validator\DefaultTranslator;
 use Symfony\Component\Validator\Mapping\ClassMetadataFactory;
 use Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader;
-use Symfony\Component\Validator\ConstraintValidatorFactory;
+use Symfony\Component\Validator\ConstraintValidatorFactory as BaseConstraintValidatorFactory;
 
 /**
  * Symfony Validator component Provider.
@@ -29,7 +30,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
 {
     public function register(Application $app)
     {
-        $app['validator'] = $app->share(function ($app) {
+        $app['validator'] = $app->share(function($app) {
             $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
 
             if (isset($app['translator'])) {
@@ -58,8 +59,16 @@ class ValidatorServiceProvider implements ServiceProviderInterface
             return new ClassMetadataFactory(new StaticMethodLoader());
         });
 
-        $app['validator.validator_factory'] = $app->share(function () {
-            return new ConstraintValidatorFactory();
+        $app['validator.validator_factory'] = $app->share(function() use ($app) {
+            if (isset($app['validator.validator_service_ids'])) {
+                $validators = array();
+                foreach ($app['validator.validator_service_ids'] as $service) {
+                    $validators[] = $app[$service];
+                }
+                return new ConstraintValidatorFactory($app, $validators);
+            } else {
+                return new BaseConstraintValidatorFactory();
+            }
         });
     }
 

tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

@@ -39,6 +39,40 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
         return $app;
     }
 
+    public function testRegisterWithCustomValidators()
+    {
+        $app = new Application();
+
+        // Dummy ConstraintValidators
+        $app['validator.x'] = 'x';
+        $app['validator.y'] = 'y';
+
+        $app->register(new ValidatorServiceProvider(), array(
+            'validator.validator_service_ids' => array(
+                'validator.x',
+                'validator.y'
+            )
+        ));
+
+        return $app;
+    }
+
+    /**
+     * @depends testRegisterWithCustomValidators
+     */
+    public function testSilexConstraintValidatorFactory($app)
+    {
+        $this->assertInstanceOf('Silex\ConstraintValidatorFactory', $app['validator.validator_factory']);
+    }
+
+    /**
+     * @depends testRegister
+     */
+    public function testSymfonyConstraintValidatorFactory($app)
+    {
+        $this->assertInstanceOf('Symfony\Component\Validator\ConstraintValidatorFactory', $app['validator.validator_factory']);
+    }
+
     /**
      * @depends testRegister
      */