Skip to content

Commit be74d6b

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash
2 parents fb65172 + aa9f88c commit be74d6b

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
@@ -112,5 +112,6 @@ abstract protected function compareValues($value1, $value2);
112112
*/
113113
protected function getErrorCode()
114114
{
115+
return null;
115116
}
116117
}

Tests/Constraints/AbstractComparisonValidatorTestCase.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,5 +244,6 @@ abstract protected function createConstraint(array $options = null);
244244
*/
245245
protected function getErrorCode()
246246
{
247+
return null;
247248
}
248249
}

0 commit comments

Comments
 (0)