Commit 3e36da1
committed
Merge branch '5.4' into 6.4
* 5.4:
Mitigate PHPUnit deprecations
[TwigBundle] Add support for resetting globals between HTTP requests
[Validator] Add Catalan and Spanish translation for `Week` constraint
Don't use is_resource() on non-streams
[Ldap] Fix extension deprecation1 file changed
+1
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
217 | 217 | | |
218 | 218 | | |
219 | 219 | | |
220 | | - | |
221 | | - | |
| 220 | + | |
222 | 221 | | |
223 | 222 | | |
224 | 223 | | |
| |||
0 commit comments