Merge branch '5.2' into 5.x
* 5.2: Fix merge
This commit is contained in:
commit
c9fc299aed
@ -119,7 +119,7 @@ final class FrenchInflector implements InflectorInterface
|
|||||||
return [$plural];
|
return [$plural];
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (self::$singularizeRegexp as $rule) {
|
foreach (self::SINGULARIZE_REGEXP as $rule) {
|
||||||
[$regexp, $replace] = $rule;
|
[$regexp, $replace] = $rule;
|
||||||
|
|
||||||
if (1 === preg_match($regexp, $plural)) {
|
if (1 === preg_match($regexp, $plural)) {
|
||||||
|
Reference in New Issue
Block a user