eventespresso / event-espresso-core

core/domain/services/graphql/mutators/BulkEntityMutator.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         // $errors = [];
 
         try {
-            if (empty($input['uniqueInputs']) || !is_array($input['uniqueInputs'])) {
+            if (empty($input['uniqueInputs']) || ! is_array($input['uniqueInputs'])) {
                 throw new OutOfBoundsException(
                     esc_html__('A valid input was not provided.', 'event_espresso')
                 );

Indentation +59 added lines, -59 removed lines

@@ -10,69 +10,69 @@
 class BulkEntityMutator extends EntityMutator
 {
 
-    /**
-     * @var callable $entity_mutator .
-     */
-    protected $entity_mutator;
+	/**
+	 * @var callable $entity_mutator .
+	 */
+	protected $entity_mutator;
 
-    /**
-     * BulkEntityMutator constructor.
-     *
-     * @param callable $entity_mutator The mutator for an entity.
-     */
-    public function __construct(callable $entity_mutator)
-    {
-        $this->entity_mutator = $entity_mutator;
-    }
-    /**
-     * Bulk updates entities.
-     *
-     * @param array       $input   The input for the mutation
-     * @param AppContext  $context The AppContext passed down to all resolvers
-     * @param ResolveInfo $info    The ResolveInfo passed down to all resolvers
-     * @return array
-     */
-    public function updateEntities(array $input, AppContext $context, ResolveInfo $info): array
-    {
+	/**
+	 * BulkEntityMutator constructor.
+	 *
+	 * @param callable $entity_mutator The mutator for an entity.
+	 */
+	public function __construct(callable $entity_mutator)
+	{
+		$this->entity_mutator = $entity_mutator;
+	}
+	/**
+	 * Bulk updates entities.
+	 *
+	 * @param array       $input   The input for the mutation
+	 * @param AppContext  $context The AppContext passed down to all resolvers
+	 * @param ResolveInfo $info    The ResolveInfo passed down to all resolvers
+	 * @return array
+	 */
+	public function updateEntities(array $input, AppContext $context, ResolveInfo $info): array
+	{
 
-        $updated = [];
-        $failed = [];
-        // TODO Add meaningful error messages for every failure.
-        // $errors = [];
+		$updated = [];
+		$failed = [];
+		// TODO Add meaningful error messages for every failure.
+		// $errors = [];
 
-        try {
-            if (empty($input['uniqueInputs']) || !is_array($input['uniqueInputs'])) {
-                throw new OutOfBoundsException(
-                    esc_html__('A valid input was not provided.', 'event_espresso')
-                );
-            }
+		try {
+			if (empty($input['uniqueInputs']) || !is_array($input['uniqueInputs'])) {
+				throw new OutOfBoundsException(
+					esc_html__('A valid input was not provided.', 'event_espresso')
+				);
+			}
 
-            $sharedInput = ! empty($input['sharedInput']) ? $input['sharedInput'] : [];
+			$sharedInput = ! empty($input['sharedInput']) ? $input['sharedInput'] : [];
 
-            foreach ($input['uniqueInputs'] as $uniqueInput) {
-                try {
-                    // values in $uniqueInput will override those in $sharedInput
-                    $finalInput = array_merge($sharedInput, $uniqueInput);
-                    // mutate the individual entity.
-                    $mutator = $this->entity_mutator;
-                    $mutator($finalInput, $context, $info);
-                    // we are here it means the update was successful.
-                    $updated[] = $uniqueInput['id'];
-                } catch (Exception $e) {
-                    // sorry mate, couldn't help you :(
-                    $failed[] = $uniqueInput['id'];
-                }
-            }
-        } catch (Exception $exception) {
-            EntityMutator::handleExceptions(
-                $exception,
-                esc_html__(
-                    'Could not perform the update because of the following error(s)',
-                    'event_espresso'
-                )
-            );
-        }
+			foreach ($input['uniqueInputs'] as $uniqueInput) {
+				try {
+					// values in $uniqueInput will override those in $sharedInput
+					$finalInput = array_merge($sharedInput, $uniqueInput);
+					// mutate the individual entity.
+					$mutator = $this->entity_mutator;
+					$mutator($finalInput, $context, $info);
+					// we are here it means the update was successful.
+					$updated[] = $uniqueInput['id'];
+				} catch (Exception $e) {
+					// sorry mate, couldn't help you :(
+					$failed[] = $uniqueInput['id'];
+				}
+			}
+		} catch (Exception $exception) {
+			EntityMutator::handleExceptions(
+				$exception,
+				esc_html__(
+					'Could not perform the update because of the following error(s)',
+					'event_espresso'
+				)
+			);
+		}
 
-        return compact('updated', 'failed');
-    }
+		return compact('updated', 'failed');
+	}
 }

core/domain/services/graphql/mutators/TicketBulkUpdate.php

Indentation +13 added lines, -13 removed lines

@@ -8,17 +8,17 @@
 class TicketBulkUpdate extends EntityMutator
 {
 
-    /**
-     * Defines the mutation data modification closure.
-     *
-     * @param EEM_Ticket $model
-     * @param Ticket     $type
-     * @return callable
-     */
-    public static function mutateAndGetPayload(EEM_Ticket $model, Ticket $type)
-    {
-        $entityMutator = TicketUpdate::mutateAndGetPayload($model, $type);
-        $bulkMutator = new BulkEntityMutator($entityMutator);
-        return array($bulkMutator, 'updateEntities');
-    }
+	/**
+	 * Defines the mutation data modification closure.
+	 *
+	 * @param EEM_Ticket $model
+	 * @param Ticket     $type
+	 * @return callable
+	 */
+	public static function mutateAndGetPayload(EEM_Ticket $model, Ticket $type)
+	{
+		$entityMutator = TicketUpdate::mutateAndGetPayload($model, $type);
+		$bulkMutator = new BulkEntityMutator($entityMutator);
+		return array($bulkMutator, 'updateEntities');
+	}
 }

core/services/factory/Factory.php

Indentation +13 added lines, -13 removed lines

@@ -7,19 +7,19 @@
 abstract class Factory implements FactoryInterface
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * RouteFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * RouteFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 }

core/services/assets/AssetManifestFactory.php

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function create($fqcn, array $arguments = [])
     {
-        if (! isset($arguments[0]) || ! $arguments[0] instanceof DomainInterface) {
+        if ( ! isset($arguments[0]) || ! $arguments[0] instanceof DomainInterface) {
             throw new InvalidArgumentException(
                 esc_html__(
                     'In order to generate an AssetManifest class you need to supply an array where the first argument is an instance of DomainInterface.',
@@ -73,9 +73,9 @@ 
     private function getAssetManifestForDomain($manifest_fqcn, DomainInterface $domain)
     {
         $domain_fqcn = get_class($domain);
-        if (! isset(AssetManifestFactory::$manifests[ $domain_fqcn ])) {
+        if ( ! isset(AssetManifestFactory::$manifests[$domain_fqcn])) {
             $asset_manifest = new $manifest_fqcn($domain);
-            if (! $asset_manifest instanceof AssetManifestInterface || ! $asset_manifest instanceof $manifest_fqcn) {
+            if ( ! $asset_manifest instanceof AssetManifestInterface || ! $asset_manifest instanceof $manifest_fqcn) {
                 throw new DomainException(
                     sprintf(
                         esc_html__(
@@ -88,8 +88,8 @@ 
             }
             // we still need to share this with the core loader to facilitate automatic dependency injection
             $this->loader->share(AssetManifest::class, $asset_manifest, [$domain]);
-            AssetManifestFactory::$manifests[ $domain_fqcn ] = $asset_manifest;
+            AssetManifestFactory::$manifests[$domain_fqcn] = $asset_manifest;
         }
-        return AssetManifestFactory::$manifests[ $domain_fqcn ];
+        return AssetManifestFactory::$manifests[$domain_fqcn];
     }
 }

Indentation +73 added lines, -73 removed lines

@@ -16,86 +16,86 @@
  */
 class AssetManifestFactory implements FactoryInterface
 {
-    /**
-     * @var AssetManifestInterface[]
-     */
-    private static $manifests = [];
+	/**
+	 * @var AssetManifestInterface[]
+	 */
+	private static $manifests = [];
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * AssetManifestFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * AssetManifestFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * returns the applicable AssetManifest for the provided Domain
-     *
-     * @param DomainInterface $domain
-     * @return AssetManifestInterface
-     */
-    public function createFromDomainObject(DomainInterface $domain)
-    {
-        return $this->getAssetManifestForDomain(AssetManifest::class, $domain);
-    }
+	/**
+	 * returns the applicable AssetManifest for the provided Domain
+	 *
+	 * @param DomainInterface $domain
+	 * @return AssetManifestInterface
+	 */
+	public function createFromDomainObject(DomainInterface $domain)
+	{
+		return $this->getAssetManifestForDomain(AssetManifest::class, $domain);
+	}
 
 
-    /**
-     * for creating an atypical AssetManifest for the Domain provided in the $arguments array
-     *
-     * @param string $fqcn      Fully Qualified Class Name
-     * @param array  $arguments [optional] array of data required for construction
-     * @return AssetManifestInterface
-     */
-    public function create($fqcn, array $arguments = [])
-    {
-        if (! isset($arguments[0]) || ! $arguments[0] instanceof DomainInterface) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'In order to generate an AssetManifest class you need to supply an array where the first argument is an instance of DomainInterface.',
-                    'event_espresso'
-                )
-            );
-        }
-        return $this->getAssetManifestForDomain($fqcn, $arguments[0]);
-    }
+	/**
+	 * for creating an atypical AssetManifest for the Domain provided in the $arguments array
+	 *
+	 * @param string $fqcn      Fully Qualified Class Name
+	 * @param array  $arguments [optional] array of data required for construction
+	 * @return AssetManifestInterface
+	 */
+	public function create($fqcn, array $arguments = [])
+	{
+		if (! isset($arguments[0]) || ! $arguments[0] instanceof DomainInterface) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'In order to generate an AssetManifest class you need to supply an array where the first argument is an instance of DomainInterface.',
+					'event_espresso'
+				)
+			);
+		}
+		return $this->getAssetManifestForDomain($fqcn, $arguments[0]);
+	}
 
 
-    /**
-     * @param string          $manifest_fqcn
-     * @param DomainInterface $domain
-     * @return AssetManifestInterface
-     */
-    private function getAssetManifestForDomain($manifest_fqcn, DomainInterface $domain)
-    {
-        $domain_fqcn = get_class($domain);
-        if (! isset(AssetManifestFactory::$manifests[ $domain_fqcn ])) {
-            $asset_manifest = new $manifest_fqcn($domain);
-            if (! $asset_manifest instanceof AssetManifestInterface || ! $asset_manifest instanceof $manifest_fqcn) {
-                throw new DomainException(
-                    sprintf(
-                        esc_html__(
-                            'The requested AssetManifest class "%1$s" could not be loaded.',
-                            'event_espresso'
-                        ),
-                        $manifest_fqcn
-                    )
-                );
-            }
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            $this->loader->share(AssetManifest::class, $asset_manifest, [$domain]);
-            AssetManifestFactory::$manifests[ $domain_fqcn ] = $asset_manifest;
-        }
-        return AssetManifestFactory::$manifests[ $domain_fqcn ];
-    }
+	/**
+	 * @param string          $manifest_fqcn
+	 * @param DomainInterface $domain
+	 * @return AssetManifestInterface
+	 */
+	private function getAssetManifestForDomain($manifest_fqcn, DomainInterface $domain)
+	{
+		$domain_fqcn = get_class($domain);
+		if (! isset(AssetManifestFactory::$manifests[ $domain_fqcn ])) {
+			$asset_manifest = new $manifest_fqcn($domain);
+			if (! $asset_manifest instanceof AssetManifestInterface || ! $asset_manifest instanceof $manifest_fqcn) {
+				throw new DomainException(
+					sprintf(
+						esc_html__(
+							'The requested AssetManifest class "%1$s" could not be loaded.',
+							'event_espresso'
+						),
+						$manifest_fqcn
+					)
+				);
+			}
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			$this->loader->share(AssetManifest::class, $asset_manifest, [$domain]);
+			AssetManifestFactory::$manifests[ $domain_fqcn ] = $asset_manifest;
+		}
+		return AssetManifestFactory::$manifests[ $domain_fqcn ];
+	}
 }

core/services/assets/Barista.php

Indentation +79 added lines, -79 removed lines

@@ -13,94 +13,94 @@
 class Barista implements BaristaInterface
 {
 
-    const DEPENDENCY_LIST_REGISTERED = 'registered';
+	const DEPENDENCY_LIST_REGISTERED = 'registered';
 
 
-    /**
-     * @var AssetManifestInterface
-     */
-    private $asset_manifest;
+	/**
+	 * @var AssetManifestInterface
+	 */
+	private $asset_manifest;
 
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
 
 
-    /**
-     * Barista constructor.
-     *
-     * @param AssetManifestInterface $asset_manifest
-     */
-    public function __construct(AssetManifestInterface $asset_manifest)
-    {
-        $this->asset_manifest = $asset_manifest;
-    }
+	/**
+	 * Barista constructor.
+	 *
+	 * @param AssetManifestInterface $asset_manifest
+	 */
+	public function __construct(AssetManifestInterface $asset_manifest)
+	{
+		$this->asset_manifest = $asset_manifest;
+	}
 
 
-    /**
-     * @return void
-     */
-    public function initialize()
-    {
-        if (! $this->initialized) {
-            $this->asset_manifest->initialize();
-            add_action('wp_enqueue_scripts', [$this, 'registerScripts'], 0);
-            add_action('admin_enqueue_scripts', [$this, 'registerScripts'], 0);
-            add_action('wp_enqueue_scripts', [$this, 'registerStyles'], 0);
-            add_action('admin_enqueue_scripts', [$this, 'registerStyles'], 0);
-            $this->initialized = true;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function initialize()
+	{
+		if (! $this->initialized) {
+			$this->asset_manifest->initialize();
+			add_action('wp_enqueue_scripts', [$this, 'registerScripts'], 0);
+			add_action('admin_enqueue_scripts', [$this, 'registerScripts'], 0);
+			add_action('wp_enqueue_scripts', [$this, 'registerStyles'], 0);
+			add_action('admin_enqueue_scripts', [$this, 'registerStyles'], 0);
+			$this->initialized = true;
+		}
+	}
 
 
-    /**
-     * Registers all the WordPress packages scripts that are in the standardized
-     * `build/` location.
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function registerScripts()
-    {
-        try {
-            $entry_points = $this->asset_manifest->getEntryPoints();
-            foreach ($entry_points as $entry_point) {
-                if ($this->asset_manifest->hasAsset($entry_point)) {
-                    $handle = $this->asset_manifest->getAssetHandle($entry_point);
-                    $source = $this->asset_manifest->getAssetUrl($entry_point);
-                    $dependencies = $this->asset_manifest->getAssetDependencies($entry_point);
-                    $version = $this->asset_manifest->getAssetVersion($entry_point);
-                    wp_register_script($handle, $source, $dependencies, $version, true);
-                }
-            }
-        } catch (Exception $exception) {
-            wp_die(new ExceptionStackTraceDisplay($exception));
-        }
-    }
+	/**
+	 * Registers all the WordPress packages scripts that are in the standardized
+	 * `build/` location.
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function registerScripts()
+	{
+		try {
+			$entry_points = $this->asset_manifest->getEntryPoints();
+			foreach ($entry_points as $entry_point) {
+				if ($this->asset_manifest->hasAsset($entry_point)) {
+					$handle = $this->asset_manifest->getAssetHandle($entry_point);
+					$source = $this->asset_manifest->getAssetUrl($entry_point);
+					$dependencies = $this->asset_manifest->getAssetDependencies($entry_point);
+					$version = $this->asset_manifest->getAssetVersion($entry_point);
+					wp_register_script($handle, $source, $dependencies, $version, true);
+				}
+			}
+		} catch (Exception $exception) {
+			wp_die(new ExceptionStackTraceDisplay($exception));
+		}
+	}
 
 
-    /**
-     * Registers all the packages and domain styles that are in the build folder.
-     *
-     * @return void
-     * @throws Exception
-     */
-    public function registerStyles()
-    {
-        try {
-            $entry_points = $this->asset_manifest->getEntryPoints();
-            foreach ($entry_points as $entry_point) {
-                if ($this->asset_manifest->hasAsset($entry_point, AssetManifest::ASSET_EXT_CSS)) {
-                    $handle = $this->asset_manifest->getAssetHandle($entry_point);
-                    $source = $this->asset_manifest->getAssetUrl($entry_point, AssetManifest::ASSET_EXT_CSS);
-                    $dependencies = $this->asset_manifest->getAssetDependencies($entry_point, AssetManifest::ASSET_EXT_CSS);
-                    $version = $this->asset_manifest->getAssetVersion($entry_point, AssetManifest::ASSET_EXT_CSS);
-                    wp_register_style($handle, $source, $dependencies, $version, 'all');
-                }
-            }
-        } catch (Exception $exception) {
-            wp_die(new ExceptionStackTraceDisplay($exception));
-        }
-    }
+	/**
+	 * Registers all the packages and domain styles that are in the build folder.
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function registerStyles()
+	{
+		try {
+			$entry_points = $this->asset_manifest->getEntryPoints();
+			foreach ($entry_points as $entry_point) {
+				if ($this->asset_manifest->hasAsset($entry_point, AssetManifest::ASSET_EXT_CSS)) {
+					$handle = $this->asset_manifest->getAssetHandle($entry_point);
+					$source = $this->asset_manifest->getAssetUrl($entry_point, AssetManifest::ASSET_EXT_CSS);
+					$dependencies = $this->asset_manifest->getAssetDependencies($entry_point, AssetManifest::ASSET_EXT_CSS);
+					$version = $this->asset_manifest->getAssetVersion($entry_point, AssetManifest::ASSET_EXT_CSS);
+					wp_register_style($handle, $source, $dependencies, $version, 'all');
+				}
+			}
+		} catch (Exception $exception) {
+			wp_die(new ExceptionStackTraceDisplay($exception));
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
      */
     public function initialize()
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->asset_manifest->initialize();
             add_action('wp_enqueue_scripts', [$this, 'registerScripts'], 0);
             add_action('admin_enqueue_scripts', [$this, 'registerScripts'], 0);

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/BaristaFactory.php

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];
     }
 
 

Indentation +109 added lines, -109 removed lines

@@ -11,114 +11,114 @@
 
 class BaristaFactory implements FactoryInterface
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
-
-    /**
-     * @var BaristaInterface[]
-     */
-    private static $baristas = [];
-
-    /**
-     * @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;
-    }
-
-
-    /**
-     * @param string $domain_fqcn
-     * @return BaristaInterface
-     */
-    public function createFromDomainClass($domain_fqcn)
-    {
-        /** @var DomainInterface $domain */
-        $domain = $this->loader->getShared($domain_fqcn);
-        return $this->createFromDomainObject($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 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.
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
+
+	/**
+	 * @var BaristaInterface[]
+	 */
+	private static $baristas = [];
+
+	/**
+	 * @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;
+	}
+
+
+	/**
+	 * @param string $domain_fqcn
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainClass($domain_fqcn)
+	{
+		/** @var DomainInterface $domain */
+		$domain = $this->loader->getShared($domain_fqcn);
+		return $this->createFromDomainObject($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 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.
                     %1$sThe supplied FQCN ("%2$s") is either invalid or the class is missing.',
-                    'event_espresso'
-                ),
-                '<br />',
-                $domain_fqcn
-            )
-        );
-    }
+					'event_espresso'
+				),
+				'<br />',
+				$domain_fqcn
+			)
+		);
+	}
 }

core/services/assets/JedLocaleData.php

Indentation +30 added lines, -30 removed lines

@@ -15,35 +15,35 @@
 class JedLocaleData
 {
 
-    /**
-     * @var array $locales
-     */
-    protected $locales = [];
+	/**
+	 * @var array $locales
+	 */
+	protected $locales = [];
 
-    /**
-     * Returns Jed-formatted localization data.
-     *
-     * @param string $domain Translation domain.
-     * @return array
-     */
-    public function getData($domain = Domain::TEXT_DOMAIN)
-    {
-        if (! isset($locales[ $domain ])) {
-            $translations = get_translations_for_domain($domain);
-            $locale = [
-                '' => [
-                    'domain' => $domain,
-                    'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
-                ],
-            ];
-            if (! empty($translations->headers['Plural-Forms'])) {
-                $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
-            }
-            foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
-            }
-            $locales[ $domain ] = $locale;
-        }
-        return $locales[ $domain ];
-    }
+	/**
+	 * Returns Jed-formatted localization data.
+	 *
+	 * @param string $domain Translation domain.
+	 * @return array
+	 */
+	public function getData($domain = Domain::TEXT_DOMAIN)
+	{
+		if (! isset($locales[ $domain ])) {
+			$translations = get_translations_for_domain($domain);
+			$locale = [
+				'' => [
+					'domain' => $domain,
+					'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
+				],
+			];
+			if (! empty($translations->headers['Plural-Forms'])) {
+				$locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
+			}
+			foreach ($translations->entries as $id => $entry) {
+				$locale[ $id ] = $entry->translations;
+			}
+			$locales[ $domain ] = $locale;
+		}
+		return $locales[ $domain ];
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function getData($domain = Domain::TEXT_DOMAIN)
     {
-        if (! isset($locales[ $domain ])) {
+        if ( ! isset($locales[$domain])) {
             $translations = get_translations_for_domain($domain);
             $locale = [
                 '' => [
@@ -36,14 +36,14 @@ 
                     'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
                 ],
             ];
-            if (! empty($translations->headers['Plural-Forms'])) {
+            if ( ! empty($translations->headers['Plural-Forms'])) {
                 $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
             }
             foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
+                $locale[$id] = $entry->translations;
             }
-            $locales[ $domain ] = $locale;
+            $locales[$domain] = $locale;
         }
-        return $locales[ $domain ];
+        return $locales[$domain];
     }
 }
\ No newline at end of file