Various CS fixes

Author: nicolas-grekas

Countries.php

@@ -234,7 +234,7 @@ public static function getAlpha3Names(?string $displayLocale = null): array
     public static function withUserAssigned(?bool $withUserAssigned = null): bool
     {
         if (null === $withUserAssigned) {
-            return self::$withUserAssigned ??= filter_var($_ENV['SYMFONY_INTL_WITH_USER_ASSIGNED'] ?? $_SERVER['SYMFONY_INTL_WITH_USER_ASSIGNED'] ?? getenv('SYMFONY_INTL_WITH_USER_ASSIGNED'), FILTER_VALIDATE_BOOLEAN);
+            return self::$withUserAssigned ??= filter_var($_ENV['SYMFONY_INTL_WITH_USER_ASSIGNED'] ?? $_SERVER['SYMFONY_INTL_WITH_USER_ASSIGNED'] ?? getenv('SYMFONY_INTL_WITH_USER_ASSIGNED'), \FILTER_VALIDATE_BOOLEAN);
         }
 
         return self::$withUserAssigned = $withUserAssigned;

Tests/CountriesTest.php

@@ -780,10 +780,10 @@ class CountriesTest extends ResourceBundleTestCase
 
     public function testAllGettersGenerateTheSameDataSetCount()
     {
-        $alpha2Count = count(Countries::getCountryCodes());
-        $alpha3Count = count(Countries::getAlpha3Codes());
-        $numericCodesCount = count(Countries::getNumericCodes());
-        $namesCount = count(Countries::getNames());
+        $alpha2Count = \count(Countries::getCountryCodes());
+        $alpha3Count = \count(Countries::getAlpha3Codes());
+        $numericCodesCount = \count(Countries::getNumericCodes());
+        $namesCount = \count(Countries::getNames());
 
         // we base all on Name count since it is the first to be generated
         $this->assertEquals($namesCount, $alpha2Count, 'Alpha 2 count does not match');

Tests/CountriesWithUserAssignedTest.php

@@ -797,11 +797,11 @@ public static function tearDownAfterClass(): void
 
     public function testAllGettersGenerateTheSameDataSetCount(): void
     {
-        $expected = count(self::COUNTRIES_WITH_USER_ASSIGNED);
-        $alpha2Count = count(Countries::getCountryCodes());
-        $alpha3Count = count(Countries::getAlpha3Codes());
-        $numericCodesCount = count(Countries::getNumericCodes());
-        $namesCount = count(Countries::getNames());
+        $expected = \count(self::COUNTRIES_WITH_USER_ASSIGNED);
+        $alpha2Count = \count(Countries::getCountryCodes());
+        $alpha3Count = \count(Countries::getAlpha3Codes());
+        $numericCodesCount = \count(Countries::getNumericCodes());
+        $namesCount = \count(Countries::getNames());
 
         // we compare against our test list to check that optional user assigned is included
         $this->assertEquals($expected, $namesCount, 'Names count does not match');
@@ -832,7 +832,7 @@ public function testGetNames($displayLocale): void
     }
 
     /**
-     * This test is for backward compatibility. testGetNames already checks `XK` is included
+     * This test is for backward compatibility; testGetNames already checks `XK` is included.
      *
      * @dataProvider provideLocaleAliases
      */
@@ -849,7 +849,7 @@ public function testGetNamesSupportsAliases($alias, $ofLocale): void
     }
 
     /**
-     * This test is for backward compatibility. testGetNames already checks `XK` is included
+     * This test is for backward compatibility; testGetNames already checks `XK` is included.
      *
      * @dataProvider provideLocales
      */

Tests/TimezonesTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Intl\Tests;
 
-use Symfony\Component\Intl\Countries;
 use Symfony\Component\Intl\Exception\MissingResourceException;
 use Symfony\Component\Intl\Timezones;
 use Symfony\Component\Intl\Util\IntlTestHelper;