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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	lib/composer/installed.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php
#	sources/application/TwigBase/Controller/Controller.php
This commit is contained in:
Pierre Goiffon
2022-02-14 08:41:33 +01:00
parent a65c55fc48 4a67819f87
commit 6a5840ed82
416 changed files with 6638 additions and 2444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/iTopModulesPhpVersionChecklistTest.php
View File

@@ -88,7 +88,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());