Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bound upper PHP version in composer.json #9298

Merged
merged 2 commits into from
Jan 2, 2024
Merged

Bound upper PHP version in composer.json #9298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4e819
bound upper PHP version
mvorisek Dec 19, 2023
adadbe4
improve/replace all relative includes
mvorisek Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json-dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions installer/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/password/drivers/tinycp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down