Bound upper PHP version in composer.json (#9298)

* bound upper PHP version * improve/replace all relative includes
roundcube · Jan 2, 2024 · b563706 · b563706
1 parent 86eda9f
commit b563706
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/composer.json-dist b/composer.json-dist
@@ -3,7 +3,7 @@
     "description": "The Roundcube Webmail suite",
     "license": "GPL-3.0-or-later",
     "require": {
-        "php": ">=7.3.0",
+        "php": ">=7.3 <8.4",
         "bacon/bacon-qr-code": "^2.0.8",
         "guzzlehttp/guzzle": "^7.3.0",
         "masterminds/html5": "~2.8.0",

diff --git a/installer/index.php b/installer/index.php
@@ -140,9 +140,9 @@
 <ol id="progress">
 <?php
 $include_steps = [
-    1 => './check.php',
-    2 => './config.php',
-    3 => './test.php',
+    1 => __DIR__ . '/check.php',
+    2 => __DIR__ . '/config.php',
+    3 => __DIR__ . '/test.php',
 ];
 
 if (!in_array($RCI->step, array_keys($include_steps))) {

diff --git a/plugins/password/drivers/tinycp.php b/plugins/password/drivers/tinycp.php
@@ -31,7 +31,7 @@ class rcube_tinycp_password
 {
     public function save($currpass, $newpass, $username)
     {
-        require_once 'TinyCPConnector.php';
+        require_once __DIR__ . '/TinyCPConnector.php';
 
         $tinycp_host   = rcmail::get_instance()->config->get('password_tinycp_host');
         $tinycp_port   = rcmail::get_instance()->config->get('password_tinycp_port');