Merge branch '1.x' into feature/locale_is_right_to_lef

alexander-schranz · web-flow · commit 6154b51ecd6e · 2025-06-24T16:03:03.000+02:00
diff --git a/README.md b/README.md
@@ -71,9 +71,13 @@ Polyfills are provided for:
 - the `array_find`, `array_find_key`, `array_any` and `array_all` functions introduced in PHP 8.4;
 - the `Deprecated` attribute introduced in PHP 8.4;
 - the `mb_trim`, `mb_ltrim` and `mb_rtrim` functions introduced in PHP 8.4;
+- the `ReflectionConstant` class introduced in PHP 8.4
 - the `CURL_HTTP_VERSION_3` and `CURL_HTTP_VERSION_3ONLY` constants introduced in PHP 8.4;
+- the `grapheme_str_split` function introduced in PHP 8.4;
+- the `bcdivmod` function introduced in PHP 8.4;
 - the `get_error_handler` and `get_exception_handler` functions introduced in PHP 8.5;
 - the `NoDiscard` attribute introduced in PHP 8.5;
+- the `array_first` and `array_last` functions introduced in PHP 8.5;
 
 It is strongly recommended to upgrade your PHP version and/or install the missing
 extensions whenever possible. This polyfill should be used only when there is no
diff --git a/src/Intl/Grapheme/Grapheme.php b/src/Intl/Grapheme/Grapheme.php
@@ -26,6 +26,7 @@
  * - grapheme_strrpos  - Find position (in grapheme units) of last occurrence of a string
  * - grapheme_strstr   - Returns part of haystack string from the first occurrence of needle to the end of haystack
  * - grapheme_substr   - Return part of a string
+ * - grapheme_str_split - Splits a string into an array of individual or chunks of graphemes
  *
  * @author Nicolas Grekas <p@tchwork.com>
  *
@@ -191,6 +192,37 @@ public static function grapheme_strstr($s, $needle, $beforeNeedle = false)
         return mb_strstr($s, $needle, $beforeNeedle, 'UTF-8');
     }
 
+    public static function grapheme_str_split($s, $len = 1)
+    {
+        if (0 > $len || 1073741823 < $len) {
+            if (80000 > \PHP_VERSION_ID) {
+                return false;
+            }
+
+            throw new \ValueError('grapheme_str_split(): Argument #2 ($length) must be greater than 0 and less than or equal to 1073741823.');
+        }
+
+        if ('' === $s) {
+            return [];
+        }
+
+        if (!preg_match_all('/('.SYMFONY_GRAPHEME_CLUSTER_RX.')/u', $s, $matches)) {
+            return false;
+        }
+
+        if (1 === $len) {
+            return $matches[0];
+        }
+
+        $chunks = array_chunk($matches[0], $len);
+
+        foreach ($chunks as &$chunk) {
+            $chunk = implode('', $chunk);
+        }
+
+        return $chunks;
+    }
+
     private static function grapheme_position($s, $needle, $offset, $mode)
     {
         $needle = (string) $needle;
diff --git a/src/Intl/Grapheme/README.md b/src/Intl/Grapheme/README.md
@@ -21,6 +21,7 @@ This component provides a partial, native PHP implementation of the
 - [`grapheme_strstr`](https://php.net/grapheme_strstr): Returns part of haystack string from
   the first occurrence of needle to the end of haystack
 - [`grapheme_substr`](https://php.net/grapheme_substr): Return part of a string
+- [`grapheme_str_split](https://php.net/grapheme_str_split): Splits a string into an array of individual or chunks of graphemes
 
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
diff --git a/src/Intl/Grapheme/bootstrap.php b/src/Intl/Grapheme/bootstrap.php
@@ -56,3 +56,6 @@ function grapheme_strstr($haystack, $needle, $beforeNeedle = false) { return p\G
 if (!function_exists('grapheme_substr')) {
     function grapheme_substr($string, $offset, $length = null) { return p\Grapheme::grapheme_substr($string, $offset, $length); }
 }
+if (!function_exists('grapheme_str_split')) {
+    function grapheme_str_split($string, $length = 1) { return p\Grapheme::grapheme_str_split($string, $length); }
+}
diff --git a/src/Intl/Grapheme/bootstrap80.php b/src/Intl/Grapheme/bootstrap80.php
@@ -48,3 +48,6 @@ function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle
 if (!function_exists('grapheme_substr')) {
     function grapheme_substr(?string $string, ?int $offset, ?int $length = null): string|false { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, $length); }
 }
+if (!function_exists('grapheme_str_split')) {
+    function grapheme_str_split(string $string, int $length = 1): array|false { return p\Grapheme::grapheme_str_split($string, $length); }
+}
diff --git a/src/Intl/Icu/NumberFormatter.php b/src/Intl/Icu/NumberFormatter.php
@@ -340,7 +340,7 @@ public function formatCurrency(float $amount, string $currency)
      * @param int       $type Type of the formatting, one of the format type constants.
      *                        Only type NumberFormatter::TYPE_DEFAULT is currently supported.
      *
-     * @return bool|string The formatted value or false on error
+     * @return false|string The formatted value or false on error
      *
      * @see https://php.net/numberformatter.format
      *
diff --git a/src/Php84/Php84.php b/src/Php84/Php84.php
@@ -174,4 +174,44 @@ private static function mb_internal_trim(string $regex, string $string, ?string
 
         return mb_convert_encoding($string, $encoding, 'UTF-8');
     }
+
+    public static function grapheme_str_split(string $string, int $length)
+    {
+        if (0 > $length || 1073741823 < $length) {
+            throw new \ValueError('grapheme_str_split(): Argument #2 ($length) must be greater than 0 and less than or equal to 1073741823.');
+        }
+
+        if ('' === $string) {
+            return [];
+        }
+
+        $regex = ((float) \PCRE_VERSION < 10 ? (float) \PCRE_VERSION >= 8.32 : (float) \PCRE_VERSION >= 10.39)
+            ? '\X'
+            : '(?:\r\n|(?:[ -~\x{200C}\x{200D}]|[ᆨ-ᇹ]+|[ᄀ-ᅟ]*(?:[가개갸걔거게겨계고과괘괴교구궈궤귀규그긔기까깨꺄꺠꺼께껴꼐꼬꽈꽤꾀꾜꾸꿔꿰뀌뀨끄끠끼나내냐냬너네녀녜노놔놰뇌뇨누눠눼뉘뉴느늬니다대댜댸더데뎌뎨도돠돼되됴두둬뒈뒤듀드듸디따때땨떄떠떼뗘뗴또똬뙈뙤뚀뚜뚸뛔뛰뜌뜨띄띠라래랴럐러레려례로롸뢔뢰료루뤄뤠뤼류르릐리마매먀먜머메며몌모뫄뫠뫼묘무뭐뭬뮈뮤므믜미바배뱌뱨버베벼볘보봐봬뵈뵤부붜붸뷔뷰브븨비빠빼뺘뺴뻐뻬뼈뼤뽀뽜뽸뾔뾰뿌뿨쀄쀠쀼쁘쁴삐사새샤섀서세셔셰소솨쇄쇠쇼수숴쉐쉬슈스싀시싸쌔쌰썌써쎄쎠쎼쏘쏴쐐쐬쑈쑤쒀쒜쒸쓔쓰씌씨아애야얘어에여예오와왜외요우워웨위유으의이자재쟈쟤저제져졔조좌좨죄죠주줘줴쥐쥬즈즤지짜째쨔쨰쩌쩨쪄쪠쪼쫘쫴쬐쬬쭈쭤쮀쮜쮸쯔쯰찌차채챠챼처체쳐쳬초촤쵀최쵸추춰췌취츄츠츼치카캐캬컈커케켜켸코콰쾌쾨쿄쿠쿼퀘퀴큐크킈키타태탸턔터테텨톄토톼퇘퇴툐투퉈퉤튀튜트틔티파패퍄퍠퍼페펴폐포퐈퐤푀표푸풔풰퓌퓨프픠피하해햐햬허헤혀혜호화홰회효후훠훼휘휴흐희히]?[ᅠ-ᆢ]+|[가-힣])[ᆨ-ᇹ]*|[ᄀ-ᅟ]+|[^\p{Cc}\p{Cf}\p{Zl}\p{Zp}])[\p{Mn}\p{Me}\x{09BE}\x{09D7}\x{0B3E}\x{0B57}\x{0BBE}\x{0BD7}\x{0CC2}\x{0CD5}\x{0CD6}\x{0D3E}\x{0D57}\x{0DCF}\x{0DDF}\x{200C}\x{200D}\x{1D165}\x{1D16E}-\x{1D172}]*|[\p{Cc}\p{Cf}\p{Zl}\p{Zp}])';
+
+        if (!preg_match_all('/'. $regex .'/u', $string, $matches)) {
+            return false;
+        }
+
+        if (1 === $length) {
+            return $matches[0];
+        }
+
+        $chunks = array_chunk($matches[0], $length);
+        foreach ($chunks as &$chunk) {
+            $chunk = implode('', $chunk);
+        }
+
+        return $chunks;
+    }
+
+    public static function bcdivmod(string $num1, string $num2, ?int $scale = null): ?array
+    {
+        if (null === $quot = \bcdiv($num1, $num2, 0)) {
+            return null;
+        }
+        $scale = $scale ?? (\PHP_VERSION_ID >= 70300 ? \bcscale() : (ini_get('bcmath.scale') ?: 0));
+
+        return [$quot, \bcmod($num1, $num2, $scale)];
+    }
 }
diff --git a/src/Php84/README.md b/src/Php84/README.md
@@ -3,12 +3,15 @@ Symfony Polyfill / Php84
 
 This component provides features added to PHP 8.4 core:
 
-- [`mb_ucfirst` and `mb_lcfirst`](https://wiki.php.net/rfc/mb_ucfirst)
 - [`array_find`, `array_find_key`, `array_any` and `array_all`](https://wiki.php.net/rfc/array_find)
+- [`bcdivmod`](https://wiki.php.net/rfc/add_bcdivmod_to_bcmath)
 - [`Deprecated`](https://wiki.php.net/rfc/deprecated_attribute)
 - `CURL_HTTP_VERSION_3` and `CURL_HTTP_VERSION_3ONLY` constants
 - [`fpow`](https://wiki.php.net/rfc/raising_zero_to_power_of_negative_number)
+- [`grapheme_str_split`](https://wiki.php.net/rfc/grapheme_str_split)
 - [`mb_trim`, `mb_ltrim` and `mb_rtrim`](https://wiki.php.net/rfc/mb_trim)
+- [`mb_ucfirst` and `mb_lcfirst`](https://wiki.php.net/rfc/mb_ucfirst)
+- [`ReflectionConstant`](https://github.com/php/php-src/pull/13669)
 
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
diff --git a/src/Php84/Resources/stubs/ReflectionConstant.php b/src/Php84/Resources/stubs/ReflectionConstant.php
@@ -0,0 +1,158 @@
+<?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.
+ */
+
+if (\PHP_VERSION_ID < 80400) {
+    /**
+     * @author Daniel Scherzer <daniel.e.scherzer@gmail.com>
+     */
+    final class ReflectionConstant
+    {
+        /**
+         * @var string
+         *
+         * @readonly
+         */
+        public $name;
+
+        private $value;
+        private $deprecated;
+
+        private static $persistentConstants = [];
+
+        public function __construct(string $name)
+        {
+            if (!defined($name) || false !== strpos($name, '::')) {
+                throw new ReflectionException("Constant \"$name\" does not exist");
+            }
+
+            $this->name = ltrim($name, '\\');
+            $deprecated = false;
+            $eh = set_error_handler(static function ($type, $msg, $file, $line) use ($name, &$deprecated, &$eh) {
+                if (\E_DEPRECATED === $type && "Constant $name is deprecated" === $msg) {
+                    return $deprecated = true;
+                }
+
+                return $eh && $eh($type, $msg, $file, $line);
+            });
+
+            try {
+                $this->value = constant($name);
+                $this->deprecated = $deprecated;
+            } finally {
+                restore_error_handler();
+            }
+        }
+
+        public function getName(): string
+        {
+            return $this->name;
+        }
+
+        public function getValue()
+        {
+            return $this->value;
+        }
+
+        public function getNamespaceName(): string
+        {
+            if (false === $slashPos = strrpos($this->name, '\\')) {
+                return '';
+            }
+
+            return substr($this->name, 0, $slashPos);
+        }
+
+        public function getShortName(): string
+        {
+            if (false === $slashPos = strrpos($this->name, '\\')) {
+                return $this->name;
+            }
+
+            return substr($this->name, $slashPos + 1);
+        }
+
+        public function isDeprecated(): bool
+        {
+            return $this->deprecated;
+        }
+
+        public function __toString(): string
+        {
+            // A constant is persistent if provided by PHP itself rather than
+            // being defined by users. If we got here, we know that it *is*
+            // defined, so we just need to figure out if it is defined by the
+            // user or not
+            if (!self::$persistentConstants) {
+                $persistentConstants = get_defined_constants(true);
+                unset($persistentConstants['user']);
+                foreach ($persistentConstants as $constants) {
+                    self::$persistentConstants += $constants;
+                }
+            }
+            $persistent = array_key_exists($this->name, self::$persistentConstants);
+
+            // Can't match the inclusion of `no_file_cache` but the rest is
+            // possible to match
+            $result = 'Constant [ ';
+            if ($persistent || $this->deprecated) {
+                $result .= '<';
+                if ($persistent) {
+                    $result .= 'persistent';
+                    if ($this->deprecated) {
+                        $result .= ', ';
+                    }
+                }
+                if ($this->deprecated) {
+                    $result .= 'deprecated';
+                }
+                $result .= '> ';
+            }
+            // Cannot just use gettype() to match zend_zval_type_name()
+            if (is_object($this->value)) {
+                $result .= \PHP_VERSION_ID >= 80000 ? get_debug_type($this->value) : gettype($this->value);
+            } elseif (is_bool($this->value)) {
+                $result .= 'bool';
+            } elseif (is_int($this->value)) {
+                $result .= 'int';
+            } elseif (is_float($this->value)) {
+                $result .= 'float';
+            } elseif (null === $this->value) {
+                $result .= 'null';
+            } else {
+                $result .= gettype($this->value);
+            }
+            $result .= ' ';
+            $result .= $this->name;
+            $result .= ' ] { ';
+            if (is_array($this->value)) {
+                $result .= 'Array';
+            } else {
+                // This will throw an exception if the value is an object that
+                // cannot be converted to string; that is expected and matches
+                // the behavior of zval_get_string_func()
+                $result .= (string) $this->value;
+            }
+            $result .= " }\n";
+
+            return $result;
+        }
+
+        public function __sleep(): array
+        {
+            throw new Exception("Serialization of 'ReflectionConstant' is not allowed");
+        }
+
+        public function __wakeup(): void
+        {
+            throw new Exception("Unserialization of 'ReflectionConstant' is not allowed");
+        }
+    }
+}
diff --git a/src/Php84/bootstrap.php b/src/Php84/bootstrap.php
@@ -66,3 +66,17 @@ function mb_ltrim(string $string, ?string $characters = null, ?string $encoding
         function mb_rtrim(string $string, ?string $characters = null, ?string $encoding = null): string { return p\Php84::mb_rtrim($string, $characters, $encoding); }
     }
 }
+
+if (extension_loaded('bcmath')) {
+    if (!function_exists('bcdivmod')) {
+        function bcdivmod(string $num1, string $num2, ?int $scale = null): ?array { return p\Php84::bcdivmod($num1, $num2, $scale); }
+    }
+}
+
+if (\PHP_VERSION_ID >= 80200) {
+    return require __DIR__.'/bootstrap82.php';
+}
+
+if (extension_loaded('intl') && !function_exists('grapheme_str_split')) {
+    function grapheme_str_split(string $string, int $length = 1) { return p\Php84::grapheme_str_split($string, $length); }
+}
diff --git a/src/Php84/bootstrap82.php b/src/Php84/bootstrap82.php
@@ -0,0 +1,20 @@
+<?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\Polyfill\Php84 as p;
+
+if (\PHP_VERSION_ID >= 80400) {
+    return;
+}
+
+if (extension_loaded('intl') && !function_exists('grapheme_str_split')) {
+    function grapheme_str_split(string $string, int $length = 1): array|false { return p\Php84::grapheme_str_split($string, $length); }
+}
diff --git a/src/Php85/Php85.php b/src/Php85/Php85.php
@@ -35,6 +35,20 @@ public static function get_exception_handler(): ?callable
         return $handler;
     }
 
+    public static function array_first(array $array)
+    {
+        foreach ($array as $value) {
+            return $value;
+        }
+
+        return null;
+    }
+
+    public static function array_last(array $array)
+    {
+        return $array ? current(array_slice($array, -1)) : null;
+    }
+
     public static function locale_is_right_to_left(string $locale): bool {
         static $rtlScripts = [
             'Adlm', 'Arab', 'Armi', 'Hebr', 'Mani', 'Mend', 'Nkoo',
diff --git a/src/Php85/README.md b/src/Php85/README.md
@@ -5,6 +5,7 @@ This component provides features added to PHP 8.5 core:
 
 - [`get_error_handler` and `get_exception_handler`](https://wiki.php.net/rfc/get-error-exception-handler)
 - [`NoDiscard`](https://wiki.php.net/rfc/marking_return_value_as_important)
+- [`array_first` and `array_last`](https://wiki.php.net/rfc/array_first_last)
 
 More information can be found in the
 [main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
diff --git a/src/Php85/bootstrap.php b/src/Php85/bootstrap.php
@@ -23,6 +23,14 @@ function get_error_handler(): ?callable { return p\Php85::get_error_handler(); }
     function get_exception_handler(): ?callable { return p\Php85::get_exception_handler(); }
 }
 
+if (!function_exists('array_first')) {
+    function array_first(array $array) { return p\Php85::array_first($array); }
+}
+
+if (!function_exists('array_last')) {
+    function array_last(array $array) { return p\Php85::array_last($array); }
+}
+
 if (!function_exists('locale_is_right_to_left')) {
     function locale_is_right_to_left(string $locale): bool { return p\Php85::locale_is_right_to_left($locale); }
-}
+}
diff --git a/src/Util/TestListenerTrait.php b/src/Util/TestListenerTrait.php
diff --git a/tests/Intl/Grapheme/GraphemeTest.php b/tests/Intl/Grapheme/GraphemeTest.php
diff --git a/tests/Php84/Php84Test.php b/tests/Php84/Php84Test.php
diff --git a/tests/Php84/ReflectionConstantTest.php b/tests/Php84/ReflectionConstantTest.php
diff --git a/tests/Php85/Php85Test.php b/tests/Php85/Php85Test.php

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,6 @@ function grapheme_strstr($haystack, $needle, $beforeNeedle = false) { return p\G`
`56`	`56`	`if (!function_exists('grapheme_substr')) {`
`57`	`57`	`function grapheme_substr($string, $offset, $length = null) { return p\Grapheme::grapheme_substr($string, $offset, $length); }`
`58`	`58`	`}`
	`59`	`+if (!function_exists('grapheme_str_split')) {`
	`60`	`+ function grapheme_str_split($string, $length = 1) { return p\Grapheme::grapheme_str_split($string, $length); }`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -48,3 +48,6 @@ function grapheme_strstr(?string $haystack, ?string $needle, ?bool $beforeNeedle`
`48`	`48`	`if (!function_exists('grapheme_substr')) {`
`49`	`49`	`function grapheme_substr(?string $string, ?int $offset, ?int $length = null): string\|false { return p\Grapheme::grapheme_substr((string) $string, (int) $offset, $length); }`
`50`	`50`	`}`
	`51`	`+if (!function_exists('grapheme_str_split')) {`
	`52`	`+ function grapheme_str_split(string $string, int $length = 1): array\|false { return p\Grapheme::grapheme_str_split($string, $length); }`
	`53`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ public function formatCurrency(float $amount, string $currency)`
`340`	`340`	`* @param int $type Type of the formatting, one of the format type constants.`
`341`	`341`	`* Only type NumberFormatter::TYPE_DEFAULT is currently supported.`
`342`	`342`	`*`
`343`		`- * @return bool\|string The formatted value or false on error`
	`343`	`+ * @return false\|string The formatted value or false on error`
`344`	`344`	`*`
`345`	`345`	`* @see https://php.net/numberformatter.format`
`346`	`346`	`*`