Skip to content

Commit

Permalink
[Validator] Fixed failing tests
Browse files Browse the repository at this point in the history
  • Loading branch information
webmozart committed Jul 28, 2014
1 parent 3bd6d80 commit 295e5bb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Expand Up @@ -13,10 +13,10 @@

use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\All;
use Symfony\Component\Validator\ConstraintValidatorFactory;
use Symfony\Component\Validator\ConstraintViolation;
use Symfony\Component\Validator\ConstraintViolationList;
use Symfony\Component\Validator\ExecutionContext;
use Symfony\Component\Validator\LegacyConstraintValidatorFactory;
use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
use Symfony\Component\Validator\ValidationVisitor;

Expand Down Expand Up @@ -313,7 +313,7 @@ public function testGetPropertyPathWithNestedCollectionsAndAllMixed()
'[name]'
);

$visitor = new ValidationVisitor('Root', $this->metadataFactory, new ConstraintValidatorFactory(), $this->translator);
$visitor = new ValidationVisitor('Root', $this->metadataFactory, new LegacyConstraintValidatorFactory(), $this->translator);
$context = new ExecutionContext($visitor, $this->translator, self::TRANS_DOMAIN);
$context->validateValue($data, $constraints);

Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Validator/ValidatorBuilder.php
Expand Up @@ -397,7 +397,7 @@ public function getValidator()
}

if (Validation::API_VERSION_2_5 === $apiVersion) {
$contextFactory = new ExecutionContextFactory($metadataFactory, $translator, $this->translationDomain);
$contextFactory = new ExecutionContextFactory($translator, $this->translationDomain);
$validatorFactory = $validatorFactory ?: new ConstraintValidatorFactory($this->propertyAccessor);

return new RecursiveValidator($contextFactory, $metadataFactory, $validatorFactory, $this->initializers);
Expand Down

0 comments on commit 295e5bb

Please sign in to comment.