[Intl] deprecate polyfills in favor of symfony/polyfill-intl-icu

nicolas-grekas · nicolas-grekas · commit 1421dcf52407 · 2020-11-03T17:53:13.000+01:00
diff --git a/composer.json b/composer.json
@@ -29,7 +29,6 @@
         "symfony/contracts": "^2.1",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-grapheme": "~1.0",
-        "symfony/polyfill-intl-icu": "~1.0",
         "symfony/polyfill-intl-idn": "^1.10",
         "symfony/polyfill-intl-normalizer": "~1.0",
         "symfony/polyfill-mbstring": "~1.0",
@@ -131,6 +130,7 @@
         "psr/simple-cache": "^1.0",
         "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
         "symfony/phpunit-bridge": "^5.2",
+        "symfony/polyfill-intl-icu": "^1.0",
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
         "twig/cssinliner-extra": "^2.12",
@@ -157,12 +157,16 @@
         "classmap": [
             "src/Symfony/Component/Intl/Resources/stubs"
         ],
+        "files": [
+            "src/Symfony/Component/Intl/Resources/functions.php"
+        ],
         "exclude-from-classmap": [
             "**/Tests/"
         ]
     },
     "autoload-dev": {
         "files": [
+            "src/Symfony/Component/Intl/Resources/functions.php",
             "src/Symfony/Component/String/Resources/functions.php",
             "src/Symfony/Component/VarDumper/Resources/functions/dump.php"
         ]
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -22,6 +22,7 @@
         "symfony/intl": "^4.4|^5.0",
         "symfony/options-resolver": "^5.1",
         "symfony/polyfill-ctype": "~1.8",
+        "symfony/polyfill-intl-icu": "^1.12",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/polyfill-php80": "^1.15",
         "symfony/property-access": "^5.0.8",
@@ -48,7 +49,6 @@
         "symfony/error-handler": "<4.4.5",
         "symfony/framework-bundle": "<4.4",
         "symfony/http-kernel": "<4.4",
-        "symfony/intl": "<4.4",
         "symfony/translation": "<4.4",
         "symfony/translation-contracts": "<1.1.7",
         "symfony/twig-bridge": "<4.4"
diff --git a/src/Symfony/Component/Intl/Collator/Collator.php b/src/Symfony/Component/Intl/Collator/Collator.php
@@ -32,6 +32,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class Collator
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/AmPmTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class AmPmTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfWeekTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class DayOfWeekTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayOfYearTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class DayOfYearTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class DayTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/FullTransformer.php
@@ -20,6 +20,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class FullTransformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1200Transformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class Hour1200Transformer extends HourTransformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour1201Transformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class Hour1201Transformer extends HourTransformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2400Transformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class Hour2400Transformer extends HourTransformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Hour2401Transformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class Hour2401Transformer extends HourTransformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/HourTransformer.php
@@ -17,6 +17,8 @@
  * @author Eriksen Costa <eriksen.costa@infranology.com.br>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class HourTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MinuteTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class MinuteTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class MonthTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/QuarterTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class QuarterTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/SecondTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class SecondTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/TimezoneTransformer.php
@@ -19,6 +19,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class TimezoneTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/Transformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php
@@ -17,6 +17,8 @@
  * @author Igor Wiedler <igor@wiedler.ch>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class YearTransformer extends Transformer
 {
diff --git a/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php b/src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
@@ -45,6 +45,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class IntlDateFormatter
 {
diff --git a/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodArgumentNotImplementedException.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Eriksen Costa <eriksen.costa@infranology.com.br>
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class MethodArgumentNotImplementedException extends NotImplementedException
 {
diff --git a/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodArgumentValueNotImplementedException.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Eriksen Costa <eriksen.costa@infranology.com.br>
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class MethodArgumentValueNotImplementedException extends NotImplementedException
 {
diff --git a/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php b/src/Symfony/Component/Intl/Exception/MethodNotImplementedException.php
@@ -13,6 +13,8 @@
 
 /**
  * @author Eriksen Costa <eriksen.costa@infranology.com.br>
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class MethodNotImplementedException extends NotImplementedException
 {
diff --git a/src/Symfony/Component/Intl/Exception/NotImplementedException.php b/src/Symfony/Component/Intl/Exception/NotImplementedException.php
@@ -15,6 +15,8 @@
  * Base exception class for not implemented behaviors of the intl extension in the Locale component.
  *
  * @author Eriksen Costa <eriksen.costa@infranology.com.br>
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 class NotImplementedException extends RuntimeException
 {
diff --git a/src/Symfony/Component/Intl/Globals/IntlGlobals.php b/src/Symfony/Component/Intl/Globals/IntlGlobals.php
@@ -11,12 +11,16 @@
 
 namespace Symfony\Component\Intl\Globals;
 
+use Symfony\Polyfill\Intl\Icu\Icu;
+
 /**
  * Provides fake static versions of the global functions in the intl extension.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class IntlGlobals
 {
@@ -61,6 +65,12 @@ abstract class IntlGlobals
      */
     public static function isFailure(int $errorCode): bool
     {
+        if (class_exists(Icu::class)) {
+            return Icu::isFailure($errorCode);
+        }
+
+        trigger_deprecation('symfony/intl', '5.3', 'Polyfills are deprecated, try running "composer require symfony/polyfill-intl-icu ^1.21" instead.');
+
         return isset(self::$errorCodes[$errorCode])
             && $errorCode > self::U_ZERO_ERROR;
     }
@@ -74,6 +84,12 @@ public static function isFailure(int $errorCode): bool
      */
     public static function getErrorCode()
     {
+        if (class_exists(Icu::class)) {
+            return Icu::getErrorCode();
+        }
+
+        trigger_deprecation('symfony/intl', '5.3', 'Polyfills are deprecated, try running "composer require symfony/polyfill-intl-icu ^1.21" instead.');
+
         return self::$errorCode;
     }
 
@@ -84,6 +100,12 @@ public static function getErrorCode()
      */
     public static function getErrorMessage(): string
     {
+        if (class_exists(Icu::class)) {
+            return Icu::getErrorMessage();
+        }
+
+        trigger_deprecation('symfony/intl', '5.3', 'Polyfills are deprecated, try running "composer require symfony/polyfill-intl-icu ^1.21" instead.');
+
         return self::$errorMessage;
     }
 
@@ -94,6 +116,12 @@ public static function getErrorMessage(): string
      */
     public static function getErrorName(int $code): string
     {
+        if (class_exists(Icu::class)) {
+            return Icu::getErrorName($code);
+        }
+
+        trigger_deprecation('symfony/intl', '5.3', 'Polyfills are deprecated, try running "composer require symfony/polyfill-intl-icu ^1.21" instead.');
+
         return self::$errorCodes[$code] ?? '[BOGUS UErrorCode]';
     }
 
@@ -107,6 +135,10 @@ public static function getErrorName(int $code): string
      */
     public static function setError(int $code, string $message = '')
     {
+        if (class_exists(Icu::class)) {
+            return Icu::setError($code, $message);
+        }
+
         if (!isset(self::$errorCodes[$code])) {
             throw new \InvalidArgumentException(sprintf('No such error code: "%s".', $code));
         }
diff --git a/src/Symfony/Component/Intl/Locale/Locale.php b/src/Symfony/Component/Intl/Locale/Locale.php
@@ -23,6 +23,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class Locale
 {
diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
@@ -39,6 +39,8 @@
  * @author Bernhard Schussek <bschussek@gmail.com>
  *
  * @internal
+ *
+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead
  */
 abstract class NumberFormatter
 {
diff --git a/src/Symfony/Component/Intl/Resources/functions.php b/src/Symfony/Component/Intl/Resources/functions.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Component\Intl\Globals\IntlGlobals;
+
+if (!function_exists('intl_is_failure')) {
+    function intl_is_failure($error_code)
+    {
+        return IntlGlobals::isFailure($error_code);
+    }
+}
+if (!function_exists('intl_get_error_code')) {
+    function intl_get_error_code()
+    {
+        return IntlGlobals::getErrorCode();
+    }
+}
+if (!function_exists('intl_get_error_message')) {
+    function intl_get_error_message()
+    {
+        return IntlGlobals::getErrorMessage();
+    }
+}
+if (!function_exists('intl_error_name')) {
+    function intl_error_name($error_code)
+    {
+        return IntlGlobals::getErrorName($error_code);
+    }
+}
diff --git a/src/Symfony/Component/Intl/Resources/stubs/Collator.php b/src/Symfony/Component/Intl/Resources/stubs/Collator.php
diff --git a/src/Symfony/Component/Intl/Resources/stubs/IntlDateFormatter.php b/src/Symfony/Component/Intl/Resources/stubs/IntlDateFormatter.php
diff --git a/src/Symfony/Component/Intl/Resources/stubs/Locale.php b/src/Symfony/Component/Intl/Resources/stubs/Locale.php
diff --git a/src/Symfony/Component/Intl/Resources/stubs/NumberFormatter.php b/src/Symfony/Component/Intl/Resources/stubs/NumberFormatter.php
diff --git a/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
diff --git a/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/AbstractIntlGlobalsTest.php
diff --git a/src/Symfony/Component/Intl/Tests/Globals/IntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/IntlGlobalsTest.php
diff --git a/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php b/src/Symfony/Component/Intl/Tests/Globals/Verification/IntlGlobalsTest.php
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php
diff --git a/src/Symfony/Component/Intl/composer.json b/src/Symfony/Component/Intl/composer.json
diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`* @author Bernhard Schussek <[email protected]>`
`33`	`33`	`*`
`34`	`34`	`* @internal`
	`35`	`+ *`
	`36`	`+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead`
`35`	`37`	`*/`
`36`	`38`	`abstract class Collator`
`37`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`* @author Igor Wiedler <[email protected]>`
`18`	`18`	`*`
`19`	`19`	`* @internal`
	`20`	`+ *`
	`21`	`+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead`
`20`	`22`	`*/`
`21`	`23`	`class AmPmTransformer extends Transformer`
`22`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`* @author Igor Wiedler <[email protected]>`
`21`	`21`	`*`
`22`	`22`	`* @internal`
	`23`	`+ *`
	`24`	`+ * @deprecated since Symfony 5.3, use symfony/polyfill-intl-icu ^1.21 instead`
`23`	`25`	`*/`
`24`	`26`	`class FullTransformer`
`25`	`27`	`{`