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 7f8d9a0

Browse filesBrowse files
saro0hsaro0h
committed
Remove BC api version in Validator
1 parent 7192b2f commit 7f8d9a0
Copy full SHA for 7f8d9a0

File tree

Expand file treeCollapse file tree

55 files changed

+9
-1305
lines changed
Filter options

Some content is hidden

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

55 files changed

+9
-1305
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+2-11Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -753,18 +753,9 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
753753

754754
if ('2.5' === $config['api']) {
755755
$api = Validation::API_VERSION_2_5;
756-
} else {
757-
// 2.4 is now the same as 2.5 BC
758-
$api = Validation::API_VERSION_2_5_BC;
759-
// the validation class needs to be changed for BC
760-
$container->setParameter('validator.class', 'Symfony\Component\Validator\ValidatorInterface');
756+
$validatorBuilder->addMethodCall('setApiVersion', array($api));
757+
$container->setParameter('validator.api', $api);
761758
}
762-
763-
$validatorBuilder->addMethodCall('setApiVersion', array($api));
764-
765-
// You can use this parameter to check the API version in your own
766-
// bundle extension classes
767-
$container->setParameter('validator.api', $api);
768759
}
769760

770761
private function getValidatorMappingFiles(ContainerBuilder $container)

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+6-34Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ public function testValidation()
280280

281281
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
282282

283-
$this->assertCount(7, $calls);
283+
$this->assertCount(6, $calls);
284284
$this->assertSame('setConstraintValidatorFactory', $calls[0][0]);
285285
$this->assertEquals(array(new Reference('validator.validator_factory')), $calls[0][1]);
286286
$this->assertSame('setTranslator', $calls[1][0]);
@@ -293,8 +293,6 @@ public function testValidation()
293293
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
294294
$this->assertSame('setMetadataCache', $calls[5][0]);
295295
$this->assertEquals(array(new Reference('validator.mapping.cache.apc')), $calls[5][1]);
296-
$this->assertSame('setApiVersion', $calls[6][0]);
297-
$this->assertEquals(array(Validation::API_VERSION_2_5_BC), $calls[6][1]);
298296
}
299297

300298
public function testFullyConfiguredValidationService()
@@ -336,7 +334,7 @@ public function testValidationAnnotations()
336334

337335
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
338336

339-
$this->assertCount(7, $calls);
337+
$this->assertCount(6, $calls);
340338
$this->assertSame('enableAnnotationMapping', $calls[4][0]);
341339
$this->assertEquals(array(new Reference('annotation_reader')), $calls[4][1]);
342340
$this->assertSame('addMethodMapping', $calls[5][0]);
@@ -354,7 +352,7 @@ public function testValidationPaths()
354352

355353
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
356354

357-
$this->assertCount(8, $calls);
355+
$this->assertCount(7, $calls);
358356
$this->assertSame('addXmlMappings', $calls[3][0]);
359357
$this->assertSame('addYamlMappings', $calls[4][0]);
360358
$this->assertSame('enableAnnotationMapping', $calls[5][0]);
@@ -377,9 +375,8 @@ public function testValidationNoStaticMethod()
377375

378376
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
379377

380-
$this->assertCount(5, $calls);
378+
$this->assertCount(4, $calls);
381379
$this->assertSame('addXmlMappings', $calls[3][0]);
382-
// no cache, no annotations, no static methods
383380
}
384381

385382
public function testValidation2Dot5Api()
@@ -395,23 +392,6 @@ public function testValidation2Dot5Api()
395392
$this->assertSame('setApiVersion', $calls[5][0]);
396393
$this->assertSame(array(Validation::API_VERSION_2_5), $calls[5][1]);
397394
$this->assertSame('Symfony\Component\Validator\Validator\ValidatorInterface', $container->getParameter('validator.class'));
398-
// no cache, no annotations
399-
}
400-
401-
public function testValidation2Dot5BcApi()
402-
{
403-
$container = $this->createContainerFromFile('validation_2_5_bc_api');
404-
405-
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
406-
407-
$this->assertCount(6, $calls);
408-
$this->assertSame('addXmlMappings', $calls[3][0]);
409-
$this->assertSame('addMethodMapping', $calls[4][0]);
410-
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
411-
$this->assertSame('setApiVersion', $calls[5][0]);
412-
$this->assertSame(array(Validation::API_VERSION_2_5_BC), $calls[5][1]);
413-
$this->assertSame('Symfony\Component\Validator\ValidatorInterface', $container->getParameter('validator.class'));
414-
// no cache, no annotations
415395
}
416396

417397
public function testValidationImplicitApi()
@@ -420,14 +400,10 @@ public function testValidationImplicitApi()
420400

421401
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
422402

423-
$this->assertCount(6, $calls);
403+
$this->assertCount(5, $calls);
424404
$this->assertSame('addXmlMappings', $calls[3][0]);
425405
$this->assertSame('addMethodMapping', $calls[4][0]);
426406
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
427-
$this->assertSame('setApiVersion', $calls[5][0]);
428-
// no cache, no annotations
429-
430-
$this->assertSame(array(Validation::API_VERSION_2_5_BC), $calls[5][1]);
431407
}
432408

433409
/**
@@ -440,14 +416,10 @@ public function testValidationAutoApi()
440416

441417
$calls = $container->getDefinition('validator.builder')->getMethodCalls();
442418

443-
$this->assertCount(6, $calls);
419+
$this->assertCount(5, $calls);
444420
$this->assertSame('addXmlMappings', $calls[3][0]);
445421
$this->assertSame('addMethodMapping', $calls[4][0]);
446422
$this->assertSame(array('loadValidatorMetadata'), $calls[4][1]);
447-
$this->assertSame('setApiVersion', $calls[5][0]);
448-
// no cache, no annotations
449-
450-
$this->assertSame(array(Validation::API_VERSION_2_5_BC), $calls[5][1]);
451423
}
452424

453425
public function testFormsCanBeEnabledWithoutCsrfProtection()

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,6 @@ protected function createContext()
113113
$translator
114114
);
115115
break;
116-
case Validation::API_VERSION_2_5_BC:
117-
$context = new LegacyExecutionContext(
118-
$validator,
119-
$this->root,
120-
$this->getMock('Symfony\Component\Validator\MetadataFactoryInterface'),
121-
$translator
122-
);
123-
break;
124116
default:
125117
throw new \RuntimeException('Invalid API version');
126118
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidatorLegacyApiTest.php
-26Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayLegacyApiTest.php
-22Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

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