Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 8fd32ba

Browse filesBrowse files
fabpotfabpot
committed
[Validator] remove the API_VERSION
1 parent 2a6b629 commit 8fd32ba
Copy full SHA for 8fd32ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

50 files changed

+20
-1012
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
2323
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
2424
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
25-
use Symfony\Component\Validator\Validation;
2625
use Doctrine\ORM\Tools\SchemaTool;
2726

2827
/**
@@ -47,11 +46,6 @@ class UniqueEntityValidatorTest extends AbstractConstraintValidatorTest
4746
*/
4847
protected $repository;
4948

50-
protected function getApiVersion()
51-
{
52-
return Validation::API_VERSION_2_5;
53-
}
54-
5549
protected function setUp()
5650
{
5751
$this->em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
-6Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
use Symfony\Component\Validator\Constraints\NotBlank;
2323
use Symfony\Component\Validator\Constraints\Valid;
2424
use Symfony\Component\Validator\Tests\Constraints\AbstractConstraintValidatorTest;
25-
use Symfony\Component\Validator\Validation;
2625

2726
/**
2827
* @author Bernhard Schussek <bschussek@gmail.com>
@@ -56,11 +55,6 @@ protected function setUp()
5655
parent::setUp();
5756
}
5857

59-
protected function getApiVersion()
60-
{
61-
return Validation::API_VERSION_2_5;
62-
}
63-
6458
protected function createValidator()
6559
{
6660
return new FormValidator($this->serverParams);

‎src/Symfony/Component/Validator/Constraints/AllValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/AllValidator.php
+4-12Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
16-
use Symfony\Component\Validator\Context\ExecutionContextInterface;
1716
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
1817

1918
/**
@@ -40,17 +39,10 @@ public function validate($value, Constraint $constraint)
4039

4140
$context = $this->context;
4241

43-
if ($context instanceof ExecutionContextInterface) {
44-
$validator = $context->getValidator()->inContext($context);
45-
46-
foreach ($value as $key => $element) {
47-
$validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
48-
}
49-
} else {
50-
// 2.4 API
51-
foreach ($value as $key => $element) {
52-
$context->validateValue($element, $constraint->constraints, '['.$key.']');
53-
}
42+
$validator = $context->getValidator()->inContext($context);
43+
44+
foreach ($value as $key => $element) {
45+
$validator->atPath('['.$key.']')->validate($element, $constraint->constraints);
5446
}
5547
}
5648
}

‎src/Symfony/Component/Validator/Constraints/CollectionValidator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/CollectionValidator.php
+16-40Lines changed: 16 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\Validator\Constraint;
1515
use Symfony\Component\Validator\ConstraintValidator;
16-
use Symfony\Component\Validator\Context\ExecutionContextInterface;
1716
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
1817

1918
/**
@@ -56,53 +55,30 @@ public function validate($value, Constraint $constraint)
5655

5756
if ($existsInArray || $existsInArrayAccess) {
5857
if (count($fieldConstraint->constraints) > 0) {
59-
if ($context instanceof ExecutionContextInterface) {
60-
$context->getValidator()
61-
->inContext($context)
62-
->atPath('['.$field.']')
63-
->validate($value[$field], $fieldConstraint->constraints);
64-
} else {
65-
// 2.4 API
66-
$context->validateValue($value[$field], $fieldConstraint->constraints, '['.$field.']');
67-
}
68-
}
69-
} elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
70-
if ($context instanceof ExecutionContextInterface) {
71-
$context->buildViolation($constraint->missingFieldsMessage)
72-
->atPath('['.$field.']')
73-
->setParameter('{{ field }}', $this->formatValue($field))
74-
->setInvalidValue(null)
75-
->setCode(Collection::MISSING_FIELD_ERROR)
76-
->addViolation();
77-
} else {
78-
$this->buildViolationInContext($context, $constraint->missingFieldsMessage)
58+
$context->getValidator()
59+
->inContext($context)
7960
->atPath('['.$field.']')
80-
->setParameter('{{ field }}', $this->formatValue($field))
81-
->setInvalidValue(null)
82-
->setCode(Collection::MISSING_FIELD_ERROR)
83-
->addViolation();
61+
->validate($value[$field], $fieldConstraint->constraints);
8462
}
63+
} elseif (!$fieldConstraint instanceof Optional && !$constraint->allowMissingFields) {
64+
$context->buildViolation($constraint->missingFieldsMessage)
65+
->atPath('['.$field.']')
66+
->setParameter('{{ field }}', $this->formatValue($field))
67+
->setInvalidValue(null)
68+
->setCode(Collection::MISSING_FIELD_ERROR)
69+
->addViolation();
8570
}
8671
}
8772

8873
if (!$constraint->allowExtraFields) {
8974
foreach ($value as $field => $fieldValue) {
9075
if (!isset($constraint->fields[$field])) {
91-
if ($context instanceof ExecutionContextInterface) {
92-
$context->buildViolation($constraint->extraFieldsMessage)
93-
->atPath('['.$field.']')
94-
->setParameter('{{ field }}', $this->formatValue($field))
95-
->setInvalidValue($fieldValue)
96-
->setCode(Collection::NO_SUCH_FIELD_ERROR)
97-
->addViolation();
98-
} else {
99-
$this->buildViolationInContext($context, $constraint->extraFieldsMessage)
100-
->atPath('['.$field.']')
101-
->setParameter('{{ field }}', $this->formatValue($field))
102-
->setInvalidValue($fieldValue)
103-
->setCode(Collection::NO_SUCH_FIELD_ERROR)
104-
->addViolation();
105-
}
76+
$context->buildViolation($constraint->extraFieldsMessage)
77+
->atPath('['.$field.']')
78+
->setParameter('{{ field }}', $this->formatValue($field))
79+
->setInvalidValue($fieldValue)
80+
->setCode(Collection::NO_SUCH_FIELD_ERROR)
81+
->addViolation();
10682
}
10783
}
10884
}

‎src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,6 @@ protected function buildViolation($message)
204204
return new ConstraintViolationAssertion($this->context, $message, $this->constraint);
205205
}
206206

207-
protected function getApiVersion()
208-
{
209-
return Validation::API_VERSION_2_5;
210-
}
211-
212207
abstract protected function createValidator();
213208
}
214209

‎src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919

2020
class AllValidatorTest extends AbstractConstraintValidatorTest
2121
{
22-
protected function getApiVersion()
23-
{
24-
return Validation::API_VERSION_2_5;
25-
}
26-
2722
protected function createValidator()
2823
{
2924
return new AllValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/BlankValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class BlankValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new BlankValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ public static function validateStatic($object, ExecutionContextInterface $contex
4646

4747
class CallbackValidatorTest extends AbstractConstraintValidatorTest
4848
{
49-
protected function getApiVersion()
50-
{
51-
return Validation::API_VERSION_2_5;
52-
}
53-
5449
protected function createValidator()
5550
{
5651
return new CallbackValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class CardSchemeValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new CardSchemeValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ function choice_callback()
2222

2323
class ChoiceValidatorTest extends AbstractConstraintValidatorTest
2424
{
25-
protected function getApiVersion()
26-
{
27-
return Validation::API_VERSION_2_5;
28-
}
29-
3025
protected function createValidator()
3126
{
3227
return new ChoiceValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121

2222
abstract class CollectionValidatorTest extends AbstractConstraintValidatorTest
2323
{
24-
protected function getApiVersion()
25-
{
26-
return Validation::API_VERSION_2_5;
27-
}
28-
2924
protected function createValidator()
3025
{
3126
return new CollectionValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
*/
2121
abstract class CountValidatorTest extends AbstractConstraintValidatorTest
2222
{
23-
protected function getApiVersion()
24-
{
25-
return Validation::API_VERSION_2_5;
26-
}
27-
2823
protected function createValidator()
2924
{
3025
return new CountValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818

1919
class CountryValidatorTest extends AbstractConstraintValidatorTest
2020
{
21-
protected function getApiVersion()
22-
{
23-
return Validation::API_VERSION_2_5;
24-
}
25-
2621
protected function createValidator()
2722
{
2823
return new CountryValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818

1919
class CurrencyValidatorTest extends AbstractConstraintValidatorTest
2020
{
21-
protected function getApiVersion()
22-
{
23-
return Validation::API_VERSION_2_5;
24-
}
25-
2621
protected function createValidator()
2722
{
2823
return new CurrencyValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class DateTimeValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new DateTimeValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class DateValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new DateValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class EmailValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new EmailValidator(false);

‎src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/EqualToValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
*/
2121
class EqualToValidatorTest extends AbstractComparisonValidatorTestCase
2222
{
23-
protected function getApiVersion()
24-
{
25-
return Validation::API_VERSION_2_5;
26-
}
27-
2823
protected function createValidator()
2924
{
3025
return new EqualToValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/ExpressionValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919

2020
class ExpressionValidatorTest extends AbstractConstraintValidatorTest
2121
{
22-
protected function getApiVersion()
23-
{
24-
return Validation::API_VERSION_2_5;
25-
}
26-
2722
protected function createValidator()
2823
{
2924
return new ExpressionValidator(PropertyAccess::createPropertyAccessor());

‎src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ abstract class FileValidatorTest extends AbstractConstraintValidatorTest
2222

2323
protected $file;
2424

25-
protected function getApiVersion()
26-
{
27-
return Validation::API_VERSION_2_5;
28-
}
29-
3025
protected function createValidator()
3126
{
3227
return new FileValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/GreaterThanOrEqualValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
*/
2121
class GreaterThanOrEqualValidatorTest extends AbstractComparisonValidatorTestCase
2222
{
23-
protected function getApiVersion()
24-
{
25-
return Validation::API_VERSION_2_5;
26-
}
27-
2823
protected function createValidator()
2924
{
3025
return new GreaterThanOrEqualValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/GreaterThanValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
*/
2121
class GreaterThanValidatorTest extends AbstractComparisonValidatorTestCase
2222
{
23-
protected function getApiVersion()
24-
{
25-
return Validation::API_VERSION_2_5;
26-
}
27-
2823
protected function createValidator()
2924
{
3025
return new GreaterThanValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@
1717

1818
class IbanValidatorTest extends AbstractConstraintValidatorTest
1919
{
20-
protected function getApiVersion()
21-
{
22-
return Validation::API_VERSION_2_5;
23-
}
24-
2520
protected function createValidator()
2621
{
2722
return new IbanValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/IdenticalToValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
*/
2121
class IdenticalToValidatorTest extends AbstractComparisonValidatorTestCase
2222
{
23-
protected function getApiVersion()
24-
{
25-
return Validation::API_VERSION_2_5;
26-
}
27-
2823
protected function createValidator()
2924
{
3025
return new IdenticalToValidator();

‎src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
-5Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ class ImageValidatorTest extends AbstractConstraintValidatorTest
3333
protected $imagePortrait;
3434
protected $image4By3;
3535

36-
protected function getApiVersion()
37-
{
38-
return Validation::API_VERSION_2_5;
39-
}
40-
4136
protected function createValidator()
4237
{
4338
return new ImageValidator();

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.