Skip to content

Commit ffe3085

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: 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 restore deprecated properties 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 handle edge cases when constructing constraints with named arguments convert empty CSV header names into numeric keys
2 parents 236b450 + f9b06cc commit ffe3085

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,9 @@ final class EnglishInflector implements InflectorInterface
238238
// teeth (tooth)
239239
['htoot', 5, true, true, 'teeth'],
240240

241+
// albums (album)
242+
['mubla', 5, true, true, 'albums'],
243+
241244
// bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
242245
['mu', 2, true, true, 'a'],
243246

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static function singularizeProvider()
2424
['accesses', 'access'],
2525
['addresses', 'address'],
2626
['agendas', 'agenda'],
27+
['albums', 'album'],
2728
['alumnae', 'alumna'],
2829
['alumni', 'alumnus'],
2930
['analyses', ['analys', 'analyse', 'analysis']],
@@ -179,6 +180,7 @@ public static function pluralizeProvider()
179180
['address', 'addresses'],
180181
['agenda', 'agendas'],
181182
['aircraft', 'aircraft'],
183+
['album', 'albums'],
182184
['alumnus', 'alumni'],
183185
['analysis', 'analyses'],
184186
['antenna', 'antennas'], // antennae

0 commit comments

Comments
 (0)