Skip to content

Commit 8f93c44

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: [Inflector][String] Fixed singularize `edges` > `edge` ref #41087: missing turkish translations from security component Added translations for pt security file.
2 parents 01454c6 + 81e5298 commit 8f93c44

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

Inflector/EnglishInflector.php

+21
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ final class EnglishInflector implements InflectorInterface
118118
// fees (fee), trees (tree), employees (employee)
119119
['see', 3, true, true, 'ee'],
120120

121+
// edges (edge)
122+
['segd', 4, true, true, 'dge'],
123+
121124
// roses (rose), garages (garage), cassettes (cassette),
122125
// waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
123126
// shoes (shoe)
@@ -309,14 +312,32 @@ final class EnglishInflector implements InflectorInterface
309312
*/
310313
private const UNINFLECTED = [
311314
'',
315+
316+
// data
312317
'atad',
318+
319+
// deer
313320
'reed',
321+
322+
// feedback
314323
'kcabdeef',
324+
325+
// fish
315326
'hsif',
327+
328+
// info
316329
'ofni',
330+
331+
// moose
317332
'esoom',
333+
334+
// series
318335
'seires',
336+
337+
// sheep
319338
'peehs',
339+
340+
// species
320341
'seiceps',
321342
];
322343

Tests/Inflector/EnglishInflectorTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public function singularizeProvider()
6767
['drivers', 'driver'],
6868
['dwarves', ['dwarf', 'dwarve', 'dwarff']],
6969
['echoes', ['echo', 'echoe']],
70+
['edges', 'edge'],
7071
['elves', ['elf', 'elve', 'elff']],
7172
['emphases', ['emphas', 'emphase', 'emphasis']],
7273
['employees', 'employee'],
@@ -211,6 +212,7 @@ public function pluralizeProvider()
211212
['driver', 'drivers'],
212213
['dwarf', ['dwarfs', 'dwarves']],
213214
['echo', 'echoes'],
215+
['edge', 'edges'],
214216
['elf', ['elfs', 'elves']],
215217
['emphasis', 'emphases'],
216218
['fax', ['facies', 'faxes']],

0 commit comments

Comments
 (0)