Skip to content

Commit d0a29e1

Browse files
committedJul 5, 2023
Merge branch '5.4' into 6.2
* 5.4: cs fix [Messenger] Fix passing options set via tags to handler descriptors random_bytes length should be an int greater than 0 enforce UTC timezone in test [DependencyInjection] Fix autocasting null env values to empty string Fix executable bit Readme: Replace Stack Overflow with GitHub Discussions [DependencyInjection] Fix annotation [String] Fix Inflector for 'status' [EventDispatcher] [EventDispatcher] Throw exception when listener method cannot be resolved
2 parents 193e83b + 1181fe9 commit d0a29e1

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed
 

‎Inflector/EnglishInflector.php

+9
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ final class EnglishInflector implements InflectorInterface
9494
// accesses (access), addresses (address), kisses (kiss)
9595
['sess', 4, true, false, 'ss'],
9696

97+
// statuses (status)
98+
['sesutats', 8, true, true, 'status'],
99+
97100
// analyses (analysis), ellipses (ellipsis), fungi (fungus),
98101
// neuroses (neurosis), theses (thesis), emphases (emphasis),
99102
// oases (oasis), crises (crisis), houses (house), bases (base),
@@ -138,6 +141,9 @@ final class EnglishInflector implements InflectorInterface
138141
// shoes (shoe)
139142
['se', 2, true, true, ['', 'e']],
140143

144+
// status (status)
145+
['sutats', 6, true, true, 'status'],
146+
141147
// tags (tag)
142148
['s', 1, true, true, ''],
143149

@@ -279,6 +285,9 @@ final class EnglishInflector implements InflectorInterface
279285
// circuses (circus)
280286
['suc', 3, true, true, 'cuses'],
281287

288+
// status (status)
289+
['sutats', 6, true, true, ['status', 'statuses']],
290+
282291
// conspectuses (conspectus), prospectuses (prospectus)
283292
['sutcep', 6, true, true, 'pectuses'],
284293

‎Tests/Inflector/EnglishInflectorTest.php

+3
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ public static function singularizeProvider()
142142
['species', 'species'],
143143
['spies', 'spy'],
144144
['staves', ['staf', 'stave', 'staff']],
145+
['status', 'status'],
146+
['statuses', 'status'],
145147
['stories', 'story'],
146148
['strata', ['straton', 'stratum']],
147149
['suitcases', ['suitcas', 'suitcase', 'suitcasis']],
@@ -279,6 +281,7 @@ public static function pluralizeProvider()
279281
['sheriff', 'sheriffs'],
280282
['shoe', 'shoes'],
281283
['species', 'species'],
284+
['status', ['status', 'statuses']],
282285
['spy', 'spies'],
283286
['staff', 'staves'],
284287
['story', 'stories'],

0 commit comments

Comments
 (0)
Please sign in to comment.