composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source
This commit is contained in:
Pierre Goiffon
2024-02-15 14:53:27 +01:00
parent 9e24447835 95fef002a6
commit 2695aeb64b
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
View File

@@ -183,6 +183,7 @@ class DictionariesConsistencyTest extends ItopTestCase
glob($sAppRoot.'extensions/*/*.dict*.php'), glob($sAppRoot.'extensions/*/*.dict*.php'),
glob($sAppRoot.'extensions/*/dictionaries/*.dict*.php'), glob($sAppRoot.'extensions/*/dictionaries/*.dict*.php'),
); );
$this->RemoveModulesWithout7246Fixes($aDictFilesModules);
$aDictFiles = array_merge($aDictFilesCore, $aDictFilesModules); $aDictFiles = array_merge($aDictFilesCore, $aDictFilesModules);
@@ -195,6 +196,42 @@ class DictionariesConsistencyTest extends ItopTestCase
return $aTestCases; return $aTestCases;
} }
/**
* Most of our product packages uses tags for extensions modules, so they won't get the fixes. We are removing them, as we will test on newer packages anyway !
*
* @since 3.0.5 3.1.2 3.2.0 N°7246
*/
private function RemoveModulesWithout7246Fixes(array &$aDictFilesModules):void
{
require_once static::GetAppRoot() . 'approot.inc.php'; // mandatory for tearDownAfterClass to work, of not present will thow `Undefined constant "LINKSET_TRACKING_LIST"`
$this->RequireOnceItopFile('core/config.class.inc.php'); // source of the ITOP_VERSION constant
if (version_compare(ITOP_VERSION, '3.2.0', '>=')) {
return;
}
$aLegacyModulesList = [
'authent-token',
'combodo-approval-extended',
'combodo-calendar-view',
'combodo-oauth-email-synchro',
'combodo-webhook-integration',
'customer-survey',
'itop-communications',
'itop-fence',
'itop-system-information',
'itsm-designer-connector',
'templates-base',
];
foreach ($aDictFilesModules as $key => $sDictFileFullPath) {
$sDictFilePath = dirname($sDictFileFullPath);
$sDictFileModuleName = basename($sDictFilePath);
if (in_array($sDictFileModuleName, $aLegacyModulesList)) {
unset($aDictFilesModules[$key]);
}
}
}
/** /**
* @dataProvider DictionaryFileProvider * @dataProvider DictionaryFileProvider
* *
@@ -484,5 +521,4 @@ EOF
return 1; return 1;
} }
} }