Commit aaea6b8
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 keysFile tree
2 files changed
+5
-0
lines changed- Inflector
- Tests/Inflector
2 files changed
+5
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
238 | 238 | | |
239 | 239 | | |
240 | 240 | | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
241 | 244 | | |
242 | 245 | | |
243 | 246 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
179 | 180 | | |
180 | 181 | | |
181 | 182 | | |
| 183 | + | |
182 | 184 | | |
183 | 185 | | |
184 | 186 | | |
| |||
0 commit comments