eventespresso / event-espresso-core

core/db_models/fields/EE_Field_With_Model_Name.php

Spacing +2 added lines, -2 removed lines

@@ -79,10 +79,10 @@
         $model_names = [];
         if (is_array($this->_model_name_pointed_to)) {
             foreach ($this->_model_name_pointed_to as $model_name) {
-                $model_names[] = "EE_" . $model_name;
+                $model_names[] = "EE_".$model_name;
             }
         } else {
-            $model_names = ["EE_" . $this->_model_name_pointed_to];
+            $model_names = ["EE_".$this->_model_name_pointed_to];
         }
         return $model_names;
     }

Indentation +80 added lines, -80 removed lines

@@ -8,94 +8,94 @@
  */
 abstract class EE_Field_With_Model_Name extends EE_Model_Field_Base
 {
-    /**
-     * Usually the name of a single model. However, as in the case for custom post types,
-     * it can actually be an array of models
-     *
-     * @var string[]
-     */
-    protected $_model_name_pointed_to;
+	/**
+	 * Usually the name of a single model. However, as in the case for custom post types,
+	 * it can actually be an array of models
+	 *
+	 * @var string[]
+	 */
+	protected $_model_name_pointed_to;
 
 
-    /**
-     * @param string          $table_column  name of column for field
-     * @param string          $nicename      should be internationalized with __('blah','event_espresso')
-     * @param boolean         $nullable
-     * @param int|string      $default_value data type should match field type
-     * @param string|string[] $model_name    eg 'Event','Answer','Term', etc.
-     *                                       Basically its the model class's name without the "EEM_"
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
-    {
-        $this->_model_name_pointed_to = (array) $model_name;
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-    }
+	/**
+	 * @param string          $table_column  name of column for field
+	 * @param string          $nicename      should be internationalized with __('blah','event_espresso')
+	 * @param boolean         $nullable
+	 * @param int|string      $default_value data type should match field type
+	 * @param string|string[] $model_name    eg 'Event','Answer','Term', etc.
+	 *                                       Basically its the model class's name without the "EEM_"
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value, $model_name)
+	{
+		$this->_model_name_pointed_to = (array) $model_name;
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+	}
 
 
-    /**
-     * Returns the name of the model(s) pointed to
-     *
-     * @return string[] string or array of strings
-     * @deprecated since version 4.6.7
-     */
-    public function get_model_name_pointed_to(): array
-    {
-        EE_Error::doing_it_wrong(
-            'get_model_name_pointed_to',
-            __(
-                'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array',
-                'event_espresso'
-            ),
-            '4.6.7'
-        );
-        return $this->_model_name_pointed_to;
-    }
+	/**
+	 * Returns the name of the model(s) pointed to
+	 *
+	 * @return string[] string or array of strings
+	 * @deprecated since version 4.6.7
+	 */
+	public function get_model_name_pointed_to(): array
+	{
+		EE_Error::doing_it_wrong(
+			'get_model_name_pointed_to',
+			__(
+				'This method has been deprecated in favour of instead using get_model_names_pointed_to, which consistently returns an array',
+				'event_espresso'
+			),
+			'4.6.7'
+		);
+		return $this->_model_name_pointed_to;
+	}
 
 
-    /**
-     * Gets the model names pointed to by this field, always as an array
-     * (even if there's only one)
-     *
-     * @return string[] of model names pointed to by this field
-     */
-    public function get_model_names_pointed_to(): array
-    {
-        return is_array($this->_model_name_pointed_to)
-            ? $this->_model_name_pointed_to
-            : [$this->_model_name_pointed_to];
-    }
+	/**
+	 * Gets the model names pointed to by this field, always as an array
+	 * (even if there's only one)
+	 *
+	 * @return string[] of model names pointed to by this field
+	 */
+	public function get_model_names_pointed_to(): array
+	{
+		return is_array($this->_model_name_pointed_to)
+			? $this->_model_name_pointed_to
+			: [$this->_model_name_pointed_to];
+	}
 
 
-    /**
-     * Returns the model's classname (eg EE_Event instead of just Event)
-     *
-     * @return string[]
-     */
-    public function get_model_class_names_pointed_to(): array
-    {
-        $model_names = [];
-        if (is_array($this->_model_name_pointed_to)) {
-            foreach ($this->_model_name_pointed_to as $model_name) {
-                $model_names[] = "EE_" . $model_name;
-            }
-        } else {
-            $model_names = ["EE_" . $this->_model_name_pointed_to];
-        }
-        return $model_names;
-    }
+	/**
+	 * Returns the model's classname (eg EE_Event instead of just Event)
+	 *
+	 * @return string[]
+	 */
+	public function get_model_class_names_pointed_to(): array
+	{
+		$model_names = [];
+		if (is_array($this->_model_name_pointed_to)) {
+			foreach ($this->_model_name_pointed_to as $model_name) {
+				$model_names[] = "EE_" . $model_name;
+			}
+		} else {
+			$model_names = ["EE_" . $this->_model_name_pointed_to];
+		}
+		return $model_names;
+	}
 
 
-    /**
-     * @param int|EE_Base_Class $model_obj
-     * @return bool
-     */
-    public function is_model_obj_of_type_pointed_to($model_obj): bool
-    {
-        foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
-            if ($model_obj instanceof $model_obj_classname) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * @param int|EE_Base_Class $model_obj
+	 * @return bool
+	 */
+	public function is_model_obj_of_type_pointed_to($model_obj): bool
+	{
+		foreach ($this->get_model_class_names_pointed_to() as $model_obj_classname) {
+			if ($model_obj instanceof $model_obj_classname) {
+				return true;
+			}
+		}
+		return false;
+	}
 }

core/EE_Dependency_Map.core.php

Spacing +38 added lines, -38 removed lines

@@ -205,8 +205,8 @@ 
     ) {
         $class      = trim($class, '\\');
         $registered = false;
-        if (empty(EE_Dependency_Map::$_instance->_dependency_map[ $class ])) {
-            EE_Dependency_Map::$_instance->_dependency_map[ $class ] = [];
+        if (empty(EE_Dependency_Map::$_instance->_dependency_map[$class])) {
+            EE_Dependency_Map::$_instance->_dependency_map[$class] = [];
         }
         // we need to make sure that any aliases used when registering a dependency
         // get resolved to the correct class name
@@ -214,10 +214,10 @@ 
             $alias = EE_Dependency_Map::$_instance->getFqnForAlias($dependency);
             if (
                 $overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
-                || ! isset(EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $alias ])
+                || ! isset(EE_Dependency_Map::$_instance->_dependency_map[$class][$alias])
             ) {
-                unset($dependencies[ $dependency ]);
-                $dependencies[ $alias ] = $load_source;
+                unset($dependencies[$dependency]);
+                $dependencies[$alias] = $load_source;
                 $registered             = true;
             }
         }
@@ -227,13 +227,13 @@ 
         // ie: with A = B + C, entries in B take precedence over duplicate entries in C
         // Union is way faster than array_merge() but should be used with caution...
         // especially with numerically indexed arrays
-        $dependencies += EE_Dependency_Map::$_instance->_dependency_map[ $class ];
+        $dependencies += EE_Dependency_Map::$_instance->_dependency_map[$class];
         // now we need to ensure that the resulting dependencies
         // array only has the entries that are required for the class
         // so first count how many dependencies were originally registered for the class
-        $dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]);
+        $dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[$class]);
         // if that count is non-zero (meaning dependencies were already registered)
-        EE_Dependency_Map::$_instance->_dependency_map[ $class ] = $dependency_count
+        EE_Dependency_Map::$_instance->_dependency_map[$class] = $dependency_count
             // then truncate the  final array to match that count
             ? array_slice($dependencies, 0, $dependency_count)
             // otherwise just take the incoming array because nothing previously existed
@@ -262,7 +262,7 @@ 
      */
     public function registerClassLoader($class_name, $loader = 'load_core')
     {
-        if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
+        if ( ! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
             throw new DomainException(
                 esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
             );
@@ -286,8 +286,8 @@ 
             );
         }
         $class_name = EE_Dependency_Map::$_instance->getFqnForAlias($class_name);
-        if (! isset(EE_Dependency_Map::$_instance->_class_loaders[ $class_name ])) {
-            EE_Dependency_Map::$_instance->_class_loaders[ $class_name ] = $loader;
+        if ( ! isset(EE_Dependency_Map::$_instance->_class_loaders[$class_name])) {
+            EE_Dependency_Map::$_instance->_class_loaders[$class_name] = $loader;
             return true;
         }
         return false;
@@ -315,7 +315,7 @@ 
         if (strpos($class_name, 'EEM_') === 0) {
             $class_name = 'LEGACY_MODELS';
         }
-        return isset($this->_dependency_map[ $class_name ]);
+        return isset($this->_dependency_map[$class_name]);
     }
 
 
@@ -333,7 +333,7 @@ 
             $class_name = 'LEGACY_MODELS';
         }
         $dependency = $this->getFqnForAlias($dependency, $class_name);
-        return isset($this->_dependency_map[ $class_name ][ $dependency ]);
+        return isset($this->_dependency_map[$class_name][$dependency]);
     }
 
 
@@ -352,7 +352,7 @@ 
         }
         $dependency = $this->getFqnForAlias($dependency);
         return $this->has_dependency_for_class($class_name, $dependency)
-            ? $this->_dependency_map[ $class_name ][ $dependency ]
+            ? $this->_dependency_map[$class_name][$dependency]
             : EE_Dependency_Map::not_registered;
     }
 
@@ -376,7 +376,7 @@ 
             return 'load_core';
         }
         $class_name = $this->getFqnForAlias($class_name);
-        return isset($this->_class_loaders[ $class_name ]) ? $this->_class_loaders[ $class_name ] : '';
+        return isset($this->_class_loaders[$class_name]) ? $this->_class_loaders[$class_name] : '';
     }
 
 
@@ -816,7 +816,7 @@ 
     {
         $this->_class_loaders = [
             // load_core
-            'EE_Dependency_Map'                            => function () {
+            'EE_Dependency_Map'                            => function() {
                 return $this;
             },
             'EE_Capabilities'                              => 'load_core',
@@ -824,13 +824,13 @@ 
             'EE_Front_Controller'                          => 'load_core',
             'EE_Module_Request_Router'                     => 'load_core',
             'EE_Registry'                                  => 'load_core',
-            'EE_Request'                                   => function () {
+            'EE_Request'                                   => function() {
                 return $this->legacy_request;
             },
-            'EventEspresso\core\services\request\Request'  => function () {
+            'EventEspresso\core\services\request\Request'  => function() {
                 return $this->request;
             },
-            'EventEspresso\core\services\request\Response' => function () {
+            'EventEspresso\core\services\request\Response' => function() {
                 return $this->response;
             },
             'EE_Base'                                      => 'load_core',
@@ -867,7 +867,7 @@ 
             'EE_DMS_Core_4_10_0'                           => 'load_dms',
             'EE_DMS_Core_4_11_0'                           => 'load_dms',
             'EE_DMS_Core_4_12_0'                           => 'load_dms',
-            'EE_Messages_Generator'                        => static function () {
+            'EE_Messages_Generator'                        => static function() {
                 return EE_Registry::instance()->load_lib(
                     'Messages_Generator',
                     [],
@@ -875,7 +875,7 @@ 
                     false
                 );
             },
-            'EE_Messages_Template_Defaults'                => static function ($arguments = []) {
+            'EE_Messages_Template_Defaults'                => static function($arguments = []) {
                 return EE_Registry::instance()->load_lib(
                     'Messages_Template_Defaults',
                     $arguments,
@@ -884,55 +884,55 @@ 
                 );
             },
             // load_helper
-            'EEH_Parse_Shortcodes'                         => static function () {
+            'EEH_Parse_Shortcodes'                         => static function() {
                 if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
                     return new EEH_Parse_Shortcodes();
                 }
                 return null;
             },
-            'EE_Template_Config'                           => static function () {
+            'EE_Template_Config'                           => static function() {
                 return EE_Config::instance()->template_settings;
             },
-            'EE_Currency_Config'                           => static function () {
+            'EE_Currency_Config'                           => static function() {
                 return EE_Config::instance()->currency;
             },
-            'EE_Registration_Config'                       => static function () {
+            'EE_Registration_Config'                       => static function() {
                 return EE_Config::instance()->registration;
             },
-            'EE_Core_Config'                               => static function () {
+            'EE_Core_Config'                               => static function() {
                 return EE_Config::instance()->core;
             },
-            'EventEspresso\core\services\loaders\Loader'   => static function () {
+            'EventEspresso\core\services\loaders\Loader'   => static function() {
                 return LoaderFactory::getLoader();
             },
-            'EE_Network_Config'                            => static function () {
+            'EE_Network_Config'                            => static function() {
                 return EE_Network_Config::instance();
             },
-            'EE_Config'                                    => static function () {
+            'EE_Config'                                    => static function() {
                 return EE_Config::instance();
             },
-            'EventEspresso\core\domain\Domain'             => static function () {
+            'EventEspresso\core\domain\Domain'             => static function() {
                 return DomainFactory::getEventEspressoCoreDomain();
             },
-            'EE_Admin_Config'                              => static function () {
+            'EE_Admin_Config'                              => static function() {
                 return EE_Config::instance()->admin;
             },
-            'EE_Organization_Config'                       => static function () {
+            'EE_Organization_Config'                       => static function() {
                 return EE_Config::instance()->organization;
             },
-            'EE_Network_Core_Config'                       => static function () {
+            'EE_Network_Core_Config'                       => static function() {
                 return EE_Network_Config::instance()->core;
             },
-            'EE_Environment_Config'                        => static function () {
+            'EE_Environment_Config'                        => static function() {
                 return EE_Config::instance()->environment;
             },
-            'EED_Core_Rest_Api'                            => static function () {
+            'EED_Core_Rest_Api'                            => static function() {
                 return EED_Core_Rest_Api::instance();
             },
-            'WP_REST_Server'                               => static function () {
+            'WP_REST_Server'                               => static function() {
                 return rest_get_server();
             },
-            'EventEspresso\core\Psr4Autoloader'            => static function () {
+            'EventEspresso\core\Psr4Autoloader'            => static function() {
                 return EE_Psr4AutoloaderInit::psr4_loader();
             },
         ];
@@ -997,7 +997,7 @@ 
             }
             $this->class_cache->addAlias($fqn, $alias);
         }
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
             $this->class_cache->addAlias(
                 'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
                 'EventEspresso\core\services\notices\NoticeConverterInterface'

Indentation +1057 added lines, -1057 removed lines

@@ -22,1061 +22,1061 @@
 class EE_Dependency_Map
 {
 
-    /**
-     * This means that the requested class dependency is not present in the dependency map
-     */
-    const not_registered = 0;
-
-    /**
-     * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
-     */
-    const load_new_object = 1;
-
-    /**
-     * This instructs class loaders to return a previously instantiated and cached object for the requested class.
-     * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
-     */
-    const load_from_cache = 2;
-
-    /**
-     * When registering a dependency,
-     * this indicates to keep any existing dependencies that already exist,
-     * and simply discard any new dependencies declared in the incoming data
-     */
-    const KEEP_EXISTING_DEPENDENCIES = 0;
-
-    /**
-     * When registering a dependency,
-     * this indicates to overwrite any existing dependencies that already exist using the incoming data
-     */
-    const OVERWRITE_DEPENDENCIES = 1;
-
-    /**
-     * @type EE_Dependency_Map $_instance
-     */
-    protected static $_instance;
-
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
-
-    /**
-     * @type RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @type LegacyRequestInterface $legacy_request
-     */
-    protected $legacy_request;
-
-    /**
-     * @type ResponseInterface $response
-     */
-    protected $response;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @type array $_dependency_map
-     */
-    protected $_dependency_map = [];
-
-    /**
-     * @type array $_class_loaders
-     */
-    protected $_class_loaders = [];
-
-
-    /**
-     * EE_Dependency_Map constructor.
-     *
-     * @param ClassInterfaceCache $class_cache
-     */
-    protected function __construct(ClassInterfaceCache $class_cache)
-    {
-        $this->class_cache = $class_cache;
-        do_action('EE_Dependency_Map____construct', $this);
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidAliasException
-     */
-    public function initialize()
-    {
-        $this->_register_core_dependencies();
-        $this->_register_core_class_loaders();
-        $this->_register_core_aliases();
-    }
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @param ClassInterfaceCache|null $class_cache
-     * @return EE_Dependency_Map
-     */
-    public static function instance(ClassInterfaceCache $class_cache = null)
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (
-            ! EE_Dependency_Map::$_instance instanceof EE_Dependency_Map
-            && $class_cache instanceof ClassInterfaceCache
-        ) {
-            EE_Dependency_Map::$_instance = new EE_Dependency_Map($class_cache);
-        }
-        return EE_Dependency_Map::$_instance;
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /**
-     * @param LegacyRequestInterface $legacy_request
-     */
-    public function setLegacyRequest(LegacyRequestInterface $legacy_request)
-    {
-        $this->legacy_request = $legacy_request;
-    }
-
-
-    /**
-     * @param ResponseInterface $response
-     */
-    public function setResponse(ResponseInterface $response)
-    {
-        $this->response = $response;
-    }
-
-
-    /**
-     * @param LoaderInterface $loader
-     */
-    public function setLoader(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public static function register_dependencies(
-        $class,
-        array $dependencies,
-        $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ) {
-        return EE_Dependency_Map::$_instance->registerDependencies($class, $dependencies, $overwrite);
-    }
-
-
-    /**
-     * Assigns an array of class names and corresponding load sources (new or cached)
-     * to the class specified by the first parameter.
-     * IMPORTANT !!!
-     * The order of elements in the incoming $dependencies array MUST match
-     * the order of the constructor parameters for the class in question.
-     * This is especially important when overriding any existing dependencies that are registered.
-     * the third parameter controls whether any duplicate dependencies are overwritten or not.
-     *
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public function registerDependencies(
-        $class,
-        array $dependencies,
-        $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ) {
-        $class      = trim($class, '\\');
-        $registered = false;
-        if (empty(EE_Dependency_Map::$_instance->_dependency_map[ $class ])) {
-            EE_Dependency_Map::$_instance->_dependency_map[ $class ] = [];
-        }
-        // we need to make sure that any aliases used when registering a dependency
-        // get resolved to the correct class name
-        foreach ($dependencies as $dependency => $load_source) {
-            $alias = EE_Dependency_Map::$_instance->getFqnForAlias($dependency);
-            if (
-                $overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
-                || ! isset(EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $alias ])
-            ) {
-                unset($dependencies[ $dependency ]);
-                $dependencies[ $alias ] = $load_source;
-                $registered             = true;
-            }
-        }
-        // now add our two lists of dependencies together.
-        // using Union (+=) favours the arrays in precedence from left to right,
-        // so $dependencies is NOT overwritten because it is listed first
-        // ie: with A = B + C, entries in B take precedence over duplicate entries in C
-        // Union is way faster than array_merge() but should be used with caution...
-        // especially with numerically indexed arrays
-        $dependencies += EE_Dependency_Map::$_instance->_dependency_map[ $class ];
-        // now we need to ensure that the resulting dependencies
-        // array only has the entries that are required for the class
-        // so first count how many dependencies were originally registered for the class
-        $dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]);
-        // if that count is non-zero (meaning dependencies were already registered)
-        EE_Dependency_Map::$_instance->_dependency_map[ $class ] = $dependency_count
-            // then truncate the  final array to match that count
-            ? array_slice($dependencies, 0, $dependency_count)
-            // otherwise just take the incoming array because nothing previously existed
-            : $dependencies;
-        return $registered;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @param string $loader
-     * @return bool
-     * @throws DomainException
-     */
-    public static function register_class_loader($class_name, $loader = 'load_core')
-    {
-        return EE_Dependency_Map::$_instance->registerClassLoader($class_name, $loader);
-    }
-
-
-    /**
-     * @param string $class_name
-     * @param string $loader
-     * @return bool
-     * @throws DomainException
-     */
-    public function registerClassLoader($class_name, $loader = 'load_core')
-    {
-        if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
-            throw new DomainException(
-                esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
-            );
-        }
-        // check that loader is callable or method starts with "load_" and exists in EE_Registry
-        if (
-            ! is_callable($loader)
-            && (
-                strpos($loader, 'load_') !== 0
-                || ! method_exists('EE_Registry', $loader)
-            )
-        ) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        '"%1$s" is not a valid loader method on EE_Registry.',
-                        'event_espresso'
-                    ),
-                    $loader
-                )
-            );
-        }
-        $class_name = EE_Dependency_Map::$_instance->getFqnForAlias($class_name);
-        if (! isset(EE_Dependency_Map::$_instance->_class_loaders[ $class_name ])) {
-            EE_Dependency_Map::$_instance->_class_loaders[ $class_name ] = $loader;
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function dependency_map()
-    {
-        return $this->_dependency_map;
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name
-     *
-     * @param string $class_name
-     * @return boolean
-     */
-    public function has($class_name = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        return isset($this->_dependency_map[ $class_name ]);
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name AND dependency
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return bool
-     */
-    public function has_dependency_for_class($class_name = '', $dependency = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency, $class_name);
-        return isset($this->_dependency_map[ $class_name ][ $dependency ]);
-    }
-
-
-    /**
-     * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return int
-     */
-    public function loading_strategy_for_class_dependency($class_name = '', $dependency = '')
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency);
-        return $this->has_dependency_for_class($class_name, $dependency)
-            ? $this->_dependency_map[ $class_name ][ $dependency ]
-            : EE_Dependency_Map::not_registered;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return string | Closure
-     */
-    public function class_loader($class_name)
-    {
-        // all legacy models use load_model()
-        if (strpos($class_name, 'EEM_') === 0) {
-            return 'load_model';
-        }
-        // EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
-        // perform strpos() first to avoid loading regex every time we load a class
-        if (
-            strpos($class_name, 'EE_CPT_') === 0
-            && preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
-        ) {
-            return 'load_core';
-        }
-        $class_name = $this->getFqnForAlias($class_name);
-        return isset($this->_class_loaders[ $class_name ]) ? $this->_class_loaders[ $class_name ] : '';
-    }
-
-
-    /**
-     * @return array
-     */
-    public function class_loaders()
-    {
-        return $this->_class_loaders;
-    }
-
-
-    /**
-     * adds an alias for a classname
-     *
-     * @param string $fqcn      the class name that should be used (concrete class to replace interface)
-     * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
-     * @param string $for_class the class that has the dependency (is type hinting for the interface)
-     * @throws InvalidAliasException
-     */
-    public function add_alias($fqcn, $alias, $for_class = '')
-    {
-        $this->class_cache->addAlias($fqcn, $alias, $for_class);
-    }
-
-
-    /**
-     * Returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    public function isAlias($fqn = '', $for_class = '')
-    {
-        return $this->class_cache->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     */
-    public function getFqnForAlias($alias = '', $for_class = '')
-    {
-        return (string) $this->class_cache->getFqnForAlias($alias, $for_class);
-    }
-
-
-    /**
-     * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
-     * if one exists, or whether a new object should be generated every time the requested class is loaded.
-     * This is done by using the following class constants:
-     *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
-     *        EE_Dependency_Map::load_new_object - generates a new object every time
-     */
-    protected function _register_core_dependencies()
-    {
-        $this->_dependency_map = [
-            'EE_Request_Handler'                                                                                          => [
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_System'                                                                                                   => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
-                'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\Router'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Admin'                                                                                                    => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Cart'                                                                                                     => [
-                'EE_Session' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messenger_Collection_Loader'                                                                              => [
-                'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Message_Type_Collection_Loader'                                                                           => [
-                'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Message_Resource_Manager'                                                                                 => [
-                'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
-                'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
-                'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Message_Factory'                                                                                          => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_messages'                                                                                                 => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Generator'                                                                                       => [
-                'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
-                'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
-                'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
-                'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Processor'                                                                                       => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Queue'                                                                                           => [
-                'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Messages_Template_Defaults'                                                                               => [
-                'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
-                'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Message_To_Generate_From_Request'                                                                         => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-                'EE_Request_Handler'          => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandBus'                                                             => [
-                'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\services\commands\CommandHandler'                                                              => [
-                'EE_Registry'         => EE_Dependency_Map::load_from_cache,
-                'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandHandlerManager'                                                  => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CompositeCommandHandler'                                                => [
-                'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandFactory'                                                         => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\middleware\CapChecker'                                                  => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                         => [
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                     => [
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\registration\CreateRegistrationCommandHandler'                          => [
-                'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => [
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => [
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => [
-                'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => [
-                'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => [
-                'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => [
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                   => [
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler'                                  => [
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\database\TableManager'                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Data_Migration_Class_Base'                                                                                => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_1_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_2_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_3_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_4_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_5_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_6_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_7_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_8_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_9_0'                                                                                           => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_10_0'                                                                                          => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-                'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_11_0'                                                                                          => [
-                'EE_DMS_Core_4_10_0'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_12_0' => [
-                'EE_DMS_Core_4_11_0'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\Registry'                                                                 => [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-                'EventEspresso\core\services\assets\AssetManifest'   => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\cache\BasicCacheManager'                                                         => [
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                   => [
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                  => [
-                'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\values\EmailAddress'                                                               => [
-                null,
-                'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\orm\ModelFieldFactory'                                                           => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'LEGACY_MODELS'                                                                                               => [
-                null,
-                'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Module_Request_Router'                                                                                    => [
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Registration_Processor'                                                                                   => [
-                'EE_Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                      => [
-                null,
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                    => [
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-                'EE_Session'             => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\DisplayTicketSelector'                                                 => [
-                'EventEspresso\core\domain\entities\users\CurrentUser' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                 => [
-                'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
-                'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                     => [
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                              => [
-                'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                               => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_CPT_Strategy'                                                                                             => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\loaders\ObjectIdentifier'                                                        => [
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\CPTs\CptQueryModifier'                                                                    => [
-                null,
-                null,
-                null,
-                'EE_Request_Handler'                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\dependencies\DependencyResolver'                                                 => [
-                'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-                'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver'                               => [
-                'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-                'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'                                          => [
-                'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'                                    => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationManager'                                          => [
-                'EventEspresso\core\services\routing\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'    => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_URL_Validation_Strategy'                                                                                  => [
-                null,
-                null,
-                'EventEspresso\core\services\validators\URLValidator' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\request\files\FilesDataHandler'                                                  => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspressoBatchRequest\BatchRequestProcessor'                                                             => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\converters\RestApiSpoofer'                                                => [
-                'WP_REST_Server'                                               => EE_Dependency_Map::load_from_cache,
-                'EED_Core_Rest_Api'                                            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\libraries\rest_api\controllers\model\Read' => EE_Dependency_Map::load_from_cache,
-                null,
-            ],
-            'EventEspresso\core\services\routing\RouteHandler'                                                            => [
-                'EventEspresso\core\services\json\JsonDataNodeHandler' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteCollection'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\json\JsonDataNodeHandler'                                                        => [
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\Router'                                                                  => [
-                'EE_Dependency_Map'                                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteHandler' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\AssetManifest'                                                            => [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\AssetManifestFactory'                                                     => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\BaristaFactory'                                                           => [
-                'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'              => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\FeatureFlags'                                                => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\addon\AddonManager' => [
-                'EventEspresso\core\services\addon\AddonCollection'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\Psr4Autoloader'                              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\v1\RegisterAddon'         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\IncompatibleAddonHandler' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler' => [
-                'EventEspresso\core\services\request\Request'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion' => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache
-            ],
-            'EventEspressoBatchRequest\JobHandlers\PreviewEventDeletion' => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache
-            ],
-            'EventEspresso\core\domain\services\admin\events\data\PreviewDeletion' => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event' => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration' => EE_Dependency_Map::load_from_cache
-            ],
-            'EventEspresso\core\domain\services\admin\events\data\ConfirmDeletion' => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\users\CurrentUser' => [
-                'EventEspresso\core\domain\entities\users\EventManagers' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\form\meta\InputTypes' => [
-                'EventEspresso\core\services\form\meta\inputs\Block'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Button'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\DateTime' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Input'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Number'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Phone'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Select'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Text'     => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormDependencyHandler' => [
-                'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
-            ],
-        ];
-    }
-
-
-    /**
-     * Registers how core classes are loaded.
-     * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
-     *        'EE_Request_Handler' => 'load_core'
-     *        'EE_Messages_Queue'  => 'load_lib'
-     *        'EEH_Debug_Tools'    => 'load_helper'
-     * or, if greater control is required, by providing a custom closure. For example:
-     *        'Some_Class' => function () {
-     *            return new Some_Class();
-     *        },
-     * This is required for instantiating dependencies
-     * where an interface has been type hinted in a class constructor. For example:
-     *        'Required_Interface' => function () {
-     *            return new A_Class_That_Implements_Required_Interface();
-     *        },
-     */
-    protected function _register_core_class_loaders()
-    {
-        $this->_class_loaders = [
-            // load_core
-            'EE_Dependency_Map'                            => function () {
-                return $this;
-            },
-            'EE_Capabilities'                              => 'load_core',
-            'EE_Encryption'                                => 'load_core',
-            'EE_Front_Controller'                          => 'load_core',
-            'EE_Module_Request_Router'                     => 'load_core',
-            'EE_Registry'                                  => 'load_core',
-            'EE_Request'                                   => function () {
-                return $this->legacy_request;
-            },
-            'EventEspresso\core\services\request\Request'  => function () {
-                return $this->request;
-            },
-            'EventEspresso\core\services\request\Response' => function () {
-                return $this->response;
-            },
-            'EE_Base'                                      => 'load_core',
-            'EE_Request_Handler'                           => 'load_core',
-            'EE_Session'                                   => 'load_core',
-            'EE_Cron_Tasks'                                => 'load_core',
-            'EE_System'                                    => 'load_core',
-            'EE_Maintenance_Mode'                          => 'load_core',
-            'EE_Register_CPTs'                             => 'load_core',
-            'EE_Admin'                                     => 'load_core',
-            'EE_CPT_Strategy'                              => 'load_core',
-            // load_class
-            'EE_Registration_Processor'                    => 'load_class',
-            // load_lib
-            'EE_Message_Resource_Manager'                  => 'load_lib',
-            'EE_Message_Type_Collection'                   => 'load_lib',
-            'EE_Message_Type_Collection_Loader'            => 'load_lib',
-            'EE_Messenger_Collection'                      => 'load_lib',
-            'EE_Messenger_Collection_Loader'               => 'load_lib',
-            'EE_Messages_Processor'                        => 'load_lib',
-            'EE_Message_Repository'                        => 'load_lib',
-            'EE_Messages_Queue'                            => 'load_lib',
-            'EE_Messages_Data_Handler_Collection'          => 'load_lib',
-            'EE_Message_Template_Group_Collection'         => 'load_lib',
-            'EE_Payment_Method_Manager'                    => 'load_lib',
-            'EE_DMS_Core_4_1_0'                            => 'load_dms',
-            'EE_DMS_Core_4_2_0'                            => 'load_dms',
-            'EE_DMS_Core_4_3_0'                            => 'load_dms',
-            'EE_DMS_Core_4_5_0'                            => 'load_dms',
-            'EE_DMS_Core_4_6_0'                            => 'load_dms',
-            'EE_DMS_Core_4_7_0'                            => 'load_dms',
-            'EE_DMS_Core_4_8_0'                            => 'load_dms',
-            'EE_DMS_Core_4_9_0'                            => 'load_dms',
-            'EE_DMS_Core_4_10_0'                           => 'load_dms',
-            'EE_DMS_Core_4_11_0'                           => 'load_dms',
-            'EE_DMS_Core_4_12_0'                           => 'load_dms',
-            'EE_Messages_Generator'                        => static function () {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Generator',
-                    [],
-                    false,
-                    false
-                );
-            },
-            'EE_Messages_Template_Defaults'                => static function ($arguments = []) {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Template_Defaults',
-                    $arguments,
-                    false,
-                    false
-                );
-            },
-            // load_helper
-            'EEH_Parse_Shortcodes'                         => static function () {
-                if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
-                    return new EEH_Parse_Shortcodes();
-                }
-                return null;
-            },
-            'EE_Template_Config'                           => static function () {
-                return EE_Config::instance()->template_settings;
-            },
-            'EE_Currency_Config'                           => static function () {
-                return EE_Config::instance()->currency;
-            },
-            'EE_Registration_Config'                       => static function () {
-                return EE_Config::instance()->registration;
-            },
-            'EE_Core_Config'                               => static function () {
-                return EE_Config::instance()->core;
-            },
-            'EventEspresso\core\services\loaders\Loader'   => static function () {
-                return LoaderFactory::getLoader();
-            },
-            'EE_Network_Config'                            => static function () {
-                return EE_Network_Config::instance();
-            },
-            'EE_Config'                                    => static function () {
-                return EE_Config::instance();
-            },
-            'EventEspresso\core\domain\Domain'             => static function () {
-                return DomainFactory::getEventEspressoCoreDomain();
-            },
-            'EE_Admin_Config'                              => static function () {
-                return EE_Config::instance()->admin;
-            },
-            'EE_Organization_Config'                       => static function () {
-                return EE_Config::instance()->organization;
-            },
-            'EE_Network_Core_Config'                       => static function () {
-                return EE_Network_Config::instance()->core;
-            },
-            'EE_Environment_Config'                        => static function () {
-                return EE_Config::instance()->environment;
-            },
-            'EED_Core_Rest_Api'                            => static function () {
-                return EED_Core_Rest_Api::instance();
-            },
-            'WP_REST_Server'                               => static function () {
-                return rest_get_server();
-            },
-            'EventEspresso\core\Psr4Autoloader'            => static function () {
-                return EE_Psr4AutoloaderInit::psr4_loader();
-            },
-        ];
-    }
-
-
-    /**
-     * can be used for supplying alternate names for classes,
-     * or for connecting interface names to instantiable classes
-     *
-     * @throws InvalidAliasException
-     */
-    protected function _register_core_aliases()
-    {
-        $aliases = [
-            'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
-            'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
-            'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
-            'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
-            'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
-            'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
-            'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
-            'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
-            'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand',
-            'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand',
-            'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
-            'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
-            'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand',
-            'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\services\commands\transaction\CreateTransactionCommandHandler',
-            'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler',
-            'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
-            'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
-            'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-            'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
-            'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
-            'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
-            'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
-            'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
-            'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
-            'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
-            'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
-            'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
-            'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
-            'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
-            'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
-            'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
-            'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
-            'Registration_Processor'                                                       => 'EE_Registration_Processor',
-            'EventEspresso\core\services\assets\AssetManifestInterface'                    => 'EventEspresso\core\services\assets\AssetManifest',
-        ];
-        foreach ($aliases as $alias => $fqn) {
-            if (is_array($fqn)) {
-                foreach ($fqn as $class => $for_class) {
-                    $this->class_cache->addAlias($class, $alias, $for_class);
-                }
-                continue;
-            }
-            $this->class_cache->addAlias($fqn, $alias);
-        }
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            $this->class_cache->addAlias(
-                'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
-                'EventEspresso\core\services\notices\NoticeConverterInterface'
-            );
-        }
-    }
-
-
-    /**
-     * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
-     * request Primarily used by unit tests.
-     */
-    public function reset()
-    {
-        $this->_register_core_class_loaders();
-        $this->_register_core_dependencies();
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be is_alias()
-     * because it returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     * @deprecated 4.9.62.p
-     */
-    public function has_alias($fqn = '', $for_class = '')
-    {
-        return $this->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
-     * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     * @deprecated 4.9.62.p
-     */
-    public function get_alias($alias = '', $for_class = '')
-    {
-        return $this->getFqnForAlias($alias, $for_class);
-    }
+	/**
+	 * This means that the requested class dependency is not present in the dependency map
+	 */
+	const not_registered = 0;
+
+	/**
+	 * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
+	 */
+	const load_new_object = 1;
+
+	/**
+	 * This instructs class loaders to return a previously instantiated and cached object for the requested class.
+	 * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
+	 */
+	const load_from_cache = 2;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to keep any existing dependencies that already exist,
+	 * and simply discard any new dependencies declared in the incoming data
+	 */
+	const KEEP_EXISTING_DEPENDENCIES = 0;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to overwrite any existing dependencies that already exist using the incoming data
+	 */
+	const OVERWRITE_DEPENDENCIES = 1;
+
+	/**
+	 * @type EE_Dependency_Map $_instance
+	 */
+	protected static $_instance;
+
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
+
+	/**
+	 * @type RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @type LegacyRequestInterface $legacy_request
+	 */
+	protected $legacy_request;
+
+	/**
+	 * @type ResponseInterface $response
+	 */
+	protected $response;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @type array $_dependency_map
+	 */
+	protected $_dependency_map = [];
+
+	/**
+	 * @type array $_class_loaders
+	 */
+	protected $_class_loaders = [];
+
+
+	/**
+	 * EE_Dependency_Map constructor.
+	 *
+	 * @param ClassInterfaceCache $class_cache
+	 */
+	protected function __construct(ClassInterfaceCache $class_cache)
+	{
+		$this->class_cache = $class_cache;
+		do_action('EE_Dependency_Map____construct', $this);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidAliasException
+	 */
+	public function initialize()
+	{
+		$this->_register_core_dependencies();
+		$this->_register_core_class_loaders();
+		$this->_register_core_aliases();
+	}
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @param ClassInterfaceCache|null $class_cache
+	 * @return EE_Dependency_Map
+	 */
+	public static function instance(ClassInterfaceCache $class_cache = null)
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (
+			! EE_Dependency_Map::$_instance instanceof EE_Dependency_Map
+			&& $class_cache instanceof ClassInterfaceCache
+		) {
+			EE_Dependency_Map::$_instance = new EE_Dependency_Map($class_cache);
+		}
+		return EE_Dependency_Map::$_instance;
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @param LegacyRequestInterface $legacy_request
+	 */
+	public function setLegacyRequest(LegacyRequestInterface $legacy_request)
+	{
+		$this->legacy_request = $legacy_request;
+	}
+
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		$this->response = $response;
+	}
+
+
+	/**
+	 * @param LoaderInterface $loader
+	 */
+	public function setLoader(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public static function register_dependencies(
+		$class,
+		array $dependencies,
+		$overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	) {
+		return EE_Dependency_Map::$_instance->registerDependencies($class, $dependencies, $overwrite);
+	}
+
+
+	/**
+	 * Assigns an array of class names and corresponding load sources (new or cached)
+	 * to the class specified by the first parameter.
+	 * IMPORTANT !!!
+	 * The order of elements in the incoming $dependencies array MUST match
+	 * the order of the constructor parameters for the class in question.
+	 * This is especially important when overriding any existing dependencies that are registered.
+	 * the third parameter controls whether any duplicate dependencies are overwritten or not.
+	 *
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public function registerDependencies(
+		$class,
+		array $dependencies,
+		$overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	) {
+		$class      = trim($class, '\\');
+		$registered = false;
+		if (empty(EE_Dependency_Map::$_instance->_dependency_map[ $class ])) {
+			EE_Dependency_Map::$_instance->_dependency_map[ $class ] = [];
+		}
+		// we need to make sure that any aliases used when registering a dependency
+		// get resolved to the correct class name
+		foreach ($dependencies as $dependency => $load_source) {
+			$alias = EE_Dependency_Map::$_instance->getFqnForAlias($dependency);
+			if (
+				$overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
+				|| ! isset(EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $alias ])
+			) {
+				unset($dependencies[ $dependency ]);
+				$dependencies[ $alias ] = $load_source;
+				$registered             = true;
+			}
+		}
+		// now add our two lists of dependencies together.
+		// using Union (+=) favours the arrays in precedence from left to right,
+		// so $dependencies is NOT overwritten because it is listed first
+		// ie: with A = B + C, entries in B take precedence over duplicate entries in C
+		// Union is way faster than array_merge() but should be used with caution...
+		// especially with numerically indexed arrays
+		$dependencies += EE_Dependency_Map::$_instance->_dependency_map[ $class ];
+		// now we need to ensure that the resulting dependencies
+		// array only has the entries that are required for the class
+		// so first count how many dependencies were originally registered for the class
+		$dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]);
+		// if that count is non-zero (meaning dependencies were already registered)
+		EE_Dependency_Map::$_instance->_dependency_map[ $class ] = $dependency_count
+			// then truncate the  final array to match that count
+			? array_slice($dependencies, 0, $dependency_count)
+			// otherwise just take the incoming array because nothing previously existed
+			: $dependencies;
+		return $registered;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @param string $loader
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public static function register_class_loader($class_name, $loader = 'load_core')
+	{
+		return EE_Dependency_Map::$_instance->registerClassLoader($class_name, $loader);
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @param string $loader
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public function registerClassLoader($class_name, $loader = 'load_core')
+	{
+		if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
+			throw new DomainException(
+				esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
+			);
+		}
+		// check that loader is callable or method starts with "load_" and exists in EE_Registry
+		if (
+			! is_callable($loader)
+			&& (
+				strpos($loader, 'load_') !== 0
+				|| ! method_exists('EE_Registry', $loader)
+			)
+		) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'"%1$s" is not a valid loader method on EE_Registry.',
+						'event_espresso'
+					),
+					$loader
+				)
+			);
+		}
+		$class_name = EE_Dependency_Map::$_instance->getFqnForAlias($class_name);
+		if (! isset(EE_Dependency_Map::$_instance->_class_loaders[ $class_name ])) {
+			EE_Dependency_Map::$_instance->_class_loaders[ $class_name ] = $loader;
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function dependency_map()
+	{
+		return $this->_dependency_map;
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name
+	 *
+	 * @param string $class_name
+	 * @return boolean
+	 */
+	public function has($class_name = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		return isset($this->_dependency_map[ $class_name ]);
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name AND dependency
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return bool
+	 */
+	public function has_dependency_for_class($class_name = '', $dependency = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency, $class_name);
+		return isset($this->_dependency_map[ $class_name ][ $dependency ]);
+	}
+
+
+	/**
+	 * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return int
+	 */
+	public function loading_strategy_for_class_dependency($class_name = '', $dependency = '')
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency);
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[ $class_name ][ $dependency ]
+			: EE_Dependency_Map::not_registered;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return string | Closure
+	 */
+	public function class_loader($class_name)
+	{
+		// all legacy models use load_model()
+		if (strpos($class_name, 'EEM_') === 0) {
+			return 'load_model';
+		}
+		// EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
+		// perform strpos() first to avoid loading regex every time we load a class
+		if (
+			strpos($class_name, 'EE_CPT_') === 0
+			&& preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
+		) {
+			return 'load_core';
+		}
+		$class_name = $this->getFqnForAlias($class_name);
+		return isset($this->_class_loaders[ $class_name ]) ? $this->_class_loaders[ $class_name ] : '';
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function class_loaders()
+	{
+		return $this->_class_loaders;
+	}
+
+
+	/**
+	 * adds an alias for a classname
+	 *
+	 * @param string $fqcn      the class name that should be used (concrete class to replace interface)
+	 * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
+	 * @param string $for_class the class that has the dependency (is type hinting for the interface)
+	 * @throws InvalidAliasException
+	 */
+	public function add_alias($fqcn, $alias, $for_class = '')
+	{
+		$this->class_cache->addAlias($fqcn, $alias, $for_class);
+	}
+
+
+	/**
+	 * Returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	public function isAlias($fqn = '', $for_class = '')
+	{
+		return $this->class_cache->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 */
+	public function getFqnForAlias($alias = '', $for_class = '')
+	{
+		return (string) $this->class_cache->getFqnForAlias($alias, $for_class);
+	}
+
+
+	/**
+	 * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
+	 * if one exists, or whether a new object should be generated every time the requested class is loaded.
+	 * This is done by using the following class constants:
+	 *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
+	 *        EE_Dependency_Map::load_new_object - generates a new object every time
+	 */
+	protected function _register_core_dependencies()
+	{
+		$this->_dependency_map = [
+			'EE_Request_Handler'                                                                                          => [
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_System'                                                                                                   => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
+				'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\Router'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Admin'                                                                                                    => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Cart'                                                                                                     => [
+				'EE_Session' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messenger_Collection_Loader'                                                                              => [
+				'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Message_Type_Collection_Loader'                                                                           => [
+				'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Message_Resource_Manager'                                                                                 => [
+				'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
+				'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
+				'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Message_Factory'                                                                                          => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_messages'                                                                                                 => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Generator'                                                                                       => [
+				'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
+				'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
+				'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
+				'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Processor'                                                                                       => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Queue'                                                                                           => [
+				'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Messages_Template_Defaults'                                                                               => [
+				'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
+				'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Message_To_Generate_From_Request'                                                                         => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+				'EE_Request_Handler'          => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandBus'                                                             => [
+				'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\services\commands\CommandHandler'                                                              => [
+				'EE_Registry'         => EE_Dependency_Map::load_from_cache,
+				'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandHandlerManager'                                                  => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CompositeCommandHandler'                                                => [
+				'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandFactory'                                                         => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\middleware\CapChecker'                                                  => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                         => [
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                     => [
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\registration\CreateRegistrationCommandHandler'                          => [
+				'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => [
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => [
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => [
+				'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => [
+				'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => [
+				'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => [
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                   => [
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler'                                  => [
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\database\TableManager'                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Data_Migration_Class_Base'                                                                                => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_1_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_2_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_3_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_4_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_5_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_6_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_7_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_8_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_9_0'                                                                                           => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_10_0'                                                                                          => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+				'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_11_0'                                                                                          => [
+				'EE_DMS_Core_4_10_0'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_12_0' => [
+				'EE_DMS_Core_4_11_0'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\Registry'                                                                 => [
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+				'EventEspresso\core\services\assets\AssetManifest'   => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\cache\BasicCacheManager'                                                         => [
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                   => [
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                  => [
+				'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\values\EmailAddress'                                                               => [
+				null,
+				'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\orm\ModelFieldFactory'                                                           => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'LEGACY_MODELS'                                                                                               => [
+				null,
+				'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Module_Request_Router'                                                                                    => [
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Registration_Processor'                                                                                   => [
+				'EE_Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                      => [
+				null,
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                    => [
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+				'EE_Session'             => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\DisplayTicketSelector'                                                 => [
+				'EventEspresso\core\domain\entities\users\CurrentUser' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                 => [
+				'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
+				'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                     => [
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                              => [
+				'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                               => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_CPT_Strategy'                                                                                             => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\loaders\ObjectIdentifier'                                                        => [
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\CPTs\CptQueryModifier'                                                                    => [
+				null,
+				null,
+				null,
+				'EE_Request_Handler'                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\dependencies\DependencyResolver'                                                 => [
+				'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+				'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver'                               => [
+				'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+				'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'                                          => [
+				'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'                                    => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationManager'                                          => [
+				'EventEspresso\core\services\routing\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'    => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_URL_Validation_Strategy'                                                                                  => [
+				null,
+				null,
+				'EventEspresso\core\services\validators\URLValidator' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\request\files\FilesDataHandler'                                                  => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspressoBatchRequest\BatchRequestProcessor'                                                             => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\converters\RestApiSpoofer'                                                => [
+				'WP_REST_Server'                                               => EE_Dependency_Map::load_from_cache,
+				'EED_Core_Rest_Api'                                            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\libraries\rest_api\controllers\model\Read' => EE_Dependency_Map::load_from_cache,
+				null,
+			],
+			'EventEspresso\core\services\routing\RouteHandler'                                                            => [
+				'EventEspresso\core\services\json\JsonDataNodeHandler' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteCollection'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\json\JsonDataNodeHandler'                                                        => [
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\Router'                                                                  => [
+				'EE_Dependency_Map'                                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteHandler' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\AssetManifest'                                                            => [
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\AssetManifestFactory'                                                     => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\BaristaFactory'                                                           => [
+				'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'              => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\FeatureFlags'                                                => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\addon\AddonManager' => [
+				'EventEspresso\core\services\addon\AddonCollection'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\Psr4Autoloader'                              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\v1\RegisterAddon'         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\IncompatibleAddonHandler' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler' => [
+				'EventEspresso\core\services\request\Request'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspressoBatchRequest\JobHandlers\ExecuteBatchDeletion' => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache
+			],
+			'EventEspressoBatchRequest\JobHandlers\PreviewEventDeletion' => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache
+			],
+			'EventEspresso\core\domain\services\admin\events\data\PreviewDeletion' => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event' => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration' => EE_Dependency_Map::load_from_cache
+			],
+			'EventEspresso\core\domain\services\admin\events\data\ConfirmDeletion' => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\users\CurrentUser' => [
+				'EventEspresso\core\domain\entities\users\EventManagers' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\form\meta\InputTypes' => [
+				'EventEspresso\core\services\form\meta\inputs\Block'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Button'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\DateTime' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Input'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Number'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Phone'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Select'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Text'     => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormDependencyHandler' => [
+				'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
+			],
+		];
+	}
+
+
+	/**
+	 * Registers how core classes are loaded.
+	 * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
+	 *        'EE_Request_Handler' => 'load_core'
+	 *        'EE_Messages_Queue'  => 'load_lib'
+	 *        'EEH_Debug_Tools'    => 'load_helper'
+	 * or, if greater control is required, by providing a custom closure. For example:
+	 *        'Some_Class' => function () {
+	 *            return new Some_Class();
+	 *        },
+	 * This is required for instantiating dependencies
+	 * where an interface has been type hinted in a class constructor. For example:
+	 *        'Required_Interface' => function () {
+	 *            return new A_Class_That_Implements_Required_Interface();
+	 *        },
+	 */
+	protected function _register_core_class_loaders()
+	{
+		$this->_class_loaders = [
+			// load_core
+			'EE_Dependency_Map'                            => function () {
+				return $this;
+			},
+			'EE_Capabilities'                              => 'load_core',
+			'EE_Encryption'                                => 'load_core',
+			'EE_Front_Controller'                          => 'load_core',
+			'EE_Module_Request_Router'                     => 'load_core',
+			'EE_Registry'                                  => 'load_core',
+			'EE_Request'                                   => function () {
+				return $this->legacy_request;
+			},
+			'EventEspresso\core\services\request\Request'  => function () {
+				return $this->request;
+			},
+			'EventEspresso\core\services\request\Response' => function () {
+				return $this->response;
+			},
+			'EE_Base'                                      => 'load_core',
+			'EE_Request_Handler'                           => 'load_core',
+			'EE_Session'                                   => 'load_core',
+			'EE_Cron_Tasks'                                => 'load_core',
+			'EE_System'                                    => 'load_core',
+			'EE_Maintenance_Mode'                          => 'load_core',
+			'EE_Register_CPTs'                             => 'load_core',
+			'EE_Admin'                                     => 'load_core',
+			'EE_CPT_Strategy'                              => 'load_core',
+			// load_class
+			'EE_Registration_Processor'                    => 'load_class',
+			// load_lib
+			'EE_Message_Resource_Manager'                  => 'load_lib',
+			'EE_Message_Type_Collection'                   => 'load_lib',
+			'EE_Message_Type_Collection_Loader'            => 'load_lib',
+			'EE_Messenger_Collection'                      => 'load_lib',
+			'EE_Messenger_Collection_Loader'               => 'load_lib',
+			'EE_Messages_Processor'                        => 'load_lib',
+			'EE_Message_Repository'                        => 'load_lib',
+			'EE_Messages_Queue'                            => 'load_lib',
+			'EE_Messages_Data_Handler_Collection'          => 'load_lib',
+			'EE_Message_Template_Group_Collection'         => 'load_lib',
+			'EE_Payment_Method_Manager'                    => 'load_lib',
+			'EE_DMS_Core_4_1_0'                            => 'load_dms',
+			'EE_DMS_Core_4_2_0'                            => 'load_dms',
+			'EE_DMS_Core_4_3_0'                            => 'load_dms',
+			'EE_DMS_Core_4_5_0'                            => 'load_dms',
+			'EE_DMS_Core_4_6_0'                            => 'load_dms',
+			'EE_DMS_Core_4_7_0'                            => 'load_dms',
+			'EE_DMS_Core_4_8_0'                            => 'load_dms',
+			'EE_DMS_Core_4_9_0'                            => 'load_dms',
+			'EE_DMS_Core_4_10_0'                           => 'load_dms',
+			'EE_DMS_Core_4_11_0'                           => 'load_dms',
+			'EE_DMS_Core_4_12_0'                           => 'load_dms',
+			'EE_Messages_Generator'                        => static function () {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Generator',
+					[],
+					false,
+					false
+				);
+			},
+			'EE_Messages_Template_Defaults'                => static function ($arguments = []) {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Template_Defaults',
+					$arguments,
+					false,
+					false
+				);
+			},
+			// load_helper
+			'EEH_Parse_Shortcodes'                         => static function () {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
+					return new EEH_Parse_Shortcodes();
+				}
+				return null;
+			},
+			'EE_Template_Config'                           => static function () {
+				return EE_Config::instance()->template_settings;
+			},
+			'EE_Currency_Config'                           => static function () {
+				return EE_Config::instance()->currency;
+			},
+			'EE_Registration_Config'                       => static function () {
+				return EE_Config::instance()->registration;
+			},
+			'EE_Core_Config'                               => static function () {
+				return EE_Config::instance()->core;
+			},
+			'EventEspresso\core\services\loaders\Loader'   => static function () {
+				return LoaderFactory::getLoader();
+			},
+			'EE_Network_Config'                            => static function () {
+				return EE_Network_Config::instance();
+			},
+			'EE_Config'                                    => static function () {
+				return EE_Config::instance();
+			},
+			'EventEspresso\core\domain\Domain'             => static function () {
+				return DomainFactory::getEventEspressoCoreDomain();
+			},
+			'EE_Admin_Config'                              => static function () {
+				return EE_Config::instance()->admin;
+			},
+			'EE_Organization_Config'                       => static function () {
+				return EE_Config::instance()->organization;
+			},
+			'EE_Network_Core_Config'                       => static function () {
+				return EE_Network_Config::instance()->core;
+			},
+			'EE_Environment_Config'                        => static function () {
+				return EE_Config::instance()->environment;
+			},
+			'EED_Core_Rest_Api'                            => static function () {
+				return EED_Core_Rest_Api::instance();
+			},
+			'WP_REST_Server'                               => static function () {
+				return rest_get_server();
+			},
+			'EventEspresso\core\Psr4Autoloader'            => static function () {
+				return EE_Psr4AutoloaderInit::psr4_loader();
+			},
+		];
+	}
+
+
+	/**
+	 * can be used for supplying alternate names for classes,
+	 * or for connecting interface names to instantiable classes
+	 *
+	 * @throws InvalidAliasException
+	 */
+	protected function _register_core_aliases()
+	{
+		$aliases = [
+			'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
+			'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
+			'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
+			'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
+			'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
+			'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
+			'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
+			'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\services\commands\registration\CreateRegistrationCommand',
+			'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\services\commands\registration\CopyRegistrationDetailsCommand',
+			'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\services\commands\registration\CopyRegistrationPaymentsCommand',
+			'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
+			'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
+			'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\services\commands\ticket\CreateTicketLineItemCommand',
+			'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\services\commands\transaction\CreateTransactionCommandHandler',
+			'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\services\commands\attendee\CreateAttendeeCommandHandler',
+			'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
+			'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
+			'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+			'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
+			'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
+			'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
+			'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
+			'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
+			'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
+			'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
+			'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
+			'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
+			'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
+			'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
+			'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
+			'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
+			'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
+			'Registration_Processor'                                                       => 'EE_Registration_Processor',
+			'EventEspresso\core\services\assets\AssetManifestInterface'                    => 'EventEspresso\core\services\assets\AssetManifest',
+		];
+		foreach ($aliases as $alias => $fqn) {
+			if (is_array($fqn)) {
+				foreach ($fqn as $class => $for_class) {
+					$this->class_cache->addAlias($class, $alias, $for_class);
+				}
+				continue;
+			}
+			$this->class_cache->addAlias($fqn, $alias);
+		}
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			$this->class_cache->addAlias(
+				'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
+				'EventEspresso\core\services\notices\NoticeConverterInterface'
+			);
+		}
+	}
+
+
+	/**
+	 * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
+	 * request Primarily used by unit tests.
+	 */
+	public function reset()
+	{
+		$this->_register_core_class_loaders();
+		$this->_register_core_dependencies();
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be is_alias()
+	 * because it returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 * @deprecated 4.9.62.p
+	 */
+	public function has_alias($fqn = '', $for_class = '')
+	{
+		return $this->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
+	 * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 * @deprecated 4.9.62.p
+	 */
+	public function get_alias($alias = '', $for_class = '')
+	{
+		return $this->getFqnForAlias($alias, $for_class);
+	}
 }

espresso.php

Indentation +97 added lines, -97 removed lines

@@ -37,122 +37,122 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '7.1.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '7.1.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.12.0.rc.001');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.12.0.rc.001');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
 
-            // Run WP GraphQL activation callback
-            if (! class_exists('WPGraphQL')) {
-                require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-            }
-            graphql_activation_callback();
-        }
+			// Run WP GraphQL activation callback
+			if (! class_exists('WPGraphQL')) {
+				require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+			}
+			graphql_activation_callback();
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        /**
-         * espresso_plugin_deactivation
-         */
-        function espresso_plugin_deactivation()
-        {
-            // Run WP GraphQL deactivation callback
-            if (! class_exists('WPGraphQL')) {
-                require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-            }
-            graphql_deactivation_callback();
-        }
-        register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
+		/**
+		 * espresso_plugin_deactivation
+		 */
+		function espresso_plugin_deactivation()
+		{
+			// Run WP GraphQL deactivation callback
+			if (! class_exists('WPGraphQL')) {
+				require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+			}
+			graphql_deactivation_callback();
+		}
+		register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/db_models/EEM_Change_Log.model.php

Indentation +227 added lines, -227 removed lines

@@ -11,93 +11,93 @@ 
 class EEM_Change_Log extends EEM_Base
 {
 
-    /**
-     * the related object was created log type
-     */
-    const type_create = 'create';
-    /**
-     * the related object was updated (changed, or soft-deleted)
-     */
-    const type_update = 'update';
-    /**
-     * the related object was deleted permanently
-     */
-    const type_delete = 'delete';
-    /**
-     * the related item had something worth noting happen on it, but
-     * only for the purposes of debugging problems
-     */
-    const type_debug = 'debug';
-    /**
-     * the related item had an error occur on it
-     */
-    const type_error = 'error';
-    /**
-     * the related item is regarding some gateway interaction, like an IPN
-     * or request to process a payment
-     */
-    const type_gateway = 'gateway';
+	/**
+	 * the related object was created log type
+	 */
+	const type_create = 'create';
+	/**
+	 * the related object was updated (changed, or soft-deleted)
+	 */
+	const type_update = 'update';
+	/**
+	 * the related object was deleted permanently
+	 */
+	const type_delete = 'delete';
+	/**
+	 * the related item had something worth noting happen on it, but
+	 * only for the purposes of debugging problems
+	 */
+	const type_debug = 'debug';
+	/**
+	 * the related item had an error occur on it
+	 */
+	const type_error = 'error';
+	/**
+	 * the related item is regarding some gateway interaction, like an IPN
+	 * or request to process a payment
+	 */
+	const type_gateway = 'gateway';
 
-    /**
-     * private instance of the EEM_Change_Log object
-     *
-     * @access private
-     * @var EEM_Change_Log $_instance
-     */
-    protected static $_instance = null;
+	/**
+	 * private instance of the EEM_Change_Log object
+	 *
+	 * @access private
+	 * @var EEM_Change_Log $_instance
+	 */
+	protected static $_instance = null;
 
 
-    /**
-     * constructor
-     *
-     * @access protected
-     * @param null $timezone
-     * @throws EE_Error
-     */
-    protected function __construct($timezone = null)
-    {
-        global $current_user;
-        $this->singular_item       = esc_html__('Log', 'event_espresso');
-        $this->plural_item         = esc_html__('Logs', 'event_espresso');
-        $this->_tables             = array(
-            'Log' => new EE_Primary_Table('esp_log', 'LOG_ID'),
-        );
-        $models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
-        $this->_fields             = array(
-            'Log' => array(
-                'LOG_ID'      => new EE_Primary_Key_Int_Field('LOG_ID', esc_html__('Log ID', 'event_espresso')),
-                'LOG_time'    => new EE_Datetime_Field(
-                    'LOG_time',
-                    esc_html__("Log Time", 'event_espresso'),
-                    false,
-                    EE_Datetime_Field::now
-                ),
-                'OBJ_ID'      => new EE_Foreign_Key_String_Field(
-                    'OBJ_ID',
-                    esc_html__("Object ID (int or string)", 'event_espresso'),
-                    true,
-                    null,
-                    $models_this_can_attach_to
-                ),
-                'OBJ_type'    => new EE_Any_Foreign_Model_Name_Field(
-                    'OBJ_type',
-                    esc_html__("Object Type", 'event_espresso'),
-                    true,
-                    null,
-                    $models_this_can_attach_to
-                ),
-                'LOG_type'    => new EE_Plain_Text_Field(
-                    'LOG_type',
-                    esc_html__("Type of log entry", "event_espresso"),
-                    false,
-                    self::type_debug
-                ),
-                'LOG_message' => new EE_Maybe_Serialized_Text_Field(
-                    'LOG_message',
-                    esc_html__("Log Message (body)", 'event_espresso'),
-                    true
-                ),
-                /*
+	/**
+	 * constructor
+	 *
+	 * @access protected
+	 * @param null $timezone
+	 * @throws EE_Error
+	 */
+	protected function __construct($timezone = null)
+	{
+		global $current_user;
+		$this->singular_item       = esc_html__('Log', 'event_espresso');
+		$this->plural_item         = esc_html__('Logs', 'event_espresso');
+		$this->_tables             = array(
+			'Log' => new EE_Primary_Table('esp_log', 'LOG_ID'),
+		);
+		$models_this_can_attach_to = array_keys(EE_Registry::instance()->non_abstract_db_models);
+		$this->_fields             = array(
+			'Log' => array(
+				'LOG_ID'      => new EE_Primary_Key_Int_Field('LOG_ID', esc_html__('Log ID', 'event_espresso')),
+				'LOG_time'    => new EE_Datetime_Field(
+					'LOG_time',
+					esc_html__("Log Time", 'event_espresso'),
+					false,
+					EE_Datetime_Field::now
+				),
+				'OBJ_ID'      => new EE_Foreign_Key_String_Field(
+					'OBJ_ID',
+					esc_html__("Object ID (int or string)", 'event_espresso'),
+					true,
+					null,
+					$models_this_can_attach_to
+				),
+				'OBJ_type'    => new EE_Any_Foreign_Model_Name_Field(
+					'OBJ_type',
+					esc_html__("Object Type", 'event_espresso'),
+					true,
+					null,
+					$models_this_can_attach_to
+				),
+				'LOG_type'    => new EE_Plain_Text_Field(
+					'LOG_type',
+					esc_html__("Type of log entry", "event_espresso"),
+					false,
+					self::type_debug
+				),
+				'LOG_message' => new EE_Maybe_Serialized_Text_Field(
+					'LOG_message',
+					esc_html__("Log Message (body)", 'event_espresso'),
+					true
+				),
+				/*
                  * Note: when querying for a change log's user, the OBJ_ID and OBJ_type fields are used,
                  * not the LOG_wp_user field. E.g.,
                  * `EEM_Change_Log::instance()->get_all(array(array('WP_User.ID'=>1)))` will actually return
@@ -106,158 +106,158 @@ 
                  *  If you want the latter, you can't use the model's magic joining. E.g, you would need to do
                  * `EEM_Change_Log::instance()->get_all(array(array('LOG_wp_user' => 1)))`.
                  */
-                'LOG_wp_user' => new EE_WP_User_Field(
-                    'LOG_wp_user',
-                    esc_html__("User who was logged in while this occurred", 'event_espresso'),
-                    true
-                ),
-            ),
-        );
-        $this->_model_relations    = array();
-        foreach ($models_this_can_attach_to as $model) {
-            if ($model != 'Change_Log') {
-                $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
-            }
-        }
-        // use completely custom caps for this
-        unset($this->_cap_restriction_generators);
-        // caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
-        foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
-            $this->_cap_restrictions[ $cap_context ][ EE_Restriction_Generator_Base::get_default_restrictions_cap() ]
-                = new EE_Return_None_Where_Conditions();
-        }
-        parent::__construct($timezone);
-    }
+				'LOG_wp_user' => new EE_WP_User_Field(
+					'LOG_wp_user',
+					esc_html__("User who was logged in while this occurred", 'event_espresso'),
+					true
+				),
+			),
+		);
+		$this->_model_relations    = array();
+		foreach ($models_this_can_attach_to as $model) {
+			if ($model != 'Change_Log') {
+				$this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+			}
+		}
+		// use completely custom caps for this
+		unset($this->_cap_restriction_generators);
+		// caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
+		foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
+			$this->_cap_restrictions[ $cap_context ][ EE_Restriction_Generator_Base::get_default_restrictions_cap() ]
+				= new EE_Return_None_Where_Conditions();
+		}
+		parent::__construct($timezone);
+	}
 
-    /**
-     * @param string        $log_type !see the acceptable values of LOG_type in EEM__Change_Log::__construct
-     * @param mixed         $message  array|string of the message you want to record
-     * @param EE_Base_Class $related_model_obj
-     * @return EE_Change_Log
-     * @throws EE_Error
-     */
-    public function log($log_type, $message, $related_model_obj)
-    {
-        if ($related_model_obj instanceof EE_Base_Class) {
-            $obj_id   = $related_model_obj->ID();
-            $obj_type = $related_model_obj->get_model()->get_this_model_name();
-        } else {
-            $obj_id   = null;
-            $obj_type = null;
-        }
-        /** @var EE_Change_Log $log */
-        $log = EE_Change_Log::new_instance(array(
-            'LOG_type'    => $log_type,
-            'LOG_message' => $message,
-            'OBJ_ID'      => $obj_id,
-            'OBJ_type'    => $obj_type,
-        ));
-        $log->save();
-        return $log;
-    }
+	/**
+	 * @param string        $log_type !see the acceptable values of LOG_type in EEM__Change_Log::__construct
+	 * @param mixed         $message  array|string of the message you want to record
+	 * @param EE_Base_Class $related_model_obj
+	 * @return EE_Change_Log
+	 * @throws EE_Error
+	 */
+	public function log($log_type, $message, $related_model_obj)
+	{
+		if ($related_model_obj instanceof EE_Base_Class) {
+			$obj_id   = $related_model_obj->ID();
+			$obj_type = $related_model_obj->get_model()->get_this_model_name();
+		} else {
+			$obj_id   = null;
+			$obj_type = null;
+		}
+		/** @var EE_Change_Log $log */
+		$log = EE_Change_Log::new_instance(array(
+			'LOG_type'    => $log_type,
+			'LOG_message' => $message,
+			'OBJ_ID'      => $obj_id,
+			'OBJ_type'    => $obj_type,
+		));
+		$log->save();
+		return $log;
+	}
 
 
-    /**
-     * Adds a gateway log for the specified object, given its ID and type
-     *
-     * @param string $message
-     * @param mixed  $related_obj_id
-     * @param string $related_obj_type
-     * @throws EE_Error
-     * @return EE_Change_Log
-     */
-    public function gateway_log($message, $related_obj_id, $related_obj_type)
-    {
-        if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        "'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc",
-                        "event_espresso"
-                    ),
-                    $related_obj_type
-                )
-            );
-        }
-        /** @var EE_Change_Log $log */
-        $log = EE_Change_Log::new_instance(array(
-            'LOG_type'    => EEM_Change_Log::type_gateway,
-            'LOG_message' => $message,
-            'OBJ_ID'      => $related_obj_id,
-            'OBJ_type'    => $related_obj_type,
-        ));
-        $log->save();
-        return $log;
-    }
+	/**
+	 * Adds a gateway log for the specified object, given its ID and type
+	 *
+	 * @param string $message
+	 * @param mixed  $related_obj_id
+	 * @param string $related_obj_type
+	 * @throws EE_Error
+	 * @return EE_Change_Log
+	 */
+	public function gateway_log($message, $related_obj_id, $related_obj_type)
+	{
+		if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						"'%s' is not a model name. A model name must be provided when making a gateway log. Eg, 'Payment', 'Payment_Method', etc",
+						"event_espresso"
+					),
+					$related_obj_type
+				)
+			);
+		}
+		/** @var EE_Change_Log $log */
+		$log = EE_Change_Log::new_instance(array(
+			'LOG_type'    => EEM_Change_Log::type_gateway,
+			'LOG_message' => $message,
+			'OBJ_ID'      => $related_obj_id,
+			'OBJ_type'    => $related_obj_type,
+		));
+		$log->save();
+		return $log;
+	}
 
 
-    /**
-     * Just gets the bare-bones wpdb results as an array in cases where efficiency is essential
-     *
-     * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @return array of arrays
-     * @throws EE_Error
-     */
-    public function get_all_efficiently($query_params)
-    {
-        return $this->_get_all_wpdb_results($query_params);
-    }
+	/**
+	 * Just gets the bare-bones wpdb results as an array in cases where efficiency is essential
+	 *
+	 * @param array $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @return array of arrays
+	 * @throws EE_Error
+	 */
+	public function get_all_efficiently($query_params)
+	{
+		return $this->_get_all_wpdb_results($query_params);
+	}
 
 
-    /**
-     * Executes a database query to delete gateway logs. Does not affect model objects, so if you attempt to use
-     * models after this, they may be out-of-sync with the database
-     *
-     * @param DateTime $datetime
-     * @return false|int
-     * @throws EE_Error
-     */
-    public function delete_gateway_logs_older_than(DateTime $datetime)
-    {
-        global $wpdb;
-        return $wpdb->query(
-            $wpdb->prepare(
-                'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
-                EEM_Change_Log::type_gateway,
-                $datetime->format(EE_Datetime_Field::mysql_timestamp_format)
-            )
-        );
-    }
+	/**
+	 * Executes a database query to delete gateway logs. Does not affect model objects, so if you attempt to use
+	 * models after this, they may be out-of-sync with the database
+	 *
+	 * @param DateTime $datetime
+	 * @return false|int
+	 * @throws EE_Error
+	 */
+	public function delete_gateway_logs_older_than(DateTime $datetime)
+	{
+		global $wpdb;
+		return $wpdb->query(
+			$wpdb->prepare(
+				'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
+				EEM_Change_Log::type_gateway,
+				$datetime->format(EE_Datetime_Field::mysql_timestamp_format)
+			)
+		);
+	}
 
 
-    /**
-     * Returns the map of type to pretty label for identifiers used for `LOG_type`.  Client code can register their own
-     * map vai the given filter.
-     *
-     * @return array
-     */
-    public static function get_pretty_label_map_for_registered_types()
-    {
-        return apply_filters(
-            'FHEE__EEM_Change_Log__get_pretty_label_map_for_registered_types',
-            array(
-                self::type_create =>  esc_html__("Create", "event_espresso"),
-                self::type_update =>  esc_html__("Update", "event_espresso"),
-                self::type_delete => esc_html__("Delete", "event_espresso"),
-                self::type_debug =>  esc_html__("Debug", "event_espresso"),
-                self::type_error =>  esc_html__("Error", "event_espresso"),
-                self::type_gateway => esc_html__("Gateway Interaction (IPN or Direct Payment)", 'event_espresso')
-            )
-        );
-    }
+	/**
+	 * Returns the map of type to pretty label for identifiers used for `LOG_type`.  Client code can register their own
+	 * map vai the given filter.
+	 *
+	 * @return array
+	 */
+	public static function get_pretty_label_map_for_registered_types()
+	{
+		return apply_filters(
+			'FHEE__EEM_Change_Log__get_pretty_label_map_for_registered_types',
+			array(
+				self::type_create =>  esc_html__("Create", "event_espresso"),
+				self::type_update =>  esc_html__("Update", "event_espresso"),
+				self::type_delete => esc_html__("Delete", "event_espresso"),
+				self::type_debug =>  esc_html__("Debug", "event_espresso"),
+				self::type_error =>  esc_html__("Error", "event_espresso"),
+				self::type_gateway => esc_html__("Gateway Interaction (IPN or Direct Payment)", 'event_espresso')
+			)
+		);
+	}
 
 
-    /**
-     * Return the pretty (localized) label for the given log type identifier.
-     * @param string $type_identifier
-     * @return string
-     */
-    public static function get_pretty_label_for_type($type_identifier)
-    {
-        $type_identifier_map = self::get_pretty_label_map_for_registered_types();
-        // we fallback to the incoming type identifier if there is no localized label for it.
-        return isset($type_identifier_map[ $type_identifier ])
-            ? $type_identifier_map[ $type_identifier ]
-            : $type_identifier;
-    }
+	/**
+	 * Return the pretty (localized) label for the given log type identifier.
+	 * @param string $type_identifier
+	 * @return string
+	 */
+	public static function get_pretty_label_for_type($type_identifier)
+	{
+		$type_identifier_map = self::get_pretty_label_map_for_registered_types();
+		// we fallback to the incoming type identifier if there is no localized label for it.
+		return isset($type_identifier_map[ $type_identifier ])
+			? $type_identifier_map[ $type_identifier ]
+			: $type_identifier;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -113,17 +113,17 @@ 
                 ),
             ),
         );
-        $this->_model_relations    = array();
+        $this->_model_relations = array();
         foreach ($models_this_can_attach_to as $model) {
             if ($model != 'Change_Log') {
-                $this->_model_relations[ $model ] = new EE_Belongs_To_Any_Relation();
+                $this->_model_relations[$model] = new EE_Belongs_To_Any_Relation();
             }
         }
         // use completely custom caps for this
         unset($this->_cap_restriction_generators);
         // caps-wise this is all-or-nothing: if you have the default role you can access anything, otherwise nothing
         foreach ($this->_cap_contexts_to_cap_action_map as $cap_context => $action) {
-            $this->_cap_restrictions[ $cap_context ][ EE_Restriction_Generator_Base::get_default_restrictions_cap() ]
+            $this->_cap_restrictions[$cap_context][EE_Restriction_Generator_Base::get_default_restrictions_cap()]
                 = new EE_Return_None_Where_Conditions();
         }
         parent::__construct($timezone);
@@ -168,7 +168,7 @@ 
      */
     public function gateway_log($message, $related_obj_id, $related_obj_type)
     {
-        if (! EE_Registry::instance()->is_model_name($related_obj_type)) {
+        if ( ! EE_Registry::instance()->is_model_name($related_obj_type)) {
             throw new EE_Error(
                 sprintf(
                     esc_html__(
@@ -217,7 +217,7 @@ 
         global $wpdb;
         return $wpdb->query(
             $wpdb->prepare(
-                'DELETE FROM ' . $this->table() . ' WHERE LOG_type = %s AND LOG_time < %s',
+                'DELETE FROM '.$this->table().' WHERE LOG_type = %s AND LOG_time < %s',
                 EEM_Change_Log::type_gateway,
                 $datetime->format(EE_Datetime_Field::mysql_timestamp_format)
             )
@@ -256,8 +256,8 @@ 
     {
         $type_identifier_map = self::get_pretty_label_map_for_registered_types();
         // we fallback to the incoming type identifier if there is no localized label for it.
-        return isset($type_identifier_map[ $type_identifier ])
-            ? $type_identifier_map[ $type_identifier ]
+        return isset($type_identifier_map[$type_identifier])
+            ? $type_identifier_map[$type_identifier]
             : $type_identifier;
     }
 }

core/services/form/meta/inputs/Button.php

Indentation +45 added lines, -45 removed lines

@@ -4,49 +4,49 @@
 
 class Button
 {
-    /**
-     * indicates that the HTML input type is 'button'
-     */
-    public const TYPE_BUTTON = 'button';
-
-    /**
-     * indicates that the HTML input type is 'reset'
-     */
-    public const TYPE_BUTTON_RESET = 'reset';
-
-    /**
-     * indicates that the HTML input type is 'submit'
-     */
-    public const TYPE_BUTTON_SUBMIT = 'submit';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Button__valid_type_options',
-            [
-                Button::TYPE_BUTTON        => esc_html__('Button', 'event_espresso'),
-                Button::TYPE_BUTTON_RESET  => esc_html__('Reset Button', 'event_espresso'),
-                Button::TYPE_BUTTON_SUBMIT => esc_html__('Submit Button', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'button'
+	 */
+	public const TYPE_BUTTON = 'button';
+
+	/**
+	 * indicates that the HTML input type is 'reset'
+	 */
+	public const TYPE_BUTTON_RESET = 'reset';
+
+	/**
+	 * indicates that the HTML input type is 'submit'
+	 */
+	public const TYPE_BUTTON_SUBMIT = 'submit';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Button__valid_type_options',
+			[
+				Button::TYPE_BUTTON        => esc_html__('Button', 'event_espresso'),
+				Button::TYPE_BUTTON_RESET  => esc_html__('Reset Button', 'event_espresso'),
+				Button::TYPE_BUTTON_SUBMIT => esc_html__('Submit Button', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/DateTime.php

Indentation +77 added lines, -77 removed lines

@@ -5,81 +5,81 @@
 class DateTime
 {
 
-    /**
-     * indicates that the HTML input type is 'date'
-     */
-    public const TYPE_DATE = 'date';
-
-    /**
-     * indicates that the HTML input type is 'datetime-local'
-     */
-    public const TYPE_DATETIME_LOCAL = 'datetime-local';
-
-    /**
-     * indicates that the HTML input type is 'month'
-     */
-    public const TYPE_MONTH = 'month';
-
-    /**
-     * indicates that the HTML input type is 'time'
-     */
-    public const TYPE_TIME = 'time';
-
-    /**
-     * indicates that the HTML input type is 'week'
-     */
-    public const TYPE_WEEK = 'week';
-
-    // CUSTOM EE DATE TYPES
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the day for a date
-     */
-    public const TYPE_SELECT_DAY = 'day-select';
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the month for a date
-     */
-    public const TYPE_SELECT_MONTH = 'month-select';
-
-    /**
-     * indicates that the input is an HTML dropdown used for selecting the year for a date
-     */
-    public const TYPE_SELECT_YEAR = 'year-select';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_DateTime__valid_type_options',
-            [
-                DateTime::TYPE_DATE           => esc_html__('Date Picker', 'event_espresso'),
-                DateTime::TYPE_DATETIME_LOCAL => esc_html__('Local Date Picker', 'event_espresso'),
-                DateTime::TYPE_MONTH          => esc_html__('Month Picker', 'event_espresso'),
-                DateTime::TYPE_TIME           => esc_html__('Time Picker', 'event_espresso'),
-                DateTime::TYPE_WEEK           => esc_html__('Week Picker', 'event_espresso'),
-                DateTime::TYPE_SELECT_DAY     => esc_html__('Day Selector', 'event_espresso'),
-                DateTime::TYPE_SELECT_MONTH   => esc_html__('Month Selector', 'event_espresso'),
-                DateTime::TYPE_SELECT_YEAR    => esc_html__('Year Selector', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'date'
+	 */
+	public const TYPE_DATE = 'date';
+
+	/**
+	 * indicates that the HTML input type is 'datetime-local'
+	 */
+	public const TYPE_DATETIME_LOCAL = 'datetime-local';
+
+	/**
+	 * indicates that the HTML input type is 'month'
+	 */
+	public const TYPE_MONTH = 'month';
+
+	/**
+	 * indicates that the HTML input type is 'time'
+	 */
+	public const TYPE_TIME = 'time';
+
+	/**
+	 * indicates that the HTML input type is 'week'
+	 */
+	public const TYPE_WEEK = 'week';
+
+	// CUSTOM EE DATE TYPES
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the day for a date
+	 */
+	public const TYPE_SELECT_DAY = 'day-select';
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the month for a date
+	 */
+	public const TYPE_SELECT_MONTH = 'month-select';
+
+	/**
+	 * indicates that the input is an HTML dropdown used for selecting the year for a date
+	 */
+	public const TYPE_SELECT_YEAR = 'year-select';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_DateTime__valid_type_options',
+			[
+				DateTime::TYPE_DATE           => esc_html__('Date Picker', 'event_espresso'),
+				DateTime::TYPE_DATETIME_LOCAL => esc_html__('Local Date Picker', 'event_espresso'),
+				DateTime::TYPE_MONTH          => esc_html__('Month Picker', 'event_espresso'),
+				DateTime::TYPE_TIME           => esc_html__('Time Picker', 'event_espresso'),
+				DateTime::TYPE_WEEK           => esc_html__('Week Picker', 'event_espresso'),
+				DateTime::TYPE_SELECT_DAY     => esc_html__('Day Selector', 'event_espresso'),
+				DateTime::TYPE_SELECT_MONTH   => esc_html__('Month Selector', 'event_espresso'),
+				DateTime::TYPE_SELECT_YEAR    => esc_html__('Year Selector', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Number.php

Indentation +45 added lines, -45 removed lines

@@ -5,49 +5,49 @@
 class Number
 {
 
-    /**
-     * indicates that the HTML input type is 'number' whose value is a decimal (float)
-     */
-    public const TYPE_FLOAT = 'decimal';
-
-    /**
-     * indicates that the HTML input type is 'number' whose value is an integer (whole number)
-     */
-    public const TYPE_INT = 'integer';
-
-    /**
-     * indicates that the HTML input type is 'range'
-     */
-    public const TYPE_RANGE = 'range';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Number__valid_type_options',
-            [
-                Number::TYPE_FLOAT => esc_html__('Decimal Number', 'event_espresso'),
-                Number::TYPE_INT   => esc_html__('Integer (Whole) Number', 'event_espresso'),
-                Number::TYPE_RANGE => esc_html__('Number Range', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'number' whose value is a decimal (float)
+	 */
+	public const TYPE_FLOAT = 'decimal';
+
+	/**
+	 * indicates that the HTML input type is 'number' whose value is an integer (whole number)
+	 */
+	public const TYPE_INT = 'integer';
+
+	/**
+	 * indicates that the HTML input type is 'range'
+	 */
+	public const TYPE_RANGE = 'range';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Number__valid_type_options',
+			[
+				Number::TYPE_FLOAT => esc_html__('Decimal Number', 'event_espresso'),
+				Number::TYPE_INT   => esc_html__('Integer (Whole) Number', 'event_espresso'),
+				Number::TYPE_RANGE => esc_html__('Number Range', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Select.php

Indentation +55 added lines, -55 removed lines

@@ -5,59 +5,59 @@
 class Select
 {
 
-    /**
-     * indicates that the input is an HTML dropdown (select input) that accepts only one value
-     */
-    public const TYPE_SELECT = 'select';
-
-    /**
-     * indicates that the input is an HTML dropdown (select input) that accepts multiple values
-     */
-    public const TYPE_SELECT_MULTI = 'select-multi';
-
-    // CUSTOM EE SELECT TYPES
-
-    /**
-     * indicates that input is an HTML dropdown (select input)
-     * populated with names of countries that are enabled for the site
-     */
-    public const TYPE_SELECT_COUNTRY = 'select-country';
-
-    /**
-     * indicates that the input is an HTML dropdown (select input)
-     * populated with names of states for the countries that are enabled for the site
-     */
-    public const TYPE_SELECT_STATE = 'select-state';
-
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Select__valid_type_options',
-            [
-                Select::TYPE_SELECT         => esc_html__('Dropdown', 'event_espresso'),
-                Select::TYPE_SELECT_MULTI   => esc_html__('Multi-Select Dropdown', 'event_espresso'),
-                Select::TYPE_SELECT_COUNTRY => esc_html__('Country Selector', 'event_espresso'),
-                Select::TYPE_SELECT_STATE   => esc_html__('State Selector', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the input is an HTML dropdown (select input) that accepts only one value
+	 */
+	public const TYPE_SELECT = 'select';
+
+	/**
+	 * indicates that the input is an HTML dropdown (select input) that accepts multiple values
+	 */
+	public const TYPE_SELECT_MULTI = 'select-multi';
+
+	// CUSTOM EE SELECT TYPES
+
+	/**
+	 * indicates that input is an HTML dropdown (select input)
+	 * populated with names of countries that are enabled for the site
+	 */
+	public const TYPE_SELECT_COUNTRY = 'select-country';
+
+	/**
+	 * indicates that the input is an HTML dropdown (select input)
+	 * populated with names of states for the countries that are enabled for the site
+	 */
+	public const TYPE_SELECT_STATE = 'select-state';
+
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Select__valid_type_options',
+			[
+				Select::TYPE_SELECT         => esc_html__('Dropdown', 'event_espresso'),
+				Select::TYPE_SELECT_MULTI   => esc_html__('Multi-Select Dropdown', 'event_espresso'),
+				Select::TYPE_SELECT_COUNTRY => esc_html__('Country Selector', 'event_espresso'),
+				Select::TYPE_SELECT_STATE   => esc_html__('State Selector', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Phone.php

Indentation +93 added lines, -93 removed lines

@@ -5,109 +5,109 @@
 class Phone
 {
 
-    /**
-     * indicates that the HTML input type is 'tel'
-     */
-    public const INPUT_TYPE = 'tel';
+	/**
+	 * indicates that the HTML input type is 'tel'
+	 */
+	public const INPUT_TYPE = 'tel';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a US formatted phone number, examples:
-     *      ##########
-     *      ###-###-####
-     *      ### ### ####
-     *      (###)-###-####
-     *      (###) ###-####
-     *
-     * captures the intl code to the first group (+1) and the rest of the number to group 2
-     *      +1 (###) ###-####
-     */
-    public const PATTERN_US = '(\+?\d{1,3})?[\ \-]?(\(?\d{3}\)?[\ \-]?\d{3}[\ \-]?\d{4})';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a US formatted phone number, examples:
+	 *      ##########
+	 *      ###-###-####
+	 *      ### ### ####
+	 *      (###)-###-####
+	 *      (###) ###-####
+	 *
+	 * captures the intl code to the first group (+1) and the rest of the number to group 2
+	 *      +1 (###) ###-####
+	 */
+	public const PATTERN_US = '(\+?\d{1,3})?[\ \-]?(\(?\d{3}\)?[\ \-]?\d{3}[\ \-]?\d{4})';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a UK formatted phone number, examples:
-     *      (###) #### ####
-     *      (####) ### ####
-     *      (#####) ## ####
-     *
-     * captures the intl code to the first group (+44) and the rest of the number to group 2
-     *      +44 (###) #### ####
-     */
-    public const PATTERN_UK = '(\+?44)?[\ ]?(\(?(?:(?:\d{3,5})|(?:\d{4} \d{2}))\)?[\-\ ]?\d{2,4}[\-\ ]?\d{2,4})';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a UK formatted phone number, examples:
+	 *      (###) #### ####
+	 *      (####) ### ####
+	 *      (#####) ## ####
+	 *
+	 * captures the intl code to the first group (+44) and the rest of the number to group 2
+	 *      +44 (###) #### ####
+	 */
+	public const PATTERN_UK = '(\+?44)?[\ ]?(\(?(?:(?:\d{3,5})|(?:\d{4} \d{2}))\)?[\-\ ]?\d{2,4}[\-\ ]?\d{2,4})';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a France formatted phone number, examples:
-     *      0# ## ## ## ##
-     *      0### ## ## ##
-     *
-     * captures the intl code to the first group (+33) and the rest of the number to group 2
-     *      +33 # ## ## ## ##
-     *      0033 # ## ## ## ##
-     */
-    public const PATTERN_FR = '((?:\+|00)33)?[\ \.\-]*((?:(?:\(0\)[\ \.\-]{0,3})?|0)[1-9](?:(?:[\ \.\-]?\d{2}){4}|\d{2}(?:[\ \.\-]?\d{3}){2}))';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a France formatted phone number, examples:
+	 *      0# ## ## ## ##
+	 *      0### ## ## ##
+	 *
+	 * captures the intl code to the first group (+33) and the rest of the number to group 2
+	 *      +33 # ## ## ## ##
+	 *      0033 # ## ## ## ##
+	 */
+	public const PATTERN_FR = '((?:\+|00)33)?[\ \.\-]*((?:(?:\(0\)[\ \.\-]{0,3})?|0)[1-9](?:(?:[\ \.\-]?\d{2}){4}|\d{2}(?:[\ \.\-]?\d{3}){2}))';
 
-    /**
-     * indicates that the 'tel' input regex pattern is for a German formatted phone number, examples:
-     *      (0##) ####-####
-     *      (0###) ####-####
-     *      (0####) ###-####
-     *      (03####) ##-####
-     *
-     * captures the intl code to the first group (+49) and the rest of the number to group 2
-     *      +49 (0##) ####-####
-     */
-    public const PATTERN_DE = '(\+?49)?[\ \.\-]?(\(?(?:[\d \-\)\–\/\(]+){6,}\)?(?:[\ \.\-–\/]?)(?:[\d]+))';
+	/**
+	 * indicates that the 'tel' input regex pattern is for a German formatted phone number, examples:
+	 *      (0##) ####-####
+	 *      (0###) ####-####
+	 *      (0####) ###-####
+	 *      (03####) ##-####
+	 *
+	 * captures the intl code to the first group (+49) and the rest of the number to group 2
+	 *      +49 (0##) ####-####
+	 */
+	public const PATTERN_DE = '(\+?49)?[\ \.\-]?(\(?(?:[\d \-\)\–\/\(]+){6,}\)?(?:[\ \.\-–\/]?)(?:[\d]+))';
 
-    /**
-     * @var array
-     */
-    private $regex_patterns;
+	/**
+	 * @var array
+	 */
+	private $regex_patterns;
 
-    /**
-     * @var array
-     */
-    private $valid_type_options;
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
 
 
-    /**
-     * Phone constructor.
-     */
-    public function __construct()
-    {
-        $this->regex_patterns     = (array) apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
-            [
-                'de_DE' => Phone::PATTERN_DE,
-                'fr_FR' => Phone::PATTERN_FR,
-                'en_UK' => Phone::PATTERN_UK,
-                'en_US' => Phone::PATTERN_US,
-            ]
-        );
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__valid_type_options',
-            [
-                Phone::INPUT_TYPE => esc_html__('Phone Number', 'event_espresso'),
-            ]
-        );
-    }
+	/**
+	 * Phone constructor.
+	 */
+	public function __construct()
+	{
+		$this->regex_patterns     = (array) apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
+			[
+				'de_DE' => Phone::PATTERN_DE,
+				'fr_FR' => Phone::PATTERN_FR,
+				'en_UK' => Phone::PATTERN_UK,
+				'en_US' => Phone::PATTERN_US,
+			]
+		);
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__valid_type_options',
+			[
+				Phone::INPUT_TYPE => esc_html__('Phone Number', 'event_espresso'),
+			]
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function regexPatterns(): array
-    {
-        return $this->regex_patterns;
-    }
+	/**
+	 * @return array
+	 */
+	public function regexPatterns(): array
+	{
+		return $this->regex_patterns;
+	}
 
 
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
      */
     public function __construct()
     {
-        $this->regex_patterns     = (array) apply_filters(
+        $this->regex_patterns = (array) apply_filters(
             'FHEE__EventEspresso_core_services_form_meta_inputs_Phone__regex_patterns',
             [
                 'de_DE' => Phone::PATTERN_DE,