Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  [Console] Only execute additional checks for color support if the output is a TTY
  fix aircraft inflection
  [TwigBundle] Fix configuration when 'paths' is null
  register the MailPaceTransportFactory
  [String] Correct inflection of axis
  [Security] Fix `AuthenticationUtils::getLastUsername()` returning null
  [Process] Fixed inconsistent test
  • Loading branch information
xabbuh committed Jan 19, 2024
2 parents 7cb80bc + 8a8cd3f commit 1b4a76c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Inflector/EnglishInflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ final class EnglishInflector implements InflectorInterface
// Fourth entry: Whether the suffix may succeed a consonant
// Fifth entry: plural suffix, normal

// axes (axis)
['sixa', 4, false, false, 'axes'],

// criterion (criteria)
['airetirc', 8, false, false, 'criterion'],

Expand Down Expand Up @@ -384,6 +387,9 @@ final class EnglishInflector implements InflectorInterface

// traffic
'ciffart',

// aircraft
'tfarcria',
];

public function singularize(string $plural): array
Expand Down
2 changes: 2 additions & 0 deletions Tests/Inflector/EnglishInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,15 @@ public static function pluralizeProvider()
['access', 'accesses'],
['address', 'addresses'],
['agenda', 'agendas'],
['aircraft', 'aircraft'],
['alumnus', 'alumni'],
['analysis', 'analyses'],
['antenna', 'antennas'], // antennae
['appendix', ['appendicies', 'appendixes']],
['arch', 'arches'],
['atlas', 'atlases'],
['axe', 'axes'],
['axis', 'axes'],
['baby', 'babies'],
['bacterium', 'bacteria'],
['base', 'bases'],
Expand Down

0 comments on commit 1b4a76c

Please sign in to comment.