Added centralized config file to set what things should be auto-discovered, and tweaked so that Registrars are auto-disovered.

Author: lonnieezell

application/Config/Modules.php

@@ -0,0 +1,56 @@
+<?php namespace Config;
+
+// Cannot extend BaseConfig or looping resources occurs.
+class Modules
+{
+	/*
+	|--------------------------------------------------------------------------
+	| Auto-discover Rules
+	|--------------------------------------------------------------------------
+	|
+	| Lists the aliases of all discovery classes that will be active
+	| and used during the current application request. If it is not
+	| listed here, only the base application elements will be used.
+	*/
+	public $enabled = [
+		'events',
+		'registrars',
+		'routes',
+		'services',
+		'views'
+	];
+
+	/*
+	|--------------------------------------------------------------------------
+	| Cache Results?
+	|--------------------------------------------------------------------------
+	|
+	| If true, the results of all discoveries will be cached and will be
+	| not be searched for until the cache is cleared, increasing performance
+	| at the cost of any additional discovery.
+	|
+	| This is a good setting to use in production where changes are infrequent.
+	*/
+	public $cache = false;
+
+	/**
+	 * Should the application auto-discover the requested resources.
+	 *
+	 * Valid values are:
+	 *  - events
+	 *  - registrars
+	 *  - routes
+	 *  - services
+	 *  - views
+	 *
+	 * @param string $alias
+	 *
+	 * @return bool
+	 */
+	public function shouldDiscover(string $alias)
+	{
+		$alias = strtolower($alias);
+
+		return in_array($alias, $this->enabled);
+	}
+}

system/Config/BaseConfig.php

@@ -54,7 +54,9 @@ class BaseConfig
 	 *
 	 * @var array
 	 */
-	protected $registrars;
+	protected static $registrars = [];
+
+	protected static $didDiscovery = false;
 
 	/**
 	 * Will attempt to get environment variables with names
@@ -165,13 +167,23 @@ protected function getEnvValue(string $property, string $prefix, string $shortPr
 	 */
 	protected function registerProperties()
 	{
-		if (empty($this->registrars))
+		$config = config('Modules');
+
+		if (! $config->shouldDiscover('registrars'))
+		{
 			return;
+		}
+
+		if (! static::$didDiscovery)
+		{
+			$locator = \Config\Services::locator();
+			static::$registrars = $locator->search('Config/Registrar.php');
+		}
 
 		$shortName = (new \ReflectionClass($this))->getShortName();
 
 		// Check the registrar class for a method named after this class' shortName
-		foreach ($this->registrars as $callable)
+		foreach (static::$registrars as $callable)
 		{
 			// ignore non-applicable registrars
 			if ( ! method_exists($callable, $shortName))