Fabien Potencier
|
7f3b57d37d
|
Merge branch '2.7'
* 2.7:
[2.6] cleanup deprecated uses
[2.5] cleanup deprecated uses
[Debug] fix test
[Debug] split tests for deprecated interfaces
[Validator] Added a check DNS option on URL validator
Conflicts:
src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyProgressHelperTest.php
src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
src/Symfony/Component/Form/composer.json
src/Symfony/Component/HttpKernel/Tests/KernelTest.php
src/Symfony/Component/Routing/Tests/Matcher/Dumper/LegacyApacheMatcherDumperTest.php
src/Symfony/Component/Routing/Tests/Matcher/LegacyApacheUrlMatcherTest.php
src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
src/Symfony/Component/Validator/ValidatorBuilder.php
|
2015-01-05 15:34:32 +01:00 |
|
