CS fixes

nicolas-grekas · nicolas-grekas · commit c0938cd29804 · 2025-07-10T10:14:14.000+02:00
diff --git a/Data/Bundle/Compiler/GenrbCompiler.php b/Data/Bundle/Compiler/GenrbCompiler.php
@@ -37,7 +37,7 @@ public function __construct(string $genrb = 'genrb', string $envVars = '')
         exec('which '.$genrb, $output, $status);
 
         if (0 !== $status) {
-            throw new RuntimeException(sprintf('The command "%s" is not installed.', $genrb));
+            throw new RuntimeException(\sprintf('The command "%s" is not installed.', $genrb));
         }
 
         $this->genrb = ($envVars ? $envVars.' ' : '').$genrb;
@@ -52,7 +52,7 @@ public function compile(string $sourcePath, string $targetDir): void
         exec($this->genrb.' --quiet -e UTF-8 -d '.$targetDir.' '.$sourcePath, $output, $status);
 
         if (0 !== $status) {
-            throw new RuntimeException(sprintf('genrb failed with status %d while compiling "%s" to "%s".', $status, $sourcePath, $targetDir));
+            throw new RuntimeException(\sprintf('genrb failed with status %d while compiling "%s" to "%s".', $status, $sourcePath, $targetDir));
         }
     }
 }
diff --git a/Data/Bundle/Reader/BundleEntryReader.php b/Data/Bundle/Reader/BundleEntryReader.php
@@ -148,7 +148,7 @@ public function readEntry(string $path, string $locale, array $indices, bool $fa
 
         // Entry is still NULL, read error occurred. Throw an exception
         // containing the detailed path and locale
-        $errorMessage = sprintf(
+        $errorMessage = \sprintf(
             'Couldn\'t read the indices [%s] for the locale "%s" in "%s".',
             implode('][', $indices),
             $locale,
@@ -160,7 +160,7 @@ public function readEntry(string $path, string $locale, array $indices, bool $fa
             // Remove original locale
             array_shift($testedLocales);
 
-            $errorMessage .= sprintf(
+            $errorMessage .= \sprintf(
                 ' The indices also couldn\'t be found for the fallback locale(s) "%s".',
                 implode('", "', $testedLocales)
             );
diff --git a/Data/Bundle/Reader/IntlBundleReader.php b/Data/Bundle/Reader/IntlBundleReader.php
@@ -37,7 +37,7 @@ public function read(string $path, string $locale): mixed
         // The bundle is NULL if the path does not look like a resource bundle
         // (i.e. contain a bunch of *.res files)
         if (null === $bundle) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s/%s.res" could not be found.', $path, $locale));
+            throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s/%s.res" could not be found.', $path, $locale));
         }
 
         // Other possible errors are U_USING_FALLBACK_WARNING and U_ZERO_ERROR,
diff --git a/Data/Bundle/Reader/JsonBundleReader.php b/Data/Bundle/Reader/JsonBundleReader.php
@@ -29,17 +29,17 @@ public function read(string $path, string $locale): mixed
 
         // prevent directory traversal attacks
         if (\dirname($fileName) !== $path) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
+            throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         if (!is_file($fileName)) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
+            throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         $data = json_decode(file_get_contents($fileName), true);
 
         if (null === $data) {
-            throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());
+            throw new RuntimeException(\sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());
         }
 
         return $data;
diff --git a/Data/Bundle/Reader/PhpBundleReader.php b/Data/Bundle/Reader/PhpBundleReader.php
@@ -29,15 +29,15 @@ public function read(string $path, string $locale): mixed
 
         // prevent directory traversal attacks
         if (\dirname($fileName) !== $path) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
+            throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         if (is_file($fileName.'.gz')) {
             return GzipStreamWrapper::require($fileName.'.gz');
         }
 
         if (!is_file($fileName)) {
-            throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));
+            throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));
         }
 
         return include $fileName;
diff --git a/Data/Bundle/Writer/PhpBundleWriter.php b/Data/Bundle/Writer/PhpBundleWriter.php
@@ -41,6 +41,6 @@ public function write(string $path, string $locale, mixed $data): void
             }
         });
 
-        file_put_contents($path.'/'.$locale.'.php', sprintf($template, VarExporter::export($data)));
+        file_put_contents($path.'/'.$locale.'.php', \sprintf($template, VarExporter::export($data)));
     }
 }
diff --git a/Data/Generator/LocaleDataGenerator.php b/Data/Generator/LocaleDataGenerator.php
@@ -147,7 +147,7 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, string $
         // i.e. in de_AT, "AT" is the region
         if ($region = \Locale::getRegion($locale)) {
             if (ctype_alpha($region) && !RegionDataGenerator::isValidCountryCode($region)) {
-                throw new MissingResourceException(sprintf('Skipping "%s" due an invalid country.', $locale));
+                throw new MissingResourceException(\sprintf('Skipping "%s" due an invalid country.', $locale));
             }
 
             $extras[] = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/region', $displayLocale, ['Countries', $region]));
diff --git a/Data/Util/RecursiveArrayAccess.php b/Data/Util/RecursiveArrayAccess.php
@@ -36,7 +36,7 @@ public static function get(mixed $array, array $indices): mixed
                 }
             }
 
-            throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $index));
+            throw new OutOfBoundsException(\sprintf('The index "%s" does not exist.', $index));
         }
 
         return $array;
diff --git a/Data/Util/RingBuffer.php b/Data/Util/RingBuffer.php
@@ -51,7 +51,7 @@ public function offsetExists(mixed $key): bool
     public function offsetGet(mixed $key): mixed
     {
         if (!isset($this->indices[$key])) {
-            throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $key));
+            throw new OutOfBoundsException(\sprintf('The index "%s" does not exist.', $key));
         }
 
         return $this->values[$this->indices[$key]];
diff --git a/Exception/UnexpectedTypeException.php b/Exception/UnexpectedTypeException.php
@@ -20,6 +20,6 @@ class UnexpectedTypeException extends InvalidArgumentException
 {
     public function __construct(mixed $value, string $expectedType)
     {
-        parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));
+        parent::__construct(\sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));
     }
 }
diff --git a/Locale.php b/Locale.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\Intl;
 
 if (!class_exists(\Locale::class)) {
-    throw new \LogicException(sprintf('You cannot use the "%s\Locale" class as the "intl" extension is not installed. See https://php.net/intl.', __NAMESPACE__));
+    throw new \LogicException(\sprintf('You cannot use the "%s\Locale" class as the "intl" extension is not installed. See https://php.net/intl.', __NAMESPACE__));
 }
 
 /**
diff --git a/Resources/bin/common.php b/Resources/bin/common.php
@@ -84,7 +84,7 @@ function get_icu_version_from_genrb(string $genrb)
 error_reporting(\E_ALL);
 
 set_error_handler(function (int $type, string $msg, string $file, int $line) {
-    throw new \ErrorException($msg, 0, $type, $file, $line);
+    throw new ErrorException($msg, 0, $type, $file, $line);
 });
 
 set_exception_handler(function (Throwable $exception) {
diff --git a/Resources/emoji/build.php b/Resources/emoji/build.php
@@ -41,7 +41,7 @@ public static function getEmojisCodePoints(): array
             // 263A FE0F    ; fully-qualified     # ☺️ E0.6 smiling face
             preg_match('{^(?<codePoints>[\w ]+) +; [\w-]+ +# (?<emoji>.+) E\d+\.\d+ ?(?<name>.+)$}Uu', $line, $matches);
             if (!$matches) {
-                throw new \DomainException("Could not parse line: \"$line\".");
+                throw new DomainException("Could not parse line: \"$line\".");
             }
 
             $codePoints = strtolower(trim($matches['codePoints']));
diff --git a/Tests/CountriesTest.php b/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');
diff --git a/Tests/TimezonesTest.php b/Tests/TimezonesTest.php
@@ -618,7 +618,7 @@ public function testGetGmtOffsetAvailability(string $timezone)
         try {
             new \DateTimeZone($timezone);
         } catch (\Exception $e) {
-           $this->markTestSkipped(sprintf('The timezone "%s" is not available.', $timezone));
+            $this->markTestSkipped(\sprintf('The timezone "%s" is not available.', $timezone));
         }
 
         // ensure each timezone identifier has a corresponding GMT offset
diff --git a/Timezones.php b/Timezones.php
@@ -78,7 +78,7 @@ public static function getGmtOffset(string $timezone, ?int $timestamp = null, ?s
         $offset = self::getRawOffset($timezone, $timestamp);
         $abs = abs($offset);
 
-        return sprintf(self::readEntry(['Meta', 'GmtFormat'], $displayLocale), sprintf(self::readEntry(['Meta', 'HourFormat'.(0 <= $offset ? 'Pos' : 'Neg')], $displayLocale), $abs / 3600, $abs / 60 % 60));
+        return \sprintf(self::readEntry(['Meta', 'GmtFormat'], $displayLocale), \sprintf(self::readEntry(['Meta', 'HourFormat'.(0 <= $offset ? 'Pos' : 'Neg')], $displayLocale), $abs / 3600, $abs / 60 % 60));
     }
 
     /**
@@ -102,7 +102,7 @@ public static function forCountryCode(string $country): array
             }
 
             if (Countries::exists(strtoupper($country))) {
-                throw new MissingResourceException(sprintf('Country codes must be in uppercase, but "%s" was passed. Try with "%s" country code instead.', $country, strtoupper($country)));
+                throw new MissingResourceException(\sprintf('Country codes must be in uppercase, but "%s" was passed. Try with "%s" country code instead.', $country, strtoupper($country)));
             }
 
             throw $e;
diff --git a/Transliterator/EmojiTransliterator.php b/Transliterator/EmojiTransliterator.php
@@ -14,7 +14,7 @@
 use Symfony\Component\Intl\Util\GzipStreamWrapper;
 
 if (!class_exists(\Transliterator::class)) {
-    throw new \LogicException(sprintf('You cannot use the "%s\EmojiTransliterator" class as the "intl" extension is not installed. See https://php.net/intl.', __NAMESPACE__));
+    throw new \LogicException(\sprintf('You cannot use the "%s\EmojiTransliterator" class as the "intl" extension is not installed. See https://php.net/intl.', __NAMESPACE__));
 } else {
     /**
      * @internal
@@ -57,7 +57,7 @@ public static function create(string $id, int $direction = self::FORWARD): self
                 $instance = ($newInstance ??= (new \ReflectionClass(self::class))->newInstanceWithoutConstructor(...))();
                 $instance->id = $id;
             } else {
-                $instance = unserialize(sprintf('O:%d:"%s":1:{s:2:"id";s:%d:"%s";}', \strlen(self::class), self::class, \strlen($id), $id));
+                $instance = unserialize(\sprintf('O:%d:"%s":1:{s:2:"id";s:%d:"%s";}', \strlen(self::class), self::class, \strlen($id), $id));
             }
 
             $instance->map = $maps[$id] ??= str_ends_with($file, '.gz') ? GzipStreamWrapper::require($file) : require $file;
diff --git a/Util/GitRepository.php b/Util/GitRepository.php
@@ -38,7 +38,7 @@ public static function download(string $remote, string $targetDir): self
             $filesystem->remove($targetDir);
             $filesystem->mkdir($targetDir);
 
-            self::exec(sprintf('git clone %s %s', escapeshellarg($remote), escapeshellarg($targetDir)));
+            self::exec(\sprintf('git clone %s %s', escapeshellarg($remote), escapeshellarg($targetDir)));
         }
 
         return new self(realpath($targetDir));
@@ -82,20 +82,20 @@ public function getLastTag(?callable $filter = null): string
 
     public function checkout(string $branch): void
     {
-        $this->execInPath(sprintf('git checkout %s', escapeshellarg($branch)));
+        $this->execInPath(\sprintf('git checkout %s', escapeshellarg($branch)));
     }
 
     private function execInPath(string $command): array
     {
-        return self::exec(sprintf('cd %s && %s', escapeshellarg($this->path), $command));
+        return self::exec(\sprintf('cd %s && %s', escapeshellarg($this->path), $command));
     }
 
     private static function exec(string $command, ?string $customErrorMessage = null): array
     {
-        exec(sprintf('%s 2>&1', $command), $output, $result);
+        exec(\sprintf('%s 2>&1', $command), $output, $result);
 
         if (0 !== $result) {
-            throw new RuntimeException($customErrorMessage ?? sprintf('The "%s" command failed.', $command));
+            throw new RuntimeException($customErrorMessage ?? \sprintf('The "%s" command failed.', $command));
         }
 
         return $output;
diff --git a/Util/GzipStreamWrapper.php b/Util/GzipStreamWrapper.php
@@ -26,7 +26,7 @@ class GzipStreamWrapper
     public static function require(string $path): array
     {
         if (!\extension_loaded('zlib')) {
-            throw new \LogicException(sprintf('The "zlib" extension is required to load the "%s/%s" map, please enable it in your php.ini file.', basename(\dirname($path)), basename($path)));
+            throw new \LogicException(\sprintf('The "zlib" extension is required to load the "%s/%s" map, please enable it in your php.ini file.', basename(\dirname($path)), basename($path)));
         }
 
         if (!\function_exists('opcache_is_script_cached') || !@opcache_is_script_cached($path)) {
diff --git a/Util/Version.php b/Util/Version.php
@@ -70,7 +70,7 @@ public static function normalize(string $version, ?int $precision): ?string
         $pattern = '[^\.]+';
 
         for ($i = 2; $i <= $precision; ++$i) {
-            $pattern = sprintf('[^\.]+(\.%s)?', $pattern);
+            $pattern = \sprintf('[^\.]+(\.%s)?', $pattern);
         }
 
         if (!preg_match('/^'.$pattern.'/', $version, $matches)) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(string $genrb = 'genrb', string $envVars = '')`
`37`	`37`	`exec('which '.$genrb, $output, $status);`
`38`	`38`
`39`	`39`	`if (0 !== $status) {`
`40`		`- throw new RuntimeException(sprintf('The command "%s" is not installed.', $genrb));`
	`40`	`+ throw new RuntimeException(\sprintf('The command "%s" is not installed.', $genrb));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`$this->genrb = ($envVars ? $envVars.' ' : '').$genrb;`
`@@ -52,7 +52,7 @@ public function compile(string $sourcePath, string $targetDir): void`
`52`	`52`	`exec($this->genrb.' --quiet -e UTF-8 -d '.$targetDir.' '.$sourcePath, $output, $status);`
`53`	`53`
`54`	`54`	`if (0 !== $status) {`
`55`		`- throw new RuntimeException(sprintf('genrb failed with status %d while compiling "%s" to "%s".', $status, $sourcePath, $targetDir));`
	`55`	`+ throw new RuntimeException(\sprintf('genrb failed with status %d while compiling "%s" to "%s".', $status, $sourcePath, $targetDir));`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function read(string $path, string $locale): mixed`
`37`	`37`	`// The bundle is NULL if the path does not look like a resource bundle`
`38`	`38`	`// (i.e. contain a bunch of *.res files)`
`39`	`39`	`if (null === $bundle) {`
`40`		`- throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s/%s.res" could not be found.', $path, $locale));`
	`40`	`+ throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s/%s.res" could not be found.', $path, $locale));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`// Other possible errors are U_USING_FALLBACK_WARNING and U_ZERO_ERROR,`
Original file line number	Diff line number	Diff line change
`@@ -29,17 +29,17 @@ public function read(string $path, string $locale): mixed`
`29`	`29`
`30`	`30`	`// prevent directory traversal attacks`
`31`	`31`	`if (\dirname($fileName) !== $path) {`
`32`		`- throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));`
	`32`	`+ throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (!is_file($fileName)) {`
`36`		`- throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));`
	`36`	`+ throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`$data = json_decode(file_get_contents($fileName), true);`
`40`	`40`
`41`	`41`	`if (null === $data) {`
`42`		`- throw new RuntimeException(sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());`
	`42`	`+ throw new RuntimeException(\sprintf('The resource bundle "%s" contains invalid JSON: ', $fileName).json_last_error_msg());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return $data;`
Original file line number	Diff line number	Diff line change
`@@ -29,15 +29,15 @@ public function read(string $path, string $locale): mixed`
`29`	`29`
`30`	`30`	`// prevent directory traversal attacks`
`31`	`31`	`if (\dirname($fileName) !== $path) {`
`32`		`- throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));`
	`32`	`+ throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (is_file($fileName.'.gz')) {`
`36`	`36`	`return GzipStreamWrapper::require($fileName.'.gz');`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (!is_file($fileName)) {`
`40`		`- throw new ResourceBundleNotFoundException(sprintf('The resource bundle "%s" does not exist.', $fileName));`
	`40`	`+ throw new ResourceBundleNotFoundException(\sprintf('The resource bundle "%s" does not exist.', $fileName));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`return include $fileName;`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,6 @@ public function write(string $path, string $locale, mixed $data): void`
`41`	`41`	`}`
`42`	`42`	`});`
`43`	`43`
`44`		`- file_put_contents($path.'/'.$locale.'.php', sprintf($template, VarExporter::export($data)));`
	`44`	`+ file_put_contents($path.'/'.$locale.'.php', \sprintf($template, VarExporter::export($data)));`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private function generateLocaleName(BundleEntryReaderInterface $reader, string $`
`147`	`147`	`// i.e. in de_AT, "AT" is the region`
`148`	`148`	`if ($region = \Locale::getRegion($locale)) {`
`149`	`149`	`if (ctype_alpha($region) && !RegionDataGenerator::isValidCountryCode($region)) {`
`150`		`- throw new MissingResourceException(sprintf('Skipping "%s" due an invalid country.', $locale));`
	`150`	`+ throw new MissingResourceException(\sprintf('Skipping "%s" due an invalid country.', $locale));`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`$extras[] = str_replace(['(', ')'], ['[', ']'], $reader->readEntry($tempDir.'/region', $displayLocale, ['Countries', $region]));`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static function get(mixed $array, array $indices): mixed`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $index));`
	`39`	`+ throw new OutOfBoundsException(\sprintf('The index "%s" does not exist.', $index));`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`return $array;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function offsetExists(mixed $key): bool`
`51`	`51`	`public function offsetGet(mixed $key): mixed`
`52`	`52`	`{`
`53`	`53`	`if (!isset($this->indices[$key])) {`
`54`		`- throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $key));`
	`54`	`+ throw new OutOfBoundsException(\sprintf('The index "%s" does not exist.', $key));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`return $this->values[$this->indices[$key]];`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@ class UnexpectedTypeException extends InvalidArgumentException`
`20`	`20`	`{`
`21`	`21`	`public function __construct(mixed $value, string $expectedType)`
`22`	`22`	`{`
`23`		`- parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));`
	`23`	`+ parent::__construct(\sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));`
`24`	`24`	`}`
`25`	`25`	`}`