NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.7k

Commit439a278

committed

bug#58799 [String] Fix some spellings inEnglishInflector (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 | MITFixing 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 parentsda4eb8b +dfc53b8 commit439a278Copy full SHA for 439a278

File tree

4 files changed

+12

-12

lines changed

src/Symfony/Component
- Inflector
  - Tests
    - InflectorTest.php
  - composer.json
- String
  - Inflector
    - EnglishInflector.php
  - Tests/Inflector
    - EnglishInflectorTest.php

4 files changed

+12

-12

lines changed

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public static function pluralizeProvider()`
`186`	`186`	`['alumnus','alumni'],`
`187`	`187`	`['analysis','analyses'],`
`188`	`188`	`['antenna','antennas'],// antennae`
`189`		`- ['appendix', ['appendicies','appendixes']],`
	`189`	`+ ['appendix', ['appendices','appendixes']],`
`190`	`190`	`['arch','arches'],`
`191`	`191`	`['atlas','atlases'],`
`192`	`192`	`['axe','axes'],`
`@@ -229,7 +229,7 @@ public static function pluralizeProvider()`
`229`	`229`	`['edge','edges'],`
`230`	`230`	`['elf', ['elfs','elves']],`
`231`	`231`	`['emphasis','emphases'],`
`232`		`- ['fax', ['facies','faxes']],`
	`232`	`+ ['fax', ['faxes','faxxes']],`
`233`	`233`	`['feedback','feedback'],`
`234`	`234`	`['focus','focuses'],`
`235`	`235`	`['foot','feet'],`
`@@ -258,7 +258,7 @@ public static function pluralizeProvider()`
`258`	`258`	`['life','lives'],`
`259`	`259`	`['louse','lice'],`
`260`	`260`	`['man','men'],`
`261`		`- ['matrix', ['matricies','matrixes']],`
	`261`	`+ ['matrix', ['matrices','matrixes']],`
`262`	`262`	`['medium','media'],`
`263`	`263`	`['memorandum','memoranda'],`
`264`	`264`	`['mouse','mice'],`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"php":">=7.2.5",`
`27`	`27`	`"symfony/deprecation-contracts":"^2.1\|^3",`
`28`	`28`	`"symfony/polyfill-php80":"^1.16",`
`29`		`-"symfony/string":"^5.4.41\|^6.4.9"`
	`29`	`+"symfony/string":"^5.4.47\|^6.4.15"`
`30`	`30`	`},`
`31`	`31`	`"autoload": {`
`32`	`32`	`"psr-4": {"Symfony\\Component\\Inflector\\":"" },`

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

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,14 +348,14 @@ final class EnglishInflector implements InflectorInterface`
`348`	`348`	`// indices (index)`
`349`	`349`	`['xedni',5,false,true, ['indicies','indexes']],`
`350`	`350`
	`351`	`+// fax (faxes, faxxes)`
	`352`	`+ ['xaf',3,true,true, ['faxes','faxxes']],`
	`353`	`+`
`351`	`354`	`// boxes (box)`
`352`	`355`	`['xo',2,false,true,'oxes'],`
`353`	`356`
`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']],`
`359`	`359`
`360`	`360`	`// babies (baby)`
`361`	`361`	`['y',1,false,true,'ies'],`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public static function pluralizeProvider()`
`193`	`193`	`['analysis','analyses'],`
`194`	`194`	`['ankle','ankles'],`
`195`	`195`	`['antenna','antennas'],// antennae`
`196`		`- ['appendix', ['appendicies','appendixes']],`
	`196`	`+ ['appendix', ['appendices','appendixes']],`
`197`	`197`	`['arch','arches'],`
`198`	`198`	`['article','articles'],`
`199`	`199`	`['atlas','atlases'],`
`@@ -238,7 +238,7 @@ public static function pluralizeProvider()`
`238`	`238`	`['edge','edges'],`
`239`	`239`	`['elf', ['elfs','elves']],`
`240`	`240`	`['emphasis','emphases'],`
`241`		`- ['fax', ['facies','faxes']],`
	`241`	`+ ['fax', ['faxes','faxxes']],`
`242`	`242`	`['feedback','feedback'],`
`243`	`243`	`['focus','focuses'],`
`244`	`244`	`['foot','feet'],`
`@@ -267,7 +267,7 @@ public static function pluralizeProvider()`
`267`	`267`	`['life','lives'],`
`268`	`268`	`['louse','lice'],`
`269`	`269`	`['man','men'],`
`270`		`- ['matrix', ['matricies','matrixes']],`
	`270`	`+ ['matrix', ['matrices','matrixes']],`
`271`	`271`	`['medium','media'],`
`272`	`272`	`['memorandum','memoranda'],`
`273`	`273`	`['mouse','mice'],`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit439a278

File tree

4 files changed

4 files changed

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

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

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

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

0 commit comments