symfony · nicolas-grekas · Aug 8, 2019 · Jul 12, 2019
diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php
@@ -90,7 +90,7 @@ public function __construct(?string $locale)
      *
      * @throws MethodArgumentValueNotImplementedException When $locale different than "en" or null is passed
      */
-    public static function create($locale)
+    public static function create(?string $locale)
     {
         return new self($locale);
     }
@@ -106,7 +106,7 @@ public static function create($locale)
      *
      * @return bool True on success or false on failure
      */
-    public function asort(&$array, $sortFlag = self::SORT_REGULAR)
+    public function asort(array &$array, int $sortFlag = self::SORT_REGULAR)
     {
         $intlToPlainFlagMap = [
             self::SORT_REGULAR => \SORT_REGULAR,
@@ -134,7 +134,7 @@ public function asort(&$array, $sortFlag = self::SORT_REGULAR)
      *
      * @throws MethodNotImplementedException
      */
-    public function compare($str1, $str2)
+    public function compare(string $str1, string $str2)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -150,7 +150,7 @@ public function compare($str1, $str2)
      *
      * @throws MethodNotImplementedException
      */
-    public function getAttribute($attr)
+    public function getAttribute(int $attr)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -183,7 +183,7 @@ public function getErrorMessage()
      * @return string The locale used to create the collator. Currently always
      *                returns "en".
      */
-    public function getLocale($type = Locale::ACTUAL_LOCALE)
+    public function getLocale(int $type = Locale::ACTUAL_LOCALE)
     {
         return 'en';
     }
@@ -199,7 +199,7 @@ public function getLocale($type = Locale::ACTUAL_LOCALE)
      *
      * @throws MethodNotImplementedException
      */
-    public function getSortKey($string)
+    public function getSortKey(string $string)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -230,7 +230,7 @@ public function getStrength()
      *
      * @throws MethodNotImplementedException
      */
-    public function setAttribute($attr, $val)
+    public function setAttribute(int $attr, int $val)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -252,7 +252,7 @@ public function setAttribute($attr, $val)
      *
      * @throws MethodNotImplementedException
      */
-    public function setStrength($strength)
+    public function setStrength(int $strength)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -268,7 +268,7 @@ public function setStrength($strength)
      *
      * @throws MethodNotImplementedException
      */
-    public function sortWithSortKeys(&$arr)
+    public function sortWithSortKeys(array &$arr)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }
@@ -288,7 +288,7 @@ public function sortWithSortKeys(&$arr)
      *
      * @throws MethodNotImplementedException
      */
-    public function sort(&$arr, $sortFlag = self::SORT_REGULAR)
+    public function sort(array &$arr, int $sortFlag = self::SORT_REGULAR)
     {
         throw new MethodNotImplementedException(__METHOD__);
     }

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/BundleCompilerInterface.php
@@ -23,9 +23,6 @@ interface BundleCompilerInterface
     /**
      * Compiles a resource bundle at the given source to the given target
      * directory.
-     *
-     * @param string $sourcePath
-     * @param string $targetDir
      */
-    public function compile($sourcePath, $targetDir);
+    public function compile(string $sourcePath, string $targetDir);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php b/src/Symfony/Component/Intl/Data/Bundle/Compiler/GenrbCompiler.php
@@ -46,7 +46,7 @@ public function __construct(string $genrb = 'genrb', string $envVars = '')
     /**
      * {@inheritdoc}
      */
-    public function compile($sourcePath, $targetDir)
+    public function compile(string $sourcePath, string $targetDir)
     {
         if (is_dir($sourcePath)) {
             $sourcePath .= '/*.txt';

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php
@@ -37,7 +37,7 @@ public function __construct(BundleReaderInterface $reader, int $bufferSize)
     /**
      * {@inheritdoc}
      */
-    public function read($path, $locale)
+    public function read(string $path, string $locale)
     {
         $hash = $path.'//'.$locale;
 

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php
@@ -53,23 +53,23 @@ public function __construct(BundleReaderInterface $reader)
      *
      * @param array $localeAliases A mapping of locale aliases to locales
      */
-    public function setLocaleAliases($localeAliases)
+    public function setLocaleAliases(array $localeAliases)
     {
         $this->localeAliases = $localeAliases;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function read($path, $locale)
+    public function read(string $path, string $locale)
     {
         return $this->reader->read($path, $locale);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function readEntry($path, $locale, array $indices, $fallback = true)
+    public function readEntry(string $path, string $locale, array $indices, bool $fallback = true)
     {
         $entry = null;
         $isMultiValued = false;

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReaderInterface.php
@@ -38,7 +38,6 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
      *     $reader->readEntry('...', 'en', ['TopLevel', 'NestedLevel', 'Entry']);
      *
      * @param string   $path     The path to the resource bundle
-     * @param string   $locale   The locale to read
      * @param string[] $indices  The indices to read from the bundle
      * @param bool     $fallback Whether to merge the value with the value from
      *                           the fallback locale (e.g. "en" for "en_GB").
@@ -51,5 +50,5 @@ interface BundleEntryReaderInterface extends BundleReaderInterface
      *
      * @throws MissingResourceException If the indices cannot be accessed
      */
-    public function readEntry($path, $locale, array $indices, $fallback = true);
+    public function readEntry(string $path, string $locale, array $indices, bool $fallback = true);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleReaderInterface.php
@@ -21,13 +21,8 @@
 interface BundleReaderInterface
 {
     /**
-     * Reads a resource bundle.
-     *
-     * @param string $path   The path to the resource bundle
-     * @param string $locale The locale to read
-     *
      * @return mixed returns an array or {@link \ArrayAccess} instance for
      *               complex data, a scalar value otherwise
      */
-    public function read($path, $locale);
+    public function read(string $path, string $locale);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/IntlBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/IntlBundleReader.php
@@ -26,7 +26,7 @@ class IntlBundleReader implements BundleReaderInterface
     /**
      * {@inheritdoc}
      */
-    public function read($path, $locale)
+    public function read(string $path, string $locale)
     {
         // Point for future extension: Modify this class so that it works also
         // if the \ResourceBundle class is not available.

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/JsonBundleReader.php
@@ -26,7 +26,7 @@ class JsonBundleReader implements BundleReaderInterface
     /**
      * {@inheritdoc}
      */
-    public function read($path, $locale)
+    public function read(string $path, string $locale)
     {
         $fileName = $path.'/'.$locale.'.json';
 

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/PhpBundleReader.php
@@ -26,7 +26,7 @@ class PhpBundleReader implements BundleReaderInterface
     /**
      * {@inheritdoc}
      */
-    public function read($path, $locale)
+    public function read(string $path, string $locale)
     {
         $fileName = $path.'/'.$locale.'.php';
 

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/BundleWriterInterface.php
@@ -23,9 +23,7 @@ interface BundleWriterInterface
     /**
      * Writes data to a resource bundle.
      *
-     * @param string $path   The path to the resource bundle
-     * @param string $locale The locale to (over-)write
-     * @param mixed  $data   The data to write
+     * @param mixed $data The data to write
      */
-    public function write($path, $locale, $data);
+    public function write(string $path, string $locale, $data);
 }
diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/JsonBundleWriter.php
@@ -23,7 +23,7 @@ class JsonBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write($path, $locale, $data)
+    public function write(string $path, string $locale, $data)
     {
         if ($data instanceof \Traversable) {
             $data = iterator_to_array($data);

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php
@@ -23,7 +23,7 @@ class PhpBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write($path, $locale, $data)
+    public function write(string $path, string $locale, $data)
     {
         $template = <<<'TEMPLATE'
 <?php

diff --git a/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php b/src/Symfony/Component/Intl/Data/Bundle/Writer/TextBundleWriter.php
@@ -29,7 +29,7 @@ class TextBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write($path, $locale, $data, $fallback = true)
+    public function write(string $path, string $locale, $data, bool $fallback = true)
     {
         $file = fopen($path.'/'.$locale.'.txt', 'w');
 

diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php
@@ -91,39 +91,26 @@ public function generateData(GeneratorConfig $config)
     }
 
     /**
-     * @param string $sourceDir
-     *
      * @return string[]
      */
-    abstract protected function scanLocales(LocaleScanner $scanner, $sourceDir);
+    abstract protected function scanLocales(LocaleScanner $scanner, string $sourceDir);
 
-    /**
-     * @param string $sourceDir
-     * @param string $tempDir
-     */
-    abstract protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir);
+    abstract protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir);
 
     abstract protected function preGenerate();
 
     /**
-     * @param string $tempDir
-     * @param string $displayLocale
-     *
      * @return array|null
      */
-    abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale);
+    abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale);
 
     /**
-     * @param string $tempDir
-     *
      * @return array|null
      */
-    abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir);
+    abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir);
 
     /**
-     * @param string $tempDir
-     *
      * @return array|null
      */
-    abstract protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir);
+    abstract protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir);
 }
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -51,15 +51,15 @@ class CurrencyDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir)
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir)
     {
         return $scanner->scanLocales($sourceDir.'/curr');
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $compiler->compile($sourceDir.'/curr', $tempDir);
         $compiler->compile($sourceDir.'/misc/currencyNumericCodes.txt', $tempDir);
@@ -76,7 +76,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale)
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale)
     {
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
@@ -95,7 +95,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir)
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir)
     {
         $rootBundle = $reader->read($tempDir, 'root');
 
@@ -108,7 +108,7 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir)
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir)
     {
         $rootBundle = $reader->read($tempDir, 'root');
         $supplementalDataBundle = $reader->read($tempDir, 'supplementalData');

diff --git a/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php b/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php
@@ -25,23 +25,18 @@ trait FallbackTrait
     private $generatingFallback = false;
 
     /**
-     * @param string $tempDir
-     * @param string $displayLocale
-     *
      * @return array|null
      *
      * @see AbstractDataGenerator::generateDataForLocale()
      */
-    abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale);
+    abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale);
 
     /**
-     * @param string $tempDir
-     *
      * @return array|null
      *
      * @see AbstractDataGenerator::generateDataForRoot()
      */
-    abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir);
+    abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir);
 
     private function generateFallbackData(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): array
     {

diff --git a/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php b/src/Symfony/Component/Intl/Data/Generator/GeneratorConfig.php
@@ -38,10 +38,8 @@ public function __construct(string $sourceDir, string $icuVersion)
 
     /**
      * Adds a writer to be used during the data conversion.
-     *
-     * @param string $targetDir The output directory
      */
-    public function addBundleWriter($targetDir, BundleWriterInterface $writer)
+    public function addBundleWriter(string $targetDir, BundleWriterInterface $writer)
     {
         $this->bundleWriters[$targetDir] = $writer;
     }