Commit d704e30
committed
Merge branch '6.4' into 7.1
* 6.4:
Mitigate PHPUnit deprecations
[TwigBundle] Add support for resetting globals between HTTP requests
Mitigate PHPUnit deprecations
[Cache] Fix compatibility with Redis 6.1.0 pre-releases
[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 | |
|---|---|---|---|
| |||
372 | 372 | | |
373 | 373 | | |
374 | 374 | | |
375 | | - | |
| 375 | + | |
376 | 376 | | |
377 | 377 | | |
378 | 378 | | |
| |||
1434 | 1434 | | |
1435 | 1435 | | |
1436 | 1436 | | |
1437 | | - | |
| 1437 | + | |
1438 | 1438 | | |
| 1439 | + | |
1439 | 1440 | | |
1440 | 1441 | | |
1441 | 1442 | | |
| |||
0 commit comments