Skip to content

Commit a716227

Browse files
Merge branch '6.4' into 7.0
* 6.4: [HttpClient][Mailer] Revert "Let curl handle transfer encoding", use HTTP/1.1 for Mailgun Reviewed Catalan missing translations [AssetMapper] Upgrade importmap polyfill Fix typo: synchronous -> synchronously [Serializer] Check if exception message in test is correct Ibexa is sponsoring Symfony 5.4, thanks to them! \o/ [VarDumper] Fix `FFICaster` test to be platform-adaptable [String] Add `alias` case to `EnglishInflector` [FrameworkBundle] Throw runtime exception when trying to use asset-mapper while http-client is disabled [SecurityBundle] Remove unused memory users’ `name` attribute from the XSD [VarExporter] generate __doUnserialize() method in ProxyHelper::generateLazyProxy() Double check if pcntl function exists Add additional headers in Scaleway bridge [VarDumper] Fix FFI caster test [DependencyInjection] Add test coverage for `AutowireCallable::buildDefinition()`
2 parents 46fc816 + f3c6aeb commit a716227

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Inflector/EnglishInflector.php

+3
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

+1
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)