Skip to content

Commit d2cbe4a

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: fix used class after merge fix tests [Console] Only execute additional checks for color support if the output is a TTY fix aircraft inflection [TwigBundle] Fix configuration when 'paths' is null Fix AttributeClassLoaderTestCase + Added ->setUp() - Removed 'abstract' so it'd be picked up by Tests. * Changed getNamespace() to full path Qualified Name. * Rename file AttributeClassLoaderTestCase to AttributeClassLoaderTest and the class. register the MailPaceTransportFactory [String] Correct inflection of axis [Security] Fix `AuthenticationUtils::getLastUsername()` returning null [Process] Fixed inconsistent test fix(ldap): replace {username} with {user_identifier} in LDAP factories
2 parents 7a06dfa + 8574b9b commit d2cbe4a

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ final class EnglishInflector implements InflectorInterface
166166
// Fourth entry: Whether the suffix may succeed a consonant
167167
// Fifth entry: plural suffix, normal
168168

169+
// axes (axis)
170+
['sixa', 4, false, false, 'axes'],
171+
169172
// criterion (criteria)
170173
['airetirc', 8, false, false, 'criterion'],
171174

@@ -384,6 +387,9 @@ final class EnglishInflector implements InflectorInterface
384387

385388
// traffic
386389
'ciffart',
390+
391+
// aircraft
392+
'tfarcria',
387393
];
388394

389395
public function singularize(string $plural): array

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,15 @@ public static function pluralizeProvider()
178178
['access', 'accesses'],
179179
['address', 'addresses'],
180180
['agenda', 'agendas'],
181+
['aircraft', 'aircraft'],
181182
['alumnus', 'alumni'],
182183
['analysis', 'analyses'],
183184
['antenna', 'antennas'], // antennae
184185
['appendix', ['appendicies', 'appendixes']],
185186
['arch', 'arches'],
186187
['atlas', 'atlases'],
187188
['axe', 'axes'],
189+
['axis', 'axes'],
188190
['baby', 'babies'],
189191
['bacterium', 'bacteria'],
190192
['base', 'bases'],

0 commit comments

Comments
 (0)