Skip to content

Commit a562eff

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [Yaml] fix exception contexts People - person singularization [Yaml] properly handle unindented collections [Serializer] Add test for ignored attributes during denormalization chomp newlines only at the end of YAML documents Fixed server status command when port has been omitted Update UPGRADE FROM 2.x to 3.0 Catch \Throwable Use levenshtein level for better Bundle matching [WebProfilerBundle] Fix CORS ajax security issues
2 parents 1d6f018 + d663dc2 commit a562eff

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

StringUtil.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ class StringUtil
124124

125125
// chateaux (chateau)
126126
array('xuae', 4, false, true, 'eau'),
127+
128+
// people (person)
129+
array('elpoep', 6, true, true, 'person'),
127130
);
128131

129132
/**

Tests/StringUtilTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ public function singularifyProvider()
107107
array('objectives', 'objective'),
108108
array('oxen', 'ox'),
109109
array('parties', 'party'),
110+
array('people', 'person'),
111+
array('persons', 'person'),
110112
array('phenomena', array('phenomenon', 'phenomenum')),
111113
array('photos', 'photo'),
112114
array('pianos', 'piano'),

0 commit comments

Comments
 (0)