From dfc53b8ffd48a5ca053b5588673842c58dd77a0c Mon Sep 17 00:00:00 2001
From: Alexandre Daubois <alex.daubois@gmail.com>
Date: Thu, 7 Nov 2024 15:12:33 +0100
Subject: [PATCH] [String] Fix some spellings in `EnglishInflector`

---
 .../Component/Inflector/Tests/InflectorTest.php        |  6 +++---
 src/Symfony/Component/Inflector/composer.json          |  2 +-
 .../Component/String/Inflector/EnglishInflector.php    | 10 +++++-----
 .../String/Tests/Inflector/EnglishInflectorTest.php    |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Component/Inflector/Tests/InflectorTest.php b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
index d637e3d72d1eb..3d1c5769a6da0 100644
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@@ -186,7 +186,7 @@ public static function pluralizeProvider()
             ['alumnus', 'alumni'],
             ['analysis', 'analyses'],
             ['antenna', 'antennas'], // antennae
-            ['appendix', ['appendicies', 'appendixes']],
+            ['appendix', ['appendices', 'appendixes']],
             ['arch', 'arches'],
             ['atlas', 'atlases'],
             ['axe', 'axes'],
@@ -229,7 +229,7 @@ public static function pluralizeProvider()
             ['edge', 'edges'],
             ['elf', ['elfs', 'elves']],
             ['emphasis', 'emphases'],
-            ['fax', ['facies', 'faxes']],
+            ['fax', ['faxes', 'faxxes']],
             ['feedback', 'feedback'],
             ['focus', 'focuses'],
             ['foot', 'feet'],
@@ -258,7 +258,7 @@ public static function pluralizeProvider()
             ['life', 'lives'],
             ['louse', 'lice'],
             ['man', 'men'],
-            ['matrix', ['matricies', 'matrixes']],
+            ['matrix', ['matrices', 'matrixes']],
             ['medium', 'media'],
             ['memorandum', 'memoranda'],
             ['mouse', 'mice'],
diff --git a/src/Symfony/Component/Inflector/composer.json b/src/Symfony/Component/Inflector/composer.json
index 6b46f7cb918b1..70bc73720095f 100644
--- a/src/Symfony/Component/Inflector/composer.json
+++ b/src/Symfony/Component/Inflector/composer.json
@@ -26,7 +26,7 @@
         "php": ">=7.2.5",
         "symfony/deprecation-contracts": "^2.1|^3",
         "symfony/polyfill-php80": "^1.16",
-        "symfony/string": "^5.4.41|^6.4.9"
+        "symfony/string": "^5.4.47|^6.4.15"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Inflector\\": "" },
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
index 9557e3507f258..ecd51d41f4a8d 100644
--- a/src/Symfony/Component/String/Inflector/EnglishInflector.php
+++ b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -348,14 +348,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'],
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
index 47bb5aedb25b7..b87dac6f65a1e 100644
--- a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
+++ b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -193,7 +193,7 @@ public static function pluralizeProvider()
             ['analysis', 'analyses'],
             ['ankle', 'ankles'],
             ['antenna', 'antennas'], // antennae
-            ['appendix', ['appendicies', 'appendixes']],
+            ['appendix', ['appendices', 'appendixes']],
             ['arch', 'arches'],
             ['article', 'articles'],
             ['atlas', 'atlases'],
@@ -238,7 +238,7 @@ public static function pluralizeProvider()
             ['edge', 'edges'],
             ['elf', ['elfs', 'elves']],
             ['emphasis', 'emphases'],
-            ['fax', ['facies', 'faxes']],
+            ['fax', ['faxes', 'faxxes']],
             ['feedback', 'feedback'],
             ['focus', 'focuses'],
             ['foot', 'feet'],
@@ -267,7 +267,7 @@ public static function pluralizeProvider()
             ['life', 'lives'],
             ['louse', 'lice'],
             ['man', 'men'],
-            ['matrix', ['matricies', 'matrixes']],
+            ['matrix', ['matrices', 'matrixes']],
             ['medium', 'media'],
             ['memorandum', 'memoranda'],
             ['mouse', 'mice'],