Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

Tests/FunctionsTest.php

@@ -13,11 +13,12 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\String\AbstractString;
-use function Symfony\Component\String\b;
 use Symfony\Component\String\ByteString;
+use Symfony\Component\String\UnicodeString;
+
+use function Symfony\Component\String\b;
 use function Symfony\Component\String\s;
 use function Symfony\Component\String\u;
-use Symfony\Component\String\UnicodeString;
 
 final class FunctionsTest extends TestCase
 {

Tests/Inflector/EnglishInflectorTest.php

@@ -160,9 +160,9 @@ public function singularizeProvider()
             ['SubTrees', 'SubTree'],
 
             // Known issues
-            //['insignia', 'insigne'],
-            //['insignias', 'insigne'],
-            //['rattles', 'rattle'],
+            // ['insignia', 'insigne'],
+            // ['insignias', 'insigne'],
+            // ['rattles', 'rattle'],
         ];
     }