Commit 8c567a2
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
+3
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
346 | 346 | | |
347 | 347 | | |
348 | 348 | | |
349 | | - | |
| 349 | + | |
350 | 350 | | |
351 | 351 | | |
352 | 352 | | |
| |||
1400 | 1400 | | |
1401 | 1401 | | |
1402 | 1402 | | |
1403 | | - | |
| 1403 | + | |
1404 | 1404 | | |
| 1405 | + | |
1405 | 1406 | | |
1406 | 1407 | | |
1407 | 1408 | | |
| |||
0 commit comments