From 4a67819f87c5293e89779bedb44609bf8bb73d67 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Fri, 11 Feb 2022 20:00:24 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B04714=20-=20Revert=20rename=20of=20utils:?= =?UTF-8?q?:GetItopVersionWikiSyntax=20as=20it=20is=20used=20in=20cached?= =?UTF-8?q?=20packages=20in=20the=20ITSM=20Designer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 2 +- approot.inc.php | 2 +- setup/setuputils.class.inc.php | 4 ++-- test/integration/iTopModulesPhpVersionChecklistTest.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index fa4f7a03c..3e4203146 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -2250,7 +2250,7 @@ class utils * @throws \ApplicationException if constant value is invalid * @uses ITOP_CORE_VERSION */ - public static function GetCoreVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION) + public static function GetItopVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION) { $aExplodedVersion = explode('.', $sItopVersion); diff --git a/approot.inc.php b/approot.inc.php index e00277bc9..dae2341e2 100644 --- a/approot.inc.php +++ b/approot.inc.php @@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/'); * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that ! * * @since 2.7.7 3.0.1 3.1.0 N°4714 constant creation - * @used-by utils::GetCoreVersionWikiSyntax() + * @used-by utils::GetItopVersionWikiSyntax() * @used-by iTopModulesPhpVersionIntegrationTest */ define('ITOP_CORE_VERSION', '2.7.7'); diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 6d3d3511a..18b40fd61 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -918,7 +918,7 @@ class SetupUtils $oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA, $sNewDBName = '' ) { - $sWikiVersion = utils::GetCoreVersionWikiSyntax(); //eg : '2_7_0'; + $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; $sMysqlTlsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion.':install:php_and_mysql_tls'; $oPage->add(''); @@ -1194,7 +1194,7 @@ EOF { $aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_allowed_packet ($sMaxAllowedPacketFriendly) is big enough compared to upload_max_filesize ($sMaxUploadSizeFriendly)."); } else if ($iMaxAllowedPacket < $iMaxUploadSize) { - $sWikiVersion = utils::GetCoreVersionWikiSyntax(); //eg : '2_7_0'; + $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; $sAttachmentsVarsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion .':install:php_and_mysql_configuration#attachments_upload'; diff --git a/test/integration/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php index 92306552b..ffc711d33 100644 --- a/test/integration/iTopModulesPhpVersionChecklistTest.php +++ b/test/integration/iTopModulesPhpVersionChecklistTest.php @@ -96,7 +96,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase */ public function testItopWikiVersion($sItopVersion, $sExpectedWikiVersion) { try { - $sActualWikiVersion = utils::GetCoreVersionWikiSyntax($sItopVersion); + $sActualWikiVersion = utils::GetItopVersionWikiSyntax($sItopVersion); } catch (ApplicationException $e) { self::fail('Cannot get wiki version : '.$e->getMessage());