Skip to content

Commit baf0a17

Browse files
Merge branch '4.4' into 5.2
* 4.4: [Console] Fix line wrapping for decorated text in block output [Inflector] Fixed pluralize "coupon" [PhpUnitBridge] fix compat with symfony/debug [VarDumper] Adds support for ReflectionUnionType to VarDumper Correctly clear lines for multi-line progress bar messages.
1 parent 4e78d7d commit baf0a17

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Inflector/EnglishInflector.php

+3
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ final class EnglishInflector implements InflectorInterface
226226
// bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
227227
['noi', 3, true, true, 'ions'],
228228

229+
// coupon (coupons)
230+
['nop', 3, true, true, 'pons'],
231+
229232
// seasons (season), treasons (treason), poisons (poison), lessons (lesson)
230233
['nos', 3, true, true, 'sons'],
231234

Tests/EnglishInflectorTest.php renamed to Tests/Inflector/EnglishInflectorTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\String\Tests;
12+
namespace Symfony\Component\String\Tests\Inflector;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\String\Inflector\EnglishInflector;
@@ -58,6 +58,7 @@ public function singularizeProvider()
5858
['crises', ['cris', 'crise', 'crisis']],
5959
['criteria', ['criterion', 'criterium']],
6060
['cups', 'cup'],
61+
['coupon', 'coupons'],
6162
['data', 'data'],
6263
['days', 'day'],
6364
['discos', 'disco'],

Tests/FrenchInflectorTest.php renamed to Tests/Inflector/FrenchInflectorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\String\Tests;
12+
namespace Symfony\Component\String\Tests\Inflector;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\String\Inflector\FrenchInflector;

0 commit comments

Comments
 (0)