Skip to content

Commit 5d37976

Browse files
committed
Merge branch '2.5'
* 2.5: (25 commits) [Bridge][Twig] Replace deprecated features Yaml component change in 2.5 [HttpFoundation] fix switch statement [serializer] fixed whitespace issue when decoding xml [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler #10862 loadClassMetadata vs loadValidatorMetadata: revert default config fixed previous merge Added phpdoc for Cache-Control directives methods [Console] OutputFormatter Unset Bold has wrong id [Debug] fix debug handlers config [Serializer] fixed bc-break with cdata-section nodes Remove undefined variable $e [Debug] fix wrong case mismatch exception bumped Symfony version to 2.5.1 bumped Symfony version to 2.4.7 bumped Symfony version to 2.3.17 Fix a parameter name in a test updated VERSION for 2.5.0 updated CHANGELOG for 2.5.0 updated VERSION for 2.4.6 ... Conflicts: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents 4590252 + c55223b commit 5d37976

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Constraints/NotBlankValidatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ protected function tearDown()
3535
/**
3636
* @dataProvider getValidValues
3737
*/
38-
public function testValidValues($date)
38+
public function testValidValues($value)
3939
{
4040
$this->context->expects($this->never())
4141
->method('addViolation');
4242

43-
$this->validator->validate($date, new NotBlank());
43+
$this->validator->validate($value, new NotBlank());
4444
}
4545

4646
public function getValidValues()

0 commit comments

Comments
 (0)