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

code style fix

Browse Source
This commit is contained in:
odain
2025-11-14 10:41:47 +01:00
parent 2b1ecf15b4
commit 5b7a5e14a3
7 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
setup/modulediscovery.class.inc.php
View File

@@ -215,10 +215,8 @@ class ModuleDiscovery
ksort($aDependencies);
$aOrderedModules = [];
$iLoopCount = 0;
while(($iLoopCount < count($aModules)) && (count($aDependencies) > 0) )
{
foreach($aDependencies as $sId => $aRemainingDeps)
{
while (($iLoopCount < count($aModules)) && (count($aDependencies) > 0)) {
foreach ($aDependencies as $sId => $aRemainingDeps) {
$bDependenciesSolved = true;
foreach ($aRemainingDeps as $sDepId) {
if (!self::DependencyIsResolved($sDepId, $aOrderedModules, $aSelectedModules)) {
@@ -278,8 +276,7 @@ class ModuleDiscovery
$bResult = false;
$aModuleVersions = [];
// Separate the module names from their version for an easier comparison later
foreach($aOrderedModules as $sModuleId)
{
foreach ($aOrderedModules as $sModuleId) {
list($sModuleName, $sVersion) = self::GetModuleName($sModuleId);
$aModuleVersions[$sModuleName] = $sVersion;
}
@@ -398,9 +395,7 @@ class ModuleDiscovery
if ($sVersion === "") {
$sVersion = "1.0.0";
}
}
else
{
} else {
$sName = $sModuleId;
$sVersion = "1.0.0";
}

1
sources/Application/WebPage/WebPage.php
View File

@@ -1271,7 +1271,6 @@ JS;
$sConstantName = 'COMPATIBILITY_'.strtoupper($sMode).'_LINKED_'.($sFileType === static::ENUM_COMPATIBILITY_FILE_TYPE_CSS ? 'STYLESHEETS' : 'SCRIPTS').'_REL_PATH';
$sMethodName = 'Link'.($sFileType === static::ENUM_COMPATIBILITY_FILE_TYPE_CSS ? 'Resource' : 'Script').'FromAppRoot';
// Add ancestors files
foreach (array_reverse(class_parents(static::class)) as $sParentClass) {
foreach (constant($sParentClass.'::'.$sConstantName) as $sFile) {

4
sources/SessionTracker/SessionHandler.php
View File

@@ -155,7 +155,7 @@ class SessionHandler extends \SessionHandler
'login_mode' => Session::Get('login_mode'),
'user_id' => $sUserId,
'creation_time' => $iCreationTime,
'context' => implode('|', ContextTag::GetStack())
'context' => implode('|', ContextTag::GetStack()),
];
$oiSessionHandlerExtension = $this->GetSessionHandlerExtension();
@@ -183,7 +183,7 @@ class SessionHandler extends \SessionHandler
}
/** @var iSessionHandlerExtension $oSessionHandlerExtension */
$oSessionHandlerExtension = new $sSessionHandlerExtensionClass;
$oSessionHandlerExtension = new $sSessionHandlerExtensionClass();
if ($oSessionHandlerExtension instanceof iSessionHandlerExtension) {
return $oSessionHandlerExtension;
}

3
synchro/synchrodatasource.class.inc.php
View File

@@ -2397,8 +2397,7 @@ class SynchroReplica extends DBObject implements iDisplay
}
}
// Really modified ?
if ($oDestObj->IsModified())
{
if ($oDestObj->IsModified()) {
if (method_exists(get_class($oDestObj), "SetCurrentChange")) {
$oDestObj::SetCurrentChange($oChange);
}

1
tests/php-unit-tests/unitary-tests/modulediscovery/ModuleDiscoveryTest.php
View File

@@ -1,6 +1,5 @@
<?php
namespace Combodo\iTop\Test\UnitTest\Setup;
use Combodo\iTop\Test\UnitTest\ItopTestCase;