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

N°4789 - fix BeforeWritingConfig calls during setup

Browse Source
This commit is contained in:
odain
2025-08-26 16:54:36 +02:00
parent 79e1572c9e
commit f47309f535
4 changed files with 209 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
setup/modulediscovery/ModuleDiscoveryService.php
View File

@@ -60,6 +60,8 @@ class ModuleDiscoveryService {
{
throw new ModuleDiscoveryServiceException("Eval of $sModuleFilePath did not return the expected information...");
}
$this->AddModuleFilePath($aModuleInfo);
}
catch(ModuleDiscoveryServiceException $e)
{
@@ -79,6 +81,20 @@ class ModuleDiscoveryService {
return $aModuleInfo;
}
/**
* N°4789 - Parse datamodel module.xxx.php files instead of interpreting them
* additional path added to handle ModuleInstallerAPI declaration during setup only
* @param array &$aModuleInfo
*
* @return void
*/
private function AddModuleFilePath(array &$aModuleInfo)
{
if (count($aModuleInfo)==3) {
$aModuleInfo[2]['module_file_path'] = $aModuleInfo[0];
}
}
/**
* @param string $sPhpContent
*
@@ -112,6 +128,7 @@ class ModuleDiscoveryService {
if ($oNode instanceof \PhpParser\Node\Stmt\Expression) {
$aModuleConfig = $this->ParseCallToAddModuleAndReturnModuleConfiguration($sModuleFilePath, $oNode);
if (! is_null($aModuleConfig)){
$this->AddModuleFilePath($aModuleConfig);
return $aModuleConfig;
}
}
@@ -119,6 +136,7 @@ class ModuleDiscoveryService {
if ($oNode instanceof PhpParser\Node\Stmt\If_) {
$aModuleConfig = $this->BrowseIfStructure($sModuleFilePath, $oNode);
if (! is_null($aModuleConfig)){
$this->AddModuleFilePath($aModuleConfig);
return $aModuleConfig;
}
}
@@ -442,6 +460,37 @@ PHP;
return (bool) $method->invokeArgs(null, $aArgs);
}
/**
*
* @param \Config $oConfig
* @param array $aModuleInfo
*
* @return void
* @throws \ModuleDiscoveryServiceException
*/
public function CallInstallerBeforeWritingConfigMethod(Config $oConfig, array $aModuleInfo)
{
if (isset($aModuleInfo['installer']))
{
$sModuleInstallerClass = $aModuleInfo['installer'];
if (!class_exists($sModuleInstallerClass)) {
$sModuleFilePath = $aModuleInfo['module_file_path'];
$this->ReadModuleFileConfigurationLegacy($sModuleFilePath);
}
if (!class_exists($sModuleInstallerClass))
{
throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not a PHP class - Module: ".$aModuleInfo['label']);
}
if (!is_subclass_of($sModuleInstallerClass, 'ModuleInstallerAPI'))
{
throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not derived from 'ModuleInstallerAPI' - Module: ".$aModuleInfo['label']);
}
$aCallSpec = array($sModuleInstallerClass, 'BeforeWritingConfig');
call_user_func_array($aCallSpec, array($oConfig));
}
}
}
class ModuleDiscoveryServiceException extends Exception