Skip to content

Commit f583252

Browse files
Merge branch '6.4' into 7.0
* 6.4: [Console] Allow false as a $shortcut in InputOption [MonologBridge] Support symfony/security-core 5.4 again Fix plurial of word ending by pus
2 parents 524aac4 + 4e465a9 commit f583252

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Diff for: Inflector/EnglishInflector.php

+6
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,12 @@ final class EnglishInflector implements InflectorInterface
291291
// circuses (circus)
292292
['suc', 3, true, true, 'cuses'],
293293

294+
// hippocampi (hippocampus)
295+
['supmacoppih', 11, false, false, 'hippocampi'],
296+
297+
// campuses (campus)
298+
['sup', 3, true, true, 'puses'],
299+
294300
// status (status)
295301
['sutats', 6, true, true, ['status', 'statuses']],
296302

Diff for: Tests/Inflector/EnglishInflectorTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ public static function pluralizeProvider()
298298
['waltz', 'waltzes'],
299299
['wife', 'wives'],
300300
['icon', 'icons'],
301+
['hippocampus', 'hippocampi'],
302+
['campus', 'campuses'],
301303

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

0 commit comments

Comments
 (0)