Merge branch '5.2' into 5.x

* 5.2: fix merge
2021-05-10 16:56:30 +02:00 · 2021-05-10 16:56:30 +02:00 · af10fd9ba2
commit af10fd9ba2
parent 8ef49cf3b3 ddb2d0158d
2 changed files with 3 additions and 0 deletions
--- a/src/Symfony/Component/Inflector/Tests/InflectorTest.php
+++ b/src/Symfony/Component/Inflector/Tests/InflectorTest.php
@ -61,6 +61,7 @@ class InflectorTest extends TestCase
            ['crises', ['cris', 'crise', 'crisis']],
            ['criteria', ['criterion', 'criterium']],
            ['cups', 'cup'],
+            ['coupons', 'coupon'],
            ['data', 'data'],
            ['days', 'day'],
            ['discos', 'disco'],
--- a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
+++ b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@ -79,6 +79,7 @@ class EnglishInflectorTest extends TestCase
            ['focuses', ['focus', 'focuse', 'focusis']],
            ['formulae', 'formula'],
            ['formulas', 'formula'],
+            ['conspectuses', 'conspectus'],
            ['fungi', 'fungus'],
            ['funguses', ['fungus', 'funguse', 'fungusis']],
            ['garages', ['garag', 'garage']],
@ -220,6 +221,7 @@ class EnglishInflectorTest extends TestCase
            ['focus', 'focuses'],
            ['foot', 'feet'],
            ['formula', 'formulas'], //formulae
+            ['conspectus', 'conspectuses'],
            ['fungus', 'fungi'],
            ['garage', 'garages'],
            ['goose', 'geese'],