From 6cd267fb259fab2aac09d541bdc0ebbb387e1caa Mon Sep 17 00:00:00 2001 From: Samuel Akopyan Date: Tue, 24 Sep 2024 20:32:11 +0300 Subject: [PATCH 1/3] PHP 8 compatibility: Fix passing null to string parameter parameter --- framework/console/CConsoleCommand.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/console/CConsoleCommand.php b/framework/console/CConsoleCommand.php index 0c1f65993b..16e689d9e5 100644 --- a/framework/console/CConsoleCommand.php +++ b/framework/console/CConsoleCommand.php @@ -229,6 +229,9 @@ protected function resolveRequest($args) $params=array(); // unnamed parameters foreach($args as $arg) { + if (is_null($arg)) + continue; + if(preg_match('/^--(\w+)(=(.*))?$/',$arg,$matches)) // an option { $name=$matches[1]; From cd2e3dab318ba59ce7bd983079ea932fd580a2ca Mon Sep 17 00:00:00 2001 From: Samuel Akopyan Date: Tue, 24 Sep 2024 20:34:48 +0300 Subject: [PATCH 2/3] Bug #4566 Update changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 0e9160e5ec..59a97856d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ Version 1.1.30 under development - Bug #4547: PHP 8 compatibility: Fix deprecation in CCaptcha when using Imagick extension (apphp) - Bug #4541: PHP 8 compatibility: Fix deprecation in MarkdownParser (mdeweerd) - Bug #4544: PHP 8 compatibility: Fix deprecation in CLocale (apphp) +- Bug #4566: PHP 8 compatibility: Fix passing null to string parameter parameter (apphp) - Enh #4552: Added support for PHP 8.3 (sandippingle, ThePepster, marcovtwout) Version 1.1.29 November 14, 2023 From bc0f4d0eb4685ad3ebc406cc933da854598bc001 Mon Sep 17 00:00:00 2001 From: Samuel Akopyan Date: Thu, 26 Sep 2024 23:29:31 +0300 Subject: [PATCH 3/3] Bug #4566 fixed tabs instead of spaces --- framework/console/CConsoleCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/console/CConsoleCommand.php b/framework/console/CConsoleCommand.php index 16e689d9e5..a62838ff19 100644 --- a/framework/console/CConsoleCommand.php +++ b/framework/console/CConsoleCommand.php @@ -229,8 +229,8 @@ protected function resolveRequest($args) $params=array(); // unnamed parameters foreach($args as $arg) { - if (is_null($arg)) - continue; + if (is_null($arg)) + continue; if(preg_match('/^--(\w+)(=(.*))?$/',$arg,$matches)) // an option {