Bump to PHP 8.1

symfony · Sep 9, 2024 · 9d24c41 · 9d24c41
1 parent 2ae3bda
commit 9d24c41
Show file tree

Hide file tree

Showing 89 changed files with 309 additions and 3,168 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,15 +12,11 @@ jobs:
 
         env:
             COMPOSER_ROOT_VERSION: 1.x-dev
-            SYMFONY_PHPUNIT_VERSION: 8.5
+            SYMFONY_PHPUNIT_VERSION: 9.6
 
         strategy:
             matrix:
                 include:
-                    - php: '7.2'
-                    - php: '7.3'
-                    - php: '7.4'
-                    - php: '8.0'
                     - php: '8.1'
                     - php: '8.2'
                     - php: '8.3'

diff --git a/composer.json b/composer.json
@@ -16,12 +16,12 @@
         }
     ],
     "require": {
-        "php": ">=7.2"
+        "php": ">=8.1"
     },
     "require-dev": {
-        "symfony/intl": "^5.4|^6.4",
+        "symfony/intl": "^6.4",
         "symfony/phpunit-bridge": "^6.4",
-        "symfony/var-dumper": "^5.4|^6.4"
+        "symfony/var-dumper": "^6.4"
     },
     "replace": {
         "symfony/polyfill-apcu": "self.version",
@@ -64,10 +64,7 @@
             "src/Intl/Normalizer/Resources/stubs",
             "src/Php84/Resources/stubs",
             "src/Php83/Resources/stubs",
-            "src/Php82/Resources/stubs",
-            "src/Php81/Resources/stubs",
-            "src/Php80/Resources/stubs",
-            "src/Php73/Resources/stubs"
+            "src/Php82/Resources/stubs"
         ]
     },
     "minimum-stability": "dev"

diff --git a/src/Apcu/bootstrap.php b/src/Apcu/bootstrap.php
@@ -15,41 +15,37 @@
     return;
 }
 
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
 if (extension_loaded('Zend Data Cache')) {
     if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return p\Apcu::apcu_add($key, $value, $ttl); }
+        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_add($key, $value, (int) $ttl); }
     }
     if (!function_exists('apcu_delete')) {
-        function apcu_delete($key) { return p\Apcu::apcu_delete($key); }
+        function apcu_delete($key): array|bool { return p\Apcu::apcu_delete($key); }
     }
     if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return p\Apcu::apcu_exists($key); }
+        function apcu_exists($key): array|bool { return p\Apcu::apcu_exists($key); }
     }
     if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null) { return p\Apcu::apcu_fetch($key, $success); }
+        function apcu_fetch($key, &$success = null): mixed { return p\Apcu::apcu_fetch($key, $success); }
     }
     if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return p\Apcu::apcu_store($key, $value, $ttl); }
+        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_store($key, $value, (int) $ttl); }
     }
 } else {
     if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return apc_add($key, $value, $ttl); }
+        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return apc_add($key, $value, (int) $ttl); }
     }
     if (!function_exists('apcu_delete')) {
-        function apcu_delete($key) { return apc_delete($key); }
+        function apcu_delete($key): array|bool { return apc_delete($key); }
     }
     if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return apc_exists($key); }
+        function apcu_exists($key): array|bool { return apc_exists($key); }
     }
     if (!function_exists('apcu_fetch')) {
         function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
     }
     if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return apc_store($key, $value, $ttl); }
+        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return apc_store($key, $value, (int) $ttl); }
     }
 }
 
@@ -75,7 +71,7 @@ function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
 if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
     class APCuIterator extends APCIterator
     {
-        public function __construct($search = null, $format = \APC_ITER_ALL, $chunk_size = 100, $list = \APC_LIST_ACTIVE)
+        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
         {
             parent::__construct('user', $search, $format, $chunk_size, $list);
         }

diff --git a/src/Apcu/bootstrap80.php b/src/Apcu/bootstrap80.php
diff --git a/src/Apcu/composer.json b/src/Apcu/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2"
+        "php": ">=8.1"
     },
     "autoload": {
         "psr-4": { "Symfony\\Polyfill\\Apcu\\": "" },

diff --git a/src/Ctype/Ctype.php b/src/Ctype/Ctype.php
@@ -219,9 +219,7 @@ private static function convert_int_to_char_for_ctype($int, $function)
             return (string) $int;
         }
 
-        if (\PHP_VERSION_ID >= 80100) {
-            @trigger_error($function.'(): Argument of type int will be interpreted as string in the future', \E_USER_DEPRECATED);
-        }
+        @trigger_error($function.'(): Argument of type int will be interpreted as string in the future', \E_USER_DEPRECATED);
 
         if ($int < 0) {
             $int += 256;

diff --git a/src/Ctype/bootstrap.php b/src/Ctype/bootstrap.php
@@ -11,40 +11,36 @@
 
 use Symfony\Polyfill\Ctype as p;
 
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
 if (!function_exists('ctype_alnum')) {
-    function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
+    function ctype_alnum(mixed $text): bool { return p\Ctype::ctype_alnum($text); }
 }
 if (!function_exists('ctype_alpha')) {
-    function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); }
+    function ctype_alpha(mixed $text): bool { return p\Ctype::ctype_alpha($text); }
 }
 if (!function_exists('ctype_cntrl')) {
-    function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); }
+    function ctype_cntrl(mixed $text): bool { return p\Ctype::ctype_cntrl($text); }
 }
 if (!function_exists('ctype_digit')) {
-    function ctype_digit($text) { return p\Ctype::ctype_digit($text); }
+    function ctype_digit(mixed $text): bool { return p\Ctype::ctype_digit($text); }
 }
 if (!function_exists('ctype_graph')) {
-    function ctype_graph($text) { return p\Ctype::ctype_graph($text); }
+    function ctype_graph(mixed $text): bool { return p\Ctype::ctype_graph($text); }
 }
 if (!function_exists('ctype_lower')) {
-    function ctype_lower($text) { return p\Ctype::ctype_lower($text); }
+    function ctype_lower(mixed $text): bool { return p\Ctype::ctype_lower($text); }
 }
 if (!function_exists('ctype_print')) {
-    function ctype_print($text) { return p\Ctype::ctype_print($text); }
+    function ctype_print(mixed $text): bool { return p\Ctype::ctype_print($text); }
 }
 if (!function_exists('ctype_punct')) {
-    function ctype_punct($text) { return p\Ctype::ctype_punct($text); }
+    function ctype_punct(mixed $text): bool { return p\Ctype::ctype_punct($text); }
 }
 if (!function_exists('ctype_space')) {
-    function ctype_space($text) { return p\Ctype::ctype_space($text); }
+    function ctype_space(mixed $text): bool { return p\Ctype::ctype_space($text); }
 }
 if (!function_exists('ctype_upper')) {
-    function ctype_upper($text) { return p\Ctype::ctype_upper($text); }
+    function ctype_upper(mixed $text): bool { return p\Ctype::ctype_upper($text); }
 }
 if (!function_exists('ctype_xdigit')) {
-    function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); }
+    function ctype_xdigit(mixed $text): bool { return p\Ctype::ctype_xdigit($text); }
 }
diff --git a/src/Ctype/bootstrap80.php b/src/Ctype/bootstrap80.php
diff --git a/src/Ctype/composer.json b/src/Ctype/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.2"
+        "php": ">=8.1"
     },
     "provide": {
         "ext-ctype": "*"

diff --git a/src/Iconv/Iconv.php b/src/Iconv/Iconv.php
@@ -540,14 +540,10 @@ public static function iconv_substr($s, $start, $length = 2147483647, $encoding
             $start += $slen;
         }
         if (0 > $start) {
-            if (\PHP_VERSION_ID < 80000) {
-                return false;
-            }
-
             $start = 0;
         }
         if ($start >= $slen) {
-            return \PHP_VERSION_ID >= 80000 ? '' : false;
+            return '';
         }
 
         $rx = $slen - $start;
@@ -559,7 +555,7 @@ public static function iconv_substr($s, $start, $length = 2147483647, $encoding
             return '';
         }
         if (0 > $length) {
-            return \PHP_VERSION_ID >= 80000 ? '' : false;
+            return '';
         }
 
         if ($length > $rx) {