Merge branch '7.1' into 7.2

* 7.1:
  [String] Fix some spellings in `EnglishInflector`
  [TwigBridge] Fix emojify as function in Undefined Handler

Author: nicolas-grekas

src/Symfony/Bridge/Twig/UndefinedCallableHandler.php

@@ -23,6 +23,7 @@
 class UndefinedCallableHandler
 {
     private const FILTER_COMPONENTS = [
+        'emojify' => 'emoji',
         'humanize' => 'form',
         'form_encode_currency' => 'form',
         'serialize' => 'serializer',
@@ -37,7 +38,6 @@ class UndefinedCallableHandler
         'asset_version' => 'asset',
         'importmap' => 'asset-mapper',
         'dump' => 'debug-bundle',
-        'emojify' => 'emoji',
         'encore_entry_link_tags' => 'webpack-encore-bundle',
         'encore_entry_script_tags' => 'webpack-encore-bundle',
         'expression' => 'expression-language',

src/Symfony/Component/String/Inflector/EnglishInflector.php

@@ -354,14 +354,14 @@ final class EnglishInflector implements InflectorInterface
         // indices (index)
         ['xedni', 5, false, true, ['indicies', 'indexes']],
 
+        // fax (faxes, faxxes)
+        ['xaf', 3, true, true, ['faxes', 'faxxes']],
+
         // boxes (box)
         ['xo', 2, false, true, 'oxes'],
 
-        // indexes (index), matrixes (matrix)
-        ['x', 1, true, false, ['cies', 'xes']],
-
-        // appendices (appendix)
-        ['xi', 2, false, true, 'ices'],
+        // indexes (index), matrixes (matrix), appendices (appendix)
+        ['x', 1, true, false, ['ces', 'xes']],
 
         // babies (baby)
         ['y', 1, false, true, 'ies'],

src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php

@@ -195,7 +195,7 @@ public static function pluralizeProvider()
             ['analysis', 'analyses'],
             ['ankle', 'ankles'],
             ['antenna', 'antennas'], // antennae
-            ['appendix', ['appendicies', 'appendixes']],
+            ['appendix', ['appendices', 'appendixes']],
             ['arch', 'arches'],
             ['article', 'articles'],
             ['atlas', 'atlases'],
@@ -240,7 +240,7 @@ public static function pluralizeProvider()
             ['edge', 'edges'],
             ['elf', ['elfs', 'elves']],
             ['emphasis', 'emphases'],
-            ['fax', ['facies', 'faxes']],
+            ['fax', ['faxes', 'faxxes']],
             ['feedback', 'feedback'],
             ['focus', 'focuses'],
             ['foot', 'feet'],
@@ -269,7 +269,7 @@ public static function pluralizeProvider()
             ['life', 'lives'],
             ['louse', 'lice'],
             ['man', 'men'],
-            ['matrix', ['matricies', 'matrixes']],
+            ['matrix', ['matrices', 'matrixes']],
             ['medium', 'media'],
             ['memorandum', 'memoranda'],
             ['mouse', 'mice'],