[validator] throw an exception if isn't an instance of ConstraintValidatorInterface.

aitboudad · fabpot · commit fc232a5d9aba · 2013-12-07T09:07:04.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Validator/ConstraintValidatorFactoryTest.php
@@ -43,7 +43,7 @@ public function testGetInstanceReturnsService()
     {
         $service = 'validator_constraint_service';
         $alias = 'validator_constraint_alias';
-        $validator = new \stdClass();
+        $validator = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator');
 
         // mock ContainerBuilder b/c it implements TaggedContainerInterface
         $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerBuilder');
diff --git a/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php b/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php
@@ -14,7 +14,8 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;
-use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 /**
  * Uses a service container to create constraint validators.
@@ -58,7 +59,9 @@ public function __construct(ContainerInterface $container, array $validators = a
      *
      * @param Constraint $constraint A constraint
      *
-     * @return ConstraintValidator A validator for the supplied constraint
+     * @return ConstraintValidatorInterface A validator for the supplied constraint
+     *
+     * @throws UnexpectedTypeException When the validator is not an instance of ConstraintValidatorInterface
      */
     public function getInstance(Constraint $constraint)
     {
@@ -70,6 +73,10 @@ public function getInstance(Constraint $constraint)
             $this->validators[$name] = $this->container->get($this->validators[$name]);
         }
 
+        if (!$this->validators[$name] instanceof ConstraintValidatorInterface) {
+            throw new UnexpectedTypeException($this->validators[$name], 'Symfony\Component\Validator\ConstraintValidatorInterface');
+        }
+
         return $this->validators[$name];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testGetInstanceReturnsService()`
`43`	`43`	`{`
`44`	`44`	`$service = 'validator_constraint_service';`
`45`	`45`	`$alias = 'validator_constraint_alias';`
`46`		`- $validator = new \stdClass();`
	`46`	`+ $validator = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\ConstraintValidator');`
`47`	`47`
`48`	`48`	`// mock ContainerBuilder b/c it implements TaggedContainerInterface`
`49`	`49`	`$container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerBuilder');`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@`
`14`	`14`	`use Symfony\Component\DependencyInjection\ContainerInterface;`
`15`	`15`	`use Symfony\Component\Validator\Constraint;`
`16`	`16`	`use Symfony\Component\Validator\ConstraintValidatorFactoryInterface;`
`17`		`-use Symfony\Component\Validator\ConstraintValidator;`
	`17`	`+use Symfony\Component\Validator\ConstraintValidatorInterface;`
	`18`	`+use Symfony\Component\Validator\Exception\UnexpectedTypeException;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* Uses a service container to create constraint validators.`
`@@ -58,7 +59,9 @@ public function __construct(ContainerInterface $container, array $validators = a`
`58`	`59`	`*`
`59`	`60`	`* @param Constraint $constraint A constraint`
`60`	`61`	`*`
`61`		`- * @return ConstraintValidator A validator for the supplied constraint`
	`62`	`+ * @return ConstraintValidatorInterface A validator for the supplied constraint`
	`63`	`+ *`
	`64`	`+ * @throws UnexpectedTypeException When the validator is not an instance of ConstraintValidatorInterface`
`62`	`65`	`*/`
`63`	`66`	`public function getInstance(Constraint $constraint)`
`64`	`67`	`{`
`@@ -70,6 +73,10 @@ public function getInstance(Constraint $constraint)`
`70`	`73`	`$this->validators[$name] = $this->container->get($this->validators[$name]);`
`71`	`74`	`}`
`72`	`75`
	`76`	`+ if (!$this->validators[$name] instanceof ConstraintValidatorInterface) {`
	`77`	`+ throw new UnexpectedTypeException($this->validators[$name], 'Symfony\Component\Validator\ConstraintValidatorInterface');`
	`78`	`+ }`
	`79`	`+`
`73`	`80`	`return $this->validators[$name];`
`74`	`81`	`}`
`75`	`82`	`}`