eventespresso / event-espresso-core

core/services/options/JsonWpOptionManager.php

Indentation +32 added lines, -32 removed lines

@@ -16,39 +16,39 @@
  */
 class JsonWpOptionManager
 {
-    /**
-     * Updates the object with what's in the DB (specifically, the wp_options table). If nothing is in the DB, leaves
-     * the object alone and returns false.
-     * @since 4.9.80.p
-     * @param JsonWpOptionSerializableInterface $obj
-     * @return bool
-     */
-    public function populateFromDb(JsonWpOptionSerializableInterface $obj)
-    {
-        $option = get_option($obj->getWpOptionName());
-        if ($option) {
-            $json = json_decode($option, false);
-            if ($json instanceof stdClass) {
-                return $obj->fromJsonSerializedData($json);
-            }
-        }
-        return false;
-    }
+	/**
+	 * Updates the object with what's in the DB (specifically, the wp_options table). If nothing is in the DB, leaves
+	 * the object alone and returns false.
+	 * @since 4.9.80.p
+	 * @param JsonWpOptionSerializableInterface $obj
+	 * @return bool
+	 */
+	public function populateFromDb(JsonWpOptionSerializableInterface $obj)
+	{
+		$option = get_option($obj->getWpOptionName());
+		if ($option) {
+			$json = json_decode($option, false);
+			if ($json instanceof stdClass) {
+				return $obj->fromJsonSerializedData($json);
+			}
+		}
+		return false;
+	}
 
-    /**
-     * Saves the object's data to the wp_options table for later use.
-     * @since 4.9.80.p
-     * @param JsonWpOptionSerializableInterface $obj
-     * @return bool
-     */
-    public function saveToDb(JsonWpOptionSerializableInterface $obj)
-    {
-        return update_option(
-            $obj->getWpOptionName(),
-            wp_json_encode($obj->toJsonSerializableData()),
-            false
-        );
-    }
+	/**
+	 * Saves the object's data to the wp_options table for later use.
+	 * @since 4.9.80.p
+	 * @param JsonWpOptionSerializableInterface $obj
+	 * @return bool
+	 */
+	public function saveToDb(JsonWpOptionSerializableInterface $obj)
+	{
+		return update_option(
+			$obj->getWpOptionName(),
+			wp_json_encode($obj->toJsonSerializableData()),
+			false
+		);
+	}
 }
 // End of file JsonWpOptionManager.php
 // Location: EventEspresso\core\services\options/JsonWpOptionManager.php

core/services/json/JsonDataNodeValidator.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function propertyNotSet(array $data, $key, $type = 'key')
     {
-        if (isset($data[ $key ])) {
+        if (isset($data[$key])) {
             $this->overwriteError($key, $type);
             return false;
         }

Indentation +62 added lines, -62 removed lines

@@ -14,76 +14,76 @@
 class JsonDataNodeValidator
 {
 
-    /**
-     * @param array  $data      data array to check for property key
-     * @param string $key       value for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @return bool             returns true if property is safe to write, false if overwrite will occur
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function propertyNotSet(array $data, $key, $type = 'key')
-    {
-        if (isset($data[ $key ])) {
-            $this->overwriteError($key, $type);
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @param array  $data      data array to check for property key
+	 * @param string $key       value for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @return bool             returns true if property is safe to write, false if overwrite will occur
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function propertyNotSet(array $data, $key, $type = 'key')
+	{
+		if (isset($data[ $key ])) {
+			$this->overwriteError($key, $type);
+			return false;
+		}
+		return true;
+	}
 
 
-    /**
-     * @param string $key       value for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function overwriteError($key, $type)
-    {
-        if (WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    /*
+	/**
+	 * @param string $key       value for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function overwriteError($key, $type)
+	{
+		if (WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					/*
                      * translators:
                      * 'The "i18n" JsonDataNode key is already set and would be overwritten by the current action.'
                      */
-                    esc_html__(
-                        'The "%1$s" JsonDataNode %2$s is already set and would be overwritten by the current action.',
-                        'event_espresso'
-                    ),
-                    $key,
-                    $type
-                )
-            );
-        }
-    }
+					esc_html__(
+						'The "%1$s" JsonDataNode %2$s is already set and would be overwritten by the current action.',
+						'event_espresso'
+					),
+					$key,
+					$type
+				)
+			);
+		}
+	}
 
 
-    /**
-     * @param string $property  name for the key being checked for
-     * @param string $type      the type of key and/or the data being checked
-     * @param bool   $throw     if true [default] and WP_DEBUG is also true, then will throw exceptions
-     * @return bool             returns true if property is set, false if property is missing
-     * @throws DomainException  throws exception if WP_DEBUG is true
-     */
-    public function validateCriticalProperty($property, $type, $throw = true)
-    {
-        if (empty($property)) {
-            if (WP_DEBUG && $throw) {
-                throw new DomainException(
-                    sprintf(
-                        /*
+	/**
+	 * @param string $property  name for the key being checked for
+	 * @param string $type      the type of key and/or the data being checked
+	 * @param bool   $throw     if true [default] and WP_DEBUG is also true, then will throw exceptions
+	 * @return bool             returns true if property is set, false if property is missing
+	 * @throws DomainException  throws exception if WP_DEBUG is true
+	 */
+	public function validateCriticalProperty($property, $type, $throw = true)
+	{
+		if (empty($property)) {
+			if (WP_DEBUG && $throw) {
+				throw new DomainException(
+					sprintf(
+						/*
                          * translators:
                          * 'The JsonDataNodeHandler domain route is a required property but has not been set.'
                          */
-                        esc_html__(
-                            'The JsonDataNodeHandler %1$s is a required property but has not been set.',
-                            'event_espresso'
-                        ),
-                        $type
-                    )
-                );
-            }
-            return false;
-        }
-        return true;
-    }
+						esc_html__(
+							'The JsonDataNodeHandler %1$s is a required property but has not been set.',
+							'event_espresso'
+						),
+						$type
+					)
+				);
+			}
+			return false;
+		}
+		return true;
+	}
 }

core/services/json/JsonDataNodeHandler.php

Indentation +125 added lines, -125 removed lines

@@ -18,129 +18,129 @@
 class JsonDataNodeHandler
 {
 
-    /**
-     * @var PrimaryJsonDataNode $primary_data_node
-     */
-    private $primary_data_node;
-
-    /**
-     * @var JsonDataNodeValidator $validator
-     */
-    private $validator;
-
-
-    /**
-     * JsonDataNodeHandler constructor.
-     *
-     * @param JsonDataNodeValidator $validator
-     */
-    public function __construct(JsonDataNodeValidator $validator)
-    {
-        $this->validator = $validator;
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    public function addDataNode(JsonDataNode $data_node)
-    {
-        if ($data_node->isNotInitialized()) {
-            $this->validatePrimaryDataNode($data_node);
-            $this->primary_data_node->addDataNode($data_node);
-        }
-    }
-
-
-    /**
-     * @param PrimaryJsonDataNode $primary_data_node
-     */
-    public function setPrimaryDataNode(PrimaryJsonDataNode $primary_data_node)
-    {
-        $this->primary_data_node = $primary_data_node;
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @param int                $depth
-     * @return mixed
-     * @since $VID:$
-     */
-    private function initializeDataNodes(JsonDataNode $data_node, $depth = 0)
-    {
-        $depth++;
-        $data = [];
-        // initialize the data node if not done already
-        if ($data_node->isNotInitialized()) {
-            $data_node->initialize();
-            // grab the data node's data array
-            $data_node_data = $data_node->data();
-            foreach ($data_node_data as $child_node_name => $child_node) {
-                // don't parse node if it's the primary, OR if depth has exceeded wp_json_encode() limit
-                if ($child_node instanceof PrimaryJsonDataNode || $depth > 512) {
-                    continue;
-                }
-                if ($child_node instanceof JsonDataNode) {
-                    // feed data node back into this function
-                    $data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
-                } else {
-                    // or assign data directly
-                    $data[ $child_node_name ] = $child_node;
-                }
-            }
-        }
-        return $data;
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since $VID:$
-     */
-    public function printDataNode()
-    {
-        // validate that the domain, node name, and target script are set
-        $domain = $this->primary_data_node->domain();
-        $node_name = $this->primary_data_node->nodeName();
-        $target_script = $this->primary_data_node->targetScript();
-        $data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
-                       && $this->validator->validateCriticalProperty($node_name, 'node name', false)
-                       && $this->validator->validateCriticalProperty($target_script, 'target script', false);
-        if (! $data_valid) {
-            return;
-        }
-        // initialize and parse data from primary data node
-        $data = $this->initializeDataNodes($this->primary_data_node);
-        // this prepends the current domain "use case" to the front of the array
-        $data = ['domain' => $domain] + $data;
-        // add legacy i18n strings
-        $data['eei18n'] = EE_Registry::$i18n_js_strings;
-        // and finally JSON encode the data and attach to the target script
-        $data = json_encode($data);
-        wp_add_inline_script($target_script, "var {$node_name}={$data};", 'before');
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    private function validatePrimaryDataNode(JsonDataNode $data_node)
-    {
-        // set primary data node if that's what the incoming node is
-        if ($data_node instanceof PrimaryJsonDataNode) {
-            $this->setPrimaryDataNode($data_node);
-        }
-        // and don't allow other nodes to be set until a primary is set
-        if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
-            throw new DomainException(
-                esc_html__(
-                    'A PrimaryJsonDataNode needs to be set before data nodes can be added.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
+	/**
+	 * @var PrimaryJsonDataNode $primary_data_node
+	 */
+	private $primary_data_node;
+
+	/**
+	 * @var JsonDataNodeValidator $validator
+	 */
+	private $validator;
+
+
+	/**
+	 * JsonDataNodeHandler constructor.
+	 *
+	 * @param JsonDataNodeValidator $validator
+	 */
+	public function __construct(JsonDataNodeValidator $validator)
+	{
+		$this->validator = $validator;
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	public function addDataNode(JsonDataNode $data_node)
+	{
+		if ($data_node->isNotInitialized()) {
+			$this->validatePrimaryDataNode($data_node);
+			$this->primary_data_node->addDataNode($data_node);
+		}
+	}
+
+
+	/**
+	 * @param PrimaryJsonDataNode $primary_data_node
+	 */
+	public function setPrimaryDataNode(PrimaryJsonDataNode $primary_data_node)
+	{
+		$this->primary_data_node = $primary_data_node;
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @param int                $depth
+	 * @return mixed
+	 * @since $VID:$
+	 */
+	private function initializeDataNodes(JsonDataNode $data_node, $depth = 0)
+	{
+		$depth++;
+		$data = [];
+		// initialize the data node if not done already
+		if ($data_node->isNotInitialized()) {
+			$data_node->initialize();
+			// grab the data node's data array
+			$data_node_data = $data_node->data();
+			foreach ($data_node_data as $child_node_name => $child_node) {
+				// don't parse node if it's the primary, OR if depth has exceeded wp_json_encode() limit
+				if ($child_node instanceof PrimaryJsonDataNode || $depth > 512) {
+					continue;
+				}
+				if ($child_node instanceof JsonDataNode) {
+					// feed data node back into this function
+					$data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
+				} else {
+					// or assign data directly
+					$data[ $child_node_name ] = $child_node;
+				}
+			}
+		}
+		return $data;
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	public function printDataNode()
+	{
+		// validate that the domain, node name, and target script are set
+		$domain = $this->primary_data_node->domain();
+		$node_name = $this->primary_data_node->nodeName();
+		$target_script = $this->primary_data_node->targetScript();
+		$data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
+					   && $this->validator->validateCriticalProperty($node_name, 'node name', false)
+					   && $this->validator->validateCriticalProperty($target_script, 'target script', false);
+		if (! $data_valid) {
+			return;
+		}
+		// initialize and parse data from primary data node
+		$data = $this->initializeDataNodes($this->primary_data_node);
+		// this prepends the current domain "use case" to the front of the array
+		$data = ['domain' => $domain] + $data;
+		// add legacy i18n strings
+		$data['eei18n'] = EE_Registry::$i18n_js_strings;
+		// and finally JSON encode the data and attach to the target script
+		$data = json_encode($data);
+		wp_add_inline_script($target_script, "var {$node_name}={$data};", 'before');
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	private function validatePrimaryDataNode(JsonDataNode $data_node)
+	{
+		// set primary data node if that's what the incoming node is
+		if ($data_node instanceof PrimaryJsonDataNode) {
+			$this->setPrimaryDataNode($data_node);
+		}
+		// and don't allow other nodes to be set until a primary is set
+		if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
+			throw new DomainException(
+				esc_html__(
+					'A PrimaryJsonDataNode needs to be set before data nodes can be added.',
+					'event_espresso'
+				)
+			);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -84,10 +84,10 @@ 
                 }
                 if ($child_node instanceof JsonDataNode) {
                     // feed data node back into this function
-                    $data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
+                    $data[$child_node_name] = $this->initializeDataNodes($child_node, $depth);
                 } else {
                     // or assign data directly
-                    $data[ $child_node_name ] = $child_node;
+                    $data[$child_node_name] = $child_node;
                 }
             }
         }
@@ -105,10 +105,10 @@ 
         $domain = $this->primary_data_node->domain();
         $node_name = $this->primary_data_node->nodeName();
         $target_script = $this->primary_data_node->targetScript();
-        $data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
+        $data_valid = $this->validator->validateCriticalProperty($domain, 'domain route', false)
                        && $this->validator->validateCriticalProperty($node_name, 'node name', false)
                        && $this->validator->validateCriticalProperty($target_script, 'target script', false);
-        if (! $data_valid) {
+        if ( ! $data_valid) {
             return;
         }
         // initialize and parse data from primary data node
@@ -134,7 +134,7 @@ 
             $this->setPrimaryDataNode($data_node);
         }
         // and don't allow other nodes to be set until a primary is set
-        if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
+        if ( ! $this->primary_data_node instanceof PrimaryJsonDataNode) {
             throw new DomainException(
                 esc_html__(
                     'A PrimaryJsonDataNode needs to be set before data nodes can be added.',

core/services/json/JsonDataNode.php

Indentation +179 added lines, -179 removed lines

@@ -18,183 +18,183 @@
 abstract class JsonDataNode implements JsonDataNodeInterface
 {
 
-    /**
-     * @var JsonDataNodeValidator $validator
-     */
-    protected $validator;
-
-    /**
-     * @var array $data
-     */
-    private $data = [];
-
-    /**
-     * @var string $domain
-     */
-    private $domain;
-
-    /**
-     * @var boolean $initialized
-     */
-    private $initialized = false;
-
-    /**
-     * @var string $node_name
-     */
-    private $node_name;
-
-
-    /**
-     * JsonDataNodeHandler constructor.
-     *
-     * @param JsonDataNodeValidator $validator
-     * @throws DomainException
-     */
-    public function __construct(JsonDataNodeValidator $validator)
-    {
-        $this->validator = $validator;
-    }
-
-
-    /**
-     * for adding primitive data like arrays, integers, or strings
-     *
-     * @param string $key
-     * @param mixed  $data
-     * @throws DomainException
-     */
-    protected function addData($key, $data)
-    {
-        if ($this->validator->propertyNotSet($this->data, $key)) {
-            $this->data[ $key ] = $data;
-        }
-    }
-
-
-    /**
-     * for embedding other JsonDataNode objects within this one
-     *
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    public function addDataNode(JsonDataNode $data_node)
-    {
-        if ($data_node->isNotInitialized()) {
-            // $data_node->initialize();
-            $key = $data_node->nodeName();
-            $this->addData($key, $data_node);
-            // if the node being added specifies a domain (use case)
-            // and this is the primary data node, then set the domain
-            if ($this instanceof PrimaryJsonDataNode && $data_node->domain() !== null) {
-                $this->setDomain($data_node->domain());
-            }
-        }
-    }
-
-
-    /**
-     * sets the domain (use case) that this data node provides data for
-     *
-     * @param string $domain
-     * @throws DomainException
-     */
-    protected function setDomain($domain)
-    {
-        if ($this->domain !== null) {
-            $this->validator->overwriteError($domain, 'domain route');
-        }
-        $this->domain = $domain;
-    }
-
-
-    /**
-     * used to mark the data node as having been processed
-     *
-     * @param bool $initialized
-     */
-    protected function setInitialized($initialized)
-    {
-        $this->initialized = filter_var($initialized, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * self explanatory (i hope)
-     *
-     * @param string $node_name
-     * @throws DomainException
-     */
-    protected function setNodeName($node_name)
-    {
-        $this->validator->validateCriticalProperty($node_name, 'node name');
-        $this->node_name = $node_name;
-    }
-
-
-    /**
-     * the actual data in key value array format
-     *
-     * @return array
-     */
-    public function data()
-    {
-        return $this->data;
-    }
-
-
-    /**
-     * the domain (use case) that this data node provides data for
-     *
-     * @return string
-     */
-    public function domain()
-    {
-        return $this->domain;
-    }
-
-
-    /**
-     * true if the data node has been initialized,
-     * which entails retrieving the required data and adding it to the data node data array
-     *
-     * @return bool
-     */
-    public function isInitialized()
-    {
-        return $this->initialized;
-    }
-
-
-    /**
-     * true if the data node has NOT been initialized
-     *
-     * @return bool
-     */
-    public function isNotInitialized()
-    {
-        return ! $this->initialized;
-    }
-
-
-    /**
-     * Specify data which should be serialized to JSON
-     *
-     * @link  https://php.net/manual/en/jsonserializable.jsonserialize.php
-     * @return mixed data which can be serialized by json_encode
-     */
-    public function jsonSerialize()
-    {
-        return $this->data;
-    }
-
-
-    /**
-     * self explanatory (i hope)
-     *
-     * @return string
-     */
-    public function nodeName()
-    {
-        return $this->node_name;
-    }
+	/**
+	 * @var JsonDataNodeValidator $validator
+	 */
+	protected $validator;
+
+	/**
+	 * @var array $data
+	 */
+	private $data = [];
+
+	/**
+	 * @var string $domain
+	 */
+	private $domain;
+
+	/**
+	 * @var boolean $initialized
+	 */
+	private $initialized = false;
+
+	/**
+	 * @var string $node_name
+	 */
+	private $node_name;
+
+
+	/**
+	 * JsonDataNodeHandler constructor.
+	 *
+	 * @param JsonDataNodeValidator $validator
+	 * @throws DomainException
+	 */
+	public function __construct(JsonDataNodeValidator $validator)
+	{
+		$this->validator = $validator;
+	}
+
+
+	/**
+	 * for adding primitive data like arrays, integers, or strings
+	 *
+	 * @param string $key
+	 * @param mixed  $data
+	 * @throws DomainException
+	 */
+	protected function addData($key, $data)
+	{
+		if ($this->validator->propertyNotSet($this->data, $key)) {
+			$this->data[ $key ] = $data;
+		}
+	}
+
+
+	/**
+	 * for embedding other JsonDataNode objects within this one
+	 *
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	public function addDataNode(JsonDataNode $data_node)
+	{
+		if ($data_node->isNotInitialized()) {
+			// $data_node->initialize();
+			$key = $data_node->nodeName();
+			$this->addData($key, $data_node);
+			// if the node being added specifies a domain (use case)
+			// and this is the primary data node, then set the domain
+			if ($this instanceof PrimaryJsonDataNode && $data_node->domain() !== null) {
+				$this->setDomain($data_node->domain());
+			}
+		}
+	}
+
+
+	/**
+	 * sets the domain (use case) that this data node provides data for
+	 *
+	 * @param string $domain
+	 * @throws DomainException
+	 */
+	protected function setDomain($domain)
+	{
+		if ($this->domain !== null) {
+			$this->validator->overwriteError($domain, 'domain route');
+		}
+		$this->domain = $domain;
+	}
+
+
+	/**
+	 * used to mark the data node as having been processed
+	 *
+	 * @param bool $initialized
+	 */
+	protected function setInitialized($initialized)
+	{
+		$this->initialized = filter_var($initialized, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * self explanatory (i hope)
+	 *
+	 * @param string $node_name
+	 * @throws DomainException
+	 */
+	protected function setNodeName($node_name)
+	{
+		$this->validator->validateCriticalProperty($node_name, 'node name');
+		$this->node_name = $node_name;
+	}
+
+
+	/**
+	 * the actual data in key value array format
+	 *
+	 * @return array
+	 */
+	public function data()
+	{
+		return $this->data;
+	}
+
+
+	/**
+	 * the domain (use case) that this data node provides data for
+	 *
+	 * @return string
+	 */
+	public function domain()
+	{
+		return $this->domain;
+	}
+
+
+	/**
+	 * true if the data node has been initialized,
+	 * which entails retrieving the required data and adding it to the data node data array
+	 *
+	 * @return bool
+	 */
+	public function isInitialized()
+	{
+		return $this->initialized;
+	}
+
+
+	/**
+	 * true if the data node has NOT been initialized
+	 *
+	 * @return bool
+	 */
+	public function isNotInitialized()
+	{
+		return ! $this->initialized;
+	}
+
+
+	/**
+	 * Specify data which should be serialized to JSON
+	 *
+	 * @link  https://php.net/manual/en/jsonserializable.jsonserialize.php
+	 * @return mixed data which can be serialized by json_encode
+	 */
+	public function jsonSerialize()
+	{
+		return $this->data;
+	}
+
+
+	/**
+	 * self explanatory (i hope)
+	 *
+	 * @return string
+	 */
+	public function nodeName()
+	{
+		return $this->node_name;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     protected function addData($key, $data)
     {
         if ($this->validator->propertyNotSet($this->data, $key)) {
-            $this->data[ $key ] = $data;
+            $this->data[$key] = $data;
         }
     }
 

core/services/graphql/GraphQLManager.php

Indentation +63 added lines, -63 removed lines

@@ -16,76 +16,76 @@
 class GraphQLManager implements GQLManagerInterface
 {
 
-    /**
-     * @var ConnectionsManager $connections_manager
-     */
-    protected $connections_manager;
+	/**
+	 * @var ConnectionsManager $connections_manager
+	 */
+	protected $connections_manager;
 
-    /**
-     * @var DataLoaderManager $data_loader_manager
-     */
-    protected $data_loader_manager;
+	/**
+	 * @var DataLoaderManager $data_loader_manager
+	 */
+	protected $data_loader_manager;
 
-    /**
-     * @var EnumsManager $enums_manager
-     */
-    protected $enums_manager;
+	/**
+	 * @var EnumsManager $enums_manager
+	 */
+	protected $enums_manager;
 
-    /**
-     * @var InputsManager $inputs_manager
-     */
-    protected $inputs_manager;
+	/**
+	 * @var InputsManager $inputs_manager
+	 */
+	protected $inputs_manager;
 
-    /**
-     * @var TypesManager $types_manager
-     */
-    protected $types_manager;
+	/**
+	 * @var TypesManager $types_manager
+	 */
+	protected $types_manager;
 
-    /**
-     * @var boolean $initialized
-     */
-    private $initialized = false;
+	/**
+	 * @var boolean $initialized
+	 */
+	private $initialized = false;
 
 
-    /**
-     * GraphQLManager constructor.
-     *
-     * @param ConnectionsManager $connections_manager
-     * @param DataLoaderManager $data_loader_manager
-     * @param EnumsManager $enums_manager
-     * @param InputsManager $inputs_manager
-     * @param TypesManager $types_manager
-     */
-    public function __construct(
-        ConnectionsManager $connections_manager,
-        DataLoaderManager $data_loader_manager,
-        EnumsManager $enums_manager,
-        InputsManager $inputs_manager,
-        TypesManager $types_manager
-    ) {
-        $this->connections_manager = $connections_manager;
-        $this->data_loader_manager = $data_loader_manager;
-        $this->enums_manager = $enums_manager;
-        $this->inputs_manager = $inputs_manager;
-        $this->types_manager = $types_manager;
-    }
+	/**
+	 * GraphQLManager constructor.
+	 *
+	 * @param ConnectionsManager $connections_manager
+	 * @param DataLoaderManager $data_loader_manager
+	 * @param EnumsManager $enums_manager
+	 * @param InputsManager $inputs_manager
+	 * @param TypesManager $types_manager
+	 */
+	public function __construct(
+		ConnectionsManager $connections_manager,
+		DataLoaderManager $data_loader_manager,
+		EnumsManager $enums_manager,
+		InputsManager $inputs_manager,
+		TypesManager $types_manager
+	) {
+		$this->connections_manager = $connections_manager;
+		$this->data_loader_manager = $data_loader_manager;
+		$this->enums_manager = $enums_manager;
+		$this->inputs_manager = $inputs_manager;
+		$this->types_manager = $types_manager;
+	}
 
 
-    /**
-     * @throws CollectionDetailsException
-     * @throws CollectionLoaderException
-     * @since $VID:$
-     */
-    public function init()
-    {
-        if ($this->initialized) {
-            return;
-        }
-        $this->connections_manager->init();
-        $this->data_loader_manager->init();
-        $this->enums_manager->init();
-        $this->inputs_manager->init();
-        $this->types_manager->init();
-        $this->initialized = true;
-    }
+	/**
+	 * @throws CollectionDetailsException
+	 * @throws CollectionLoaderException
+	 * @since $VID:$
+	 */
+	public function init()
+	{
+		if ($this->initialized) {
+			return;
+		}
+		$this->connections_manager->init();
+		$this->data_loader_manager->init();
+		$this->enums_manager->init();
+		$this->inputs_manager->init();
+		$this->types_manager->init();
+		$this->initialized = true;
+	}
 }

core/services/assets/BlockAssetManager.php

Spacing +9 added lines, -9 removed lines

@@ -59,8 +59,8 @@ 
      */
     public function setEditorScriptHandle($editor_script_handle)
     {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+        if (strpos($editor_script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_script_handle = BlockInterface::NAME_SPACE.'-'.$editor_script_handle;
         }
         $this->editor_script_handle = $editor_script_handle;
     }
@@ -80,8 +80,8 @@ 
      */
     public function setEditorStyleHandle($editor_style_handle)
     {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $editor_style_handle = BlockInterface::NAME_SPACE.'-'.$editor_style_handle;
         }
         $this->editor_style_handle = $editor_style_handle;
     }
@@ -101,8 +101,8 @@ 
      */
     public function setScriptHandle($script_handle)
     {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+        if (strpos($script_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $script_handle = BlockInterface::NAME_SPACE.'-'.$script_handle;
         }
         $this->script_handle = $script_handle;
     }
@@ -122,8 +122,8 @@ 
      */
     public function setStyleHandle($style_handle)
     {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+        if (strpos($style_handle, BlockInterface::NAME_SPACE.'-') !== 0) {
+            $style_handle = BlockInterface::NAME_SPACE.'-'.$style_handle;
         }
         $this->style_handle = $style_handle;
     }
@@ -154,7 +154,7 @@ 
      */
     public function addEditorScript($handle, array $dependencies = array())
     {
-        if ($this->assets->hasJavascriptAsset($handle)){
+        if ($this->assets->hasJavascriptAsset($handle)) {
             return $this->assets->getJavascriptAsset($handle);
         }
         $dependencies = array_merge(

Indentation +248 added lines, -248 removed lines

@@ -21,253 +21,253 @@
  */
 abstract class BlockAssetManager extends AssetManager implements BlockAssetManagerInterface
 {
-    /**
-     * @var string $editor_script_handle
-     */
-    private $editor_script_handle;
-
-    /**
-     * @var string $editor_style_handle
-     */
-    private $editor_style_handle;
-
-    /**
-     * @var string $script_handle
-     */
-    private $script_handle;
-
-    /**
-     * @var string $style_handle
-     */
-    private $style_handle;
-
-
-    /**
-     * @return string
-     */
-    public function getEditorScriptHandle()
-    {
-        return $this->editor_script_handle;
-    }
-
-
-    /**
-     * @param string $editor_script_handle
-     */
-    public function setEditorScriptHandle($editor_script_handle)
-    {
-        if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
-        }
-        $this->editor_script_handle = $editor_script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEditorStyleHandle()
-    {
-        return $this->editor_style_handle;
-    }
-
-
-    /**
-     * @param string $editor_style_handle
-     */
-    public function setEditorStyleHandle($editor_style_handle)
-    {
-        if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
-        }
-        $this->editor_style_handle = $editor_style_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getScriptHandle()
-    {
-        return $this->script_handle;
-    }
-
-
-    /**
-     * @param string $script_handle
-     */
-    public function setScriptHandle($script_handle)
-    {
-        if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
-        }
-        $this->script_handle = $script_handle;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getStyleHandle()
-    {
-        return $this->style_handle;
-    }
-
-
-    /**
-     * @param string $style_handle
-     */
-    public function setStyleHandle($style_handle)
-    {
-        if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
-            $style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
-        }
-        $this->style_handle = $style_handle;
-    }
-
-    /**
-     * @since 4.9.71.p
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addAssets()
-    {
-        $this->addEditorScript($this->getEditorScriptHandle());
-        // $this->addEditorStyle($this->getEditorStyleHandle());
-        $this->addScript($this->getScriptHandle());
-        // $this->addStyle($this->getStyleHandle());
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since 4.9.71.p
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)){
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        $dependencies = array_merge(
-            $dependencies,
-            ['wp-blocks']
-        );
-        return $this->addJs($handle, $dependencies)->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since 4.9.71.p
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addEditorStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return $this->addCss($handle, $dependencies);
-    }
-
-
-    /**
-     * @param       $handle
-     * @param array $dependencies
-     * @since 4.9.71.p
-     * @return JavascriptAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addScript($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasJavascriptAsset($handle)) {
-            return $this->assets->getJavascriptAsset($handle);
-        }
-        return $this->addJs($handle, $dependencies)->setRequiresTranslation();
-    }
-
-
-    /**
-     * @param        $handle
-     * @param array  $dependencies
-     * @since 4.9.71.p
-     * @return StylesheetAsset
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function addStyle($handle, array $dependencies = array())
-    {
-        if ($this->assets->hasStylesheetAsset($handle)) {
-            return $this->assets->getStylesheetAsset($handle);
-        }
-        return $this->addCss($handle, $dependencies);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getEditorScript()
-    {
-        return $this->assets->getJavascriptAsset($this->editor_script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getEditorStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->editor_style_handle);
-    }
-
-
-    /**
-     * @return JavascriptAsset|null
-     */
-    public function getScript()
-    {
-        return $this->assets->getJavascriptAsset($this->script_handle);
-    }
-
-
-    /**
-     * @return StylesheetAsset|null
-     */
-    public function getStyle()
-    {
-        return $this->assets->getStylesheetAsset($this->style_handle);
-    }
-
-
-    /**
-     * @return  void
-     */
-    public function enqueueAssets()
-    {
-        $assets = array(
-            $this->getEditorScript(),
-            $this->getEditorStyle(),
-            $this->getScript(),
-            $this->getStyle(),
-        );
-        foreach ($assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
+	/**
+	 * @var string $editor_script_handle
+	 */
+	private $editor_script_handle;
+
+	/**
+	 * @var string $editor_style_handle
+	 */
+	private $editor_style_handle;
+
+	/**
+	 * @var string $script_handle
+	 */
+	private $script_handle;
+
+	/**
+	 * @var string $style_handle
+	 */
+	private $style_handle;
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorScriptHandle()
+	{
+		return $this->editor_script_handle;
+	}
+
+
+	/**
+	 * @param string $editor_script_handle
+	 */
+	public function setEditorScriptHandle($editor_script_handle)
+	{
+		if(strpos($editor_script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_script_handle = BlockInterface::NAME_SPACE . '-' . $editor_script_handle;
+		}
+		$this->editor_script_handle = $editor_script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEditorStyleHandle()
+	{
+		return $this->editor_style_handle;
+	}
+
+
+	/**
+	 * @param string $editor_style_handle
+	 */
+	public function setEditorStyleHandle($editor_style_handle)
+	{
+		if (strpos($editor_style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$editor_style_handle = BlockInterface::NAME_SPACE . '-' . $editor_style_handle;
+		}
+		$this->editor_style_handle = $editor_style_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getScriptHandle()
+	{
+		return $this->script_handle;
+	}
+
+
+	/**
+	 * @param string $script_handle
+	 */
+	public function setScriptHandle($script_handle)
+	{
+		if (strpos($script_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$script_handle = BlockInterface::NAME_SPACE . '-' . $script_handle;
+		}
+		$this->script_handle = $script_handle;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getStyleHandle()
+	{
+		return $this->style_handle;
+	}
+
+
+	/**
+	 * @param string $style_handle
+	 */
+	public function setStyleHandle($style_handle)
+	{
+		if (strpos($style_handle, BlockInterface::NAME_SPACE . '-') !== 0) {
+			$style_handle = BlockInterface::NAME_SPACE . '-' . $style_handle;
+		}
+		$this->style_handle = $style_handle;
+	}
+
+	/**
+	 * @since 4.9.71.p
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addAssets()
+	{
+		$this->addEditorScript($this->getEditorScriptHandle());
+		// $this->addEditorStyle($this->getEditorStyleHandle());
+		$this->addScript($this->getScriptHandle());
+		// $this->addStyle($this->getStyleHandle());
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since 4.9.71.p
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)){
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		$dependencies = array_merge(
+			$dependencies,
+			['wp-blocks']
+		);
+		return $this->addJs($handle, $dependencies)->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since 4.9.71.p
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addEditorStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return $this->addCss($handle, $dependencies);
+	}
+
+
+	/**
+	 * @param       $handle
+	 * @param array $dependencies
+	 * @since 4.9.71.p
+	 * @return JavascriptAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addScript($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasJavascriptAsset($handle)) {
+			return $this->assets->getJavascriptAsset($handle);
+		}
+		return $this->addJs($handle, $dependencies)->setRequiresTranslation();
+	}
+
+
+	/**
+	 * @param        $handle
+	 * @param array  $dependencies
+	 * @since 4.9.71.p
+	 * @return StylesheetAsset
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function addStyle($handle, array $dependencies = array())
+	{
+		if ($this->assets->hasStylesheetAsset($handle)) {
+			return $this->assets->getStylesheetAsset($handle);
+		}
+		return $this->addCss($handle, $dependencies);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getEditorScript()
+	{
+		return $this->assets->getJavascriptAsset($this->editor_script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getEditorStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->editor_style_handle);
+	}
+
+
+	/**
+	 * @return JavascriptAsset|null
+	 */
+	public function getScript()
+	{
+		return $this->assets->getJavascriptAsset($this->script_handle);
+	}
+
+
+	/**
+	 * @return StylesheetAsset|null
+	 */
+	public function getStyle()
+	{
+		return $this->assets->getStylesheetAsset($this->style_handle);
+	}
+
+
+	/**
+	 * @return  void
+	 */
+	public function enqueueAssets()
+	{
+		$assets = array(
+			$this->getEditorScript(),
+			$this->getEditorStyle(),
+			$this->getScript(),
+			$this->getStyle(),
+		);
+		foreach ($assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
 
 }

core/services/assets/AssetManager.php

Indentation +304 added lines, -304 removed lines

@@ -24,308 +24,308 @@
 abstract class AssetManager implements AssetManagerInterface
 {
 
-    /**
-     * @var AssetCollection $assets
-     */
-    protected $assets;
-
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
-
-    /**
-     * @var Registry $registry
-     */
-    protected $registry;
-
-
-    /**
-     * AssetRegister constructor.
-     *
-     * @param DomainInterface $domain
-     * @param AssetCollection $assets
-     * @param Registry        $registry
-     */
-    public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
-    {
-        $this->domain = $domain;
-        $this->assets = $assets;
-        $this->registry = $registry;
-        add_action('wp_enqueue_scripts', array($this, 'addManifestFile'), 0);
-        add_action('admin_enqueue_scripts', array($this, 'addManifestFile'), 0);
-        add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
-        add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
-    }
-
-
-    /**
-     * @return AssetCollection
-     */
-    public function getAssets()
-    {
-        return $this->assets;
-    }
-
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function assetNamespace()
-    {
-        return $this->domain->assetNamespace();
-    }
-
-
-    /**
-     * @return void
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addManifestFile()
-    {
-        // if a manifest file has already been added for this domain, then just return
-        if ($this->assets->has($this->domain->assetNamespace())) {
-            return;
-        }
-        $asset = new ManifestFile($this->domain);
-        $this->assets->add($asset, $this->domain->assetNamespace());
-    }
-
-
-    /**
-     * @return ManifestFile[]
-     * @since 4.9.62.p
-     */
-    public function getManifestFile()
-    {
-        return $this->assets->getManifestFiles();
-    }
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @param string $version
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @since 4.9.62.p
-     */
-    public function addJavascript(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $load_in_footer = true,
-        $version = ''
-    ) {
-        $asset = new JavascriptAsset(
-            $handle,
-            $source,
-            array_unique($dependencies),
-            $load_in_footer,
-            $this->domain,
-            $version
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-    /**
-     * Used to register a javascript asset where everything is dynamically derived from the given handle.
-     *
-     * @param string       $handle
-     * @param string|array $extra_dependencies
-     * @return JavascriptAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function addJs($handle, $extra_dependencies = [])
-    {
-        $details = $this->getAssetDetails(
-            Asset::TYPE_JS,
-            $handle,
-            $extra_dependencies
-        );
-        $source = $this->registry->getJsUrl($this->domain->assetNamespace(), $handle);
-        return $this->addJavascript(
-            $handle,
-            $source,
-            $details['dependencies'],
-            true,
-            $details['version']
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @param array  $dependencies
-     * @param bool   $load_in_footer
-     * @param string $version
-     * @return JavascriptAsset
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.71.p
-     */
-    public function addVendorJavascript(
-        $handle,
-        array $dependencies = array(),
-        $load_in_footer = true,
-        $version = ''
-    ) {
-        $dev_suffix = wp_scripts_get_suffix('dev');
-        $vendor_path = $this->domain->pluginUrl() . 'assets/vendor/';
-        return $this->addJavascript(
-            $handle,
-            "{$vendor_path}{$handle}{$dev_suffix}.js",
-            $dependencies,
-            $load_in_footer,
-            $version
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @param string $source
-     * @param array  $dependencies
-     * @param string $media
-     * @param string $version
-     * @return StylesheetAsset
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @since 4.9.62.p
-     */
-    public function addStylesheet(
-        $handle,
-        $source,
-        array $dependencies = array(),
-        $media = 'all',
-        $version = ''
-    ) {
-        $asset = new StylesheetAsset(
-            $handle,
-            $source,
-            array_unique($dependencies),
-            $this->domain,
-            $media,
-            $version
-        );
-        $this->assets->add($asset, $handle);
-        return $asset;
-    }
-
-
-    /**
-     * Used to register a css asset where everything is dynamically derived from the given handle.
-     *
-     * @param string       $handle
-     * @param string|array $extra_dependencies
-     * @return StylesheetAsset
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     */
-    public function addCss($handle, $extra_dependencies = [])
-    {
-        $details = $this->getAssetDetails(
-            Asset::TYPE_CSS,
-            $handle,
-            $extra_dependencies
-        );
-        return $this->addStylesheet(
-            $handle,
-            $this->registry->getCssUrl($this->domain->assetNamespace(), $handle),
-            $details['dependencies'],
-            'all',
-            $details['version']
-        );
-    }
-
-
-    /**
-     * @param string $handle
-     * @return bool
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset($handle)
-    {
-        if ($this->assets->has($handle)) {
-            $asset = $this->assets->get($handle);
-            if ($asset->isRegistered()) {
-                $asset->enqueueAsset();
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @return  void
-     * @since   $VID:$
-     */
-    public function enqueueBrowserAssets()
-    {
-        foreach ($this->assets as $asset) {
-            if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
-                $asset->enqueueAsset();
-            }
-        }
-    }
-
-
-    /**
-     * @param string $asset_type
-     * @param string $handle
-     * @param array  $extra_dependencies
-     * @return array
-     * @since 4.10.2.p
-     */
-    private function getAssetDetails($asset_type, $handle, $extra_dependencies = [])
-    {
-        $getAssetDetails = '';
-        switch ($asset_type) {
-            case Asset::TYPE_JS :
-                $getAssetDetails = 'getJsAssetDetails';
-                break;
-            case Asset::TYPE_CSS :
-                $getAssetDetails = 'getCssAssetDetails';
-                break;
-        }
-        if ($getAssetDetails === '') {
-            return ['dependencies' => [], 'version' => ''];
-        }
-        $details = $this->registry->$getAssetDetails(
-            $this->domain->assetNamespace(),
-            $handle
-        );
-        $details['dependencies'] = isset($details['dependencies'])
-            ? $details['dependencies']
-            : [];
-        $details['version'] = isset($details['version'])
-            ? $details['version']
-            : '';
-        $details['dependencies'] = ! empty($extra_dependencies)
-            ? array_merge($details['dependencies'], (array) $extra_dependencies)
-            : $details['dependencies'];
-        return $details;
-
-    }
+	/**
+	 * @var AssetCollection $assets
+	 */
+	protected $assets;
+
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
+
+	/**
+	 * @var Registry $registry
+	 */
+	protected $registry;
+
+
+	/**
+	 * AssetRegister constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @param AssetCollection $assets
+	 * @param Registry        $registry
+	 */
+	public function __construct(DomainInterface $domain, AssetCollection $assets, Registry $registry)
+	{
+		$this->domain = $domain;
+		$this->assets = $assets;
+		$this->registry = $registry;
+		add_action('wp_enqueue_scripts', array($this, 'addManifestFile'), 0);
+		add_action('admin_enqueue_scripts', array($this, 'addManifestFile'), 0);
+		add_action('wp_enqueue_scripts', array($this, 'addAssets'), 2);
+		add_action('admin_enqueue_scripts', array($this, 'addAssets'), 2);
+	}
+
+
+	/**
+	 * @return AssetCollection
+	 */
+	public function getAssets()
+	{
+		return $this->assets;
+	}
+
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function assetNamespace()
+	{
+		return $this->domain->assetNamespace();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addManifestFile()
+	{
+		// if a manifest file has already been added for this domain, then just return
+		if ($this->assets->has($this->domain->assetNamespace())) {
+			return;
+		}
+		$asset = new ManifestFile($this->domain);
+		$this->assets->add($asset, $this->domain->assetNamespace());
+	}
+
+
+	/**
+	 * @return ManifestFile[]
+	 * @since 4.9.62.p
+	 */
+	public function getManifestFile()
+	{
+		return $this->assets->getManifestFiles();
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @param string $version
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @since 4.9.62.p
+	 */
+	public function addJavascript(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$load_in_footer = true,
+		$version = ''
+	) {
+		$asset = new JavascriptAsset(
+			$handle,
+			$source,
+			array_unique($dependencies),
+			$load_in_footer,
+			$this->domain,
+			$version
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+	/**
+	 * Used to register a javascript asset where everything is dynamically derived from the given handle.
+	 *
+	 * @param string       $handle
+	 * @param string|array $extra_dependencies
+	 * @return JavascriptAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function addJs($handle, $extra_dependencies = [])
+	{
+		$details = $this->getAssetDetails(
+			Asset::TYPE_JS,
+			$handle,
+			$extra_dependencies
+		);
+		$source = $this->registry->getJsUrl($this->domain->assetNamespace(), $handle);
+		return $this->addJavascript(
+			$handle,
+			$source,
+			$details['dependencies'],
+			true,
+			$details['version']
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param array  $dependencies
+	 * @param bool   $load_in_footer
+	 * @param string $version
+	 * @return JavascriptAsset
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.71.p
+	 */
+	public function addVendorJavascript(
+		$handle,
+		array $dependencies = array(),
+		$load_in_footer = true,
+		$version = ''
+	) {
+		$dev_suffix = wp_scripts_get_suffix('dev');
+		$vendor_path = $this->domain->pluginUrl() . 'assets/vendor/';
+		return $this->addJavascript(
+			$handle,
+			"{$vendor_path}{$handle}{$dev_suffix}.js",
+			$dependencies,
+			$load_in_footer,
+			$version
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @param string $source
+	 * @param array  $dependencies
+	 * @param string $media
+	 * @param string $version
+	 * @return StylesheetAsset
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @since 4.9.62.p
+	 */
+	public function addStylesheet(
+		$handle,
+		$source,
+		array $dependencies = array(),
+		$media = 'all',
+		$version = ''
+	) {
+		$asset = new StylesheetAsset(
+			$handle,
+			$source,
+			array_unique($dependencies),
+			$this->domain,
+			$media,
+			$version
+		);
+		$this->assets->add($asset, $handle);
+		return $asset;
+	}
+
+
+	/**
+	 * Used to register a css asset where everything is dynamically derived from the given handle.
+	 *
+	 * @param string       $handle
+	 * @param string|array $extra_dependencies
+	 * @return StylesheetAsset
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 */
+	public function addCss($handle, $extra_dependencies = [])
+	{
+		$details = $this->getAssetDetails(
+			Asset::TYPE_CSS,
+			$handle,
+			$extra_dependencies
+		);
+		return $this->addStylesheet(
+			$handle,
+			$this->registry->getCssUrl($this->domain->assetNamespace(), $handle),
+			$details['dependencies'],
+			'all',
+			$details['version']
+		);
+	}
+
+
+	/**
+	 * @param string $handle
+	 * @return bool
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset($handle)
+	{
+		if ($this->assets->has($handle)) {
+			$asset = $this->assets->get($handle);
+			if ($asset->isRegistered()) {
+				$asset->enqueueAsset();
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @return  void
+	 * @since   $VID:$
+	 */
+	public function enqueueBrowserAssets()
+	{
+		foreach ($this->assets as $asset) {
+			if ($asset instanceof BrowserAsset && $asset->isRegistered()) {
+				$asset->enqueueAsset();
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $asset_type
+	 * @param string $handle
+	 * @param array  $extra_dependencies
+	 * @return array
+	 * @since 4.10.2.p
+	 */
+	private function getAssetDetails($asset_type, $handle, $extra_dependencies = [])
+	{
+		$getAssetDetails = '';
+		switch ($asset_type) {
+			case Asset::TYPE_JS :
+				$getAssetDetails = 'getJsAssetDetails';
+				break;
+			case Asset::TYPE_CSS :
+				$getAssetDetails = 'getCssAssetDetails';
+				break;
+		}
+		if ($getAssetDetails === '') {
+			return ['dependencies' => [], 'version' => ''];
+		}
+		$details = $this->registry->$getAssetDetails(
+			$this->domain->assetNamespace(),
+			$handle
+		);
+		$details['dependencies'] = isset($details['dependencies'])
+			? $details['dependencies']
+			: [];
+		$details['version'] = isset($details['version'])
+			? $details['version']
+			: '';
+		$details['dependencies'] = ! empty($extra_dependencies)
+			? array_merge($details['dependencies'], (array) $extra_dependencies)
+			: $details['dependencies'];
+		return $details;
+
+	}
 }

core/services/assets/Registry.php

Indentation +785 added lines, -785 removed lines

@@ -26,796 +26,796 @@
 class Registry
 {
 
-    const FILE_NAME_BUILD_MANIFEST = 'build-manifest.json';
-
-    /**
-     * @var AssetCollection $assets
-     */
-    protected $assets;
-
-    /**
-     * @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();
-
-
-    /**
-     * Holds the manifest data obtained from registered manifest files.
-     * Manifests are maps of asset chunk name to actual built asset file names.
-     * Shape of this array is:
-     * array(
-     *  'some_namespace_slug' => array(
-     *      'some_chunk_name' => array(
-     *          'js' => 'filename.js'
-     *          'css' => 'filename.js'
-     *      ),
-     *      'url_base' => 'https://baseurl.com/to/assets
-     *  )
-     * )
-     *
-     * @var array
-     */
-    private $manifest_data = array();
-
-
-    /**
-     * Holds any dependency data obtained from registered dependency map json.
-     * Dependency map json is generated via the @wordpress/dependency-extraction-webpack-plugin via the webpack config.
-     * @see https://github.com/WordPress/gutenberg/tree/master/packages/dependency-extraction-webpack-plugin
-     *
-     * @var array
-     */
-    private $dependencies_data = [];
-
-
-    /**
-     * This is a known array of possible wp css handles that correspond to what may be exposed as dependencies in our
-     * build process.  Currently the dependency export process in webpack does not consider css imports, so we derive
-     * them via the js dependencies (WP uses the same handle for both js and css). This is a list of known handles that
-     * are used for both js and 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',
-    ];
-
-
-    /**
-     * Registry constructor.
-     * Hooking into WP actions for script registry.
-     *
-     * @param AssetCollection      $assets
-     * @param I18nRegistry         $i18n_registry
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(AssetCollection $assets, I18nRegistry $i18n_registry)
-    {
-        $this->assets = $assets;
-        $this->i18n_registry = $i18n_registry;
-        add_action('wp_enqueue_scripts', array($this, 'registerManifestFiles'), 1);
-        add_action('admin_enqueue_scripts', array($this, 'registerManifestFiles'), 1);
-        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);
-    }
-
-
-    /**
-     * 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 {
-            $this->registerScripts($this->assets->getJavascriptAssets());
-            $this->registerStyles($this->assets->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());
-            }
-            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();
-            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'
-            );
-            $scripts = $this->assets->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 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();
+
+
+	/**
+	 * Holds the manifest data obtained from registered manifest files.
+	 * Manifests are maps of asset chunk name to actual built asset file names.
+	 * Shape of this array is:
+	 * array(
+	 *  'some_namespace_slug' => array(
+	 *      'some_chunk_name' => array(
+	 *          'js' => 'filename.js'
+	 *          'css' => 'filename.js'
+	 *      ),
+	 *      'url_base' => 'https://baseurl.com/to/assets
+	 *  )
+	 * )
+	 *
+	 * @var array
+	 */
+	private $manifest_data = array();
+
+
+	/**
+	 * Holds any dependency data obtained from registered dependency map json.
+	 * Dependency map json is generated via the @wordpress/dependency-extraction-webpack-plugin via the webpack config.
+	 * @see https://github.com/WordPress/gutenberg/tree/master/packages/dependency-extraction-webpack-plugin
+	 *
+	 * @var array
+	 */
+	private $dependencies_data = [];
+
+
+	/**
+	 * This is a known array of possible wp css handles that correspond to what may be exposed as dependencies in our
+	 * build process.  Currently the dependency export process in webpack does not consider css imports, so we derive
+	 * them via the js dependencies (WP uses the same handle for both js and css). This is a list of known handles that
+	 * are used for both js and 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',
+	];
+
+
+	/**
+	 * Registry constructor.
+	 * Hooking into WP actions for script registry.
+	 *
+	 * @param AssetCollection      $assets
+	 * @param I18nRegistry         $i18n_registry
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(AssetCollection $assets, I18nRegistry $i18n_registry)
+	{
+		$this->assets = $assets;
+		$this->i18n_registry = $i18n_registry;
+		add_action('wp_enqueue_scripts', array($this, 'registerManifestFiles'), 1);
+		add_action('admin_enqueue_scripts', array($this, 'registerManifestFiles'), 1);
+		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);
+	}
+
+
+	/**
+	 * 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 {
+			$this->registerScripts($this->assets->getJavascriptAssets());
+			$this->registerStyles($this->assets->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());
+			}
+			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();
+			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'
+			);
+			$scripts = $this->assets->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)
-    {
-        $asset_index = $chunk_name . '.' . $asset_type;
-        $url = isset(
-            $this->manifest_data[ $namespace ][ $asset_index ],
-            $this->manifest_data[ $namespace ]['url_base']
-        )
-            ? $this->manifest_data[ $namespace ]['url_base']
-              . $this->manifest_data[ $namespace ][ $asset_index ]
-            : '';
-        return apply_filters(
-            'FHEE__EventEspresso_core_services_assets_Registry__getAssetUrl',
-            $url,
-            $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);
-    }
-
-
-    /**
-     * Return the dependencies array and version string for a given asset $chunk_name
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @param string $asset_type
-     * @return array
-     * @since 4.9.82.p
-     */
-    private function getDetailsForAsset($namespace, $chunk_name, $asset_type)
-    {
-        $asset_index = $chunk_name . '.' . $asset_type;
-        if (! isset( $this->dependencies_data[ $namespace ][ $asset_index ])) {
-            $path = isset($this->manifest_data[ $namespace ]['path'])
-                ? $this->manifest_data[ $namespace ]['path']
-                : '';
-            $dependencies_index = $chunk_name . '.' . Asset::TYPE_PHP;
-            $file_path = isset($this->manifest_data[ $namespace ][ $dependencies_index ])
-                ? $path . $this->manifest_data[ $namespace ][ $dependencies_index ]
-                :
-                '';
-            $this->dependencies_data[ $namespace ][ $asset_index ] = $file_path !== '' && file_exists($file_path)
-                ? $this->getDetailsForAssetType($namespace, $asset_type, $file_path, $chunk_name)
-                : [];
-        }
-        return $this->dependencies_data[ $namespace ][ $asset_index ];
-    }
-
-
-    /**
-     * Return dependencies array and version string according to asset type.
-     * For css assets, this filters the auto generated dependencies by css type.
-     *
-     * @param string $namespace
-     * @param string $asset_type
-     * @param string $file_path
-     * @param string $chunk_name
-     * @return array
-     * @since 4.9.82.p
-     */
-    private function getDetailsForAssetType($namespace, $asset_type, $file_path, $chunk_name)
-    {
-        // $asset_dependencies = json_decode(file_get_contents($file_path), true);
-        $asset_details = require($file_path);
-        $asset_details['dependencies'] = isset($asset_details['dependencies'])
-            ? $asset_details['dependencies']
-            : [];
-        $asset_details['version'] = isset($asset_details['version'])
-            ? $asset_details['version']
-            : '';
-        if ($asset_type === Asset::TYPE_JS) {
-            $asset_details['dependencies'] =  $chunk_name === 'eejs-core'
-                ? $asset_details['dependencies']
-                : $asset_details['dependencies'] + [ CoreAssetManager::JS_HANDLE_JS_CORE ];
-            return $asset_details;
-        }
-        // for css we need to make sure there is actually a css file related to this chunk.
-        if (isset($this->manifest_data[ $namespace ])) {
-            // array of css chunk files for ee.
-            $css_chunks = array_map(
-                static function ($value) {
-                    return str_replace('.css', '', $value);
-                },
-                array_filter(
-                    array_keys($this->manifest_data[ $namespace ]),
-                    static function ($value) {
-                        return strpos($value, '.css') !== false;
-                    }
-                )
-            );
-            // add known wp chunks with css
-            $css_chunks = array_merge( $css_chunks, $this->wp_css_handle_dependencies);
-            // flip for easier search
-            $css_chunks = array_flip($css_chunks);
-
-            // now let's filter the dependencies for the incoming chunk to actual chunks that have styles
-            $asset_details['dependencies'] = array_filter(
-                $asset_details['dependencies'],
-                static function ($chunk_name) use ($css_chunks) {
-                    return isset($css_chunks[ $chunk_name ]);
-                }
-            );
-            return $asset_details;
-        }
-        return ['dependencies' => [], 'version' => ''];
-    }
-
-
-    /**
-     * Get the dependencies array and version string for the given js asset chunk name
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @since 4.10.2.p
-     */
-    public function getJsAssetDetails($namespace, $chunk_name)
-    {
-        return $this->getDetailsForAsset($namespace, $chunk_name, Asset::TYPE_JS);
-    }
-
-
-    /**
-     * Get the dependencies array and version string for the given css asset chunk name
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @since 4.10.2.p
-     */
-    public function getCssAssetDetails($namespace, $chunk_name)
-    {
-        return $this->getDetailsForAsset($namespace, $chunk_name, Asset::TYPE_CSS);
-    }
-
-
-    /**
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidFilePathException
-     * @since 4.9.62.p
-     */
-    public function registerManifestFiles()
-    {
-        try {
-            $manifest_files = $this->assets->getManifestFiles();
-            foreach ($manifest_files as $manifest_file) {
-                $this->registerManifestFile(
-                    $manifest_file->assetNamespace(),
-                    $manifest_file->urlBase(),
-                    $manifest_file->filepath() . Registry::FILE_NAME_BUILD_MANIFEST,
-                    $manifest_file->filepath()
-                );
-            }
-        } catch (Exception $exception) {
-            EE_Error::add_error($exception->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * Used to register a js/css manifest file with the registered_manifest_files property.
-     *
-     * @param string $namespace     Provided to associate the manifest file with a specific namespace.
-     * @param string $url_base      The url base for the manifest file location.
-     * @param string $manifest_file The absolute path to the manifest file.
-     * @param string $manifest_file_path  The path to the folder containing the manifest file. If not provided will be
-     *                                    default to `plugin_root/assets/dist`.
-     * @throws InvalidArgumentException
-     * @throws InvalidFilePathException
-     * @since 4.9.59.p
-     */
-    public function registerManifestFile($namespace, $url_base, $manifest_file, $manifest_file_path = '')
-    {
-        if (isset($this->manifest_data[ $namespace ])) {
-            if (! $this->debug()) {
-                return;
-            }
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'The namespace for this manifest file has already been registered, choose a namespace other than %s',
-                        'event_espresso'
-                    ),
-                    $namespace
-                )
-            );
-        }
-        if (filter_var($url_base, FILTER_VALIDATE_URL) === false) {
-            if (is_admin()) {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'The url given for %1$s assets is invalid.  The url provided was: "%2$s". This usually happens when another plugin or theme on a site is using the "%3$s" filter or has an invalid url set for the "%4$s" constant',
-                            'event_espresso'
-                        ),
-                        'Event Espresso',
-                        $url_base,
-                        'plugins_url',
-                        'WP_PLUGIN_URL'
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-            return;
-        }
-        $this->manifest_data[ $namespace ] = $this->decodeManifestFile($manifest_file);
-        if (! isset($this->manifest_data[ $namespace ]['url_base'])) {
-            $this->manifest_data[ $namespace ]['url_base'] = untrailingslashit($url_base);
-        }
-        if (! isset($this->manifest_data[ $namespace ]['path'])) {
-            $this->manifest_data[ $namespace ]['path'] = untrailingslashit($manifest_file_path);
-        }
-    }
-
-
-    /**
-     * Decodes json from the provided manifest file.
-     *
-     * @since 4.9.59.p
-     * @param string $manifest_file Path to manifest file.
-     * @return array
-     * @throws InvalidFilePathException
-     */
-    private function decodeManifestFile($manifest_file)
-    {
-        if (! file_exists($manifest_file)) {
-            throw new InvalidFilePathException($manifest_file);
-        }
-        return json_decode(file_get_contents($manifest_file), true);
-    }
-
-
-    /**
-     * 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)
+	{
+		$asset_index = $chunk_name . '.' . $asset_type;
+		$url = isset(
+			$this->manifest_data[ $namespace ][ $asset_index ],
+			$this->manifest_data[ $namespace ]['url_base']
+		)
+			? $this->manifest_data[ $namespace ]['url_base']
+			  . $this->manifest_data[ $namespace ][ $asset_index ]
+			: '';
+		return apply_filters(
+			'FHEE__EventEspresso_core_services_assets_Registry__getAssetUrl',
+			$url,
+			$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);
+	}
+
+
+	/**
+	 * Return the dependencies array and version string for a given asset $chunk_name
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @param string $asset_type
+	 * @return array
+	 * @since 4.9.82.p
+	 */
+	private function getDetailsForAsset($namespace, $chunk_name, $asset_type)
+	{
+		$asset_index = $chunk_name . '.' . $asset_type;
+		if (! isset( $this->dependencies_data[ $namespace ][ $asset_index ])) {
+			$path = isset($this->manifest_data[ $namespace ]['path'])
+				? $this->manifest_data[ $namespace ]['path']
+				: '';
+			$dependencies_index = $chunk_name . '.' . Asset::TYPE_PHP;
+			$file_path = isset($this->manifest_data[ $namespace ][ $dependencies_index ])
+				? $path . $this->manifest_data[ $namespace ][ $dependencies_index ]
+				:
+				'';
+			$this->dependencies_data[ $namespace ][ $asset_index ] = $file_path !== '' && file_exists($file_path)
+				? $this->getDetailsForAssetType($namespace, $asset_type, $file_path, $chunk_name)
+				: [];
+		}
+		return $this->dependencies_data[ $namespace ][ $asset_index ];
+	}
+
+
+	/**
+	 * Return dependencies array and version string according to asset type.
+	 * For css assets, this filters the auto generated dependencies by css type.
+	 *
+	 * @param string $namespace
+	 * @param string $asset_type
+	 * @param string $file_path
+	 * @param string $chunk_name
+	 * @return array
+	 * @since 4.9.82.p
+	 */
+	private function getDetailsForAssetType($namespace, $asset_type, $file_path, $chunk_name)
+	{
+		// $asset_dependencies = json_decode(file_get_contents($file_path), true);
+		$asset_details = require($file_path);
+		$asset_details['dependencies'] = isset($asset_details['dependencies'])
+			? $asset_details['dependencies']
+			: [];
+		$asset_details['version'] = isset($asset_details['version'])
+			? $asset_details['version']
+			: '';
+		if ($asset_type === Asset::TYPE_JS) {
+			$asset_details['dependencies'] =  $chunk_name === 'eejs-core'
+				? $asset_details['dependencies']
+				: $asset_details['dependencies'] + [ CoreAssetManager::JS_HANDLE_JS_CORE ];
+			return $asset_details;
+		}
+		// for css we need to make sure there is actually a css file related to this chunk.
+		if (isset($this->manifest_data[ $namespace ])) {
+			// array of css chunk files for ee.
+			$css_chunks = array_map(
+				static function ($value) {
+					return str_replace('.css', '', $value);
+				},
+				array_filter(
+					array_keys($this->manifest_data[ $namespace ]),
+					static function ($value) {
+						return strpos($value, '.css') !== false;
+					}
+				)
+			);
+			// add known wp chunks with css
+			$css_chunks = array_merge( $css_chunks, $this->wp_css_handle_dependencies);
+			// flip for easier search
+			$css_chunks = array_flip($css_chunks);
+
+			// now let's filter the dependencies for the incoming chunk to actual chunks that have styles
+			$asset_details['dependencies'] = array_filter(
+				$asset_details['dependencies'],
+				static function ($chunk_name) use ($css_chunks) {
+					return isset($css_chunks[ $chunk_name ]);
+				}
+			);
+			return $asset_details;
+		}
+		return ['dependencies' => [], 'version' => ''];
+	}
+
+
+	/**
+	 * Get the dependencies array and version string for the given js asset chunk name
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @since 4.10.2.p
+	 */
+	public function getJsAssetDetails($namespace, $chunk_name)
+	{
+		return $this->getDetailsForAsset($namespace, $chunk_name, Asset::TYPE_JS);
+	}
+
+
+	/**
+	 * Get the dependencies array and version string for the given css asset chunk name
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @since 4.10.2.p
+	 */
+	public function getCssAssetDetails($namespace, $chunk_name)
+	{
+		return $this->getDetailsForAsset($namespace, $chunk_name, Asset::TYPE_CSS);
+	}
+
+
+	/**
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFilePathException
+	 * @since 4.9.62.p
+	 */
+	public function registerManifestFiles()
+	{
+		try {
+			$manifest_files = $this->assets->getManifestFiles();
+			foreach ($manifest_files as $manifest_file) {
+				$this->registerManifestFile(
+					$manifest_file->assetNamespace(),
+					$manifest_file->urlBase(),
+					$manifest_file->filepath() . Registry::FILE_NAME_BUILD_MANIFEST,
+					$manifest_file->filepath()
+				);
+			}
+		} catch (Exception $exception) {
+			EE_Error::add_error($exception->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * Used to register a js/css manifest file with the registered_manifest_files property.
+	 *
+	 * @param string $namespace     Provided to associate the manifest file with a specific namespace.
+	 * @param string $url_base      The url base for the manifest file location.
+	 * @param string $manifest_file The absolute path to the manifest file.
+	 * @param string $manifest_file_path  The path to the folder containing the manifest file. If not provided will be
+	 *                                    default to `plugin_root/assets/dist`.
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFilePathException
+	 * @since 4.9.59.p
+	 */
+	public function registerManifestFile($namespace, $url_base, $manifest_file, $manifest_file_path = '')
+	{
+		if (isset($this->manifest_data[ $namespace ])) {
+			if (! $this->debug()) {
+				return;
+			}
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'The namespace for this manifest file has already been registered, choose a namespace other than %s',
+						'event_espresso'
+					),
+					$namespace
+				)
+			);
+		}
+		if (filter_var($url_base, FILTER_VALIDATE_URL) === false) {
+			if (is_admin()) {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'The url given for %1$s assets is invalid.  The url provided was: "%2$s". This usually happens when another plugin or theme on a site is using the "%3$s" filter or has an invalid url set for the "%4$s" constant',
+							'event_espresso'
+						),
+						'Event Espresso',
+						$url_base,
+						'plugins_url',
+						'WP_PLUGIN_URL'
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+			return;
+		}
+		$this->manifest_data[ $namespace ] = $this->decodeManifestFile($manifest_file);
+		if (! isset($this->manifest_data[ $namespace ]['url_base'])) {
+			$this->manifest_data[ $namespace ]['url_base'] = untrailingslashit($url_base);
+		}
+		if (! isset($this->manifest_data[ $namespace ]['path'])) {
+			$this->manifest_data[ $namespace ]['path'] = untrailingslashit($manifest_file_path);
+		}
+	}
+
+
+	/**
+	 * Decodes json from the provided manifest file.
+	 *
+	 * @since 4.9.59.p
+	 * @param string $manifest_file Path to manifest file.
+	 * @return array
+	 * @throws InvalidFilePathException
+	 */
+	private function decodeManifestFile($manifest_file)
+	{
+		if (! file_exists($manifest_file)) {
+			throw new InvalidFilePathException($manifest_file);
+		}
+		return json_decode(file_get_contents($manifest_file), true);
+	}
+
+
+	/**
+	 * 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
-        );
-    }
-
-
-    /**
-     * Get the dependencies array for the given js asset chunk name
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated 4.10.2.p
-     * @since 4.9.82.p
-     */
-    public function getJsDependencies($namespace, $chunk_name)
-    {
-        $details = $this->getJsAssetDetails($namespace, $chunk_name);
-        return isset($details['dependencies']) ? $details['dependencies'] : [];
-    }
-
-
-    /**
-     * Get the dependencies array for the given css asset chunk name
-     *
-     * @param string $namespace
-     * @param string $chunk_name
-     * @return array
-     * @deprecated 4.10.2.p
-     * @since      4.9.82.p
-     */
-    public function getCssDependencies($namespace, $chunk_name)
-    {
-        $details = $this->getCssAssetDetails($namespace, $chunk_name);
-        return isset($details['dependencies']) ? $details['dependencies'] : [];
-    }
+	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
+		);
+	}
+
+
+	/**
+	 * Get the dependencies array for the given js asset chunk name
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated 4.10.2.p
+	 * @since 4.9.82.p
+	 */
+	public function getJsDependencies($namespace, $chunk_name)
+	{
+		$details = $this->getJsAssetDetails($namespace, $chunk_name);
+		return isset($details['dependencies']) ? $details['dependencies'] : [];
+	}
+
+
+	/**
+	 * Get the dependencies array for the given css asset chunk name
+	 *
+	 * @param string $namespace
+	 * @param string $chunk_name
+	 * @return array
+	 * @deprecated 4.10.2.p
+	 * @since      4.9.82.p
+	 */
+	public function getCssDependencies($namespace, $chunk_name)
+	{
+		$details = $this->getCssAssetDetails($namespace, $chunk_name);
+		return isset($details['dependencies']) ? $details['dependencies'] : [];
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -184,7 +184,7 @@ 
                 $script->version(),
                 $script->loadInFooter()
             );
-            if (! $registered && $this->debug()) {
+            if ( ! $registered && $this->debug()) {
                 throw new AssetRegistrationException($script->handle());
             }
             $script->setRegistered($registered);
@@ -247,7 +247,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'
             );
             $scripts = $this->assets->getJavascriptAssetsWithData();
@@ -281,7 +281,7 @@ 
     public function addData($key, $value)
     {
         if ($this->verifyDataNotExisting($key)) {
-            $this->jsdata[ $key ] = $value;
+            $this->jsdata[$key] = $value;
         }
     }
 
@@ -306,10 +306,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(
@@ -324,10 +324,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);
         }
     }
 
@@ -342,12 +342,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(
@@ -360,7 +360,7 @@ 
                 )
             );
         }
-        $this->jsdata['templates'][ $template_reference ] = $template_content;
+        $this->jsdata['templates'][$template_reference] = $template_content;
     }
 
 
@@ -372,8 +372,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]
             : '';
     }
 
@@ -386,8 +386,8 @@ 
      */
     public function getData($key)
     {
-        return isset($this->jsdata[ $key ])
-            ? $this->jsdata[ $key ]
+        return isset($this->jsdata[$key])
+            ? $this->jsdata[$key]
             : false;
     }
 
@@ -402,11 +402,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(
                         __(
@@ -448,13 +448,13 @@ 
      */
     public function getAssetUrl($namespace, $chunk_name, $asset_type)
     {
-        $asset_index = $chunk_name . '.' . $asset_type;
+        $asset_index = $chunk_name.'.'.$asset_type;
         $url = isset(
-            $this->manifest_data[ $namespace ][ $asset_index ],
-            $this->manifest_data[ $namespace ]['url_base']
+            $this->manifest_data[$namespace][$asset_index],
+            $this->manifest_data[$namespace]['url_base']
         )
-            ? $this->manifest_data[ $namespace ]['url_base']
-              . $this->manifest_data[ $namespace ][ $asset_index ]
+            ? $this->manifest_data[$namespace]['url_base']
+              . $this->manifest_data[$namespace][$asset_index]
             : '';
         return apply_filters(
             'FHEE__EventEspresso_core_services_assets_Registry__getAssetUrl',
@@ -504,21 +504,21 @@ 
      */
     private function getDetailsForAsset($namespace, $chunk_name, $asset_type)
     {
-        $asset_index = $chunk_name . '.' . $asset_type;
-        if (! isset( $this->dependencies_data[ $namespace ][ $asset_index ])) {
-            $path = isset($this->manifest_data[ $namespace ]['path'])
-                ? $this->manifest_data[ $namespace ]['path']
+        $asset_index = $chunk_name.'.'.$asset_type;
+        if ( ! isset($this->dependencies_data[$namespace][$asset_index])) {
+            $path = isset($this->manifest_data[$namespace]['path'])
+                ? $this->manifest_data[$namespace]['path']
                 : '';
-            $dependencies_index = $chunk_name . '.' . Asset::TYPE_PHP;
-            $file_path = isset($this->manifest_data[ $namespace ][ $dependencies_index ])
-                ? $path . $this->manifest_data[ $namespace ][ $dependencies_index ]
+            $dependencies_index = $chunk_name.'.'.Asset::TYPE_PHP;
+            $file_path = isset($this->manifest_data[$namespace][$dependencies_index])
+                ? $path.$this->manifest_data[$namespace][$dependencies_index]
                 :
                 '';
-            $this->dependencies_data[ $namespace ][ $asset_index ] = $file_path !== '' && file_exists($file_path)
+            $this->dependencies_data[$namespace][$asset_index] = $file_path !== '' && file_exists($file_path)
                 ? $this->getDetailsForAssetType($namespace, $asset_type, $file_path, $chunk_name)
                 : [];
         }
-        return $this->dependencies_data[ $namespace ][ $asset_index ];
+        return $this->dependencies_data[$namespace][$asset_index];
     }
 
 
@@ -544,35 +544,35 @@ 
             ? $asset_details['version']
             : '';
         if ($asset_type === Asset::TYPE_JS) {
-            $asset_details['dependencies'] =  $chunk_name === 'eejs-core'
+            $asset_details['dependencies'] = $chunk_name === 'eejs-core'
                 ? $asset_details['dependencies']
-                : $asset_details['dependencies'] + [ CoreAssetManager::JS_HANDLE_JS_CORE ];
+                : $asset_details['dependencies'] + [CoreAssetManager::JS_HANDLE_JS_CORE];
             return $asset_details;
         }
         // for css we need to make sure there is actually a css file related to this chunk.
-        if (isset($this->manifest_data[ $namespace ])) {
+        if (isset($this->manifest_data[$namespace])) {
             // array of css chunk files for ee.
             $css_chunks = array_map(
-                static function ($value) {
+                static function($value) {
                     return str_replace('.css', '', $value);
                 },
                 array_filter(
-                    array_keys($this->manifest_data[ $namespace ]),
-                    static function ($value) {
+                    array_keys($this->manifest_data[$namespace]),
+                    static function($value) {
                         return strpos($value, '.css') !== false;
                     }
                 )
             );
             // add known wp chunks with css
-            $css_chunks = array_merge( $css_chunks, $this->wp_css_handle_dependencies);
+            $css_chunks = array_merge($css_chunks, $this->wp_css_handle_dependencies);
             // flip for easier search
             $css_chunks = array_flip($css_chunks);
 
             // now let's filter the dependencies for the incoming chunk to actual chunks that have styles
             $asset_details['dependencies'] = array_filter(
                 $asset_details['dependencies'],
-                static function ($chunk_name) use ($css_chunks) {
-                    return isset($css_chunks[ $chunk_name ]);
+                static function($chunk_name) use ($css_chunks) {
+                    return isset($css_chunks[$chunk_name]);
                 }
             );
             return $asset_details;
@@ -623,7 +623,7 @@ 
                 $this->registerManifestFile(
                     $manifest_file->assetNamespace(),
                     $manifest_file->urlBase(),
-                    $manifest_file->filepath() . Registry::FILE_NAME_BUILD_MANIFEST,
+                    $manifest_file->filepath().Registry::FILE_NAME_BUILD_MANIFEST,
                     $manifest_file->filepath()
                 );
             }
@@ -648,8 +648,8 @@ 
      */
     public function registerManifestFile($namespace, $url_base, $manifest_file, $manifest_file_path = '')
     {
-        if (isset($this->manifest_data[ $namespace ])) {
-            if (! $this->debug()) {
+        if (isset($this->manifest_data[$namespace])) {
+            if ( ! $this->debug()) {
                 return;
             }
             throw new InvalidArgumentException(
@@ -682,12 +682,12 @@ 
             }
             return;
         }
-        $this->manifest_data[ $namespace ] = $this->decodeManifestFile($manifest_file);
-        if (! isset($this->manifest_data[ $namespace ]['url_base'])) {
-            $this->manifest_data[ $namespace ]['url_base'] = untrailingslashit($url_base);
+        $this->manifest_data[$namespace] = $this->decodeManifestFile($manifest_file);
+        if ( ! isset($this->manifest_data[$namespace]['url_base'])) {
+            $this->manifest_data[$namespace]['url_base'] = untrailingslashit($url_base);
         }
-        if (! isset($this->manifest_data[ $namespace ]['path'])) {
-            $this->manifest_data[ $namespace ]['path'] = untrailingslashit($manifest_file_path);
+        if ( ! isset($this->manifest_data[$namespace]['path'])) {
+            $this->manifest_data[$namespace]['path'] = untrailingslashit($manifest_file_path);
         }
     }
 
@@ -702,7 +702,7 @@ 
      */
     private function decodeManifestFile($manifest_file)
     {
-        if (! file_exists($manifest_file)) {
+        if ( ! file_exists($manifest_file)) {
             throw new InvalidFilePathException($manifest_file);
         }
         return json_decode(file_get_contents($manifest_file), true);
@@ -716,7 +716,7 @@ 
      */
     private function addRegisteredScriptHandlesWithData($script_handle)
     {
-        $this->script_handles_with_data[ $script_handle ] = $script_handle;
+        $this->script_handles_with_data[$script_handle] = $script_handle;
     }
 
 
@@ -742,23 +742,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/routing/RouteInterface.php

Indentation +36 added lines, -36 removed lines

@@ -19,50 +19,50 @@
 interface RouteInterface
 {
 
-    /**
-     * @return JsonDataNode
-     */
-    public function dataNode();
+	/**
+	 * @return JsonDataNode
+	 */
+	public function dataNode();
 
 
-    /**
-     * final method called by RouteHandler on Route which in turn calls requestHandler()
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function handleRequest();
+	/**
+	 * final method called by RouteHandler on Route which in turn calls requestHandler()
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function handleRequest();
 
 
-    /**
-     * a place to run any setup required for matchesCurrentRequest() which runs immediately after
-     *
-     * @since $VID:$
-     */
-    public function initialize();
+	/**
+	 * a place to run any setup required for matchesCurrentRequest() which runs immediately after
+	 *
+	 * @since $VID:$
+	 */
+	public function initialize();
 
 
-    /**
-     * returns true if the route has already been handled
-     *
-     * @return bool
-     */
-    public function isHandled();
+	/**
+	 * returns true if the route has already been handled
+	 *
+	 * @return bool
+	 */
+	public function isHandled();
 
 
-    /**
-     * returns true if the route has not yet been handled
-     *
-     * @return bool
-     */
-    public function isNotHandled();
+	/**
+	 * returns true if the route has not yet been handled
+	 *
+	 * @return bool
+	 */
+	public function isNotHandled();
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest();
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest();
 }