eventespresso / event-espresso-core

core/services/assets/AssetManifestException.php

Indentation +37 added lines, -37 removed lines

@@ -13,42 +13,42 @@
  */
 class AssetManifestException extends DomainException
 {
-    /**
-     * AssetManifestException constructor
-     *
-     * @param string    $entry
-     * @param string    $path
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
-     */
-    public function __construct($entry, $path, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (empty($message)) {
-            switch($entry) {
-                case AssetManifest::KEY_DEPENDENCIES:
-                    $key = 'file';
-                    break;
-                case AssetManifest::KEY_VERSION:
-                    $key = 'version';
-                    break;
-                case AssetManifest::KEY_ENTRY_POINTS:
-                case AssetManifest::KEY_FILES:
-                default:
-                    $key = 'key';
-            }
-            $message =
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" %2$s was not found in the assets manifest file at: %3$s',
-                        'event_espresso'
-                    ),
-                    $entry,
-                    $key,
-                    $path
-                );
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * AssetManifestException constructor
+	 *
+	 * @param string    $entry
+	 * @param string    $path
+	 * @param string    $message
+	 * @param int       $code
+	 * @param Exception $previous
+	 */
+	public function __construct($entry, $path, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (empty($message)) {
+			switch($entry) {
+				case AssetManifest::KEY_DEPENDENCIES:
+					$key = 'file';
+					break;
+				case AssetManifest::KEY_VERSION:
+					$key = 'version';
+					break;
+				case AssetManifest::KEY_ENTRY_POINTS:
+				case AssetManifest::KEY_FILES:
+				default:
+					$key = 'key';
+			}
+			$message =
+				sprintf(
+					esc_html__(
+						'The "%1$s" %2$s was not found in the assets manifest file at: %3$s',
+						'event_espresso'
+					),
+					$entry,
+					$key,
+					$path
+				);
+		}
+		parent::__construct($message, $code, $previous);
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     public function __construct($entry, $path, $message = '', $code = 0, Exception $previous = null)
     {
         if (empty($message)) {
-            switch($entry) {
+            switch ($entry) {
                 case AssetManifest::KEY_DEPENDENCIES:
                     $key = 'file';
                     break;

core/services/assets/AssetManifest.php

Indentation +324 added lines, -324 removed lines

@@ -14,328 +14,328 @@
 class AssetManifest implements AssetManifestInterface
 {
 
-    const ASSET_EXT_CSS      = '.css';
-
-    const ASSET_EXT_JS      = '.js';
-
-    const ASSET_EXT_PHP     = '.php';
-
-    const FILE_NAME         = 'asset-manifest.json';
-
-    const KEY_DEPENDENCIES  = 'dependencies';
-
-    const KEY_ENTRY_POINTS  = 'entrypoints';
-
-    const KEY_FILES         = 'files';
-
-    const KEY_VERSION       = 'version';
-
-
-    /**
-     * @var array
-     */
-    private $asset_files;
-
-    /**
-     * @var string
-     */
-    private $assets_namespace;
-
-    /**
-     * @var string
-     */
-    private $assets_path;
-
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var array
-     */
-    private $entry_points;
-
-    /**
-     * @var array
-     */
-    private $manifest;
-
-    /**
-     * @var string
-     */
-    private $manifest_path;
-
-    /**
-     * This is a list of known handles that are used for css.
-     * @var array
-     */
-    private $wp_css_handle_dependencies = [
-        'wp-components',
-        'wp-block-editor',
-        'wp-block-library',
-        'wp-edit-post',
-        'wp-edit-widgets',
-        'wp-editor',
-        'wp-format-library',
-        'wp-list-reusable-blocks',
-        'wp-nux',
-    ];
-
-
-    /**
-     * AssetManifest constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->initialize();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function initialize()
-    {
-        if (! $this->manifest) {
-            $this->assets_namespace = $this->domain->assetNamespace();
-            $assets_path = $this->domain->distributionAssetsPath();
-            $this->assets_path = trailingslashit($assets_path);
-            $this->setManifestFilepath();
-            $this->loadManifest();
-            $this->getAssetFiles();
-            $this->getEntryPoints();
-        }
-    }
-
-
-    /**
-     * @param string $manifest_path
-     */
-    public function setManifestFilepath($manifest_path = '')
-    {
-        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
-        if (! is_readable($manifest_path)) {
-            throw new AssetManifestException(
-                $manifest_path,
-                '',
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" file was not found or is not readable. Please verify that the file exists and has appropriate permissions.',
-                        'event_espresso'
-                    ),
-                    $manifest_path
-                )
-            );
-        }
-        $this->manifest_path = $manifest_path;
-    }
-
-
-    /**
-     * @return void
-     */
-    private function loadManifest()
-    {
-        if (! $this->manifest) {
-            // TODO May be use WP File system? ¯\_(ツ)_/¯
-            $manifest_json  = file_get_contents($this->manifest_path);
-            $this->manifest = json_decode($manifest_json, true);
-        }
-    }
-
-
-    /**
-     * @param string $file_name
-     * @return string
-     */
-    private function trimAssetFilename($file_name)
-    {
-        return ltrim($file_name, '/');
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getAssetFiles()
-    {
-        if (! $this->asset_files) {
-            if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
-                if (WP_DEBUG) {
-                    throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
-                }
-                return [];
-            }
-            $this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
-        }
-        return $this->asset_files;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getEntryPoints()
-    {
-        if (! $this->entry_points) {
-            if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
-                if (WP_DEBUG) {
-                    throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
-                }
-                return [];
-            }
-            $this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
-        }
-        return $this->entry_points;
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        return $this->hasAsset($entry_point, $type)
-            ? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
-            : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return array
-     */
-    public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $asset = $this->getAssetDetails($entry_point);
-        if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
-            return [];
-        }
-        $dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
-        // remove cyclical dependencies, if any
-        if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
-            unset($dependencies[ $key ]);
-        }
-        // currently need to derive dependencies for CSS from the JS dependencies
-        if ($type === AssetManifest::ASSET_EXT_CSS) {
-            $css_dependencies = [];
-            foreach ($dependencies as $handle) {
-                $dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
-                if (isset($this->asset_files[ $dependency_style ])
-                    || in_array($handle, $this->wp_css_handle_dependencies)
-                ) {
-                    $css_dependencies[] = $handle;
-                }
-            }
-            return $css_dependencies;
-        }
-        return $dependencies;
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @return array
-     */
-    public function getAssetDetails($entry_point)
-    {
-        $file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
-        if (! $file_name) {
-            return [];
-        }
-        $full_path = $this->assets_path . $file_name;
-        if (! is_readable($full_path)) {
-            if (WP_DEBUG) {
-                throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
-            }
-            return [];
-        }
-        return require($full_path);
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @return string|int|false
-     */
-    public function getAssetHandle($entry_point)
-    {
-        return $this->assets_namespace . '-' . $entry_point;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getAssetsPath()
-    {
-        return $this->assets_path;
-    }
-
-
-    /**
-     * @param string $handle
-     * @return string|int|false
-     */
-    private function getEntryPointFromHandle($handle)
-    {   $find = $this->assets_namespace . '-';
-        return str_replace($find, '', $handle);
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function getAssetPath($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $this->getAsset($entry_point, $type);
-        return $file_name ? $this->domain->distributionAssetsPath($file_name) : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function getAssetUrl($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $this->getAsset($entry_point, $type);
-        return $file_name ? $this->domain->distributionAssetsUrl($file_name) : '';
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string|int|false
-     */
-    public function getAssetVersion($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $asset = $this->getAssetDetails($entry_point);
-        return $type === AssetManifest::ASSET_EXT_JS && isset($asset[AssetManifest::KEY_VERSION])
-            ? $asset[AssetManifest::KEY_VERSION]
-            : filemtime($this->getAssetPath($entry_point, $type));
-    }
-
-
-    /**
-     * @param string $entry_point
-     * @param string $type
-     * @return string
-     */
-    public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
-    {
-        $file_name = $entry_point . $type;
-        return ! empty($this->asset_files[ $file_name ]);
-    }
+	const ASSET_EXT_CSS      = '.css';
+
+	const ASSET_EXT_JS      = '.js';
+
+	const ASSET_EXT_PHP     = '.php';
+
+	const FILE_NAME         = 'asset-manifest.json';
+
+	const KEY_DEPENDENCIES  = 'dependencies';
+
+	const KEY_ENTRY_POINTS  = 'entrypoints';
+
+	const KEY_FILES         = 'files';
+
+	const KEY_VERSION       = 'version';
+
+
+	/**
+	 * @var array
+	 */
+	private $asset_files;
+
+	/**
+	 * @var string
+	 */
+	private $assets_namespace;
+
+	/**
+	 * @var string
+	 */
+	private $assets_path;
+
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var array
+	 */
+	private $entry_points;
+
+	/**
+	 * @var array
+	 */
+	private $manifest;
+
+	/**
+	 * @var string
+	 */
+	private $manifest_path;
+
+	/**
+	 * This is a list of known handles that are used for css.
+	 * @var array
+	 */
+	private $wp_css_handle_dependencies = [
+		'wp-components',
+		'wp-block-editor',
+		'wp-block-library',
+		'wp-edit-post',
+		'wp-edit-widgets',
+		'wp-editor',
+		'wp-format-library',
+		'wp-list-reusable-blocks',
+		'wp-nux',
+	];
+
+
+	/**
+	 * AssetManifest constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->initialize();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function initialize()
+	{
+		if (! $this->manifest) {
+			$this->assets_namespace = $this->domain->assetNamespace();
+			$assets_path = $this->domain->distributionAssetsPath();
+			$this->assets_path = trailingslashit($assets_path);
+			$this->setManifestFilepath();
+			$this->loadManifest();
+			$this->getAssetFiles();
+			$this->getEntryPoints();
+		}
+	}
+
+
+	/**
+	 * @param string $manifest_path
+	 */
+	public function setManifestFilepath($manifest_path = '')
+	{
+		$manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
+		if (! is_readable($manifest_path)) {
+			throw new AssetManifestException(
+				$manifest_path,
+				'',
+				sprintf(
+					esc_html__(
+						'The "%1$s" file was not found or is not readable. Please verify that the file exists and has appropriate permissions.',
+						'event_espresso'
+					),
+					$manifest_path
+				)
+			);
+		}
+		$this->manifest_path = $manifest_path;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function loadManifest()
+	{
+		if (! $this->manifest) {
+			// TODO May be use WP File system? ¯\_(ツ)_/¯
+			$manifest_json  = file_get_contents($this->manifest_path);
+			$this->manifest = json_decode($manifest_json, true);
+		}
+	}
+
+
+	/**
+	 * @param string $file_name
+	 * @return string
+	 */
+	private function trimAssetFilename($file_name)
+	{
+		return ltrim($file_name, '/');
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getAssetFiles()
+	{
+		if (! $this->asset_files) {
+			if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
+				if (WP_DEBUG) {
+					throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
+				}
+				return [];
+			}
+			$this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
+		}
+		return $this->asset_files;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getEntryPoints()
+	{
+		if (! $this->entry_points) {
+			if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
+				if (WP_DEBUG) {
+					throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
+				}
+				return [];
+			}
+			$this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
+		}
+		return $this->entry_points;
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		return $this->hasAsset($entry_point, $type)
+			? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
+			: '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return array
+	 */
+	public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$asset = $this->getAssetDetails($entry_point);
+		if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
+			return [];
+		}
+		$dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
+		// remove cyclical dependencies, if any
+		if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
+			unset($dependencies[ $key ]);
+		}
+		// currently need to derive dependencies for CSS from the JS dependencies
+		if ($type === AssetManifest::ASSET_EXT_CSS) {
+			$css_dependencies = [];
+			foreach ($dependencies as $handle) {
+				$dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
+				if (isset($this->asset_files[ $dependency_style ])
+					|| in_array($handle, $this->wp_css_handle_dependencies)
+				) {
+					$css_dependencies[] = $handle;
+				}
+			}
+			return $css_dependencies;
+		}
+		return $dependencies;
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @return array
+	 */
+	public function getAssetDetails($entry_point)
+	{
+		$file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
+		if (! $file_name) {
+			return [];
+		}
+		$full_path = $this->assets_path . $file_name;
+		if (! is_readable($full_path)) {
+			if (WP_DEBUG) {
+				throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
+			}
+			return [];
+		}
+		return require($full_path);
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @return string|int|false
+	 */
+	public function getAssetHandle($entry_point)
+	{
+		return $this->assets_namespace . '-' . $entry_point;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getAssetsPath()
+	{
+		return $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return string|int|false
+	 */
+	private function getEntryPointFromHandle($handle)
+	{   $find = $this->assets_namespace . '-';
+		return str_replace($find, '', $handle);
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function getAssetPath($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $this->getAsset($entry_point, $type);
+		return $file_name ? $this->domain->distributionAssetsPath($file_name) : '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function getAssetUrl($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $this->getAsset($entry_point, $type);
+		return $file_name ? $this->domain->distributionAssetsUrl($file_name) : '';
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string|int|false
+	 */
+	public function getAssetVersion($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$asset = $this->getAssetDetails($entry_point);
+		return $type === AssetManifest::ASSET_EXT_JS && isset($asset[AssetManifest::KEY_VERSION])
+			? $asset[AssetManifest::KEY_VERSION]
+			: filemtime($this->getAssetPath($entry_point, $type));
+	}
+
+
+	/**
+	 * @param string $entry_point
+	 * @param string $type
+	 * @return string
+	 */
+	public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
+	{
+		$file_name = $entry_point . $type;
+		return ! empty($this->asset_files[ $file_name ]);
+	}
 }

Spacing +24 added lines, -24 removed lines

@@ -14,7 +14,7 @@ 
 class AssetManifest implements AssetManifestInterface
 {
 
-    const ASSET_EXT_CSS      = '.css';
+    const ASSET_EXT_CSS = '.css';
 
     const ASSET_EXT_JS      = '.js';
 
@@ -100,7 +100,7 @@ 
      */
     public function initialize()
     {
-        if (! $this->manifest) {
+        if ( ! $this->manifest) {
             $this->assets_namespace = $this->domain->assetNamespace();
             $assets_path = $this->domain->distributionAssetsPath();
             $this->assets_path = trailingslashit($assets_path);
@@ -117,8 +117,8 @@ 
      */
     public function setManifestFilepath($manifest_path = '')
     {
-        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path . AssetManifest::FILE_NAME;
-        if (! is_readable($manifest_path)) {
+        $manifest_path = $manifest_path ? $manifest_path : $this->assets_path.AssetManifest::FILE_NAME;
+        if ( ! is_readable($manifest_path)) {
             throw new AssetManifestException(
                 $manifest_path,
                 '',
@@ -140,7 +140,7 @@ 
      */
     private function loadManifest()
     {
-        if (! $this->manifest) {
+        if ( ! $this->manifest) {
             // TODO May be use WP File system? ¯\_(ツ)_/¯
             $manifest_json  = file_get_contents($this->manifest_path);
             $this->manifest = json_decode($manifest_json, true);
@@ -163,14 +163,14 @@ 
      */
     public function getAssetFiles()
     {
-        if (! $this->asset_files) {
-            if (empty($this->manifest[ AssetManifest::KEY_FILES ])) {
+        if ( ! $this->asset_files) {
+            if (empty($this->manifest[AssetManifest::KEY_FILES])) {
                 if (WP_DEBUG) {
                     throw new AssetManifestException(AssetManifest::KEY_FILES, $this->manifest_path);
                 }
                 return [];
             }
-            $this->asset_files = $this->manifest[ AssetManifest::KEY_FILES ];
+            $this->asset_files = $this->manifest[AssetManifest::KEY_FILES];
         }
         return $this->asset_files;
     }
@@ -181,14 +181,14 @@ 
      */
     public function getEntryPoints()
     {
-        if (! $this->entry_points) {
-            if (empty($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ])) {
+        if ( ! $this->entry_points) {
+            if (empty($this->manifest[AssetManifest::KEY_ENTRY_POINTS])) {
                 if (WP_DEBUG) {
                     throw new AssetManifestException(AssetManifest::KEY_ENTRY_POINTS, $this->manifest_path);
                 }
                 return [];
             }
-            $this->entry_points = array_keys($this->manifest[ AssetManifest::KEY_ENTRY_POINTS ]);
+            $this->entry_points = array_keys($this->manifest[AssetManifest::KEY_ENTRY_POINTS]);
         }
         return $this->entry_points;
     }
@@ -202,7 +202,7 @@ 
     private function getAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
         return $this->hasAsset($entry_point, $type)
-            ? $this->trimAssetFilename($this->asset_files[ $entry_point . $type ])
+            ? $this->trimAssetFilename($this->asset_files[$entry_point.$type])
             : '';
     }
 
@@ -215,20 +215,20 @@ 
     public function getAssetDependencies($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
         $asset = $this->getAssetDetails($entry_point);
-        if (! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
+        if ( ! isset($asset[AssetManifest::KEY_DEPENDENCIES])) {
             return [];
         }
         $dependencies = $asset[AssetManifest::KEY_DEPENDENCIES];
         // remove cyclical dependencies, if any
-        if (($key = array_search($this->assets_namespace . '-' . $entry_point, $dependencies, true)) !== false) {
-            unset($dependencies[ $key ]);
+        if (($key = array_search($this->assets_namespace.'-'.$entry_point, $dependencies, true)) !== false) {
+            unset($dependencies[$key]);
         }
         // currently need to derive dependencies for CSS from the JS dependencies
         if ($type === AssetManifest::ASSET_EXT_CSS) {
             $css_dependencies = [];
             foreach ($dependencies as $handle) {
-                $dependency_style = $this->getEntryPointFromHandle($handle) . AssetManifest::ASSET_EXT_CSS;
-                if (isset($this->asset_files[ $dependency_style ])
+                $dependency_style = $this->getEntryPointFromHandle($handle).AssetManifest::ASSET_EXT_CSS;
+                if (isset($this->asset_files[$dependency_style])
                     || in_array($handle, $this->wp_css_handle_dependencies)
                 ) {
                     $css_dependencies[] = $handle;
@@ -247,11 +247,11 @@ 
     public function getAssetDetails($entry_point)
     {
         $file_name = $this->getAsset($entry_point, AssetManifest::ASSET_EXT_PHP);
-        if (! $file_name) {
+        if ( ! $file_name) {
             return [];
         }
-        $full_path = $this->assets_path . $file_name;
-        if (! is_readable($full_path)) {
+        $full_path = $this->assets_path.$file_name;
+        if ( ! is_readable($full_path)) {
             if (WP_DEBUG) {
                 throw new AssetManifestException(AssetManifest::KEY_DEPENDENCIES, $full_path);
             }
@@ -267,7 +267,7 @@ 
      */
     public function getAssetHandle($entry_point)
     {
-        return $this->assets_namespace . '-' . $entry_point;
+        return $this->assets_namespace.'-'.$entry_point;
     }
 
 
@@ -285,7 +285,7 @@ 
      * @return string|int|false
      */
     private function getEntryPointFromHandle($handle)
-    {   $find = $this->assets_namespace . '-';
+    {   $find = $this->assets_namespace.'-';
         return str_replace($find, '', $handle);
     }
 
@@ -335,7 +335,7 @@ 
      */
     public function hasAsset($entry_point, $type = AssetManifest::ASSET_EXT_JS)
     {
-        $file_name = $entry_point . $type;
-        return ! empty($this->asset_files[ $file_name ]);
+        $file_name = $entry_point.$type;
+        return ! empty($this->asset_files[$file_name]);
     }
 }

core/services/assets/Registry.php

Indentation +587 added lines, -587 removed lines

@@ -24,598 +24,598 @@
 class Registry
 {
 
-    const FILE_NAME_BUILD_MANIFEST = 'build-manifest.json';
-
-    /**
-     * @var AssetCollection[] $assets
-     */
-    protected $assets = [];
-
-    /**
-     * @var AssetManifestInterface
-     */
-    private $asset_manifest;
-
-    /**
-     * @var I18nRegistry
-     */
-    private $i18n_registry;
-
-    /**
-     * This holds the jsdata data object that will be exposed on pages that enqueue the `eejs-core` script.
-     *
-     * @var array
-     */
-    protected $jsdata = array();
-
-    /**
-     * This keeps track of all scripts with registered data.  It is used to prevent duplicate data objects setup in the
-     * page source.
-     *
-     * @var array
-     */
-    private $script_handles_with_data = array();
-
-
-    /**
-     * Registry constructor.
-     * Hooking into WP actions for script registry.
-     *
-     * @param AssetCollection        $assets
-     * @param AssetManifestInterface $asset_manifest
-     * @param I18nRegistry           $i18n_registry
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(AssetCollection $assets, AssetManifestInterface $asset_manifest, I18nRegistry $i18n_registry)
-    {
-        $this->addAssetCollection($assets);
-        $this->asset_manifest = $asset_manifest;
-        $this->asset_manifest->initialize();
-        $this->i18n_registry = $i18n_registry;
-        add_action('wp_enqueue_scripts', array($this, 'registerScriptsAndStyles'), 4);
-        add_action('admin_enqueue_scripts', array($this, 'registerScriptsAndStyles'), 4);
-        add_action('wp_enqueue_scripts', array($this, 'enqueueData'), 5);
-        add_action('admin_enqueue_scripts', array($this, 'enqueueData'), 5);
-        add_action('wp_print_footer_scripts', array($this, 'enqueueData'), 1);
-        add_action('admin_print_footer_scripts', array($this, 'enqueueData'), 1);
-    }
-
-
-    /**
-     * @param AssetCollection $asset_collection
-     */
-    public function addAssetCollection(AssetCollection $asset_collection)
-    {
-        $id = $asset_collection->collectionIdentifier();
-        if (! array_key_exists($id, $this->assets)) {
-            $this->assets[ $id ] = $asset_collection;
-        }
-    }
-
-
-
-
-    /**
-     * For classes that have Registry as a dependency, this provides a handy way to register script handles for i18n
-     * translation handling.
-     *
-     * @return I18nRegistry
-     */
-    public function getI18nRegistry()
-    {
-        return $this->i18n_registry;
-    }
-
-
-    /**
-     * Callback for the wp_enqueue_scripts actions used to register assets.
-     *
-     * @since 4.9.62.p
-     * @throws Exception
-     */
-    public function registerScriptsAndStyles()
-    {
-        try {
-            foreach ($this->assets as $asset_collection) {
-                $this->registerScripts($asset_collection->getJavascriptAssets());
-                $this->registerStyles($asset_collection->getStylesheetAssets());
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * Registers JS assets with WP core
-     *
-     * @param JavascriptAsset[] $scripts
-     * @throws AssetRegistrationException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @since 4.9.62.p
-     */
-    public function registerScripts(array $scripts)
-    {
-        foreach ($scripts as $script) {
-            // skip to next script if this has already been done
-            if ($script->isRegistered()) {
-                continue;
-            }
-            do_action(
-                'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
-                $script
-            );
-            $registered = wp_register_script(
-                $script->handle(),
-                $script->source(),
-                $script->dependencies(),
-                $script->version(),
-                $script->loadInFooter()
-            );
-            if (! $registered && $this->debug()) {
-                throw new AssetRegistrationException($script->handle());
-            }
-            $script->setRegistered($registered);
-            if ($script->requiresTranslation()) {
-                $this->registerTranslation($script->handle());
-            }
-            if ($script->enqueueImmediately()) {
-                wp_enqueue_script($script->handle());
-            }
-            do_action(
-                'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__after_script',
-                $script
-            );
-        }
-    }
-
-
-    /**
-     * Registers CSS assets with WP core
-     *
-     * @param StylesheetAsset[] $styles
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @since 4.9.62.p
-     */
-    public function registerStyles(array $styles)
-    {
-        foreach ($styles as $style) {
-            // skip to next style if this has already been done
-            if ($style->isRegistered()) {
-                continue;
-            }
-            do_action(
-                'AHEE__EventEspresso_core_services_assets_Registry__registerStyles__before_style',
-                $style
-            );
-            wp_register_style(
-                $style->handle(),
-                $style->source(),
-                $style->dependencies(),
-                $style->version(),
-                $style->media()
-            );
-            $style->setRegistered();
-            if ($style->enqueueImmediately()) {
-                wp_enqueue_style($style->handle());
-            }
-            do_action(
-                'AHEE__EventEspresso_core_services_assets_Registry__registerStyles__after_style',
-                $style
-            );
-        }
-    }
-
-
-    /**
-     * Call back for the script print in frontend and backend.
-     * Used to call wp_localize_scripts so that data can be added throughout the runtime until this later hook point.
-     *
-     * @throws Exception
-     * @since 4.9.31.rc.015
-     */
-    public function enqueueData()
-    {
-        try {
-            $this->removeAlreadyRegisteredDataForScriptHandles();
-            wp_add_inline_script(
-                'eejs-core',
-                'var eejsdata=' . wp_json_encode(['data' => $this->jsdata]),
-                'before'
-            );
-            foreach ($this->assets as $asset_collection) {
-                $scripts = $asset_collection->getJavascriptAssetsWithData();
-                foreach ($scripts as $script) {
-                    $this->addRegisteredScriptHandlesWithData($script->handle());
-                    if ($script->hasInlineDataCallback()) {
-                        $localize = $script->inlineDataCallback();
-                        $localize();
-                    }
-                }
-            }
-        } catch (Exception $exception) {
-            EE_Error::add_error($exception->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * Used to add data to eejs.data object.
-     * Note:  Overriding existing data is not allowed.
-     * Data will be accessible as a javascript object when you list `eejs-core` as a dependency for your javascript.
-     * If the data you add is something like this:
-     *  $this->addData( 'my_plugin_data', array( 'foo' => 'gar' ) );
-     * It will be exposed in the page source as:
-     *  eejs.data.my_plugin_data.foo == gar
-     *
-     * @param string       $key   Key used to access your data
-     * @param string|array $value Value to attach to key
-     * @throws InvalidArgumentException
-     */
-    public function addData($key, $value)
-    {
-        if ($this->verifyDataNotExisting($key)) {
-            $this->jsdata[ $key ] = $value;
-        }
-    }
-
-
-    /**
-     * Similar to addData except this allows for users to push values to an existing key where the values on key are
-     * elements in an array.
-     *
-     * When you use this method, the value you include will be merged with the array on $key.
-     * So if the $key was 'test' and you added a value of ['my_data'] then it would be represented in the javascript
-     * object like this, eejs.data.test = [ my_data,
-     * ]
-     * If there has already been a scalar value attached to the data object given key (via addData for instance), then
-     * this will throw an exception.
-     *
-     * Caution: Only add data using this method if you are okay with the potential for additional data added on the same
-     * key potentially overriding the existing data on merge (specifically with associative arrays).
-     *
-     * @param string       $key   Key to attach data to.
-     * @param string|array $value Value being registered.
-     * @throws InvalidArgumentException
-     */
-    public function pushData($key, $value)
-    {
-        if (isset($this->jsdata[ $key ])
-            && ! is_array($this->jsdata[ $key ])
-        ) {
-            if (! $this->debug()) {
-                return;
-            }
-            throw new InvalidArgumentException(
-                sprintf(
-                    __(
-                        'The value for %1$s is already set and it is not an array. The %2$s method can only be used to
+	const FILE_NAME_BUILD_MANIFEST = 'build-manifest.json';
+
+	/**
+	 * @var AssetCollection[] $assets
+	 */
+	protected $assets = [];
+
+	/**
+	 * @var AssetManifestInterface
+	 */
+	private $asset_manifest;
+
+	/**
+	 * @var I18nRegistry
+	 */
+	private $i18n_registry;
+
+	/**
+	 * This holds the jsdata data object that will be exposed on pages that enqueue the `eejs-core` script.
+	 *
+	 * @var array
+	 */
+	protected $jsdata = array();
+
+	/**
+	 * This keeps track of all scripts with registered data.  It is used to prevent duplicate data objects setup in the
+	 * page source.
+	 *
+	 * @var array
+	 */
+	private $script_handles_with_data = array();
+
+
+	/**
+	 * Registry constructor.
+	 * Hooking into WP actions for script registry.
+	 *
+	 * @param AssetCollection        $assets
+	 * @param AssetManifestInterface $asset_manifest
+	 * @param I18nRegistry           $i18n_registry
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(AssetCollection $assets, AssetManifestInterface $asset_manifest, I18nRegistry $i18n_registry)
+	{
+		$this->addAssetCollection($assets);
+		$this->asset_manifest = $asset_manifest;
+		$this->asset_manifest->initialize();
+		$this->i18n_registry = $i18n_registry;
+		add_action('wp_enqueue_scripts', array($this, 'registerScriptsAndStyles'), 4);
+		add_action('admin_enqueue_scripts', array($this, 'registerScriptsAndStyles'), 4);
+		add_action('wp_enqueue_scripts', array($this, 'enqueueData'), 5);
+		add_action('admin_enqueue_scripts', array($this, 'enqueueData'), 5);
+		add_action('wp_print_footer_scripts', array($this, 'enqueueData'), 1);
+		add_action('admin_print_footer_scripts', array($this, 'enqueueData'), 1);
+	}
+
+
+	/**
+	 * @param AssetCollection $asset_collection
+	 */
+	public function addAssetCollection(AssetCollection $asset_collection)
+	{
+		$id = $asset_collection->collectionIdentifier();
+		if (! array_key_exists($id, $this->assets)) {
+			$this->assets[ $id ] = $asset_collection;
+		}
+	}
+
+
+
+
+	/**
+	 * For classes that have Registry as a dependency, this provides a handy way to register script handles for i18n
+	 * translation handling.
+	 *
+	 * @return I18nRegistry
+	 */
+	public function getI18nRegistry()
+	{
+		return $this->i18n_registry;
+	}
+
+
+	/**
+	 * Callback for the wp_enqueue_scripts actions used to register assets.
+	 *
+	 * @since 4.9.62.p
+	 * @throws Exception
+	 */
+	public function registerScriptsAndStyles()
+	{
+		try {
+			foreach ($this->assets as $asset_collection) {
+				$this->registerScripts($asset_collection->getJavascriptAssets());
+				$this->registerStyles($asset_collection->getStylesheetAssets());
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * Registers JS assets with WP core
+	 *
+	 * @param JavascriptAsset[] $scripts
+	 * @throws AssetRegistrationException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @since 4.9.62.p
+	 */
+	public function registerScripts(array $scripts)
+	{
+		foreach ($scripts as $script) {
+			// skip to next script if this has already been done
+			if ($script->isRegistered()) {
+				continue;
+			}
+			do_action(
+				'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__before_script',
+				$script
+			);
+			$registered = wp_register_script(
+				$script->handle(),
+				$script->source(),
+				$script->dependencies(),
+				$script->version(),
+				$script->loadInFooter()
+			);
+			if (! $registered && $this->debug()) {
+				throw new AssetRegistrationException($script->handle());
+			}
+			$script->setRegistered($registered);
+			if ($script->requiresTranslation()) {
+				$this->registerTranslation($script->handle());
+			}
+			if ($script->enqueueImmediately()) {
+				wp_enqueue_script($script->handle());
+			}
+			do_action(
+				'AHEE__EventEspresso_core_services_assets_Registry__registerScripts__after_script',
+				$script
+			);
+		}
+	}
+
+
+	/**
+	 * Registers CSS assets with WP core
+	 *
+	 * @param StylesheetAsset[] $styles
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @since 4.9.62.p
+	 */
+	public function registerStyles(array $styles)
+	{
+		foreach ($styles as $style) {
+			// skip to next style if this has already been done
+			if ($style->isRegistered()) {
+				continue;
+			}
+			do_action(
+				'AHEE__EventEspresso_core_services_assets_Registry__registerStyles__before_style',
+				$style
+			);
+			wp_register_style(
+				$style->handle(),
+				$style->source(),
+				$style->dependencies(),
+				$style->version(),
+				$style->media()
+			);
+			$style->setRegistered();
+			if ($style->enqueueImmediately()) {
+				wp_enqueue_style($style->handle());
+			}
+			do_action(
+				'AHEE__EventEspresso_core_services_assets_Registry__registerStyles__after_style',
+				$style
+			);
+		}
+	}
+
+
+	/**
+	 * Call back for the script print in frontend and backend.
+	 * Used to call wp_localize_scripts so that data can be added throughout the runtime until this later hook point.
+	 *
+	 * @throws Exception
+	 * @since 4.9.31.rc.015
+	 */
+	public function enqueueData()
+	{
+		try {
+			$this->removeAlreadyRegisteredDataForScriptHandles();
+			wp_add_inline_script(
+				'eejs-core',
+				'var eejsdata=' . wp_json_encode(['data' => $this->jsdata]),
+				'before'
+			);
+			foreach ($this->assets as $asset_collection) {
+				$scripts = $asset_collection->getJavascriptAssetsWithData();
+				foreach ($scripts as $script) {
+					$this->addRegisteredScriptHandlesWithData($script->handle());
+					if ($script->hasInlineDataCallback()) {
+						$localize = $script->inlineDataCallback();
+						$localize();
+					}
+				}
+			}
+		} catch (Exception $exception) {
+			EE_Error::add_error($exception->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * Used to add data to eejs.data object.
+	 * Note:  Overriding existing data is not allowed.
+	 * Data will be accessible as a javascript object when you list `eejs-core` as a dependency for your javascript.
+	 * If the data you add is something like this:
+	 *  $this->addData( 'my_plugin_data', array( 'foo' => 'gar' ) );
+	 * It will be exposed in the page source as:
+	 *  eejs.data.my_plugin_data.foo == gar
+	 *
+	 * @param string       $key   Key used to access your data
+	 * @param string|array $value Value to attach to key
+	 * @throws InvalidArgumentException
+	 */
+	public function addData($key, $value)
+	{
+		if ($this->verifyDataNotExisting($key)) {
+			$this->jsdata[ $key ] = $value;
+		}
+	}
+
+
+	/**
+	 * Similar to addData except this allows for users to push values to an existing key where the values on key are
+	 * elements in an array.
+	 *
+	 * When you use this method, the value you include will be merged with the array on $key.
+	 * So if the $key was 'test' and you added a value of ['my_data'] then it would be represented in the javascript
+	 * object like this, eejs.data.test = [ my_data,
+	 * ]
+	 * If there has already been a scalar value attached to the data object given key (via addData for instance), then
+	 * this will throw an exception.
+	 *
+	 * Caution: Only add data using this method if you are okay with the potential for additional data added on the same
+	 * key potentially overriding the existing data on merge (specifically with associative arrays).
+	 *
+	 * @param string       $key   Key to attach data to.
+	 * @param string|array $value Value being registered.
+	 * @throws InvalidArgumentException
+	 */
+	public function pushData($key, $value)
+	{
+		if (isset($this->jsdata[ $key ])
+			&& ! is_array($this->jsdata[ $key ])
+		) {
+			if (! $this->debug()) {
+				return;
+			}
+			throw new InvalidArgumentException(
+				sprintf(
+					__(
+						'The value for %1$s is already set and it is not an array. The %2$s method can only be used to
                          push values to this data element when it is an array.',
-                        'event_espresso'
-                    ),
-                    $key,
-                    __METHOD__
-                )
-            );
-        }
-        if ( ! isset( $this->jsdata[ $key ] ) ) {
-            $this->jsdata[ $key ] = is_array($value) ? $value : [$value];
-        } else {
-            $this->jsdata[ $key ] = array_merge( $this->jsdata[$key], (array) $value);
-        }
-    }
-
-
-    /**
-     * Used to set content used by javascript for a template.
-     * Note: Overrides of existing registered templates are not allowed.
-     *
-     * @param string $template_reference
-     * @param string $template_content
-     * @throws InvalidArgumentException
-     */
-    public function addTemplate($template_reference, $template_content)
-    {
-        if (! isset($this->jsdata['templates'])) {
-            $this->jsdata['templates'] = array();
-        }
-        //no overrides allowed.
-        if (isset($this->jsdata['templates'][ $template_reference ])) {
-            if (! $this->debug()) {
-                return;
-            }
-            throw new InvalidArgumentException(
-                sprintf(
-                    __(
-                        'The %1$s key already exists for the templates array in the js data array.  No overrides are allowed.',
-                        'event_espresso'
-                    ),
-                    $template_reference
-                )
-            );
-        }
-        $this->jsdata['templates'][ $template_reference ] = $template_content;
-    }
-
-
-    /**
-     * Retrieve the template content already registered for the given reference.
-     *
-     * @param string $template_reference
-     * @return string
-     */
-    public function getTemplate($template_reference)
-    {
-        return isset($this->jsdata['templates'][ $template_reference ])
-            ? $this->jsdata['templates'][ $template_reference ]
-            : '';
-    }
-
-
-    /**
-     * Retrieve registered data.
-     *
-     * @param string $key Name of key to attach data to.
-     * @return mixed                If there is no for the given key, then false is returned.
-     */
-    public function getData($key)
-    {
-        return isset($this->jsdata[ $key ])
-            ? $this->jsdata[ $key ]
-            : false;
-    }
-
-
-    /**
-     * Verifies whether the given data exists already on the jsdata array.
-     * Overriding data is not allowed.
-     *
-     * @param string $key Index for data.
-     * @return bool        If valid then return true.
-     * @throws InvalidArgumentException if data already exists.
-     */
-    protected function verifyDataNotExisting($key)
-    {
-        if (isset($this->jsdata[ $key ])) {
-            if (! $this->debug()) {
-                return false;
-            }
-            if (is_array($this->jsdata[ $key ])) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        __(
-                            'The value for %1$s already exists in the Registry::eejs object.
+						'event_espresso'
+					),
+					$key,
+					__METHOD__
+				)
+			);
+		}
+		if ( ! isset( $this->jsdata[ $key ] ) ) {
+			$this->jsdata[ $key ] = is_array($value) ? $value : [$value];
+		} else {
+			$this->jsdata[ $key ] = array_merge( $this->jsdata[$key], (array) $value);
+		}
+	}
+
+
+	/**
+	 * Used to set content used by javascript for a template.
+	 * Note: Overrides of existing registered templates are not allowed.
+	 *
+	 * @param string $template_reference
+	 * @param string $template_content
+	 * @throws InvalidArgumentException
+	 */
+	public function addTemplate($template_reference, $template_content)
+	{
+		if (! isset($this->jsdata['templates'])) {
+			$this->jsdata['templates'] = array();
+		}
+		//no overrides allowed.
+		if (isset($this->jsdata['templates'][ $template_reference ])) {
+			if (! $this->debug()) {
+				return;
+			}
+			throw new InvalidArgumentException(
+				sprintf(
+					__(
+						'The %1$s key already exists for the templates array in the js data array.  No overrides are allowed.',
+						'event_espresso'
+					),
+					$template_reference
+				)
+			);
+		}
+		$this->jsdata['templates'][ $template_reference ] = $template_content;
+	}
+
+
+	/**
+	 * Retrieve the template content already registered for the given reference.
+	 *
+	 * @param string $template_reference
+	 * @return string
+	 */
+	public function getTemplate($template_reference)
+	{
+		return isset($this->jsdata['templates'][ $template_reference ])
+			? $this->jsdata['templates'][ $template_reference ]
+			: '';
+	}
+
+
+	/**
+	 * Retrieve registered data.
+	 *
+	 * @param string $key Name of key to attach data to.
+	 * @return mixed                If there is no for the given key, then false is returned.
+	 */
+	public function getData($key)
+	{
+		return isset($this->jsdata[ $key ])
+			? $this->jsdata[ $key ]
+			: false;
+	}
+
+
+	/**
+	 * Verifies whether the given data exists already on the jsdata array.
+	 * Overriding data is not allowed.
+	 *
+	 * @param string $key Index for data.
+	 * @return bool        If valid then return true.
+	 * @throws InvalidArgumentException if data already exists.
+	 */
+	protected function verifyDataNotExisting($key)
+	{
+		if (isset($this->jsdata[ $key ])) {
+			if (! $this->debug()) {
+				return false;
+			}
+			if (is_array($this->jsdata[ $key ])) {
+				throw new InvalidArgumentException(
+					sprintf(
+						__(
+							'The value for %1$s already exists in the Registry::eejs object.
                             Overrides are not allowed. Since the value of this data is an array, you may want to use the
                             %2$s method to push your value to the array.',
-                            'event_espresso'
-                        ),
-                        $key,
-                        'pushData()'
-                    )
-                );
-            }
-            throw new InvalidArgumentException(
-                sprintf(
-                    __(
-                        'The value for %1$s already exists in the Registry::eejs object. Overrides are not
+							'event_espresso'
+						),
+						$key,
+						'pushData()'
+					)
+				);
+			}
+			throw new InvalidArgumentException(
+				sprintf(
+					__(
+						'The value for %1$s already exists in the Registry::eejs object. Overrides are not
                         allowed.  Consider attaching your value to a different key',
-                        'event_espresso'
-                    ),
-                    $key
-                )
-            );
-        }
-        return true;
-    }
-
-
-    /**
-     * Get the actual asset path for asset manifests.
-     * If there is no asset path found for the given $chunk_name, then the $chunk_name is returned.
-     *
-     * @param string $namespace  The namespace associated with the manifest file hosting the map of chunk_name to actual
-     *                           asset file location.
-     * @param string $chunk_name
-     * @param string $asset_type
-     * @return string
-     * @since 4.9.59.p
-     */
-    public function getAssetUrl($namespace, $chunk_name, $asset_type)
-    {
-        return apply_filters(
-            'FHEE__EventEspresso_core_services_assets_Registry__getAssetUrl',
-            $this->asset_manifest->getAssetUrl($chunk_name, $asset_type),
-            $namespace,
-            $chunk_name,
-            $asset_type
-        );
-    }
-
-
-
-    /**
-     * Return the url to a js file for the given namespace and chunk name.
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return string
-     */
-    public function getJsUrl($namespace, $chunk_name)
-    {
-        return $this->getAssetUrl($namespace, $chunk_name, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * Return the url to a css file for the given namespace and chunk name.
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return string
-     */
-    public function getCssUrl($namespace, $chunk_name)
-    {
-        return $this->getAssetUrl($namespace, $chunk_name, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * This is used to set registered script handles that have data.
-     *
-     * @param string $script_handle
-     */
-    private function addRegisteredScriptHandlesWithData($script_handle)
-    {
-        $this->script_handles_with_data[ $script_handle ] = $script_handle;
-    }
-
-
-    /**i
+						'event_espresso'
+					),
+					$key
+				)
+			);
+		}
+		return true;
+	}
+
+
+	/**
+	 * Get the actual asset path for asset manifests.
+	 * If there is no asset path found for the given $chunk_name, then the $chunk_name is returned.
+	 *
+	 * @param string $namespace  The namespace associated with the manifest file hosting the map of chunk_name to actual
+	 *                           asset file location.
+	 * @param string $chunk_name
+	 * @param string $asset_type
+	 * @return string
+	 * @since 4.9.59.p
+	 */
+	public function getAssetUrl($namespace, $chunk_name, $asset_type)
+	{
+		return apply_filters(
+			'FHEE__EventEspresso_core_services_assets_Registry__getAssetUrl',
+			$this->asset_manifest->getAssetUrl($chunk_name, $asset_type),
+			$namespace,
+			$chunk_name,
+			$asset_type
+		);
+	}
+
+
+
+	/**
+	 * Return the url to a js file for the given namespace and chunk name.
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return string
+	 */
+	public function getJsUrl($namespace, $chunk_name)
+	{
+		return $this->getAssetUrl($namespace, $chunk_name, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * Return the url to a css file for the given namespace and chunk name.
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return string
+	 */
+	public function getCssUrl($namespace, $chunk_name)
+	{
+		return $this->getAssetUrl($namespace, $chunk_name, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * This is used to set registered script handles that have data.
+	 *
+	 * @param string $script_handle
+	 */
+	private function addRegisteredScriptHandlesWithData($script_handle)
+	{
+		$this->script_handles_with_data[ $script_handle ] = $script_handle;
+	}
+
+
+	/**i
      * Checks WP_Scripts for all of each script handle registered internally as having data and unsets from the
      * Dependency stored in WP_Scripts if its set.
      */
-    private function removeAlreadyRegisteredDataForScriptHandles()
-    {
-        if (empty($this->script_handles_with_data)) {
-            return;
-        }
-        foreach ($this->script_handles_with_data as $script_handle) {
-            $this->removeAlreadyRegisteredDataForScriptHandle($script_handle);
-        }
-    }
-
-
-    /**
-     * Removes any data dependency registered in WP_Scripts if its set.
-     *
-     * @param string $script_handle
-     */
-    private function removeAlreadyRegisteredDataForScriptHandle($script_handle)
-    {
-        if (isset($this->script_handles_with_data[ $script_handle ])) {
-            global $wp_scripts;
-            $unset_handle = false;
-            if ($wp_scripts->get_data($script_handle, 'data')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['data']);
-                $unset_handle = true;
-            }
-            //deal with inline_scripts
-            if ($wp_scripts->get_data($script_handle, 'before')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['before']);
-                $unset_handle = true;
-            }
-            if ($wp_scripts->get_data($script_handle, 'after')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['after']);
-            }
-            if ($unset_handle) {
-                unset($this->script_handles_with_data[ $script_handle ]);
-            }
-        }
-    }
-
-
-    /**
-     * register translations for a registered script
-     *
-     * @param string $handle
-     */
-    public function registerTranslation($handle)
-    {
-        $this->i18n_registry->registerScriptI18n($handle);
-    }
-
-
-    /**
-     * @since 4.9.63.p
-     * @return bool
-     */
-    private function debug()
-    {
-        return apply_filters(
-            'FHEE__EventEspresso_core_services_assets_Registry__debug',
-            defined('EE_DEBUG') && EE_DEBUG
-        );
-    }
-
-
-    /**************** deprecated ****************/
-
-
-    /**
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated $VID:$
-     */
-    public function getCssAssetDetails($namespace, $chunk_name)
-    {
-        return [
-            AssetManifest::KEY_DEPENDENCIES => $this->asset_manifest->getAssetDependencies($chunk_name, Asset::TYPE_CSS),
-            AssetManifest::KEY_VERSION => $this->asset_manifest->getAssetVersion($chunk_name, Asset::TYPE_CSS),
-        ];
-    }
-
-
-    /**
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated $VID:$
-     */
-    public function getCssDependencies($namespace, $chunk_name)
-    {
-        return $this->asset_manifest->getAssetDependencies($chunk_name, AssetManifest::ASSET_EXT_CSS);
-    }
-
-
-    /**
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated $VID:$
-     */
-    public function getJsAssetDetails($namespace, $chunk_name)
-    {
-        return [
-            AssetManifest::KEY_DEPENDENCIES => $this->asset_manifest->getAssetDependencies($chunk_name, Asset::TYPE_JS),
-            AssetManifest::KEY_VERSION => $this->asset_manifest->getAssetVersion($chunk_name, Asset::TYPE_JS),
-        ];
-    }
-
-
-    /**
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated $VID:$
-     */
-    public function getJsDependencies($namespace, $chunk_name)
-    {
-        return $this->asset_manifest->getAssetDependencies($chunk_name);
-    }
-
-
-    /**
-     * @deprecated $VID:$
-     */
-    public function registerManifestFiles()
-    {
-    }
-
-
-    /**
-     * @param string $namespace
-     * @param string $url_base
-     * @param string $manifest_file
-     * @param string $manifest_file_path
-     * @deprecated $VID:$
-     */
-    public function registerManifestFile($namespace, $url_base, $manifest_file, $manifest_file_path = '')
-    {
-    }
+	private function removeAlreadyRegisteredDataForScriptHandles()
+	{
+		if (empty($this->script_handles_with_data)) {
+			return;
+		}
+		foreach ($this->script_handles_with_data as $script_handle) {
+			$this->removeAlreadyRegisteredDataForScriptHandle($script_handle);
+		}
+	}
+
+
+	/**
+	 * Removes any data dependency registered in WP_Scripts if its set.
+	 *
+	 * @param string $script_handle
+	 */
+	private function removeAlreadyRegisteredDataForScriptHandle($script_handle)
+	{
+		if (isset($this->script_handles_with_data[ $script_handle ])) {
+			global $wp_scripts;
+			$unset_handle = false;
+			if ($wp_scripts->get_data($script_handle, 'data')) {
+				unset($wp_scripts->registered[ $script_handle ]->extra['data']);
+				$unset_handle = true;
+			}
+			//deal with inline_scripts
+			if ($wp_scripts->get_data($script_handle, 'before')) {
+				unset($wp_scripts->registered[ $script_handle ]->extra['before']);
+				$unset_handle = true;
+			}
+			if ($wp_scripts->get_data($script_handle, 'after')) {
+				unset($wp_scripts->registered[ $script_handle ]->extra['after']);
+			}
+			if ($unset_handle) {
+				unset($this->script_handles_with_data[ $script_handle ]);
+			}
+		}
+	}
+
+
+	/**
+	 * register translations for a registered script
+	 *
+	 * @param string $handle
+	 */
+	public function registerTranslation($handle)
+	{
+		$this->i18n_registry->registerScriptI18n($handle);
+	}
+
+
+	/**
+	 * @since 4.9.63.p
+	 * @return bool
+	 */
+	private function debug()
+	{
+		return apply_filters(
+			'FHEE__EventEspresso_core_services_assets_Registry__debug',
+			defined('EE_DEBUG') && EE_DEBUG
+		);
+	}
+
+
+	/**************** deprecated ****************/
+
+
+	/**
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated $VID:$
+	 */
+	public function getCssAssetDetails($namespace, $chunk_name)
+	{
+		return [
+			AssetManifest::KEY_DEPENDENCIES => $this->asset_manifest->getAssetDependencies($chunk_name, Asset::TYPE_CSS),
+			AssetManifest::KEY_VERSION => $this->asset_manifest->getAssetVersion($chunk_name, Asset::TYPE_CSS),
+		];
+	}
+
+
+	/**
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated $VID:$
+	 */
+	public function getCssDependencies($namespace, $chunk_name)
+	{
+		return $this->asset_manifest->getAssetDependencies($chunk_name, AssetManifest::ASSET_EXT_CSS);
+	}
+
+
+	/**
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated $VID:$
+	 */
+	public function getJsAssetDetails($namespace, $chunk_name)
+	{
+		return [
+			AssetManifest::KEY_DEPENDENCIES => $this->asset_manifest->getAssetDependencies($chunk_name, Asset::TYPE_JS),
+			AssetManifest::KEY_VERSION => $this->asset_manifest->getAssetVersion($chunk_name, Asset::TYPE_JS),
+		];
+	}
+
+
+	/**
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated $VID:$
+	 */
+	public function getJsDependencies($namespace, $chunk_name)
+	{
+		return $this->asset_manifest->getAssetDependencies($chunk_name);
+	}
+
+
+	/**
+	 * @deprecated $VID:$
+	 */
+	public function registerManifestFiles()
+	{
+	}
+
+
+	/**
+	 * @param string $namespace
+	 * @param string $url_base
+	 * @param string $manifest_file
+	 * @param string $manifest_file_path
+	 * @deprecated $VID:$
+	 */
+	public function registerManifestFile($namespace, $url_base, $manifest_file, $manifest_file_path = '')
+	{
+	}
 }

Spacing +28 added lines, -28 removed lines

@@ -89,8 +89,8 @@ 
     public function addAssetCollection(AssetCollection $asset_collection)
     {
         $id = $asset_collection->collectionIdentifier();
-        if (! array_key_exists($id, $this->assets)) {
-            $this->assets[ $id ] = $asset_collection;
+        if ( ! array_key_exists($id, $this->assets)) {
+            $this->assets[$id] = $asset_collection;
         }
     }
 
@@ -155,7 +155,7 @@ 
                 $script->version(),
                 $script->loadInFooter()
             );
-            if (! $registered && $this->debug()) {
+            if ( ! $registered && $this->debug()) {
                 throw new AssetRegistrationException($script->handle());
             }
             $script->setRegistered($registered);
@@ -224,7 +224,7 @@ 
             $this->removeAlreadyRegisteredDataForScriptHandles();
             wp_add_inline_script(
                 'eejs-core',
-                'var eejsdata=' . wp_json_encode(['data' => $this->jsdata]),
+                'var eejsdata='.wp_json_encode(['data' => $this->jsdata]),
                 'before'
             );
             foreach ($this->assets as $asset_collection) {
@@ -260,7 +260,7 @@ 
     public function addData($key, $value)
     {
         if ($this->verifyDataNotExisting($key)) {
-            $this->jsdata[ $key ] = $value;
+            $this->jsdata[$key] = $value;
         }
     }
 
@@ -285,10 +285,10 @@ 
      */
     public function pushData($key, $value)
     {
-        if (isset($this->jsdata[ $key ])
-            && ! is_array($this->jsdata[ $key ])
+        if (isset($this->jsdata[$key])
+            && ! is_array($this->jsdata[$key])
         ) {
-            if (! $this->debug()) {
+            if ( ! $this->debug()) {
                 return;
             }
             throw new InvalidArgumentException(
@@ -303,10 +303,10 @@ 
                 )
             );
         }
-        if ( ! isset( $this->jsdata[ $key ] ) ) {
-            $this->jsdata[ $key ] = is_array($value) ? $value : [$value];
+        if ( ! isset($this->jsdata[$key])) {
+            $this->jsdata[$key] = is_array($value) ? $value : [$value];
         } else {
-            $this->jsdata[ $key ] = array_merge( $this->jsdata[$key], (array) $value);
+            $this->jsdata[$key] = array_merge($this->jsdata[$key], (array) $value);
         }
     }
 
@@ -321,12 +321,12 @@ 
      */
     public function addTemplate($template_reference, $template_content)
     {
-        if (! isset($this->jsdata['templates'])) {
+        if ( ! isset($this->jsdata['templates'])) {
             $this->jsdata['templates'] = array();
         }
         //no overrides allowed.
-        if (isset($this->jsdata['templates'][ $template_reference ])) {
-            if (! $this->debug()) {
+        if (isset($this->jsdata['templates'][$template_reference])) {
+            if ( ! $this->debug()) {
                 return;
             }
             throw new InvalidArgumentException(
@@ -339,7 +339,7 @@ 
                 )
             );
         }
-        $this->jsdata['templates'][ $template_reference ] = $template_content;
+        $this->jsdata['templates'][$template_reference] = $template_content;
     }
 
 
@@ -351,8 +351,8 @@ 
      */
     public function getTemplate($template_reference)
     {
-        return isset($this->jsdata['templates'][ $template_reference ])
-            ? $this->jsdata['templates'][ $template_reference ]
+        return isset($this->jsdata['templates'][$template_reference])
+            ? $this->jsdata['templates'][$template_reference]
             : '';
     }
 
@@ -365,8 +365,8 @@ 
      */
     public function getData($key)
     {
-        return isset($this->jsdata[ $key ])
-            ? $this->jsdata[ $key ]
+        return isset($this->jsdata[$key])
+            ? $this->jsdata[$key]
             : false;
     }
 
@@ -381,11 +381,11 @@ 
      */
     protected function verifyDataNotExisting($key)
     {
-        if (isset($this->jsdata[ $key ])) {
-            if (! $this->debug()) {
+        if (isset($this->jsdata[$key])) {
+            if ( ! $this->debug()) {
                 return false;
             }
-            if (is_array($this->jsdata[ $key ])) {
+            if (is_array($this->jsdata[$key])) {
                 throw new InvalidArgumentException(
                     sprintf(
                         __(
@@ -471,7 +471,7 @@ 
      */
     private function addRegisteredScriptHandlesWithData($script_handle)
     {
-        $this->script_handles_with_data[ $script_handle ] = $script_handle;
+        $this->script_handles_with_data[$script_handle] = $script_handle;
     }
 
 
@@ -497,23 +497,23 @@ 
      */
     private function removeAlreadyRegisteredDataForScriptHandle($script_handle)
     {
-        if (isset($this->script_handles_with_data[ $script_handle ])) {
+        if (isset($this->script_handles_with_data[$script_handle])) {
             global $wp_scripts;
             $unset_handle = false;
             if ($wp_scripts->get_data($script_handle, 'data')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['data']);
+                unset($wp_scripts->registered[$script_handle]->extra['data']);
                 $unset_handle = true;
             }
             //deal with inline_scripts
             if ($wp_scripts->get_data($script_handle, 'before')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['before']);
+                unset($wp_scripts->registered[$script_handle]->extra['before']);
                 $unset_handle = true;
             }
             if ($wp_scripts->get_data($script_handle, 'after')) {
-                unset($wp_scripts->registered[ $script_handle ]->extra['after']);
+                unset($wp_scripts->registered[$script_handle]->extra['after']);
             }
             if ($unset_handle) {
-                unset($this->script_handles_with_data[ $script_handle ]);
+                unset($this->script_handles_with_data[$script_handle]);
             }
         }
     }

core/services/assets/BaristaFactory.php

Indentation +85 added lines, -85 removed lines

@@ -11,102 +11,102 @@
 
 class BaristaFactory implements FactoryInterface
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
 
-    /**
-     * @var BaristaInterface[]
-     */
-    private static $baristas = [];
+	/**
+	 * @var BaristaInterface[]
+	 */
+	private static $baristas = [];
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * BaristaFactory constructor.
-     *
-     * @param AssetManifestFactory $manifest_factory
-     * @param LoaderInterface      $loader
-     */
-    public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
-    {
-        $this->manifest_factory = $manifest_factory;
-        $this->loader           = $loader;
-    }
+	/**
+	 * BaristaFactory constructor.
+	 *
+	 * @param AssetManifestFactory $manifest_factory
+	 * @param LoaderInterface      $loader
+	 */
+	public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
+	{
+		$this->manifest_factory = $manifest_factory;
+		$this->loader           = $loader;
+	}
 
 
-    /**
-     * @param DomainInterface $domain
-     * @return BaristaInterface
-     */
-    public function createFromDomainObject(DomainInterface $domain)
-    {
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
+	/**
+	 * @param DomainInterface $domain
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainObject(DomainInterface $domain)
+	{
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
 
 
-    /**
-     * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $domain_arguments arguments required by the applicable DomainInterface class
-     * @return BaristaInterface
-     */
-    public function create($domain_fqcn = '', array $domain_arguments = [])
-    {
-        $domain         = $this->getDomain($domain_fqcn, $domain_arguments);
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
+	/**
+	 * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $domain_arguments arguments required by the applicable DomainInterface class
+	 * @return BaristaInterface
+	 */
+	public function create($domain_fqcn = '', array $domain_arguments = [])
+	{
+		$domain         = $this->getDomain($domain_fqcn, $domain_arguments);
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
 
 
-    /**
-     * @param AssetManifestInterface $asset_manifest
-     * @param DomainInterface        $domain
-     * @return BaristaInterface
-     */
-    private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
-    {
-        $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
-            $barista = new Barista($asset_manifest);
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
-        }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
-    }
+	/**
+	 * @param AssetManifestInterface $asset_manifest
+	 * @param DomainInterface        $domain
+	 * @return BaristaInterface
+	 */
+	private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
+	{
+		$domain_fqcn = get_class($domain);
+		if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+			$barista = new Barista($asset_manifest);
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			$this->loader->share(Barista::class, $barista, [$asset_manifest]);
+			BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+		}
+		return BaristaFactory::$baristas[ $domain_fqcn ];
+	}
 
 
-    /**
-     * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $arguments
-     * @return DomainInterface
-     */
-    private function getDomain($domain_fqcn, array $arguments = [])
-    {
-        // if no FQCN is supplied for the domain, then we are loading the defaults for core
-        // add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
-        $domain = empty($domain_fqcn)
-            ? DomainFactory::getEventEspressoCoreDomain()
-            : DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
-        if ($domain instanceof DomainInterface) {
-            return $domain;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__(
-                    'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
+	/**
+	 * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $arguments
+	 * @return DomainInterface
+	 */
+	private function getDomain($domain_fqcn, array $arguments = [])
+	{
+		// if no FQCN is supplied for the domain, then we are loading the defaults for core
+		// add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
+		$domain = empty($domain_fqcn)
+			? DomainFactory::getEventEspressoCoreDomain()
+			: DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
+		if ($domain instanceof DomainInterface) {
+			return $domain;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__(
+					'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
                     %1$sThe supplied FQCN ("%2$s") is either invalid or the class is missing.',
-                    'event_espresso'
-                ),
-                '<br />',
-                $domain_fqcn
-            )
-        );
-    }
+					'event_espresso'
+				),
+				'<br />',
+				$domain_fqcn
+			)
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -72,13 +72,13 @@
     private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
     {
         $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+        if ( ! isset(BaristaFactory::$baristas[$domain_fqcn])) {
             $barista = new Barista($asset_manifest);
             // we still need to share this with the core loader to facilitate automatic dependency injection
             $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+            BaristaFactory::$baristas[$domain_fqcn] = $barista;
         }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
+        return BaristaFactory::$baristas[$domain_fqcn];
     }
 
 

core/EE_Dependency_Map.core.php

Indentation +997 added lines, -997 removed lines

@@ -21,1001 +21,1001 @@
 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,
-            ],
-            'EventEspresso\core\services\assets\I18nRegistry'                                                             => [
-                'EventEspresso\core\domain\Domain'                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\JedLocaleData' => 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\assets\I18nRegistry'    => 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\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,
-            ],
-        ];
-    }
-
-
-    /**
-     * 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_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();
-            },
-        ];
-    }
-
-
-    /**
-     * 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,
+			],
+			'EventEspresso\core\services\assets\I18nRegistry'                                                             => [
+				'EventEspresso\core\domain\Domain'                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\JedLocaleData' => 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\assets\I18nRegistry'    => 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\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,
+			],
+		];
+	}
+
+
+	/**
+	 * 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_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();
+			},
+		];
+	}
+
+
+	/**
+	 * 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);
+	}
 }

core/domain/entities/routing/handlers/shared/GQLRequests.php

Indentation +196 added lines, -196 removed lines

@@ -19,208 +19,208 @@
  */
 class GQLRequests extends Route
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map    $dependency_map
-     * @param LoaderInterface      $loader
-     * @param RequestInterface     $request
-     * @param AssetManifestFactory $manifest_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        AssetManifestFactory $manifest_factory
-    ) {
-        $this->manifest_factory = $manifest_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map    $dependency_map
+	 * @param LoaderInterface      $loader
+	 * @param RequestInterface     $request
+	 * @param AssetManifestFactory $manifest_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		AssetManifestFactory $manifest_factory
+	) {
+		$this->manifest_factory = $manifest_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        global $pagenow;
-        return PHP_VERSION_ID > 70000
-               && (
-                   $this->request->isGQL()
-                   || $this->request->isUnitTesting()
-                   || (
-                       $this->request->isAdmin()
-                       && $this->request->getRequestParam('page') === 'espresso_events'
-                       && (
-                           $this->request->getRequestParam('action') === 'create_new'
-                           || $this->request->getRequestParam('action') === 'edit'
-                       )
-                   )
-                   || (
-                       $pagenow
-                       && (
-                           $pagenow === 'post-new.php'
-                           || (
-                               $pagenow === 'post.php'
-                               && $this->request->getRequestParam('action') === 'edit'
-                           )
-                       )
-                   )
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		global $pagenow;
+		return PHP_VERSION_ID > 70000
+			   && (
+				   $this->request->isGQL()
+				   || $this->request->isUnitTesting()
+				   || (
+					   $this->request->isAdmin()
+					   && $this->request->getRequestParam('page') === 'espresso_events'
+					   && (
+						   $this->request->getRequestParam('action') === 'create_new'
+						   || $this->request->getRequestParam('action') === 'edit'
+					   )
+				   )
+				   || (
+					   $pagenow
+					   && (
+						   $pagenow === 'post-new.php'
+						   || (
+							   $pagenow === 'post.php'
+							   && $this->request->getRequestParam('action') === 'edit'
+						   )
+					   )
+				   )
+			   );
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\GraphQLManager',
-            [
-                'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\TypesManager',
-            [
-                'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\InputsManager',
-            [
-                'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\EnumsManager',
-            [
-                'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\ConnectionsManager',
-            [
-                'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\DataLoaderManager',
-            [
-                'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Datetime',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Attendee',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Event',
-            ['EEM_Event' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Ticket',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Price',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\PriceType',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Venue',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\State',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Country',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\GraphQLManager',
+			[
+				'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\TypesManager',
+			[
+				'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\InputsManager',
+			[
+				'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\EnumsManager',
+			[
+				'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\ConnectionsManager',
+			[
+				'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\DataLoaderManager',
+			[
+				'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Datetime',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Attendee',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Event',
+			['EEM_Event' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Ticket',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Price',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\PriceType',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Venue',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\State',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Country',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        if (! class_exists('WPGraphQL')) {
-            require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-        }
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        $manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
-        $manifest->initialize();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		if (! class_exists('WPGraphQL')) {
+			require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+		}
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		$manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
+		$manifest->initialize();
+		return true;
+	}
 }

core/domain/entities/routing/handlers/shared/AssetRequests.php

Indentation +133 added lines, -133 removed lines

@@ -23,147 +23,147 @@
 class AssetRequests extends Route
 {
 
-    /**
-     * @var BaristaFactory $barista_factory
-     */
-    protected $barista_factory;
+	/**
+	 * @var BaristaFactory $barista_factory
+	 */
+	protected $barista_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map                $dependency_map
-     * @param LoaderInterface                  $loader
-     * @param RequestInterface                 $request
-     * @param BaristaFactory $barista_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        BaristaFactory $barista_factory
-    ) {
-        $this->barista_factory = $barista_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map                $dependency_map
+	 * @param LoaderInterface                  $loader
+	 * @param RequestInterface                 $request
+	 * @param BaristaFactory $barista_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		BaristaFactory $barista_factory
+	) {
+		$this->barista_factory = $barista_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return $this->request->isAdmin()
-               || $this->request->isFrontend()
-               || $this->request->isIframe()
-               || $this->request->isWordPressApi();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return $this->request->isAdmin()
+			   || $this->request->isFrontend()
+			   || $this->request->isIframe()
+			   || $this->request->isWordPressApi();
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $default_dependencies = [
-            'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-            'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-            'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-        ];
-        $this->dependency_map->registerDependencies(JqueryAssetManager::class, $default_dependencies);
-        $this->dependency_map->registerDependencies(ReactAssetManager::class, $default_dependencies);
-        $this->dependency_map->registerDependencies(
-            CoreAssetManager::class,
-            [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-                'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\editor\BlockRegistrationManager',
-            [
-                'EventEspresso\core\services\assets\BlockAssetManagerCollection'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\editor\BlockCollection'          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager',
-            [
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer',
-            [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-                'EEM_Attendee'                     => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\editor\blocks\EventAttendees',
-            [
-                'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        if (apply_filters('FHEE__load_Barista', true)) {
-            $this->dependency_map->registerDependencies(
-                'EventEspresso\core\services\assets\Barista',
-                ['EventEspresso\core\services\assets\AssetManifest' => EE_Dependency_Map::load_from_cache]
-            );
-        }
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$default_dependencies = [
+			'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+			'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+			'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+		];
+		$this->dependency_map->registerDependencies(JqueryAssetManager::class, $default_dependencies);
+		$this->dependency_map->registerDependencies(ReactAssetManager::class, $default_dependencies);
+		$this->dependency_map->registerDependencies(
+			CoreAssetManager::class,
+			[
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+				'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\editor\BlockRegistrationManager',
+			[
+				'EventEspresso\core\services\assets\BlockAssetManagerCollection'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\editor\BlockCollection'          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteMatchSpecificationManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager',
+			[
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_new_object,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer',
+			[
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+				'EEM_Attendee'                     => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\editor\blocks\EventAttendees',
+			[
+				'EventEspresso\core\domain\entities\editor\CoreBlocksAssetManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\blocks\EventAttendeesBlockRenderer' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		if (apply_filters('FHEE__load_Barista', true)) {
+			$this->dependency_map->registerDependencies(
+				'EventEspresso\core\services\assets\Barista',
+				['EventEspresso\core\services\assets\AssetManifest' => EE_Dependency_Map::load_from_cache]
+			);
+		}
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        if (apply_filters('FHEE__load_Barista', true)) {
-            $barista = $this->barista_factory->create();
-            if ($barista instanceof BaristaInterface) {
-                $barista->initialize();
-                $this->loader->getShared('EventEspresso\core\services\assets\Registry');
-            }
-        }
-        $this->loader->getShared(JqueryAssetManager::class);
-        $this->loader->getShared(CoreAssetManager::class);
-        if ($this->canLoadBlocks()) {
-            $this->loader->getShared(
-                'EventEspresso\core\services\editor\BlockRegistrationManager'
-            );
-        }
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		if (apply_filters('FHEE__load_Barista', true)) {
+			$barista = $this->barista_factory->create();
+			if ($barista instanceof BaristaInterface) {
+				$barista->initialize();
+				$this->loader->getShared('EventEspresso\core\services\assets\Registry');
+			}
+		}
+		$this->loader->getShared(JqueryAssetManager::class);
+		$this->loader->getShared(CoreAssetManager::class);
+		if ($this->canLoadBlocks()) {
+			$this->loader->getShared(
+				'EventEspresso\core\services\editor\BlockRegistrationManager'
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * Return whether blocks can be registered/loaded or not.
-     *
-     * @return bool
-     * @since $VID:$
-     */
-    private function canLoadBlocks()
-    {
-        return apply_filters('FHEE__EE_System__canLoadBlocks', true)
-               && function_exists('register_block_type')
-               // don't load blocks if in the Divi page builder editor context
-               // @see https://github.com/eventespresso/event-espresso-core/issues/814
-               && ! $this->request->getRequestParam('et_fb', false);
-    }
+	/**
+	 * Return whether blocks can be registered/loaded or not.
+	 *
+	 * @return bool
+	 * @since $VID:$
+	 */
+	private function canLoadBlocks()
+	{
+		return apply_filters('FHEE__EE_System__canLoadBlocks', true)
+			   && function_exists('register_block_type')
+			   // don't load blocks if in the Divi page builder editor context
+			   // @see https://github.com/eventespresso/event-espresso-core/issues/814
+			   && ! $this->request->getRequestParam('et_fb', false);
+	}
 }

core/domain/entities/routing/handlers/shared/RegularRequests.php

Indentation +124 added lines, -124 removed lines

@@ -17,134 +17,134 @@
 class RegularRequests extends PrimaryRoute
 {
 
-    /**
-     * called just before matchesCurrentRequest()
-     * and allows Route to perform any setup required such as calling setSpecification()
-     *
-     * @since $VID:$
-     */
-    public function initialize()
-    {
-        $basic_nodes = [
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Api',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale',
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls',
-        ];
-        foreach ($basic_nodes as $basic_node) {
-            $this->dependency_map->registerDependencies(
-                $basic_node,
-                ['EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache]
-            );
-        }
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings',
-            [
-                'EventEspresso\core\services\json\JsonDataNodeValidator'                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\converters\date_time_formats\PhpToUnicode' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData',
-            [
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Api'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Config' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\JedLocaleData'                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'            => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\Config',
-            [
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser'        => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale'             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls'           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator'                        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain',
-            [
-                'EventEspresso\core\domain\Domain'                       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency',
-            [
-                'EE_Currency_Config'                                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->setDataNode(
-            $this->loader->getShared('EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData')
-        );
-    }
+	/**
+	 * called just before matchesCurrentRequest()
+	 * and allows Route to perform any setup required such as calling setSpecification()
+	 *
+	 * @since $VID:$
+	 */
+	public function initialize()
+	{
+		$basic_nodes = [
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Api',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale',
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls',
+		];
+		foreach ($basic_nodes as $basic_node) {
+			$this->dependency_map->registerDependencies(
+				$basic_node,
+				['EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache]
+			);
+		}
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings',
+			[
+				'EventEspresso\core\services\json\JsonDataNodeValidator'                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\converters\date_time_formats\PhpToUnicode' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData',
+			[
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Api'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Config' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\JedLocaleData'                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'            => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\Config',
+			[
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\CurrentUser'        => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\GeneralSettings'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\Locale'             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteUrls'           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator'                        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\EspressoCoreDomain',
+			[
+				'EventEspresso\core\domain\Domain'                       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\core\SiteCurrency',
+			[
+				'EE_Currency_Config'                                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->setDataNode(
+			$this->loader->getShared('EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData')
+		);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest()
-    {
-        return ! $this->request->isActivation() || $this->request->isUnitTesting();
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest()
+	{
+		return ! $this->request->isActivation() || $this->request->isUnitTesting();
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $admin = ['EE_Admin_Config' => EE_Dependency_Map::load_from_cache] + Route::$default_dependencies;
-        $public = ['EE_Maintenance_Mode' => EE_Dependency_Map::load_from_cache] + Route::$default_dependencies;
-        $default_with_barista = [
-            'EventEspresso\core\services\assets\BaristaFactory' => EE_Dependency_Map::load_from_cache
-        ] + Route::$default_dependencies;
-        $default_with_manifest = [
-            'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache
-        ] + Route::$default_dependencies;
-        $default_routes = [
-            // default dependencies
-            'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'          => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage' => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests' => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'     => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'     => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'  => Route::$default_dependencies,
-            'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'       => $default_with_barista,
-            'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'         => $default_with_manifest,
-            // admin dependencies
-            'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'           => $admin,
-            'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'  => $admin,
-            'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'  => $admin,
-            'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'  => $admin,
-            'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'      => $admin,
-            // public dependencies
-            'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests' => $public,
-            'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'  => $public,
-        ];
-        foreach ($default_routes as $route => $dependencies) {
-            $this->dependency_map->registerDependencies($route, $dependencies);
-        }
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$admin = ['EE_Admin_Config' => EE_Dependency_Map::load_from_cache] + Route::$default_dependencies;
+		$public = ['EE_Maintenance_Mode' => EE_Dependency_Map::load_from_cache] + Route::$default_dependencies;
+		$default_with_barista = [
+			'EventEspresso\core\services\assets\BaristaFactory' => EE_Dependency_Map::load_from_cache
+		] + Route::$default_dependencies;
+		$default_with_manifest = [
+			'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache
+		] + Route::$default_dependencies;
+		$default_routes = [
+			// default dependencies
+			'EventEspresso\core\domain\entities\routing\handlers\admin\PueRequests'          => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage' => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests' => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'     => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'     => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'  => Route::$default_dependencies,
+			'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'       => $default_with_barista,
+			'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'         => $default_with_manifest,
+			// admin dependencies
+			'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'           => $admin,
+			'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'  => $admin,
+			'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'  => $admin,
+			'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'  => $admin,
+			'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'      => $admin,
+			// public dependencies
+			'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests' => $public,
+			'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'  => $public,
+		];
+		foreach ($default_routes as $route => $dependencies) {
+			$this->dependency_map->registerDependencies($route, $dependencies);
+		}
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler()
-    {
-        $this->setRouteRequestType(PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR);
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler()
+	{
+		$this->setRouteRequestType(PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR);
+		return true;
+	}
 }

core/domain/DomainBase.php

Indentation +211 added lines, -211 removed lines

@@ -18,215 +18,215 @@
 abstract class DomainBase implements DomainInterface
 {
 
-    const ASSETS_FOLDER = 'assets/';
-
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
-
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-    /**
-     * @var string $asset_namespace
-     */
-    private $asset_namespace;
-
-    /**
-     * @var string $assets_path
-     */
-    private $assets_path;
-
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @param string $asset_namespace
-     */
-    public function __construct(FilePath $plugin_file, Version $version, $asset_namespace = 'eventespresso')
-    {
-        $this->plugin_file = $plugin_file;
-        $this->version     = $version;
-        $this->initialize($asset_namespace);
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     * @since $VID:$
-     */
-    public function initialize($asset_namespace = 'eventespresso')
-    {
-        if (! $this->initialized) {
-            $this->plugin_basename = plugin_basename($this->pluginFile());
-            $this->plugin_path     = plugin_dir_path($this->pluginFile());
-            $this->plugin_url      = plugin_dir_url($this->pluginFile());
-            $this->setAssetNamespace($asset_namespace);
-            $this->setDistributionAssetsPath();
-            $this->initialized = true;
-        }
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     */
-    public function setAssetNamespace($asset_namespace = 'eventespresso')
-    {
-        if (! $this->asset_namespace) {
-            $this->asset_namespace = sanitize_key(
-                // convert directory separators to dashes and remove file extension
-                str_replace(['/', '.php'], ['-', ''], $asset_namespace)
-            );
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since $VID:$
-     */
-    private function setDistributionAssetsPath()
-    {
-        $assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
-        if (! is_readable($assets_path)) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The assets distribution folder was not found or is not readable. Please verify that "%1$s" exists and has valid permissions.',
-                        'event_espresso'
-                    ),
-                    $assets_path
-                )
-            );
-        }
-        $this->assets_path = trailingslashit($assets_path);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile()
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename()
-    {
-        return $this->plugin_basename;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginPath()
-    {
-        return $this->plugin_path;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginUrl()
-    {
-        return $this->plugin_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version()
-    {
-        return (string) $this->version;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsFolder()
-    {
-        return DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsPath($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
-            : $this->assets_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsUrl($additional_path = '')
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->asset_namespace;
-    }
+	const ASSETS_FOLDER = 'assets/';
+
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
+
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+	/**
+	 * @var string $asset_namespace
+	 */
+	private $asset_namespace;
+
+	/**
+	 * @var string $assets_path
+	 */
+	private $assets_path;
+
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @param string $asset_namespace
+	 */
+	public function __construct(FilePath $plugin_file, Version $version, $asset_namespace = 'eventespresso')
+	{
+		$this->plugin_file = $plugin_file;
+		$this->version     = $version;
+		$this->initialize($asset_namespace);
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 * @since $VID:$
+	 */
+	public function initialize($asset_namespace = 'eventespresso')
+	{
+		if (! $this->initialized) {
+			$this->plugin_basename = plugin_basename($this->pluginFile());
+			$this->plugin_path     = plugin_dir_path($this->pluginFile());
+			$this->plugin_url      = plugin_dir_url($this->pluginFile());
+			$this->setAssetNamespace($asset_namespace);
+			$this->setDistributionAssetsPath();
+			$this->initialized = true;
+		}
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 */
+	public function setAssetNamespace($asset_namespace = 'eventespresso')
+	{
+		if (! $this->asset_namespace) {
+			$this->asset_namespace = sanitize_key(
+				// convert directory separators to dashes and remove file extension
+				str_replace(['/', '.php'], ['-', ''], $asset_namespace)
+			);
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	private function setDistributionAssetsPath()
+	{
+		$assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
+		if (! is_readable($assets_path)) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The assets distribution folder was not found or is not readable. Please verify that "%1$s" exists and has valid permissions.',
+						'event_espresso'
+					),
+					$assets_path
+				)
+			);
+		}
+		$this->assets_path = trailingslashit($assets_path);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile()
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename()
+	{
+		return $this->plugin_basename;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginPath()
+	{
+		return $this->plugin_path;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginUrl()
+	{
+		return $this->plugin_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version()
+	{
+		return (string) $this->version;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsFolder()
+	{
+		return DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsPath($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_path . $additional_path
+			: $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsUrl($additional_path = '')
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
+			: $this->plugin_url . DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->asset_namespace;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function initialize($asset_namespace = 'eventespresso')
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->plugin_basename = plugin_basename($this->pluginFile());
             $this->plugin_path     = plugin_dir_path($this->pluginFile());
             $this->plugin_url      = plugin_dir_url($this->pluginFile());
@@ -104,7 +104,7 @@ 
      */
     public function setAssetNamespace($asset_namespace = 'eventespresso')
     {
-        if (! $this->asset_namespace) {
+        if ( ! $this->asset_namespace) {
             $this->asset_namespace = sanitize_key(
                 // convert directory separators to dashes and remove file extension
                 str_replace(['/', '.php'], ['-', ''], $asset_namespace)
@@ -119,8 +119,8 @@ 
      */
     private function setDistributionAssetsPath()
     {
-        $assets_path = $this->pluginPath() . DomainBase::ASSETS_FOLDER;
-        if (! is_readable($assets_path)) {
+        $assets_path = $this->pluginPath().DomainBase::ASSETS_FOLDER;
+        if ( ! is_readable($assets_path)) {
             throw new DomainException(
                 sprintf(
                     esc_html__(
@@ -205,7 +205,7 @@ 
     public function distributionAssetsPath($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
+            ? $this->assets_path.$additional_path
             : $this->assets_path;
     }
 
@@ -217,8 +217,8 @@ 
     public function distributionAssetsUrl($additional_path = '')
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
+            ? $this->plugin_url.DomainBase::ASSETS_FOLDER.$additional_path
+            : $this->plugin_url.DomainBase::ASSETS_FOLDER;
     }