Skip to content

Commit 0475303

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: not registered definitions must not be modified [String] Fix Inflector for 'hardware' Bump Symfony version to 5.4.41 Update VERSION for 5.4.40 Update CONTRIBUTORS for 5.4.40 Update CHANGELOG for 5.4.40
2 parents a147c0f + dd2c915 commit 0475303

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,9 @@ final class EnglishInflector implements InflectorInterface
399399

400400
// aircraft
401401
'tfarcria',
402+
403+
// hardware
404+
'erawdrah',
402405
];
403406

404407
public function singularize(string $plural): array

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ public static function pluralizeProvider()
302302
['icon', 'icons'],
303303
['hippocampus', 'hippocampi'],
304304
['campus', 'campuses'],
305+
['hardware', 'hardware'],
305306

306307
// test casing: if the first letter was uppercase, it should remain so
307308
['Man', 'Men'],

0 commit comments

Comments
 (0)