Skip to content

Commit b87a95c

Browse files
Merge branch '7.4' into 8.0
* 7.4: [Security] Fix deprecation [Serializer] Don't fallback to default serializer if tags specify a named one make RoutingControllerPass and AttributeServicesLoader final fix tests [Security] Preserve ordering of roles in RoleHierarchy [Messenger] Fix Oracle errors 'ORA-00955: Name is already used by an existing object' with Doctrine transport [FrameworkBundle] Only show relevant columns in `debug:router` call and adding colors [Security] Improve performance of `RoleHierarchy::buildRoleMap` method chore: add exclude-receivers consume parameters [ObjectMapper] embed collection transformer [SecurityHttp] Removes final keyword from IsGranted attribute [String] Fix nodes singular [Console] Fix testing multiline question [Security][Validator] Review translations. [Security] Ignore target route when exiting impersonation [Console] Restore SHELL_VERBOSITY after a command is ran
2 parents 309b28f + 324705b commit b87a95c

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Inflector/EnglishInflector.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ final class EnglishInflector implements InflectorInterface
2525
// Fourth entry: Whether the suffix may succeed a consonant
2626
// Fifth entry: singular suffix, normal
2727

28+
// nodes (node)
29+
['sedon', 5, true, true, 'node'],
30+
2831
// bacteria (bacterium)
2932
['airetcab', 8, true, true, 'bacterium'],
3033

@@ -202,6 +205,9 @@ final class EnglishInflector implements InflectorInterface
202205
// Fourth entry: Whether the suffix may succeed a consonant
203206
// Fifth entry: plural suffix, normal
204207

208+
// nodes (node)
209+
['edon', 4, true, true, 'nodes'],
210+
205211
// axes (axis)
206212
['sixa', 4, false, false, 'axes'],
207213

Tests/Inflector/EnglishInflectorTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public static function singularizeProvider()
124124
['nebulae', 'nebula'],
125125
['neuroses', ['neuros', 'neurose', 'neurosis']],
126126
['news', 'news'],
127+
['nodes', 'node'],
127128
['oases', ['oas', 'oase', 'oasis']],
128129
['objectives', 'objective'],
129130
['outages', 'outage'],
@@ -282,6 +283,7 @@ public static function pluralizeProvider()
282283
['nebula', 'nebulae'],
283284
['neurosis', 'neuroses'],
284285
['news', 'news'],
286+
['node', 'nodes'],
285287
['oasis', 'oases'],
286288
['objective', 'objectives'],
287289
['ox', 'oxen'],

0 commit comments

Comments
 (0)