From 35ce6ae539789444350cf308d0ea93c9fd72b553 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 10 Mar 2023 16:32:09 -0800 Subject: [PATCH] set-version.php - Fix warning on PHP 8.1 The `$sqlFile` may or may not be needed, which produces a warning: ``` Deprecated: file_exists(): Passing null to parameter #1 ($filename) of type string is deprecated in /.../tools/bin/scripts/set-version.php on line 105 ``` --- tools/bin/scripts/set-version.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/bin/scripts/set-version.php b/tools/bin/scripts/set-version.php index ca63a4b04967..85247f5fed9a 100755 --- a/tools/bin/scripts/set-version.php +++ b/tools/bin/scripts/set-version.php @@ -60,6 +60,9 @@ return "{* file to handle db changes in $newVersion during upgrade *}\n"; }); } +else { + $sqlFile = NULL; +} updateFile("xml/version.xml", function ($content) use ($newVersion, $oldVersion) { return str_replace($oldVersion, $newVersion, $content); @@ -101,8 +104,10 @@ if ($doCommit) { $files = array_filter( - array_merge(['xml/version.xml', 'sql/civicrm_generated.mysql', 'sql/test_data_second_domain.mysql', $phpFile, @$sqlFile], $infoXmls), - 'file_exists' + array_merge(['xml/version.xml', 'sql/civicrm_generated.mysql', 'sql/test_data_second_domain.mysql', $phpFile, $sqlFile], $infoXmls), + function($file) { + return $file && file_exists($file); + } ); $filesEsc = implode(' ', array_map('escapeshellarg', $files)); passthru("git add $filesEsc");