Skip to content

Commit ded6e42

Browse files
Merge branch '4.3' into 4.4
* 4.3: cs fix Fix inconsistent return points. [Config] Add handling for ignored keys in ArrayNode::mergeValues. Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
2 parents eb108e2 + be74d6b commit ded6e42

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Constraints/AbstractComparisonValidator.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,6 @@ abstract protected function compareValues($value1, $value2);
117117
*/
118118
protected function getErrorCode()
119119
{
120+
return null;
120121
}
121122
}

Tests/Constraints/AbstractComparisonValidatorTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,5 +266,6 @@ abstract protected function createConstraint(array $options = null);
266266
*/
267267
protected function getErrorCode()
268268
{
269+
return null;
269270
}
270271
}

0 commit comments

Comments
 (0)