Refactored Services to use Modules config file when discovering.

Author: lonnieezell

system/Config/BaseConfig.php

@@ -58,6 +58,8 @@ class BaseConfig
 
 	protected static $didDiscovery = false;
 
+	protected static $moduleConfig;
+
 	/**
 	 * Will attempt to get environment variables with names
 	 * that match the properties of the child class.
@@ -66,6 +68,8 @@ class BaseConfig
 	 */
 	public function __construct()
 	{
+		static::$moduleConfig = config('Modules');
+
 		$properties = array_keys(get_object_vars($this));
 		$prefix = get_class($this);
 		$slashAt = strrpos($prefix, '\\');
@@ -167,9 +171,7 @@ protected function getEnvValue(string $property, string $prefix, string $shortPr
 	 */
 	protected function registerProperties()
 	{
-		$config = config('Modules');
-
-		if (! $config->shouldDiscover('registrars'))
+		if (! static::$moduleConfig->shouldDiscover('registrars'))
 		{
 			return;
 		}

system/Config/BaseService.php

@@ -202,22 +202,27 @@ protected static function discoverServices(string $name, array $arguments)
 	{
 		if (! static::$discovered)
 		{
-			$locator = static::locator();
-			$files   = $locator->search('Config/Services');
+			$config = config('Modules');
 
-			if (empty($files))
+			if ($config->shouldDiscover('services'))
 			{
-				return;
-			}
+				$locator = static::locator();
+				$files   = $locator->search('Config/Services');
 
-			// Get instances of all service classes and cache them locally.
-			foreach ($files as $file)
-			{
-				$classname = $locator->getClassname($file);
+				if (empty($files))
+				{
+					return;
+				}
 
-				if (! in_array($classname, ['CodeIgniter\\Config\\Services']))
+				// Get instances of all service classes and cache them locally.
+				foreach ($files as $file)
 				{
-					static::$services[] = new $classname();
+					$classname = $locator->getClassname($file);
+
+					if (! in_array($classname, ['CodeIgniter\\Config\\Services']))
+					{
+						static::$services[] = new $classname();
+					}
 				}
 			}