Merge branch '1.3'

* 1.3:
  added missing docs
  added support for Symfony ConstraintValidatorFactory
  simplified code

doc/providers/validator.rst

@@ -8,7 +8,8 @@ standalone.
 Parameters
 ----------
 
-none
+* **validator.validator_service_ids**: An array of service names representing
+  validators.
 
 Services
 --------
@@ -24,10 +25,6 @@ Services
   data class, which takes a ClassMetadata argument. Then you can set
   constraints on this ClassMetadata instance.
 
-* **validator.validator_factory**: Factory for ConstraintValidators. Defaults
-  to a standard ``ConstraintValidatorFactory``. Mostly used internally by the
-  Validator.
-
 Registering
 -----------
 

src/Silex/Provider/SecurityServiceProvider.php

@@ -568,10 +568,6 @@ class SecurityServiceProvider implements ServiceProviderInterface, EventListener
                 return new UserPasswordValidator($app['security.token_storage'], $app['security.encoder_factory']);
             };
 
-            if (!isset($app['validator.validator_service_ids'])) {
-                $app['validator.validator_service_ids'] = array();
-            }
-
             $app['validator.validator_service_ids'] = array_merge($app['validator.validator_service_ids'], array('security.validator.user_password' => 'security.validator.user_password_validator'));
         }
     }

src/Silex/Provider/Validator/ConstraintValidatorFactory.php

@@ -13,8 +13,7 @@ namespace Silex\Provider\Validator;
 
 use Pimple\Container;
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
-use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\ConstraintValidatorFactory as BaseConstraintValidatorFactory;
 
 /**
  * Uses a service container to create constraint validators with dependencies.
@@ -22,7 +21,7 @@ use Symfony\Component\Validator\ConstraintValidator;
  * @author Kris Wallsmith <kris@symfony.com>
  * @author Alex Kalyvitis <alex.kalyvitis@gmail.com>
  */
-class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
+class ConstraintValidatorFactory extends BaseConstraintValidatorFactory
 {
     /**
      * @var Container
@@ -34,57 +33,31 @@ class ConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
      */
     protected $serviceNames;
 
-    /**
-     * @var array
-     */
-    protected $validators;
-
     /**
      * Constructor.
      *
      * @param Container $container    DI container
      * @param array     $serviceNames Validator service names
      */
-    public function __construct(Container $container, array $serviceNames = array())
+    public function __construct(Container $container, array $serviceNames = array(), $propertyAccessor = null)
     {
+        parent::__construct($propertyAccessor);
+
         $this->container = $container;
         $this->serviceNames = $serviceNames;
-        $this->validators = array();
     }
 
     /**
-     * Returns the validator for the supplied constraint.
-     *
-     * @param Constraint $constraint A constraint
-     *
-     * @return ConstraintValidator A validator for the supplied constraint
+     * {@inheritdoc}
      */
     public function getInstance(Constraint $constraint)
     {
         $name = $constraint->validatedBy();
 
-        if (isset($this->validators[$name])) {
-            return $this->validators[$name];
-        }
-
-        $this->validators[$name] = $this->createValidator($name);
-
-        return $this->validators[$name];
-    }
-
-    /**
-     * Returns the validator instance.
-     *
-     * @param string $name
-     *
-     * @return ConstraintValidator
-     */
-    private function createValidator($name)
-    {
         if (isset($this->serviceNames[$name])) {
             return $this->container[$this->serviceNames[$name]];
         }
 
-        return new $name();
+        return parent::getInstance($constraint);
     }
 }

src/Silex/Provider/ValidatorServiceProvider.php

@@ -64,13 +64,13 @@ class ValidatorServiceProvider implements ServiceProviderInterface
         };
 
         $app['validator.validator_factory'] = function () use ($app) {
-            $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array();
-
-            return new ConstraintValidatorFactory($app, $validators);
+            return new ConstraintValidatorFactory($app, $app['validator.validator_service_ids']);
         };
 
         $app['validator.object_initializers'] = function ($app) {
             return array();
         };
+
+        $app['validator.validator_service_ids'] = array();
     }
 }

tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php

@@ -64,6 +64,20 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Silex\Tests\Provider\ValidatorServiceProviderTest\Constraint\CustomValidator', $validator);
     }
 
+    /**
+     * @depends testRegister
+     */
+    public function testConstraintValidatorFactoryWithExpression($app)
+    {
+        if (!class_exists('Symfony\Component\Validator\Constraints\Expression')) {
+            $this->markTestSkipped('Expression are not supported by this version of Symfony');
+        }
+
+        $constraint = new Assert\Expression('true');
+        $validator = $app['validator.validator_factory']->getInstance($constraint);
+        $this->assertInstanceOf('Symfony\Component\Validator\Constraints\ExpressionValidator', $validator);
+    }
+
     /**
      * @depends testRegister
      */