Merge branch '7.0' into 7.1

* 7.0: not registered definitions must not be modified fix low deps [String] Fix Inflector for 'hardware' [Mime] Use streams instead of loading raw message generator into memory Bump Symfony version to 7.0.9 Update VERSION for 7.0.8 Update CHANGELOG for 7.0.8 Bump Symfony version to 6.4.9 Update VERSION for 6.4.8 Update CHANGELOG for 6.4.8 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
symfony · Jun 4, 2024 · 60bc311 · 60bc311
2 parents 8beaf4e + fbabbf6
commit 60bc311
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
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'],