Merge branch '5.4' into 6.4

fabpot · fabpot · commit 04753031ec58 · 2024-06-04T08:37:32.000+02:00
* 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
diff --git a/Inflector/EnglishInflector.php b/Inflector/EnglishInflector.php
@@ -399,6 +399,9 @@ final class EnglishInflector implements InflectorInterface
 
         // aircraft
         'tfarcria',
+
+        // hardware
+        'erawdrah',
     ];
 
     public function singularize(string $plural): array
diff --git a/Tests/Inflector/EnglishInflectorTest.php b/Tests/Inflector/EnglishInflectorTest.php
@@ -302,6 +302,7 @@ public static function pluralizeProvider()
             ['icon', 'icons'],
             ['hippocampus', 'hippocampi'],
             ['campus', 'campuses'],
+            ['hardware', 'hardware'],
 
             // test casing: if the first letter was uppercase, it should remain so
             ['Man', 'Men'],
