[Intl] Add Union Types

ValentineBoineau · nicolas-grekas · commit 8e9e08707215 · 2021-06-09T10:09:01.000+02:00
diff --git a/Countries.php b/Countries.php
@@ -109,7 +109,7 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale =
      *
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(?string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }
@@ -121,7 +121,7 @@ public static function getNames($displayLocale = null): array
      *
      * @return string[]
      */
-    public static function getAlpha3Names($displayLocale = null): array
+    public static function getAlpha3Names(?string $displayLocale = null): array
     {
         $alpha2Names = self::getNames($displayLocale);
         $alpha3Names = [];
diff --git a/Data/Bundle/Writer/BundleWriterInterface.php b/Data/Bundle/Writer/BundleWriterInterface.php
@@ -20,10 +20,5 @@
  */
 interface BundleWriterInterface
 {
-    /**
-     * Writes data to a resource bundle.
-     *
-     * @param mixed $data The data to write
-     */
-    public function write(string $path, string $locale, $data);
+    public function write(string $path, string $locale, mixed $data);
 }
diff --git a/Data/Bundle/Writer/JsonBundleWriter.php b/Data/Bundle/Writer/JsonBundleWriter.php
@@ -23,7 +23,7 @@ class JsonBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write(string $path, string $locale, $data)
+    public function write(string $path, string $locale, mixed $data)
     {
         if ($data instanceof \Traversable) {
             $data = iterator_to_array($data);
diff --git a/Data/Bundle/Writer/PhpBundleWriter.php b/Data/Bundle/Writer/PhpBundleWriter.php
@@ -23,7 +23,7 @@ class PhpBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write(string $path, string $locale, $data)
+    public function write(string $path, string $locale, mixed $data)
     {
         $template = <<<'TEMPLATE'
 <?php
diff --git a/Data/Bundle/Writer/TextBundleWriter.php b/Data/Bundle/Writer/TextBundleWriter.php
@@ -29,7 +29,7 @@ class TextBundleWriter implements BundleWriterInterface
     /**
      * {@inheritdoc}
      */
-    public function write(string $path, string $locale, $data, bool $fallback = true)
+    public function write(string $path, string $locale, mixed $data, bool $fallback = true)
     {
         $file = fopen($path.'/'.$locale.'.txt', 'w');
 
@@ -46,7 +46,7 @@ public function write(string $path, string $locale, $data, bool $fallback = true
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeResourceBundle($file, string $bundleName, $value, bool $fallback)
+    private function writeResourceBundle($file, string $bundleName, mixed $value, bool $fallback)
     {
         fwrite($file, $bundleName);
 
@@ -63,7 +63,7 @@ private function writeResourceBundle($file, string $bundleName, $value, bool $fa
      *
      * @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt
      */
-    private function writeResource($file, $value, int $indentation, bool $requireBraces = true)
+    private function writeResource($file, mixed $value, int $indentation, bool $requireBraces = true)
     {
         if (\is_int($value)) {
             $this->writeInteger($file, $value);
diff --git a/Data/Generator/RegionDataGenerator.php b/Data/Generator/RegionDataGenerator.php
@@ -67,7 +67,7 @@ class RegionDataGenerator extends AbstractDataGenerator
      */
     private $regionCodes = [];
 
-    public static function isValidCountryCode($region)
+    public static function isValidCountryCode(int|string|null $region)
     {
         if (isset(self::DENYLIST[$region])) {
             return false;
diff --git a/Data/Util/ArrayAccessibleResourceBundle.php b/Data/Util/ArrayAccessibleResourceBundle.php
@@ -32,29 +32,29 @@ public function __construct(\ResourceBundle $bundleImpl)
         $this->bundleImpl = $bundleImpl;
     }
 
-    public function get($offset)
+    public function get(int|string $offset)
     {
         $value = $this->bundleImpl->get($offset);
 
         return $value instanceof \ResourceBundle ? new static($value) : $value;
     }
 
-    public function offsetExists($offset): bool
+    public function offsetExists(mixed $offset): bool
     {
         return null !== $this->bundleImpl->get($offset);
     }
 
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset)
     {
         return $this->get($offset);
     }
 
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value)
     {
         throw new BadMethodCallException('Resource bundles cannot be modified.');
     }
 
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset)
     {
         throw new BadMethodCallException('Resource bundles cannot be modified.');
     }
diff --git a/Data/Util/RecursiveArrayAccess.php b/Data/Util/RecursiveArrayAccess.php
@@ -20,23 +20,14 @@
  */
 class RecursiveArrayAccess
 {
-    public static function get($array, array $indices)
+    public static function get(array|\ArrayAccess $array, array $indices)
     {
         foreach ($indices as $index) {
-            // Use array_key_exists() for arrays, isset() otherwise
-            if (\is_array($array)) {
-                if (\array_key_exists($index, $array)) {
-                    $array = $array[$index];
-                    continue;
-                }
-            } elseif ($array instanceof \ArrayAccess) {
-                if (isset($array[$index])) {
-                    $array = $array[$index];
-                    continue;
-                }
+            if (\is_array($array) ? !\array_key_exists($index, $array) : !isset($array[$index])) {
+                throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $index));
             }
 
-            throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $index));
+            $array = $array[$index];
         }
 
         return $array;
diff --git a/Data/Util/RingBuffer.php b/Data/Util/RingBuffer.php
@@ -42,15 +42,15 @@ public function __construct(int $size)
     /**
      * {@inheritdoc}
      */
-    public function offsetExists($key): bool
+    public function offsetExists(mixed $key): bool
     {
         return isset($this->indices[$key]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function offsetGet($key)
+    public function offsetGet(mixed $key)
     {
         if (!isset($this->indices[$key])) {
             throw new OutOfBoundsException(sprintf('The index "%s" does not exist.', $key));
@@ -62,7 +62,7 @@ public function offsetGet($key)
     /**
      * {@inheritdoc}
      */
-    public function offsetSet($key, $value)
+    public function offsetSet(mixed $key, mixed $value)
     {
         if (false !== ($keyToRemove = array_search($this->cursor, $this->indices))) {
             unset($this->indices[$keyToRemove]);
@@ -77,7 +77,7 @@ public function offsetSet($key, $value)
     /**
      * {@inheritdoc}
      */
-    public function offsetUnset($key)
+    public function offsetUnset(mixed $key)
     {
         if (isset($this->indices[$key])) {
             $this->values[$this->indices[$key]] = null;
diff --git a/Exception/UnexpectedTypeException.php b/Exception/UnexpectedTypeException.php
@@ -18,7 +18,7 @@
  */
 class UnexpectedTypeException extends InvalidArgumentException
 {
-    public function __construct($value, string $expectedType)
+    public function __construct(mixed $value, string $expectedType)
     {
         parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));
     }
diff --git a/Languages.php b/Languages.php
@@ -159,7 +159,7 @@ public static function getAlpha3Name(string $language, string $displayLocale = n
      *
      * @return string[]
      */
-    public static function getAlpha3Names($displayLocale = null): array
+    public static function getAlpha3Names(?string $displayLocale = null): array
     {
         $alpha2Names = self::getNames($displayLocale);
         $alpha3Names = [];
diff --git a/Locales.php b/Locales.php
@@ -67,7 +67,7 @@ public static function getName(string $locale, string $displayLocale = null): st
     /**
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(?string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }
diff --git a/Resources/bin/common.php b/Resources/bin/common.php
@@ -13,35 +13,35 @@
 
 define('LINE', str_repeat('-', LINE_WIDTH)."\n");
 
-function bailout($message)
+function bailout(string $message)
 {
     echo wordwrap($message, LINE_WIDTH)." Aborting.\n";
 
     exit(1);
 }
 
-function strip_minor_versions($version)
+function strip_minor_versions(string $version)
 {
     preg_match('/^(?P<version>[0-9]\.[0-9]|[0-9]{2,})/', $version, $matches);
 
     return $matches['version'];
 }
 
-function centered($text)
+function centered(string $text)
 {
     $padding = (int) ((LINE_WIDTH - strlen($text)) / 2);
 
     return str_repeat(' ', $padding).$text;
 }
 
-function cd($dir)
+function cd(string $dir)
 {
     if (false === chdir($dir)) {
         bailout("Could not switch to directory $dir.");
     }
 }
 
-function run($command)
+function run(string $command)
 {
     exec($command, $output, $status);
 
@@ -53,7 +53,7 @@ function run($command)
     }
 }
 
-function get_icu_version_from_genrb($genrb)
+function get_icu_version_from_genrb(string $genrb)
 {
     exec($genrb.' --version - 2>&1', $output, $status);
 
@@ -70,7 +70,7 @@ function get_icu_version_from_genrb($genrb)
 
 error_reporting(\E_ALL);
 
-set_error_handler(function ($type, $msg, $file, $line) {
+set_error_handler(function (int $type, string $msg, string $file, int $line) {
     throw new \ErrorException($msg, 0, $type, $file, $line);
 });
 
diff --git a/Scripts.php b/Scripts.php
@@ -51,7 +51,7 @@ public static function getName(string $script, string $displayLocale = null): st
     /**
      * @return string[]
      */
-    public static function getNames($displayLocale = null): array
+    public static function getNames(?string $displayLocale = null): array
     {
         return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);
     }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public static function getAlpha3Name(string $alpha3Code, string $displayLocale =`
`109`	`109`	`*`
`110`	`110`	`* @return string[]`
`111`	`111`	`*/`
`112`		`- public static function getNames($displayLocale = null): array`
	`112`	`+ public static function getNames(?string $displayLocale = null): array`
`113`	`113`	`{`
`114`	`114`	`return self::asort(self::readEntry(['Names'], $displayLocale), $displayLocale);`
`115`	`115`	`}`
`@@ -121,7 +121,7 @@ public static function getNames($displayLocale = null): array`
`121`	`121`	`*`
`122`	`122`	`* @return string[]`
`123`	`123`	`*/`
`124`		`- public static function getAlpha3Names($displayLocale = null): array`
	`124`	`+ public static function getAlpha3Names(?string $displayLocale = null): array`
`125`	`125`	`{`
`126`	`126`	`$alpha2Names = self::getNames($displayLocale);`
`127`	`127`	`$alpha3Names = [];`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,5 @@`
`20`	`20`	`*/`
`21`	`21`	`interface BundleWriterInterface`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * Writes data to a resource bundle.`
`25`		`- *`
`26`		`- * @param mixed $data The data to write`
`27`		`- */`
`28`		`- public function write(string $path, string $locale, $data);`
	`23`	`+ public function write(string $path, string $locale, mixed $data);`
`29`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class JsonBundleWriter implements BundleWriterInterface`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function write(string $path, string $locale, $data)`
	`26`	`+ public function write(string $path, string $locale, mixed $data)`
`27`	`27`	`{`
`28`	`28`	`if ($data instanceof \Traversable) {`
`29`	`29`	`$data = iterator_to_array($data);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class PhpBundleWriter implements BundleWriterInterface`
`23`	`23`	`/**`
`24`	`24`	`* {@inheritdoc}`
`25`	`25`	`*/`
`26`		`- public function write(string $path, string $locale, $data)`
	`26`	`+ public function write(string $path, string $locale, mixed $data)`
`27`	`27`	`{`
`28`	`28`	`$template = <<<'TEMPLATE'`
`29`	`29`	`<?php`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class TextBundleWriter implements BundleWriterInterface`
`29`	`29`	`/**`
`30`	`30`	`* {@inheritdoc}`
`31`	`31`	`*/`
`32`		`- public function write(string $path, string $locale, $data, bool $fallback = true)`
	`32`	`+ public function write(string $path, string $locale, mixed $data, bool $fallback = true)`
`33`	`33`	`{`
`34`	`34`	`$file = fopen($path.'/'.$locale.'.txt', 'w');`
`35`	`35`
`@@ -46,7 +46,7 @@ public function write(string $path, string $locale, $data, bool $fallback = true`
`46`	`46`	`*`
`47`	`47`	`* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt`
`48`	`48`	`*/`
`49`		`- private function writeResourceBundle($file, string $bundleName, $value, bool $fallback)`
	`49`	`+ private function writeResourceBundle($file, string $bundleName, mixed $value, bool $fallback)`
`50`	`50`	`{`
`51`	`51`	`fwrite($file, $bundleName);`
`52`	`52`
`@@ -63,7 +63,7 @@ private function writeResourceBundle($file, string $bundleName, $value, bool $fa`
`63`	`63`	`*`
`64`	`64`	`* @see http://source.icu-project.org/repos/icu/icuhtml/trunk/design/bnf_rb.txt`
`65`	`65`	`*/`
`66`		`- private function writeResource($file, $value, int $indentation, bool $requireBraces = true)`
	`66`	`+ private function writeResource($file, mixed $value, int $indentation, bool $requireBraces = true)`
`67`	`67`	`{`
`68`	`68`	`if (\is_int($value)) {`
`69`	`69`	`$this->writeInteger($file, $value);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ class RegionDataGenerator extends AbstractDataGenerator`
`67`	`67`	`*/`
`68`	`68`	`private $regionCodes = [];`
`69`	`69`
`70`		`- public static function isValidCountryCode($region)`
	`70`	`+ public static function isValidCountryCode(int\|string\|null $region)`
`71`	`71`	`{`
`72`	`72`	`if (isset(self::DENYLIST[$region])) {`
`73`	`73`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -32,29 +32,29 @@ public function __construct(\ResourceBundle $bundleImpl)`
`32`	`32`	`$this->bundleImpl = $bundleImpl;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function get($offset)`
	`35`	`+ public function get(int\|string $offset)`
`36`	`36`	`{`
`37`	`37`	`$value = $this->bundleImpl->get($offset);`
`38`	`38`
`39`	`39`	`return $value instanceof \ResourceBundle ? new static($value) : $value;`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function offsetExists($offset): bool`
	`42`	`+ public function offsetExists(mixed $offset): bool`
`43`	`43`	`{`
`44`	`44`	`return null !== $this->bundleImpl->get($offset);`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function offsetGet($offset)`
	`47`	`+ public function offsetGet(mixed $offset)`
`48`	`48`	`{`
`49`	`49`	`return $this->get($offset);`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function offsetSet($offset, $value)`
	`52`	`+ public function offsetSet(mixed $offset, mixed $value)`
`53`	`53`	`{`
`54`	`54`	`throw new BadMethodCallException('Resource bundles cannot be modified.');`
`55`	`55`	`}`
`56`	`56`
`57`		`- public function offsetUnset($offset)`
	`57`	`+ public function offsetUnset(mixed $offset)`
`58`	`58`	`{`
`59`	`59`	`throw new BadMethodCallException('Resource bundles cannot be modified.');`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class UnexpectedTypeException extends InvalidArgumentException`
`20`	`20`	`{`
`21`		`- public function __construct($value, string $expectedType)`
	`21`	`+ public function __construct(mixed $value, string $expectedType)`
`22`	`22`	`{`
`23`	`23`	`parent::__construct(sprintf('Expected argument of type "%s", "%s" given', $expectedType, get_debug_type($value)));`
`24`	`24`	`}`