Commit ea7263d
committed
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)"1 file changed
+2
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
60 | 62 | | |
61 | 63 | | |
0 commit comments