Auto-discover events

Author: lonnieezell

application/Config/Modules.php

@@ -14,6 +14,7 @@ class Modules
 	*/
 	public $enabled = [
 		'events',
+		'helpers',
 		'registrars',
 		'routes',
 		'services',
@@ -38,6 +39,7 @@ class Modules
 	 *
 	 * Valid values are:
 	 *  - events
+	 *  - helpers
 	 *  - registrars
 	 *  - routes
 	 *  - services

system/Events/Events.php

@@ -1,5 +1,7 @@
 <?php namespace CodeIgniter\Events;
 
+use Config\Services;
+
 /**
  * CodeIgniter
  *
@@ -53,19 +55,12 @@ class Events
 	protected static $listeners = [];
 
 	/**
-	 * Flag to let us know if we've read from the Config file
+	 * Flag to let us know if we've read from the Config file(s)
 	 * and have all of the defined events.
 	 *
 	 * @var bool
 	 */
-	protected static $haveReadFromFile = false;
-
-	/**
-	 * The path to the file containing the events to load in.
-	 *
-	 * @var string
-	 */
-	protected static $eventsFile = '';
+	protected static $initialized = false;
 
 	/**
 	 * If true, events will not actually be fired.
@@ -92,18 +87,33 @@ class Events
 	public static function initialize(string $file = null)
 	{
 		// Don't overwrite anything....
-		if ( ! empty(self::$eventsFile))
+		if (self::$initialized)
+		{
+			return;
+		}
+
+		$config = config('Modules');
+
+		if (! $config->shouldDiscover('events'))
 		{
 			return;
 		}
 
-		// Default value
-		if (empty($file))
+		$locator = Services::locator();
+
+		$files = $locator->search('Config/Events.php');
+
+		foreach ($files as $file)
 		{
-			$file = APPPATH . 'Config/Events.php';
+			if (! file_exists($file))
+			{
+				continue;
+			}
+
+			include $file;
 		}
 
-		self::$eventsFile = $file;
+		self::$initialized = true;
 	}
 
 	//--------------------------------------------------------------------
@@ -155,15 +165,9 @@ public static function on($event_name, callable $callback, $priority = EVENT_PRI
 	public static function trigger($eventName, ...$arguments): bool
 	{
 		// Read in our Config/events file so that we have them all!
-		if ( ! self::$haveReadFromFile)
+		if ( ! self::$initialized)
 		{
 			self::initialize();
-
-			if (is_file(self::$eventsFile))
-			{
-				include self::$eventsFile;
-			}
-			self::$haveReadFromFile = true;
 		}
 
 		$listeners = self::listeners($eventName);