Skip to content

Commit ba72779

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (33 commits) do not pass a boolean to the constructor of the Dotenv class [Notifier] Fix low-deps tests Deprecate Composer 1 [Filesystem] Add third argument `$lockFile` to `Filesystem::appendToFile()` [TwigBundle] fix auto-enabling assets/expression/routing/yaml/workflow extensions [PhpUnitBridge] fix symlink to bridge in docker by making its path relative [Dotenv] Duplicate $_SERVER values in $_ENV if they don't exist Fix markup [Notifier] Add Expo bridge Add polish translations (#43725) Rename translation:update to translation:extract [String] Add PLURAL_MAP "zombies" -- fix #43789 Added support for `statusCode` default parameter when loading a template directly from route using the `Symfony\Bundle\FrameworkBundle\Controller\TemplateController` controller. [Validator] Update validators.bs.xlf Cache voters that will always abstain [Messenger] Fix `TraceableMessageBus` implementation so it can compute caller even when used within a callback [Validator] Add the missing translations for Russian (ru) [Validator] Added missing translations for Latvian (lv) [Validator] Added missing translations [Validator] Add missing translations for Vietnamese (VI) ...
2 parents 2118912 + dad92b1 commit ba72779

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
@@ -58,6 +58,9 @@ final class EnglishInflector implements InflectorInterface
5858
// selfies (selfie)
5959
['seifles', 7, true, true, 'selfie'],
6060

61+
// zombies (zombie)
62+
['seibmoz', 7, true, true, 'zombie'],
63+
6164
// movies (movie)
6265
['seivom', 6, true, true, 'movie'],
6366

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ public function singularizeProvider()
152152
['trees', 'tree'],
153153
['waltzes', ['waltz', 'waltze']],
154154
['wives', 'wife'],
155+
['zombies', 'zombie'],
155156

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

0 commit comments

Comments
 (0)