Update min PHP version check, cleanup outdated checks/comments

roundcube · Feb 23, 2025 · a9b1ca3 · a9b1ca3
1 parent 8bd1c93
commit a9b1ca3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
@@ -107,7 +107,7 @@ public function init_ui()
                 'I' => $dt->format('I'),
                 'O' => $dt->format('O'),
                 'P' => $dt->format('P'),
-                'p' => version_compare(\PHP_VERSION, '8.0.0') >= 0 ? $dt->format('p') : $dt->format('P'),
+                'p' => $dt->format('p'),
                 'T' => $dt->format('T'),
                 'Z' => $dt->format('Z'),
             ]);

diff --git a/program/include/iniset.php b/program/include/iniset.php
@@ -19,8 +19,8 @@
  +-----------------------------------------------------------------------+
 */
 
-if (\PHP_VERSION_ID < 70300) {
-    exit('Unsupported PHP version. Required PHP >= 7.3.');
+if (\PHP_VERSION_ID < 80100) {
+    exit('Unsupported PHP version. Required PHP >= 8.1.');
 }
 
 // application constants

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
@@ -18,24 +18,12 @@
  +-----------------------------------------------------------------------+
 */
 
-/**
- * Roundcube Framework Initialization
- */
-
+// Some users are not using Installer, so we'll check some critical PHP settings here
 $config = [
     'display_errors' => false,
     'log_errors' => true,
 ];
 
-// Some users are not using Installer, so we'll check some
-// critical PHP settings here. Only these, which doesn't provide
-// an error/warning in the logs later. See (#1486307).
-if (\PHP_MAJOR_VERSION < 8) {
-    $config += [
-        'mbstring.func_overload' => 0,
-    ];
-}
-
 // check these additional ini settings if not called via CLI
 if (\PHP_SAPI != 'cli') {
     $config += [
@@ -47,8 +35,10 @@
 }
 
 foreach ($config as $optname => $optval) {
+    // @phpstan-ignore-next-line
     $ini_optval = filter_var(ini_get($optname), is_bool($optval) ? \FILTER_VALIDATE_BOOLEAN : \FILTER_VALIDATE_INT);
     if ($optval != $ini_optval && @ini_set($optname, $optval) === false) {
+        // @phpstan-ignore-next-line
         $optval = !is_bool($optval) ? $optval : ($optval ? 'On' : 'Off');
         $error = "ERROR: Wrong '{$optname}' option value and it wasn't possible to set it to required value ({$optval}).\n"
             . 'Check your PHP configuration (including php_admin_flag).';