Commit b69088f
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 keys1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
| 48 | + | |
49 | 49 | | |
50 | 50 | | |
51 | 51 | | |
| |||
0 commit comments