Merge branch '6.4' into 7.0

* 6.4:
  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
  register the MailPaceTransportFactory
  [String] Correct inflection of axis
  [Security] Fix `AuthenticationUtils::getLastUsername()` returning null
  [Process] Fixed inconsistent test

Author: xabbuh

Inflector/EnglishInflector.php

@@ -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'],
 
@@ -384,6 +387,9 @@ final class EnglishInflector implements InflectorInterface
 
         // traffic
         'ciffart',
+
+        // aircraft
+        'tfarcria',
     ];
 
     public function singularize(string $plural): array

Tests/Inflector/EnglishInflectorTest.php

@@ -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'],