From cec89334ce3c88557e2f53c53e5d4a023a4f5543 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 19 Aug 2013 13:28:56 -0500 Subject: [PATCH] Un-revert change to ModuleEvent - re-add EVENT_MERGE_CONFIG, per https://github.com/zendframework/zf2/blob/78eaad03cb25aa89e448beaad55cdbb6fe1227fc/library/Zend/ModuleManager/ModuleEvent.php#L23-L27 --- src/ModuleEvent.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ModuleEvent.php b/src/ModuleEvent.php index c81e773..e29dd8e 100644 --- a/src/ModuleEvent.php +++ b/src/ModuleEvent.php @@ -20,6 +20,7 @@ class ModuleEvent extends Event /** * Module events triggered by eventmanager */ + CONST EVENT_MERGE_CONFIG = 'mergeConfig'; CONST EVENT_LOAD_MODULES = 'loadModules'; CONST EVENT_LOAD_MODULE_RESOLVE = 'loadModule.resolve'; CONST EVENT_LOAD_MODULE = 'loadModule';