Commit 59cc509
committed
Merge branch '5.4' into 6.4
* 5.4:
fix compatibility with Twig 3.10
[Strings][EnglishInflector] Fix incorrect pluralisation of 'Album'
handle union and intersection types for cascaded validations
move wiring of the property info extractor to the ObjectNormalizer
move Process component dep to require-dev
Remove calls to `onConsecutiveCalls()`
fix: remove unwanted type cast
accept AbstractAsset instances when filtering schemas
better distinguish URL schemes and windows drive letters
convert empty CSV header names into numeric keys3 files changed
+6
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
365 | 365 | | |
366 | 366 | | |
367 | 367 | | |
368 | | - | |
| 368 | + | |
369 | 369 | | |
370 | 370 | | |
371 | 371 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
375 | 375 | | |
376 | 376 | | |
377 | 377 | | |
| 378 | + | |
| 379 | + | |
378 | 380 | | |
379 | 381 | | |
380 | 382 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
22 | 24 | | |
23 | 25 | | |
24 | 26 | | |
| |||
0 commit comments