Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

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');