10000 bug #58799 [String] Fix some spellings in `EnglishInflector` (alexand… · symfony/symfony@439a278 · GitHub
[go: up one dir, main page]
Skip to content

Commit 439a278

Browse files
fabpotfabpot
committed
bug #58799 [String] Fix some spellings in EnglishInflector (alexandre-daubois)
This PR was merged into the 5.4 branch. Discussion ---------- [String] Fix some spellings in `EnglishInflector` | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #58797 | License | MIT Fixing the issue highlighted a spelling error for "fax" as well (https://en.wiktionary.org/wiki/fax#English) Commits ------- dfc53b8 [String] Fix some spellings in `EnglishInflector`
2 parents da4eb8b + dfc53b8 commit 439a278

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

‎src/Symfony/Component/Inflector/Tests/InflectorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public static function pluralizeProvider()
186186
['alumnus', 'alumni'],
187187
['analysis', 'analyses'],
188188
['antenna', 'antennas'], // antennae
189-
['appendix', ['appendicies', 'appendixes']],
189+
['appendix', ['appendices', 'appendixes']],
190190
['arch', 'arches'],
191191
['atlas', 'atlases'],
192192
['axe', 'axes'],
@@ -229,7 +229,7 @@ public static function pluralizeProvider()
229229
['edge', 'edges'],
230230
['elf', ['elfs', 'elves']],
231231
['emphasis', 'emphases'],
232-
['fax', ['facies', 'faxes']],
232+
['fax', ['faxes', 'faxxes']],
233233
['feedback', 'feedback'],
234234
['focus', 'focuses'],
235235
['foot', 'feet'],
@@ -258,7 +258,7 @@ public static function pluralizeProvider()
258258
['life', 'lives'],
259259
['louse', 'lice'],
260260
['man', 'men'],
261-
['matrix', ['matricies', 'matrixes']],
261+
['matrix', ['matrices', 'matrixes']],
262262
['medium', 'media'],
263263
['memorandum', 'memoranda'],
264264
['mouse', 'mice'],

‎src/Symfony/Component/Inflector/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"php": ">=7.2.5",
2727
"symfony/deprecation-contracts": "^2.1|^3",
2828
"symfony/polyfill-php80": "^1.16",
29-
"symfony/string": "^5.4.41|^6.4.9"
29+
"symfony/string": "^5.4.47|^6.4.15"
3030
},
3131
"autoload": {
3232
"psr-4": { "Symfony\\Component\\Inflector\\": "" },

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,14 @@ final class EnglishInflector implements InflectorInterface
348348
// indices (index)
349349
['xedni', 5, false, true, ['indicies', 'indexes']],
350350

351+
// fax (faxes, faxxes)
352+
['xaf', 3, true, true, ['faxes', 'faxxes']],
353+
351354
// boxes (box)
352355
['xo', 2, false, true, 'oxes'],
353356

354-
// indexes (index), matrixes (matrix)
355-
['x', 1, true, false, ['cies', 'xes']],
356-
357-
// appendices (appendix)
358-
['xi', 2, false, true, 'ices'],
357+
// indexes (index), matrixes (matrix), appendices (appendix)
358+
['x', 1, true, false, ['ces', 'xes']],
359359

360360
// babies (baby)
361361
['y', 1, false, true, 'ies'],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public static function pluralizeProvider()
193193
['analysis', 'analyses'],
194194
['ankle', 'ankles'],
195195
['antenna', 'antennas'], // antennae
196-
['appendix', ['appendicies', 'appendixes']],
196+
['appendix', ['appendices', 'appendixes']],
197197
['arch', 'arches'],
198198
['article', 'articles'],
199199
['atlas', 'atlases'],
@@ -238,7 +238,7 @@ public static function pluralizeProvider()
238238
['edge', 'edges'],
239239
['elf', ['elfs', 'elves']],
240240
['emphasis', 'emphases'],
241-
['fax', ['facies', 'faxes']],
241+
['fax', ['faxes', 'faxxes']],
242242
['feedback', 'feedback'],
243243
['focus', 'focuses'],
244244
['foot', 'feet'],
@@ -267,7 +267,7 @@ public static function pluralizeProvider()
267267
['life', 'lives'],
268268
['louse', 'lice'],
269269
['man', 'men'],
270-
['matrix', ['matricies', 'matrixes']],
270+
['matrix', ['matrices', 'matrixes']],
271271
['medium', 'media'],
272272
['memorandum', 'memoranda'],
273273
['mouse', 'mice'],

0 commit comments

Comments
 (0)
0