composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4714 - Revert rename of utils::GetItopVersionWikiSyntax as it is used in cached packages in the ITSM Designer

Browse Source
This commit is contained in:
Molkobain
2022-02-11 20:00:24 +01:00
parent 81c39c35cd
commit 4a67819f87
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/utils.inc.php
View File

@@ -2250,7 +2250,7 @@ class utils
* @throws \ApplicationException if constant value is invalid * @throws \ApplicationException if constant value is invalid
* @uses ITOP_CORE_VERSION * @uses ITOP_CORE_VERSION
*/ */
public static function GetCoreVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION) public static function GetItopVersionWikiSyntax($sItopVersion = ITOP_CORE_VERSION)
{ {
$aExplodedVersion = explode('.', $sItopVersion); $aExplodedVersion = explode('.', $sItopVersion);

2
approot.inc.php
View File

@@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/');
* When releasing, both constants should be updated : see `.make/release/update-versions.php` for that ! * 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 * @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 * @used-by iTopModulesPhpVersionIntegrationTest
*/ */
define('ITOP_CORE_VERSION', '2.7.7'); define('ITOP_CORE_VERSION', '2.7.7');

4
setup/setuputils.class.inc.php
View File

@@ -918,7 +918,7 @@ class SetupUtils
$oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA, $oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA,
$sNewDBName = '' $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'; $sMysqlTlsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion.':install:php_and_mysql_tls';
$oPage->add('<tr><td colspan="2">'); $oPage->add('<tr><td colspan="2">');
@@ -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)."); $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) { } 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 $sAttachmentsVarsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion
.':install:php_and_mysql_configuration#attachments_upload'; .':install:php_and_mysql_configuration#attachments_upload';

2
test/integration/iTopModulesPhpVersionChecklistTest.php
View File

@@ -96,7 +96,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
*/ */
public function testItopWikiVersion($sItopVersion, $sExpectedWikiVersion) { public function testItopWikiVersion($sItopVersion, $sExpectedWikiVersion) {
try { try {
$sActualWikiVersion = utils::GetCoreVersionWikiSyntax($sItopVersion); $sActualWikiVersion = utils::GetItopVersionWikiSyntax($sItopVersion);
} }
catch (ApplicationException $e) { catch (ApplicationException $e) {
self::fail('Cannot get wiki version : '.$e->getMessage()); self::fail('Cannot get wiki version : '.$e->getMessage());