Skip to content

Commit f3c6aeb

Browse files
Merge branch '5.4' into 6.4
* 5.4: [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun Reviewed Catalan missing translations Fix typo: synchronous -> synchronously [Serializer] Check if exception message in test is correct Ibexa is sponsoring Symfony 5.4, thanks to them! \o/ [String] Add `alias` case to `EnglishInflector`
2 parents 99ff820 + a8b1c35 commit f3c6aeb

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,9 @@ final class EnglishInflector implements InflectorInterface
289289
// atlases (atlas)
290290
['salta', 5, true, true, 'atlases'],
291291

292+
// aliases (alias)
293+
['saila', 5, true, true, 'aliases'],
294+
292295
// irises (iris)
293296
['siri', 4, true, true, 'irises'],
294297

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ public static function pluralizeProvider()
317317
['hippocampus', 'hippocampi'],
318318
['campus', 'campuses'],
319319
['hardware', 'hardware'],
320+
['alias', 'aliases'],
320321

321322
// test casing: if the first letter was uppercase, it should remain so
322323
['Man', 'Men'],

0 commit comments

Comments
 (0)