Skip to content

Commit

Permalink
Merge branch '6.0' into 6.1
Browse files Browse the repository at this point in the history
* 6.0:
  [HttpKernel] Fix a PHP 8.1 deprecation notice in HttpCache
  Add an invariable word in french
  [Serializer] Fix denormalization union types with constructor
  • Loading branch information
nicolas-grekas committed Jun 26, 2022
2 parents d3edc75 + 1b3adf0 commit 1903f28
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Inflector/FrenchInflector.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ final class FrenchInflector implements InflectorInterface
* A list of words which should not be inflected.
* This list is only used by singularize.
*/
private const UNINFLECTED = '/^(abcès|accès|abus|albatros|anchois|anglais|autobus|bois|brebis|carquois|cas|chas|colis|concours|corps|cours|cyprès|décès|devis|discours|dos|embarras|engrais|entrelacs|excès|fils|fois|gâchis|gars|glas|héros|intrus|jars|jus|kermès|lacis|legs|lilas|marais|mars|matelas|mépris|mets|mois|mors|obus|os|palais|paradis|parcours|pardessus|pays|plusieurs|poids|pois|pouls|printemps|processus|progrès|puits|pus|rabais|radis|recors|recours|refus|relais|remords|remous|rictus|rhinocéros|repas|rubis|sas|secours|sens|souris|succès|talus|tapis|tas|taudis|temps|tiers|univers|velours|verglas|vernis|virus)$/i';
private const UNINFLECTED = '/^(abcès|accès|abus|albatros|anchois|anglais|autobus|bois|brebis|carquois|cas|chas|colis|concours|corps|cours|cyprès|décès|devis|discours|dos|embarras|engrais|entrelacs|excès|fils|fois|gâchis|gars|glas|héros|intrus|jars|jus|kermès|lacis|legs|lilas|marais|mars|matelas|mépris|mets|mois|mors|obus|os|palais|paradis|parcours|pardessus|pays|plusieurs|poids|pois|pouls|printemps|processus|progrès|puits|pus|rabais|radis|recors|recours|refus|relais|remords|remous|rictus|rhinocéros|repas|rubis|sans|sas|secours|sens|souris|succès|talus|tapis|tas|taudis|temps|tiers|univers|velours|verglas|vernis|virus)$/i';

/**
* {@inheritdoc}
Expand Down
1 change: 1 addition & 0 deletions Tests/Inflector/FrenchInflectorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public function pluralizeProvider()
['héros', 'héros'],
['nez', 'nez'],
['rictus', 'rictus'],
['sans', 'sans'],
['souris', 'souris'],
['tas', 'tas'],
['toux', 'toux'],
Expand Down

0 comments on commit 1903f28

Please sign in to comment.