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

N°4756 - Fix event listeners for modules

Browse Source 
Counter part is that we can no longer fire events before MetaModel::Startup
This commit is contained in:
Molkobain
2022-12-22 10:21:39 +01:00
parent bdd5741290
commit 86b3129c08
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/startup.inc.php
View File

@@ -72,9 +72,6 @@ $oKPI = new ExecutionKPI();
Session::Start();
$oKPI->ComputeAndReport("Session Start");
EventService::InitService();
EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_REQUEST_RECEIVED));
$sSwitchEnv = utils::ReadParam('switch_env', null);
$bAllowCache = true;
if (($sSwitchEnv != null) && file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE) &&( Session::Get('itop_env') !== $sSwitchEnv))
@@ -106,4 +103,6 @@ else
}
$sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);
// Event service must be initialized after the MetaModel startup, otherwise it cannot discover classes implementing the iEventServiceSetup interface
EventService::InitService();
EventService::FireEvent(new EventData(ApplicationEvents::APPLICATION_EVENT_METAMODEL_STARTED));

8
sources/Application/ApplicationEvents.php
View File

@@ -13,7 +13,6 @@ use Combodo\iTop\Service\Events\iEventServiceSetup;
class ApplicationEvents implements iEventServiceSetup
{
// Startup events
const APPLICATION_EVENT_REQUEST_RECEIVED = 'APPLICATION_EVENT_REQUEST_RECEIVED';
const APPLICATION_EVENT_METAMODEL_STARTED = 'APPLICATION_EVENT_METAMODEL_STARTED';
/**
@@ -21,13 +20,6 @@ class ApplicationEvents implements iEventServiceSetup
*/
public function RegisterEventsAndListeners()
{
EventService::RegisterEvent(new EventDescription(
self::APPLICATION_EVENT_REQUEST_RECEIVED,
null,
'A request was received from the network, at this point only the session is started, the configuration is not even loaded',
'',
[],
'application'));
EventService::RegisterEvent(new EventDescription(
self::APPLICATION_EVENT_METAMODEL_STARTED,
null,

4
sources/Application/Service/Events/EventService.php
View File

@@ -38,10 +38,6 @@ class EventService
*/
public static function InitService()
{
self::$aEventListeners = [];
self::$iEventIdCounter = 0;
self::$aEventDescription = [];
$aEventServiceSetup = utils::GetClassesForInterface(iEventServiceSetup::class, '', ['[\\\\/]lib[\\\\/]', '[\\\\/]node_modules[\\\\/]', '[\\\\/]test[\\\\/]']);
foreach ($aEventServiceSetup as $sEventServiceSetupClass) {
/** @var \Combodo\iTop\Service\Events\iEventServiceSetup $oEventServiceSetup */