Skip to content

Commit d5e739f

Browse files
Merge branch '7.3' into 7.4
* 7.3: remove deprecated nullable option from primary key columns specific fix to avoid 'outag' when inflecting 'outages' [DependencyInjection] Don’t autowire excluded services Add bool return type to CustomCredentials callable parameter [Process] Enhance hasSystemCallBeenInterrupted function for non-english locale [FrameworkBundle] Make `cache:warmup` warm up read-only caches
2 parents 3ba35cb + d5b4dc5 commit d5e739f

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
@@ -166,6 +166,9 @@ final class EnglishInflector implements InflectorInterface
166166
// edges (edge)
167167
['segd', 4, true, true, 'dge'],
168168

169+
// outages (outage) - specific fix to avoid 'outag'
170+
['segatuo', 7, true, true, 'outage'],
171+
169172
// roses (rose), garages (garage), cassettes (cassette),
170173
// waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
171174
// shoes (shoe)

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public static function singularizeProvider()
125125
['news', 'news'],
126126
['oases', ['oas', 'oase', 'oasis']],
127127
['objectives', 'objective'],
128+
['outages', 'outage'],
128129
['oxen', 'ox'],
129130
['parties', 'party'],
130131
['people', 'person'],

0 commit comments

Comments
 (0)