eventespresso / event-espresso-core

core/services/routing/RouteMatchSpecificationFactory.php

Indentation +37 added lines, -37 removed lines

@@ -23,44 +23,44 @@
  */
 class RouteMatchSpecificationFactory extends FactoryWithDependencyResolver implements InterminableInterface
 {
-    /**
-     * RouteMatchSpecificationFactory constructor
-     *
-     * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
-     * @param LoaderInterface                           $loader
-     */
-    public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
-    {
-        parent::__construct($dependency_resolver, $loader);
-    }
+	/**
+	 * RouteMatchSpecificationFactory constructor
+	 *
+	 * @param RouteMatchSpecificationDependencyResolver $dependency_resolver
+	 * @param LoaderInterface                           $loader
+	 */
+	public function __construct(RouteMatchSpecificationDependencyResolver $dependency_resolver, LoaderInterface $loader)
+	{
+		parent::__construct($dependency_resolver, $loader);
+	}
 
-    /**
-     * @param string $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidDataTypeException
-     * @since 4.9.71.p
-     */
-    public function createNewRouteMatchSpecification(string $fqcn): RouteMatchSpecification
-    {
-        $this->dependencyResolver()->resolveDependenciesForClass($fqcn);
-        return $this->loader()->getShared($fqcn);
-    }
+	/**
+	 * @param string $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidDataTypeException
+	 * @since 4.9.71.p
+	 */
+	public function createNewRouteMatchSpecification(string $fqcn): RouteMatchSpecification
+	{
+		$this->dependencyResolver()->resolveDependenciesForClass($fqcn);
+		return $this->loader()->getShared($fqcn);
+	}
 
 
-    /**
-     * @param string $fqcn
-     * @return RouteMatchSpecification
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @since 4.9.71.p
-     */
-    public static function create($fqcn): RouteMatchSpecification
-    {
-        /** @var RouteMatchSpecificationFactory $specification_factory */
-        $specification_factory = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'
-        );
-        return $specification_factory->createNewRouteMatchSpecification($fqcn);
-    }
+	/**
+	 * @param string $fqcn
+	 * @return RouteMatchSpecification
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.71.p
+	 */
+	public static function create($fqcn): RouteMatchSpecification
+	{
+		/** @var RouteMatchSpecificationFactory $specification_factory */
+		$specification_factory = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'
+		);
+		return $specification_factory->createNewRouteMatchSpecification($fqcn);
+	}
 }

core/services/routing/RouteMatchSpecificationCollection.php

Indentation +28 added lines, -28 removed lines

@@ -15,36 +15,36 @@
  */
 class RouteMatchSpecificationCollection extends Collection
 {
-    const COLLECTION_NAME = 'route_match_specifications';
+	const COLLECTION_NAME = 'route_match_specifications';
 
 
-    /**
-     * RouteMatchSpecificationCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'EventEspresso\core\domain\entities\routing\specifications\RouteMatchSpecificationInterface',
-            RouteMatchSpecificationCollection::COLLECTION_NAME
-        );
-    }
+	/**
+	 * RouteMatchSpecificationCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			'EventEspresso\core\domain\entities\routing\specifications\RouteMatchSpecificationInterface',
+			RouteMatchSpecificationCollection::COLLECTION_NAME
+		);
+	}
 
 
-    /**
-     * getIdentifier
-     * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
-     * If no $identifier is supplied, then the  fully qualified class name is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return string
-     */
-    public function getIdentifier($object, $identifier = null): string
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : get_class($object);
-    }
+	/**
+	 * getIdentifier
+	 * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
+	 * If no $identifier is supplied, then the  fully qualified class name is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return string
+	 */
+	public function getIdentifier($object, $identifier = null): string
+	{
+		return ! empty($identifier)
+			? $identifier
+			: get_class($object);
+	}
 }

core/services/routing/RouteCollection.php

Indentation +64 added lines, -64 removed lines

@@ -15,76 +15,76 @@
  */
 class RouteCollection extends Collection
 {
-    const COLLECTION_NAME = 'routes';
+	const COLLECTION_NAME = 'routes';
 
 
-    /**
-     * RouteMatchSpecificationCollection constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'EventEspresso\core\services\routing\RouteInterface',
-            RouteCollection::COLLECTION_NAME
-        );
-    }
+	/**
+	 * RouteMatchSpecificationCollection constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			'EventEspresso\core\services\routing\RouteInterface',
+			RouteCollection::COLLECTION_NAME
+		);
+	}
 
 
-    /**
-     * getIdentifier
-     * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
-     * If no $identifier is supplied, then the  fully qualified class name is used
-     *
-     * @param        $object
-     * @param mixed  $identifier
-     * @return string
-     */
-    public function getIdentifier($object, $identifier = null): string
-    {
-        return ! empty($identifier)
-            ? $identifier
-            : get_class($object);
-    }
+	/**
+	 * getIdentifier
+	 * Overrides EventEspresso\core\services\collections\Collection::getIdentifier()
+	 * If no $identifier is supplied, then the  fully qualified class name is used
+	 *
+	 * @param        $object
+	 * @param mixed  $identifier
+	 * @return string
+	 */
+	public function getIdentifier($object, $identifier = null): string
+	{
+		return ! empty($identifier)
+			? $identifier
+			: get_class($object);
+	}
 
 
-    /**
-     * finds and returns all Routes that have yet to be handled
-     *
-     * @return RouteInterface[]
-     */
-    public function getRoutesForCurrentRequest(): array
-    {
-        $routes = [];
-        $this->rewind();
-        while ($this->valid()) {
-            /** @var RouteInterface $route */
-            $route = $this->current();
-            if ($route->matchesCurrentRequest()) {
-                $routes[] = $route;
-            }
-            $this->next();
-        }
-        $this->rewind();
-        return $routes;
-    }
+	/**
+	 * finds and returns all Routes that have yet to be handled
+	 *
+	 * @return RouteInterface[]
+	 */
+	public function getRoutesForCurrentRequest(): array
+	{
+		$routes = [];
+		$this->rewind();
+		while ($this->valid()) {
+			/** @var RouteInterface $route */
+			$route = $this->current();
+			if ($route->matchesCurrentRequest()) {
+				$routes[] = $route;
+			}
+			$this->next();
+		}
+		$this->rewind();
+		return $routes;
+	}
 
 
-    /**
-     * calls RouteInterface::handleRequest() on all Routes that
-     *      - match current request
-     *      - have yet to be handled
-     *
-     * @return void
-     */
-    public function handleRoutesForCurrentRequest()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $this->current()->handleRequest();
-            $this->next();
-        }
-        $this->rewind();
-    }
+	/**
+	 * calls RouteInterface::handleRequest() on all Routes that
+	 *      - match current request
+	 *      - have yet to be handled
+	 *
+	 * @return void
+	 */
+	public function handleRoutesForCurrentRequest()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$this->current()->handleRequest();
+			$this->next();
+		}
+		$this->rewind();
+	}
 }

core/services/loaders/ObjectIdentifier.php

Indentation +104 added lines, -104 removed lines

@@ -15,119 +15,119 @@
  */
 class ObjectIdentifier
 {
-    /**
-     * used to separate the FQCN from the class's arguments identifier
-     */
-    const DELIMITER = '____';
+	/**
+	 * used to separate the FQCN from the class's arguments identifier
+	 */
+	const DELIMITER = '____';
 
-    /**
-     * @var ClassInterfaceCache $class_cache
-     */
-    private $class_cache;
+	/**
+	 * @var ClassInterfaceCache $class_cache
+	 */
+	private $class_cache;
 
 
-    /**
-     * ObjectIdentifier constructor.
-     *
-     * @param ClassInterfaceCache $class_cache
-     */
-    public function __construct(ClassInterfaceCache $class_cache)
-    {
-        $this->class_cache = $class_cache;
-    }
+	/**
+	 * ObjectIdentifier constructor.
+	 *
+	 * @param ClassInterfaceCache $class_cache
+	 */
+	public function __construct(ClassInterfaceCache $class_cache)
+	{
+		$this->class_cache = $class_cache;
+	}
 
 
-    /**
-     * Returns true if the supplied $object_identifier contains
-     * the delimiter used to separate an fqcn from the arguments hash
-     *
-     * @param string $object_identifier
-     * @return bool
-     */
-    public function hasArguments(string $object_identifier): bool
-    {
-        // type casting to bool instead of using strpos() !== false
-        // because an object identifier should never begin with the delimiter
-        // therefore the delimiter should NOT be found at position 0
-        return (bool) strpos($object_identifier, ObjectIdentifier::DELIMITER);
-    }
+	/**
+	 * Returns true if the supplied $object_identifier contains
+	 * the delimiter used to separate an fqcn from the arguments hash
+	 *
+	 * @param string $object_identifier
+	 * @return bool
+	 */
+	public function hasArguments(string $object_identifier): bool
+	{
+		// type casting to bool instead of using strpos() !== false
+		// because an object identifier should never begin with the delimiter
+		// therefore the delimiter should NOT be found at position 0
+		return (bool) strpos($object_identifier, ObjectIdentifier::DELIMITER);
+	}
 
 
-    /**
-     * Returns true if the supplied FQCN equals the supplied $object_identifier
-     * OR the supplied FQCN matches the FQCN portion of the supplied $object_identifier
-     * AND that $object_identifier is for an object with arguments.
-     * This allows a request for an object using a FQCN to match
-     * a previously instantiated object with arguments
-     * without having to know those arguments.
-     *
-     * @param string $fqcn
-     * @param string $object_identifier
-     * @return bool
-     */
-    public function fqcnMatchesObjectIdentifier(string $fqcn, string $object_identifier): bool
-    {
-        $fqcn = str_replace('\\', '_', $fqcn);
-        return $fqcn === $object_identifier
-               || strpos($object_identifier, $fqcn . ObjectIdentifier::DELIMITER) === 0;
-    }
+	/**
+	 * Returns true if the supplied FQCN equals the supplied $object_identifier
+	 * OR the supplied FQCN matches the FQCN portion of the supplied $object_identifier
+	 * AND that $object_identifier is for an object with arguments.
+	 * This allows a request for an object using a FQCN to match
+	 * a previously instantiated object with arguments
+	 * without having to know those arguments.
+	 *
+	 * @param string $fqcn
+	 * @param string $object_identifier
+	 * @return bool
+	 */
+	public function fqcnMatchesObjectIdentifier(string $fqcn, string $object_identifier): bool
+	{
+		$fqcn = str_replace('\\', '_', $fqcn);
+		return $fqcn === $object_identifier
+			   || strpos($object_identifier, $fqcn . ObjectIdentifier::DELIMITER) === 0;
+	}
 
 
-    /**
-     * build a string representation of an object's FQCN and arguments
-     *
-     * @param string $fqcn
-     * @param array  $arguments
-     * @return string
-     */
-    public function getIdentifier(string $fqcn, array $arguments = array()): string
-    {
-        // only build identifier from arguments if class is not ReservedInstanceInterface
-        $identifier = ! $this->class_cache->hasInterface(
-            $fqcn,
-            'EventEspresso\core\interfaces\ReservedInstanceInterface'
-        )
-            ? $this->getIdentifierForArguments($arguments)
-            : '';
-        if (! empty($identifier)) {
-            $fqcn .= ObjectIdentifier::DELIMITER . md5($identifier);
-        }
-        $fqcn = str_replace('\\', '_', $fqcn);
-        return $fqcn;
-    }
+	/**
+	 * build a string representation of an object's FQCN and arguments
+	 *
+	 * @param string $fqcn
+	 * @param array  $arguments
+	 * @return string
+	 */
+	public function getIdentifier(string $fqcn, array $arguments = array()): string
+	{
+		// only build identifier from arguments if class is not ReservedInstanceInterface
+		$identifier = ! $this->class_cache->hasInterface(
+			$fqcn,
+			'EventEspresso\core\interfaces\ReservedInstanceInterface'
+		)
+			? $this->getIdentifierForArguments($arguments)
+			: '';
+		if (! empty($identifier)) {
+			$fqcn .= ObjectIdentifier::DELIMITER . md5($identifier);
+		}
+		$fqcn = str_replace('\\', '_', $fqcn);
+		return $fqcn;
+	}
 
 
-    /**
-     * build a string representation of a object's arguments
-     * (mostly because Closures can't be serialized)
-     *
-     * @param array $arguments
-     * @return string
-     */
-    protected function getIdentifierForArguments(array $arguments): string
-    {
-        if (empty($arguments)) {
-            return '';
-        }
-        $identifier = '';
-        foreach ($arguments as $key => $argument) {
-            // don't include arguments used to assist with loading legacy classes
-            if (is_string($key) && strpos($key, 'EE_Registry::create') === 0) {
-                continue;
-            }
-            switch (true) {
-                case is_object($argument):
-                case $argument instanceof Closure:
-                    $identifier .= spl_object_hash($argument);
-                    break;
-                case is_array($argument):
-                    $identifier .= $this->getIdentifierForArguments($argument);
-                    break;
-                default:
-                    $identifier .= $argument;
-                    break;
-            }
-        }
-        return $identifier;
-    }
+	/**
+	 * build a string representation of a object's arguments
+	 * (mostly because Closures can't be serialized)
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	protected function getIdentifierForArguments(array $arguments): string
+	{
+		if (empty($arguments)) {
+			return '';
+		}
+		$identifier = '';
+		foreach ($arguments as $key => $argument) {
+			// don't include arguments used to assist with loading legacy classes
+			if (is_string($key) && strpos($key, 'EE_Registry::create') === 0) {
+				continue;
+			}
+			switch (true) {
+				case is_object($argument):
+				case $argument instanceof Closure:
+					$identifier .= spl_object_hash($argument);
+					break;
+				case is_array($argument):
+					$identifier .= $this->getIdentifierForArguments($argument);
+					break;
+				default:
+					$identifier .= $argument;
+					break;
+			}
+		}
+		return $identifier;
+	}
 }

core/services/collections/Collection.php

Indentation +532 added lines, -532 removed lines

@@ -19,536 +19,536 @@
  */
 class Collection extends SplObjectStorage implements CollectionInterface
 {
-    /**
-     * a unique string for identifying this collection
-     *
-     * @type string $collection_identifier
-     */
-    protected $collection_identifier;
-
-
-    /**
-     * an interface (or class) name to be used for restricting the type of objects added to the storage
-     * this should be set from within the child class constructor
-     *
-     * @type string $interface
-     */
-    protected $collection_interface;
-
-    /**
-     * a short dash separated string describing the contents of this collection
-     * used as the base for the $collection_identifier
-     * defaults to the class short name if not set
-     *
-     * @type string $collection_identifier
-     */
-    protected $collection_name;
-
-
-    /**
-     * Collection constructor
-     *
-     * @param string $collection_interface
-     * @param string $collection_name
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(string $collection_interface, string $collection_name = '')
-    {
-        $this->setCollectionInterface($collection_interface);
-        $this->setCollectionName($collection_name);
-        $this->setCollectionIdentifier();
-    }
-
-
-    /**
-     * @return string
-     * @since 4.10.33.p
-     */
-    public function collectionInterface(): string
-    {
-        return $this->collection_interface;
-    }
-
-
-    /**
-     * setCollectionInterface
-     *
-     * @param  string $collection_interface
-     * @throws InvalidInterfaceException
-     */
-    protected function setCollectionInterface(string $collection_interface)
-    {
-        if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
-            throw new InvalidInterfaceException($collection_interface);
-        }
-        $this->collection_interface = $collection_interface;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function collectionName(): string
-    {
-        return $this->collection_name;
-    }
-
-
-    /**
-     * @param string $collection_name
-     */
-    protected function setCollectionName(string $collection_name)
-    {
-        $this->collection_name = ! empty($collection_name)
-            ? sanitize_key($collection_name)
-            : basename(str_replace('\\', '/', get_class($this)));
-    }
-
-
-    /**
-     * @return string
-     */
-    public function collectionIdentifier(): string
-    {
-        return $this->collection_identifier;
-    }
-
-
-    /**
-     * creates a very readable unique 9 character identifier like:  CF2-532-DAC
-     * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
-     *
-     * @return void
-     */
-    protected function setCollectionIdentifier()
-    {
-        // hash a few collection details
-        $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
-        // grab a few characters from the start, middle, and end of the hash
-        $id = array();
-        for ($x = 0; $x < 19; $x += 9) {
-            $id[] = substr($identifier, $x, 3);
-        }
-        $this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
-    }
-
-
-    /**
-     * add
-     * attaches an object to the Collection
-     * and sets any supplied data associated with the current iterator entry
-     * by calling EE_Object_Collection::set_identifier()
-     *
-     * @param mixed $object
-     * @param mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function add($object, $identifier = null): bool
-    {
-        if (! $object instanceof $this->collection_interface) {
-            throw new InvalidEntityException($object, $this->collection_interface);
-        }
-        $identifier = $this->getIdentifier($object, $identifier);
-        if ($this->contains($object) || $this->has($identifier)) {
-            throw new DuplicateCollectionIdentifierException($identifier);
-        }
-        parent::attach($object, $identifier);
-        return $this->contains($object);
-    }
-
-
-    /**
-     * getIdentifier
-     * if no $identifier is supplied, then the spl_object_hash() is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return string
-     */
-    public function getIdentifier($object, $identifier = null): string
-    {
-        return ! empty($identifier) ? $identifier : spl_object_hash($object);
-    }
-
-
-    /**
-     * setIdentifier
-     * Sets the data associated with an object in the Collection
-     * if no $identifier is supplied, then the spl_object_hash() is used
-     *
-     * @param        $object
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function setIdentifier($object, $identifier = null): bool
-    {
-        $identifier = $this->getIdentifier($object, $identifier);
-        $this->rewind();
-        while ($this->valid()) {
-            if ($object === $this->current()) {
-                $this->setInfo($identifier);
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * get
-     * finds and returns an object in the Collection based on the identifier that was set using addObject()
-     * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
-     *
-     * @param mixed $identifier
-     * @return mixed
-     */
-    public function get($identifier)
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $object = $this->current();
-                $this->rewind();
-                return $object;
-            }
-            $this->next();
-        }
-        return null;
-    }
-
-
-    /**
-     * has
-     * returns TRUE or FALSE
-     * depending on whether the object is within the Collection
-     * based on the supplied $identifier
-     *
-     * @param  mixed $identifier
-     * @return bool
-     */
-    public function has($identifier): bool
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                $this->rewind();
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * hasObject
-     * returns TRUE or FALSE depending on whether the supplied object is within the Collection
-     *
-     * @param $object
-     * @return bool
-     */
-    public function hasObject($object): bool
-    {
-        return $this->contains($object);
-    }
-
-
-    /**
-     * hasObjects
-     * returns true if there are objects within the Collection, and false if it is empty
-     *
-     * @return bool
-     */
-    public function hasObjects(): bool
-    {
-        return $this->count() !== 0;
-    }
-
-
-    /**
-     * isEmpty
-     * returns true if there are no objects within the Collection, and false if there are
-     *
-     * @return bool
-     */
-    public function isEmpty(): bool
-    {
-        return $this->count() === 0;
-    }
-
-
-    /**
-     * remove
-     * detaches an object from the Collection
-     *
-     * @param $object
-     * @return bool
-     */
-    public function remove($object): bool
-    {
-        $this->detach($object);
-        return true;
-    }
-
-
-    /**
-     * detaches the object matching the supplied identifier from the Collection
-     *
-     * @param mixed $identifier
-     * @return bool
-     */
-    public function removeByIdentifier($identifier): bool
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $object = $this->current();
-            $this->next();
-            if ($identifier === $this->getInfo()) {
-                $this->detach($object);
-                unset($object);
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * setCurrent
-     * advances pointer to the object whose identifier matches that which was provided
-     *
-     * @param mixed $identifier
-     * @return boolean
-     */
-    public function setCurrent($identifier): bool
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($identifier === $this->getInfo()) {
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * setCurrentUsingObject
-     * advances pointer to the provided object
-     *
-     * @param $object
-     * @return boolean
-     */
-    public function setCurrentUsingObject($object): bool
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            if ($this->current() === $object) {
-                return true;
-            }
-            $this->next();
-        }
-        return false;
-    }
-
-
-    /**
-     * Returns the object occupying the index before the current object,
-     * unless this is already the first object, in which case it just returns the first object
-     *
-     * @return mixed
-     */
-    public function previous()
-    {
-        $index = $this->indexOf($this->current());
-        if ($index === 0) {
-            return $this->current();
-        }
-        $index--;
-        return $this->objectAtIndex($index);
-    }
-
-
-    /**
-     * Returns the index of a given object, or false if not found
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param $object
-     * @return boolean|int
-     */
-    public function indexOf($object)
-    {
-        if (! $this->contains($object)) {
-            return false;
-        }
-        foreach ($this as $index => $obj) {
-            if ($obj === $object) {
-                return $index;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * Returns the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $index
-     * @return mixed
-     */
-    public function objectAtIndex($index)
-    {
-        $iterator = new LimitIterator($this, $index, 1);
-        $iterator->rewind();
-        return $iterator->current();
-    }
-
-
-    /**
-     * Returns the sequence of objects as specified by the offset and length
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $offset
-     * @param int $length
-     * @return array
-     */
-    public function slice($offset, $length): array
-    {
-        $slice = array();
-        $iterator = new LimitIterator($this, $offset, $length);
-        foreach ($iterator as $object) {
-            $slice[] = $object;
-        }
-        return $slice;
-    }
-
-
-    /**
-     * Inserts an object at a certain point
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param mixed $object A single object
-     * @param int   $index
-     * @param mixed $identifier
-     * @return bool
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidEntityException
-     */
-    public function insertObjectAt($object, int $index, $identifier = null): bool
-    {
-        // check to ensure that objects don't already exist in the collection
-        if ($this->has($identifier)) {
-            throw new DuplicateCollectionIdentifierException($identifier);
-        }
-        // detach any objects at or past this index
-        $remaining_objects = array();
-        if ($index < $this->count()) {
-            $remaining_objects = $this->slice($index, $this->count() - $index);
-            foreach ($remaining_objects as $key => $remaining_object) {
-                // we need to grab the identifiers for each object and use them as keys
-                $remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
-                // and then remove the object from the current tracking array
-                unset($remaining_objects[ $key ]);
-                // and then remove it from the Collection
-                $this->detach($remaining_object);
-            }
-        }
-        // add the new object we're splicing in
-        $this->add($object, $identifier);
-        // attach the objects we previously detached
-        foreach ($remaining_objects as $key => $remaining_object) {
-            $this->add($remaining_object, $key);
-        }
-        return $this->contains($object);
-    }
-
-
-    /**
-     * Inserts an object (or an array of objects) at a certain point
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param mixed $objects A single object or an array of objects
-     * @param int   $index
-     */
-    public function insertAt($objects, $index)
-    {
-        if (! is_array($objects)) {
-            $objects = array($objects);
-        }
-        // check to ensure that objects don't already exist in the collection
-        foreach ($objects as $key => $object) {
-            if ($this->contains($object)) {
-                unset($objects[ $key ]);
-            }
-        }
-        // do we have any objects left?
-        if (! $objects) {
-            return;
-        }
-        // detach any objects at or past this index
-        $remaining = array();
-        if ($index < $this->count()) {
-            $remaining = $this->slice($index, $this->count() - $index);
-            foreach ($remaining as $object) {
-                $this->detach($object);
-            }
-        }
-        // add the new objects we're splicing in
-        foreach ($objects as $object) {
-            $this->add($object);
-        }
-        // attach the objects we previously detached
-        foreach ($remaining as $object) {
-            $this->add($object);
-        }
-    }
-
-
-    /**
-     * Removes the object at the given index
-     *
-     * @see http://stackoverflow.com/a/8736013
-     * @param int $index
-     */
-    public function removeAt($index)
-    {
-        $this->detach($this->objectAtIndex($index));
-    }
-
-
-    /**
-     * detaches ALL objects from the Collection
-     */
-    public function detachAll()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $object = $this->current();
-            $this->next();
-            $this->detach($object);
-        }
-    }
-
-
-    /**
-     * unsets and detaches ALL objects from the Collection
-     */
-    public function trashAndDetachAll()
-    {
-        $this->rewind();
-        while ($this->valid()) {
-            $object = $this->current();
-            $this->next();
-            if (! $object instanceof InterminableInterface) {
-                $this->detach($object);
-                unset($object);
-            }
-        }
-    }
+	/**
+	 * a unique string for identifying this collection
+	 *
+	 * @type string $collection_identifier
+	 */
+	protected $collection_identifier;
+
+
+	/**
+	 * an interface (or class) name to be used for restricting the type of objects added to the storage
+	 * this should be set from within the child class constructor
+	 *
+	 * @type string $interface
+	 */
+	protected $collection_interface;
+
+	/**
+	 * a short dash separated string describing the contents of this collection
+	 * used as the base for the $collection_identifier
+	 * defaults to the class short name if not set
+	 *
+	 * @type string $collection_identifier
+	 */
+	protected $collection_name;
+
+
+	/**
+	 * Collection constructor
+	 *
+	 * @param string $collection_interface
+	 * @param string $collection_name
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(string $collection_interface, string $collection_name = '')
+	{
+		$this->setCollectionInterface($collection_interface);
+		$this->setCollectionName($collection_name);
+		$this->setCollectionIdentifier();
+	}
+
+
+	/**
+	 * @return string
+	 * @since 4.10.33.p
+	 */
+	public function collectionInterface(): string
+	{
+		return $this->collection_interface;
+	}
+
+
+	/**
+	 * setCollectionInterface
+	 *
+	 * @param  string $collection_interface
+	 * @throws InvalidInterfaceException
+	 */
+	protected function setCollectionInterface(string $collection_interface)
+	{
+		if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+			throw new InvalidInterfaceException($collection_interface);
+		}
+		$this->collection_interface = $collection_interface;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function collectionName(): string
+	{
+		return $this->collection_name;
+	}
+
+
+	/**
+	 * @param string $collection_name
+	 */
+	protected function setCollectionName(string $collection_name)
+	{
+		$this->collection_name = ! empty($collection_name)
+			? sanitize_key($collection_name)
+			: basename(str_replace('\\', '/', get_class($this)));
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function collectionIdentifier(): string
+	{
+		return $this->collection_identifier;
+	}
+
+
+	/**
+	 * creates a very readable unique 9 character identifier like:  CF2-532-DAC
+	 * and appends it to the non-qualified class name, ex: ThingCollection-CF2-532-DAC
+	 *
+	 * @return void
+	 */
+	protected function setCollectionIdentifier()
+	{
+		// hash a few collection details
+		$identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+		// grab a few characters from the start, middle, and end of the hash
+		$id = array();
+		for ($x = 0; $x < 19; $x += 9) {
+			$id[] = substr($identifier, $x, 3);
+		}
+		$this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
+	}
+
+
+	/**
+	 * add
+	 * attaches an object to the Collection
+	 * and sets any supplied data associated with the current iterator entry
+	 * by calling EE_Object_Collection::set_identifier()
+	 *
+	 * @param mixed $object
+	 * @param mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function add($object, $identifier = null): bool
+	{
+		if (! $object instanceof $this->collection_interface) {
+			throw new InvalidEntityException($object, $this->collection_interface);
+		}
+		$identifier = $this->getIdentifier($object, $identifier);
+		if ($this->contains($object) || $this->has($identifier)) {
+			throw new DuplicateCollectionIdentifierException($identifier);
+		}
+		parent::attach($object, $identifier);
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * getIdentifier
+	 * if no $identifier is supplied, then the spl_object_hash() is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return string
+	 */
+	public function getIdentifier($object, $identifier = null): string
+	{
+		return ! empty($identifier) ? $identifier : spl_object_hash($object);
+	}
+
+
+	/**
+	 * setIdentifier
+	 * Sets the data associated with an object in the Collection
+	 * if no $identifier is supplied, then the spl_object_hash() is used
+	 *
+	 * @param        $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function setIdentifier($object, $identifier = null): bool
+	{
+		$identifier = $this->getIdentifier($object, $identifier);
+		$this->rewind();
+		while ($this->valid()) {
+			if ($object === $this->current()) {
+				$this->setInfo($identifier);
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * get
+	 * finds and returns an object in the Collection based on the identifier that was set using addObject()
+	 * PLZ NOTE: the pointer is reset to the beginning of the collection before returning
+	 *
+	 * @param mixed $identifier
+	 * @return mixed
+	 */
+	public function get($identifier)
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$object = $this->current();
+				$this->rewind();
+				return $object;
+			}
+			$this->next();
+		}
+		return null;
+	}
+
+
+	/**
+	 * has
+	 * returns TRUE or FALSE
+	 * depending on whether the object is within the Collection
+	 * based on the supplied $identifier
+	 *
+	 * @param  mixed $identifier
+	 * @return bool
+	 */
+	public function has($identifier): bool
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				$this->rewind();
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * hasObject
+	 * returns TRUE or FALSE depending on whether the supplied object is within the Collection
+	 *
+	 * @param $object
+	 * @return bool
+	 */
+	public function hasObject($object): bool
+	{
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * hasObjects
+	 * returns true if there are objects within the Collection, and false if it is empty
+	 *
+	 * @return bool
+	 */
+	public function hasObjects(): bool
+	{
+		return $this->count() !== 0;
+	}
+
+
+	/**
+	 * isEmpty
+	 * returns true if there are no objects within the Collection, and false if there are
+	 *
+	 * @return bool
+	 */
+	public function isEmpty(): bool
+	{
+		return $this->count() === 0;
+	}
+
+
+	/**
+	 * remove
+	 * detaches an object from the Collection
+	 *
+	 * @param $object
+	 * @return bool
+	 */
+	public function remove($object): bool
+	{
+		$this->detach($object);
+		return true;
+	}
+
+
+	/**
+	 * detaches the object matching the supplied identifier from the Collection
+	 *
+	 * @param mixed $identifier
+	 * @return bool
+	 */
+	public function removeByIdentifier($identifier): bool
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$object = $this->current();
+			$this->next();
+			if ($identifier === $this->getInfo()) {
+				$this->detach($object);
+				unset($object);
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * setCurrent
+	 * advances pointer to the object whose identifier matches that which was provided
+	 *
+	 * @param mixed $identifier
+	 * @return boolean
+	 */
+	public function setCurrent($identifier): bool
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($identifier === $this->getInfo()) {
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * setCurrentUsingObject
+	 * advances pointer to the provided object
+	 *
+	 * @param $object
+	 * @return boolean
+	 */
+	public function setCurrentUsingObject($object): bool
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			if ($this->current() === $object) {
+				return true;
+			}
+			$this->next();
+		}
+		return false;
+	}
+
+
+	/**
+	 * Returns the object occupying the index before the current object,
+	 * unless this is already the first object, in which case it just returns the first object
+	 *
+	 * @return mixed
+	 */
+	public function previous()
+	{
+		$index = $this->indexOf($this->current());
+		if ($index === 0) {
+			return $this->current();
+		}
+		$index--;
+		return $this->objectAtIndex($index);
+	}
+
+
+	/**
+	 * Returns the index of a given object, or false if not found
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param $object
+	 * @return boolean|int
+	 */
+	public function indexOf($object)
+	{
+		if (! $this->contains($object)) {
+			return false;
+		}
+		foreach ($this as $index => $obj) {
+			if ($obj === $object) {
+				return $index;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * Returns the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $index
+	 * @return mixed
+	 */
+	public function objectAtIndex($index)
+	{
+		$iterator = new LimitIterator($this, $index, 1);
+		$iterator->rewind();
+		return $iterator->current();
+	}
+
+
+	/**
+	 * Returns the sequence of objects as specified by the offset and length
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $offset
+	 * @param int $length
+	 * @return array
+	 */
+	public function slice($offset, $length): array
+	{
+		$slice = array();
+		$iterator = new LimitIterator($this, $offset, $length);
+		foreach ($iterator as $object) {
+			$slice[] = $object;
+		}
+		return $slice;
+	}
+
+
+	/**
+	 * Inserts an object at a certain point
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param mixed $object A single object
+	 * @param int   $index
+	 * @param mixed $identifier
+	 * @return bool
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidEntityException
+	 */
+	public function insertObjectAt($object, int $index, $identifier = null): bool
+	{
+		// check to ensure that objects don't already exist in the collection
+		if ($this->has($identifier)) {
+			throw new DuplicateCollectionIdentifierException($identifier);
+		}
+		// detach any objects at or past this index
+		$remaining_objects = array();
+		if ($index < $this->count()) {
+			$remaining_objects = $this->slice($index, $this->count() - $index);
+			foreach ($remaining_objects as $key => $remaining_object) {
+				// we need to grab the identifiers for each object and use them as keys
+				$remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
+				// and then remove the object from the current tracking array
+				unset($remaining_objects[ $key ]);
+				// and then remove it from the Collection
+				$this->detach($remaining_object);
+			}
+		}
+		// add the new object we're splicing in
+		$this->add($object, $identifier);
+		// attach the objects we previously detached
+		foreach ($remaining_objects as $key => $remaining_object) {
+			$this->add($remaining_object, $key);
+		}
+		return $this->contains($object);
+	}
+
+
+	/**
+	 * Inserts an object (or an array of objects) at a certain point
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param mixed $objects A single object or an array of objects
+	 * @param int   $index
+	 */
+	public function insertAt($objects, $index)
+	{
+		if (! is_array($objects)) {
+			$objects = array($objects);
+		}
+		// check to ensure that objects don't already exist in the collection
+		foreach ($objects as $key => $object) {
+			if ($this->contains($object)) {
+				unset($objects[ $key ]);
+			}
+		}
+		// do we have any objects left?
+		if (! $objects) {
+			return;
+		}
+		// detach any objects at or past this index
+		$remaining = array();
+		if ($index < $this->count()) {
+			$remaining = $this->slice($index, $this->count() - $index);
+			foreach ($remaining as $object) {
+				$this->detach($object);
+			}
+		}
+		// add the new objects we're splicing in
+		foreach ($objects as $object) {
+			$this->add($object);
+		}
+		// attach the objects we previously detached
+		foreach ($remaining as $object) {
+			$this->add($object);
+		}
+	}
+
+
+	/**
+	 * Removes the object at the given index
+	 *
+	 * @see http://stackoverflow.com/a/8736013
+	 * @param int $index
+	 */
+	public function removeAt($index)
+	{
+		$this->detach($this->objectAtIndex($index));
+	}
+
+
+	/**
+	 * detaches ALL objects from the Collection
+	 */
+	public function detachAll()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$object = $this->current();
+			$this->next();
+			$this->detach($object);
+		}
+	}
+
+
+	/**
+	 * unsets and detaches ALL objects from the Collection
+	 */
+	public function trashAndDetachAll()
+	{
+		$this->rewind();
+		while ($this->valid()) {
+			$object = $this->current();
+			$this->next();
+			if (! $object instanceof InterminableInterface) {
+				$this->detach($object);
+				unset($object);
+			}
+		}
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -78,7 +78,7 @@ 
      */
     protected function setCollectionInterface(string $collection_interface)
     {
-        if (! (interface_exists($collection_interface) || class_exists($collection_interface))) {
+        if ( ! (interface_exists($collection_interface) || class_exists($collection_interface))) {
             throw new InvalidInterfaceException($collection_interface);
         }
         $this->collection_interface = $collection_interface;
@@ -123,13 +123,13 @@ 
     protected function setCollectionIdentifier()
     {
         // hash a few collection details
-        $identifier = md5(spl_object_hash($this) . $this->collection_interface . time());
+        $identifier = md5(spl_object_hash($this).$this->collection_interface.time());
         // grab a few characters from the start, middle, and end of the hash
         $id = array();
         for ($x = 0; $x < 19; $x += 9) {
             $id[] = substr($identifier, $x, 3);
         }
-        $this->collection_identifier = $this->collection_name . '-' . strtoupper(implode('-', $id));
+        $this->collection_identifier = $this->collection_name.'-'.strtoupper(implode('-', $id));
     }
 
 
@@ -147,7 +147,7 @@ 
      */
     public function add($object, $identifier = null): bool
     {
-        if (! $object instanceof $this->collection_interface) {
+        if ( ! $object instanceof $this->collection_interface) {
             throw new InvalidEntityException($object, $this->collection_interface);
         }
         $identifier = $this->getIdentifier($object, $identifier);
@@ -383,7 +383,7 @@ 
      */
     public function indexOf($object)
     {
-        if (! $this->contains($object)) {
+        if ( ! $this->contains($object)) {
             return false;
         }
         foreach ($this as $index => $obj) {
@@ -452,9 +452,9 @@ 
             $remaining_objects = $this->slice($index, $this->count() - $index);
             foreach ($remaining_objects as $key => $remaining_object) {
                 // we need to grab the identifiers for each object and use them as keys
-                $remaining_objects[ $remaining_object->getInfo() ] = $remaining_object;
+                $remaining_objects[$remaining_object->getInfo()] = $remaining_object;
                 // and then remove the object from the current tracking array
-                unset($remaining_objects[ $key ]);
+                unset($remaining_objects[$key]);
                 // and then remove it from the Collection
                 $this->detach($remaining_object);
             }
@@ -478,17 +478,17 @@ 
      */
     public function insertAt($objects, $index)
     {
-        if (! is_array($objects)) {
+        if ( ! is_array($objects)) {
             $objects = array($objects);
         }
         // check to ensure that objects don't already exist in the collection
         foreach ($objects as $key => $object) {
             if ($this->contains($object)) {
-                unset($objects[ $key ]);
+                unset($objects[$key]);
             }
         }
         // do we have any objects left?
-        if (! $objects) {
+        if ( ! $objects) {
             return;
         }
         // detach any objects at or past this index
@@ -545,7 +545,7 @@ 
         while ($this->valid()) {
             $object = $this->current();
             $this->next();
-            if (! $object instanceof InterminableInterface) {
+            if ( ! $object instanceof InterminableInterface) {
                 $this->detach($object);
                 unset($object);
             }

core/domain/services/assets/EspressoLegacyAdminAssetManager.php

Indentation +228 added lines, -228 removed lines

@@ -15,244 +15,244 @@
 class EspressoLegacyAdminAssetManager extends AssetManager
 {
 
-    const JS_HANDLE_EE_ADMIN                = 'ee_admin_js';
+	const JS_HANDLE_EE_ADMIN                = 'ee_admin_js';
 
-    const JS_HANDLE_EE_AJAX_TABLE_SORTING   = 'espresso_ajax_table_sorting';
+	const JS_HANDLE_EE_AJAX_TABLE_SORTING   = 'espresso_ajax_table_sorting';
 
-    const JS_HANDLE_EE_DATEPICKER           = 'ee-datepicker';
+	const JS_HANDLE_EE_DATEPICKER           = 'ee-datepicker';
 
-    const JS_HANDLE_EE_DIALOG               = 'ee-dialog';
+	const JS_HANDLE_EE_DIALOG               = 'ee-dialog';
 
-    const JS_HANDLE_EE_HELP_TOUR            = 'ee-help-tour';
+	const JS_HANDLE_EE_HELP_TOUR            = 'ee-help-tour';
 
-    const JS_HANDLE_EE_INJECT_WP            = 'ee-inject-wp';
+	const JS_HANDLE_EE_INJECT_WP            = 'ee-inject-wp';
 
-    const JS_HANDLE_GOOGLE_CHARTS           = 'google-charts';
+	const JS_HANDLE_GOOGLE_CHARTS           = 'google-charts';
 
-    const JS_HANDLE_MOMENT                  = 'ee-moment';
+	const JS_HANDLE_MOMENT                  = 'ee-moment';
 
-    const JS_HANDLE_MOMENT_CORE             = 'ee-moment-core';
+	const JS_HANDLE_MOMENT_CORE             = 'ee-moment-core';
 
-    const JS_HANDLE_PARSE_URI               = 'ee-parse-uri';
+	const JS_HANDLE_PARSE_URI               = 'ee-parse-uri';
 
-    const JS_HANDLE_EE_TEXT_LINKS           = 'ee-text-links-js';
+	const JS_HANDLE_EE_TEXT_LINKS           = 'ee-text-links-js';
 
-    const JS_HANDLE_EE_SERIALIZE_FULL_ARRAY = 'ee-serialize-full-array';
-
-    const JS_HANDLE_JOYRIDE_MODERNIZR       = 'joyride-modernizr';
+	const JS_HANDLE_EE_SERIALIZE_FULL_ARRAY = 'ee-serialize-full-array';
+
+	const JS_HANDLE_JOYRIDE_MODERNIZR       = 'joyride-modernizr';
 
-    const JS_HANDLE_JQUERY_JOYRIDE          = 'jquery-joyride';
-
-    const CSS_HANDLE_EE_ADMIN               = 'ee-admin-css';
-
-    const CSS_HANDLE_EE_JOYRIDE             = 'ee-joyride-css';
-
-    const CSS_HANDLE_EE_TEXT_LINKS          = 'ee-text-links-css';
-
-    const CSS_HANDLE_EE_UI_THEME            = 'espresso-ui-theme';
-
-    const CSS_HANDLE_JOYRIDE                = 'joyride-css';
-
-
-    /**
-     * @inheritDoc
-     */
-    public function addAssets()
-    {
-        $joyride = filter_var(apply_filters('FHEE_load_joyride', false), FILTER_VALIDATE_BOOLEAN);
-        $this->registerJavascript($joyride);
-        $this->registerStyleSheets($joyride);
-    }
-
-
-    /**
-     * Register javascript assets
-     *
-     * @param bool $joyride
-     */
-    private function registerJavascript($joyride = false)
-    {
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
-            EE_ADMIN_URL . 'assets/ee-dialog-helper.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY,
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_DRAGGABLE,
-            ]
-        );
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.js',
-            [
-                CoreAssetManager::JS_HANDLE_CORE,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
-            ]
-        );
-
-        // script for sorting tables
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_AJAX_TABLE_SORTING,
-            EE_ADMIN_URL . 'assets/espresso_ajax_table_sorting.js',
-            [
-                EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_SORTABLE,
-            ]
-        );
-
-        // script for parsing uri's
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
-            EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js'
-        );
-
-        // and parsing associative serialized form elements
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_SERIALIZE_FULL_ARRAY,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-
-        );
-
-        // helpers scripts
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE,
-            EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js'
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
-            EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js',
-            [EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE]
-        );
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DATEPICKER,
-            EE_ADMIN_URL . 'assets/ee-datepicker.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
-            ]
-        );
-
-        // google charts
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_GOOGLE_CHARTS,
-            'https://www.gstatic.com/charts/loader.js'
-        );
-
-        // this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
-        // Note: the intention of this script is to only do TARGETED injections.
-        //ie: only injecting on certain script calls.
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_INJECT_WP,
-            EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-        );
-
-        $this->loadQtipJs();
-
-        // joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_joyride', '__return_true' );
-        if (! $joyride) {
-            return;
-        }
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
-            EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js',
-            [],
-            true,
-            '2.1'
-        );
-
-        // wanna go for a joyride?
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
-                EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
-            ],
-            true,
-            '2.1'
-        )->setEnqueueImmediately();
-
-        $this->addJavascript(
-            EspressoLegacyAdminAssetManager::JS_HANDLE_EE_HELP_TOUR,
-            EE_ADMIN_URL . 'assets/ee-help-tour.js',
-            [
-                EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
-            ],
-            true,
-            '2.1'
-        )->setEnqueueImmediately();
-    }
-
-
-    /**
-     * Register CSS assets.
-     *
-     * @param bool $joyride
-     */
-    private function registerStyleSheets($joyride = false)
-    {
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_UI_THEME,
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_TEXT_LINKS,
-            EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN,
-            EE_ADMIN_URL . 'assets/ee-admin-page.css'
-        )->setEnqueueImmediately();
-
-        if (! $joyride) {
-            return;
-        }
-        // joyride style
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE,
-            EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css',
-            [],
-            'all',
-            '2.1'
-        );
-
-        $this->addStylesheet(
-            EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_JOYRIDE,
-            EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css',
-            [EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE],
-            'all',
-            EVENT_ESPRESSO_VERSION
-        )->setEnqueueImmediately();
-    }
-
-
-    /**
-     * registers assets for cleaning your ears
-     */
-    public function loadQtipJs()
-    {
-        // qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (apply_filters('FHEE_load_qtip', false)) {
-            $qtip_loader = EEH_Qtip_Loader::instance();
-            if ($qtip_loader instanceof EEH_Qtip_Loader) {
-                $qtip_loader->register_and_enqueue();
-            }
-        }
-    }
+	const JS_HANDLE_JQUERY_JOYRIDE          = 'jquery-joyride';
+
+	const CSS_HANDLE_EE_ADMIN               = 'ee-admin-css';
+
+	const CSS_HANDLE_EE_JOYRIDE             = 'ee-joyride-css';
+
+	const CSS_HANDLE_EE_TEXT_LINKS          = 'ee-text-links-css';
+
+	const CSS_HANDLE_EE_UI_THEME            = 'espresso-ui-theme';
+
+	const CSS_HANDLE_JOYRIDE                = 'joyride-css';
+
+
+	/**
+	 * @inheritDoc
+	 */
+	public function addAssets()
+	{
+		$joyride = filter_var(apply_filters('FHEE_load_joyride', false), FILTER_VALIDATE_BOOLEAN);
+		$this->registerJavascript($joyride);
+		$this->registerStyleSheets($joyride);
+	}
+
+
+	/**
+	 * Register javascript assets
+	 *
+	 * @param bool $joyride
+	 */
+	private function registerJavascript($joyride = false)
+	{
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
+			EE_ADMIN_URL . 'assets/ee-dialog-helper.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY,
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_DRAGGABLE,
+			]
+		);
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
+			EE_ADMIN_URL . 'assets/ee-admin-page.js',
+			[
+				CoreAssetManager::JS_HANDLE_CORE,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DIALOG,
+			]
+		);
+
+		// script for sorting tables
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_AJAX_TABLE_SORTING,
+			EE_ADMIN_URL . 'assets/espresso_ajax_table_sorting.js',
+			[
+				EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN,
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_SORTABLE,
+			]
+		);
+
+		// script for parsing uri's
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_PARSE_URI,
+			EE_GLOBAL_ASSETS_URL . 'scripts/parseuri.js'
+		);
+
+		// and parsing associative serialized form elements
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_SERIALIZE_FULL_ARRAY,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.serializefullarray.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+
+		);
+
+		// helpers scripts
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_TEXT_LINKS,
+			EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE,
+			EE_THIRD_PARTY_URL . 'moment/moment-with-locales.min.js'
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
+			EE_THIRD_PARTY_URL . 'moment/moment-timezone-with-data.min.js',
+			[EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT_CORE]
+		);
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_DATEPICKER,
+			EE_ADMIN_URL . 'assets/ee-datepicker.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_MOMENT,
+			]
+		);
+
+		// google charts
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_GOOGLE_CHARTS,
+			'https://www.gstatic.com/charts/loader.js'
+		);
+
+		// this javascript is loaded on every admin page to catch any injections ee needs to add to wp run js.
+		// Note: the intention of this script is to only do TARGETED injections.
+		//ie: only injecting on certain script calls.
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_INJECT_WP,
+			EE_ADMIN_URL . 'assets/ee-cpt-wp-injects.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+		);
+
+		$this->loadQtipJs();
+
+		// joyride is turned OFF by default, but prior to the admin_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_joyride', '__return_true' );
+		if (! $joyride) {
+			return;
+		}
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
+			EE_THIRD_PARTY_URL . 'joyride/modernizr.mq.js',
+			[],
+			true,
+			'2.1'
+		);
+
+		// wanna go for a joyride?
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
+			EE_THIRD_PARTY_URL . 'joyride/jquery.joyride-2.1.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
+				EspressoLegacyAdminAssetManager::JS_HANDLE_JOYRIDE_MODERNIZR,
+			],
+			true,
+			'2.1'
+		)->setEnqueueImmediately();
+
+		$this->addJavascript(
+			EspressoLegacyAdminAssetManager::JS_HANDLE_EE_HELP_TOUR,
+			EE_ADMIN_URL . 'assets/ee-help-tour.js',
+			[
+				EspressoLegacyAdminAssetManager::JS_HANDLE_JQUERY_JOYRIDE,
+			],
+			true,
+			'2.1'
+		)->setEnqueueImmediately();
+	}
+
+
+	/**
+	 * Register CSS assets.
+	 *
+	 * @param bool $joyride
+	 */
+	private function registerStyleSheets($joyride = false)
+	{
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_UI_THEME,
+			EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_TEXT_LINKS,
+			EE_PLUGIN_DIR_URL . 'core/helpers/assets/ee_text_list_helper.css'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_ADMIN,
+			EE_ADMIN_URL . 'assets/ee-admin-page.css'
+		)->setEnqueueImmediately();
+
+		if (! $joyride) {
+			return;
+		}
+		// joyride style
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE,
+			EE_THIRD_PARTY_URL . 'joyride/joyride-2.1.css',
+			[],
+			'all',
+			'2.1'
+		);
+
+		$this->addStylesheet(
+			EspressoLegacyAdminAssetManager::CSS_HANDLE_EE_JOYRIDE,
+			EE_GLOBAL_ASSETS_URL . 'css/ee-joyride-styles.css',
+			[EspressoLegacyAdminAssetManager::CSS_HANDLE_JOYRIDE],
+			'all',
+			EVENT_ESPRESSO_VERSION
+		)->setEnqueueImmediately();
+	}
+
+
+	/**
+	 * registers assets for cleaning your ears
+	 */
+	public function loadQtipJs()
+	{
+		// qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (apply_filters('FHEE_load_qtip', false)) {
+			$qtip_loader = EEH_Qtip_Loader::instance();
+			if ($qtip_loader instanceof EEH_Qtip_Loader) {
+				$qtip_loader->register_and_enqueue();
+			}
+		}
+	}
 }

core/domain/services/assets/CoreAssetManager.php

Indentation +172 added lines, -172 removed lines

@@ -29,176 +29,176 @@
 class CoreAssetManager extends AssetManager
 {
 
-    // WordPress core / Third party JS asset handles
-    const JS_HANDLE_CORE    = 'espresso_core';
-
-    const JS_HANDLE_JS_CORE = 'eejs-core';
-
-    const JS_HANDLE_I18N    = 'eei18n';
-
-    const JS_HANDLE_RAMDA  = 'ramda';
-
-    const JS_HANDLE_VENDOR  = 'eventespresso-vendor';
-
-    const JS_HANDLE_WP_PLUGINS_PAGE = 'eventespresso-wp-plugins-page-js';
-
-    const RAMDA_VERSION = '0.27.1';
-
-    // EE CSS assets handles
-    const CSS_HANDLE_DEFAULT = 'espresso_default';
-
-    const CSS_HANDLE_CUSTOM  = 'espresso_custom_css';
-
-    const CSS_HANDLE_WP_PLUGINS_PAGE = 'eventespresso-wp-plugins-page-css';
-
-    /**
-     * @var EE_Currency_Config $currency_config
-     */
-    protected $currency_config;
-
-    /**
-     * @var EE_Template_Config $template_config
-     */
-    protected $template_config;
-
-
-    /**
-     * CoreAssetRegister constructor.
-     *
-     * @param AssetCollection    $assets
-     * @param EE_Currency_Config $currency_config
-     * @param EE_Template_Config $template_config
-     * @param DomainInterface    $domain
-     * @param Registry           $registry
-     */
-    public function __construct(
-        AssetCollection $assets,
-        EE_Currency_Config $currency_config,
-        EE_Template_Config $template_config,
-        DomainInterface $domain,
-        Registry $registry
-    ) {
-        $this->currency_config = $currency_config;
-        $this->template_config = $template_config;
-        parent::__construct($domain, $assets, $registry);
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @since 4.9.62.p
-     */
-    public function addAssets()
-    {
-        $this->addJavascriptFiles();
-        $this->addStylesheetFiles();
-    }
-
-
-    /**
-     * @throws DomainException
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @since 4.9.62.p
-     */
-    public function addJavascriptFiles()
-    {
-        $this->addJs(CoreAssetManager::JS_HANDLE_VENDOR);
-        $this->addJs(CoreAssetManager::JS_HANDLE_JS_CORE)->setHasInlineData();
-        $this->addJavascript(
-            CoreAssetManager::JS_HANDLE_CORE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
-            [JqueryAssetManager::JS_HANDLE_JQUERY]
-        )->setInlineDataCallback(
-            function () {
-                wp_localize_script(
-                    CoreAssetManager::JS_HANDLE_CORE,
-                    CoreAssetManager::JS_HANDLE_I18N,
-                    EE_Registry::$i18n_js_strings
-                );
-            }
-        );
-        $this->loadQtipJs();
-        $this->addVendorJavascript(
-            CoreAssetManager::JS_HANDLE_RAMDA,
-            [],
-            true,
-            CoreAssetManager::RAMDA_VERSION
-        );
-    }
-
-
-    /**
-     * @throws DuplicateCollectionIdentifierException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws DomainException
-     * @since 4.9.62.p
-     */
-    public function addStylesheetFiles()
-    {
-        if ($this->template_config->enable_default_style && ! is_admin()) {
-            $this->addStylesheet(
-                CoreAssetManager::CSS_HANDLE_DEFAULT,
-                is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css')
-                    ? EVENT_ESPRESSO_UPLOAD_URL . 'css/espresso_default.css'
-                    : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
-                ['dashicons']
-            );
-            //Load custom style sheet if available
-            if ($this->template_config->custom_style_sheet !== null) {
-                $this->addStylesheet(
-                    CoreAssetManager::CSS_HANDLE_CUSTOM,
-                    EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
-                    [CoreAssetManager::CSS_HANDLE_DEFAULT]
-                );
-            }
-        }
-    }
-
-
-    /**
-     * Returns configuration data for the js Currency VO.
-     *
-     * @return array
-     * @since 4.9.71.p
-     */
-    private function getCurrencySettings()
-    {
-        return [
-            'code'               => $this->currency_config->code,
-            'singularLabel'      => $this->currency_config->name,
-            'pluralLabel'        => $this->currency_config->plural,
-            'sign'               => $this->currency_config->sign,
-            'signB4'             => $this->currency_config->sign_b4,
-            'decimalPlaces'      => $this->currency_config->dec_plc,
-            'decimalMark'        => $this->currency_config->dec_mrk,
-            'thousandsSeparator' => $this->currency_config->thsnds,
-        ];
-    }
-
-
-    /**
-     * replacement:
-     * EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager::loadQtipJs()
-     *
-     * @param JavascriptAsset $script
-     * @deprecated $VID:$
-     */
-    public function loadQtipJs(JavascriptAsset $script = null)
-    {
-        // qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
-        // can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
-        if (apply_filters('FHEE_load_qtip', false)) {
-            EEH_Qtip_Loader::instance()->register_and_enqueue();
-        }
-    }
+	// WordPress core / Third party JS asset handles
+	const JS_HANDLE_CORE    = 'espresso_core';
+
+	const JS_HANDLE_JS_CORE = 'eejs-core';
+
+	const JS_HANDLE_I18N    = 'eei18n';
+
+	const JS_HANDLE_RAMDA  = 'ramda';
+
+	const JS_HANDLE_VENDOR  = 'eventespresso-vendor';
+
+	const JS_HANDLE_WP_PLUGINS_PAGE = 'eventespresso-wp-plugins-page-js';
+
+	const RAMDA_VERSION = '0.27.1';
+
+	// EE CSS assets handles
+	const CSS_HANDLE_DEFAULT = 'espresso_default';
+
+	const CSS_HANDLE_CUSTOM  = 'espresso_custom_css';
+
+	const CSS_HANDLE_WP_PLUGINS_PAGE = 'eventespresso-wp-plugins-page-css';
+
+	/**
+	 * @var EE_Currency_Config $currency_config
+	 */
+	protected $currency_config;
+
+	/**
+	 * @var EE_Template_Config $template_config
+	 */
+	protected $template_config;
+
+
+	/**
+	 * CoreAssetRegister constructor.
+	 *
+	 * @param AssetCollection    $assets
+	 * @param EE_Currency_Config $currency_config
+	 * @param EE_Template_Config $template_config
+	 * @param DomainInterface    $domain
+	 * @param Registry           $registry
+	 */
+	public function __construct(
+		AssetCollection $assets,
+		EE_Currency_Config $currency_config,
+		EE_Template_Config $template_config,
+		DomainInterface $domain,
+		Registry $registry
+	) {
+		$this->currency_config = $currency_config;
+		$this->template_config = $template_config;
+		parent::__construct($domain, $assets, $registry);
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.62.p
+	 */
+	public function addAssets()
+	{
+		$this->addJavascriptFiles();
+		$this->addStylesheetFiles();
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @since 4.9.62.p
+	 */
+	public function addJavascriptFiles()
+	{
+		$this->addJs(CoreAssetManager::JS_HANDLE_VENDOR);
+		$this->addJs(CoreAssetManager::JS_HANDLE_JS_CORE)->setHasInlineData();
+		$this->addJavascript(
+			CoreAssetManager::JS_HANDLE_CORE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+			[JqueryAssetManager::JS_HANDLE_JQUERY]
+		)->setInlineDataCallback(
+			function () {
+				wp_localize_script(
+					CoreAssetManager::JS_HANDLE_CORE,
+					CoreAssetManager::JS_HANDLE_I18N,
+					EE_Registry::$i18n_js_strings
+				);
+			}
+		);
+		$this->loadQtipJs();
+		$this->addVendorJavascript(
+			CoreAssetManager::JS_HANDLE_RAMDA,
+			[],
+			true,
+			CoreAssetManager::RAMDA_VERSION
+		);
+	}
+
+
+	/**
+	 * @throws DuplicateCollectionIdentifierException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws DomainException
+	 * @since 4.9.62.p
+	 */
+	public function addStylesheetFiles()
+	{
+		if ($this->template_config->enable_default_style && ! is_admin()) {
+			$this->addStylesheet(
+				CoreAssetManager::CSS_HANDLE_DEFAULT,
+				is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css')
+					? EVENT_ESPRESSO_UPLOAD_URL . 'css/espresso_default.css'
+					: EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+				['dashicons']
+			);
+			//Load custom style sheet if available
+			if ($this->template_config->custom_style_sheet !== null) {
+				$this->addStylesheet(
+					CoreAssetManager::CSS_HANDLE_CUSTOM,
+					EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
+					[CoreAssetManager::CSS_HANDLE_DEFAULT]
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * Returns configuration data for the js Currency VO.
+	 *
+	 * @return array
+	 * @since 4.9.71.p
+	 */
+	private function getCurrencySettings()
+	{
+		return [
+			'code'               => $this->currency_config->code,
+			'singularLabel'      => $this->currency_config->name,
+			'pluralLabel'        => $this->currency_config->plural,
+			'sign'               => $this->currency_config->sign,
+			'signB4'             => $this->currency_config->sign_b4,
+			'decimalPlaces'      => $this->currency_config->dec_plc,
+			'decimalMark'        => $this->currency_config->dec_mrk,
+			'thousandsSeparator' => $this->currency_config->thsnds,
+		];
+	}
+
+
+	/**
+	 * replacement:
+	 * EventEspresso\core\domain\services\assets\EspressoLegacyAdminAssetManager::loadQtipJs()
+	 *
+	 * @param JavascriptAsset $script
+	 * @deprecated $VID:$
+	 */
+	public function loadQtipJs(JavascriptAsset $script = null)
+	{
+		// qtip is turned OFF by default, but prior to the wp_enqueue_scripts hook,
+		// can be turned back on again via: add_filter('FHEE_load_qtip', '__return_true' );
+		if (apply_filters('FHEE_load_qtip', false)) {
+			EEH_Qtip_Loader::instance()->register_and_enqueue();
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -36,9 +36,9 @@ 
 
     const JS_HANDLE_I18N    = 'eei18n';
 
-    const JS_HANDLE_RAMDA  = 'ramda';
+    const JS_HANDLE_RAMDA = 'ramda';
 
-    const JS_HANDLE_VENDOR  = 'eventespresso-vendor';
+    const JS_HANDLE_VENDOR = 'eventespresso-vendor';
 
     const JS_HANDLE_WP_PLUGINS_PAGE = 'eventespresso-wp-plugins-page-js';
 
@@ -115,10 +115,10 @@ 
         $this->addJs(CoreAssetManager::JS_HANDLE_JS_CORE)->setHasInlineData();
         $this->addJavascript(
             CoreAssetManager::JS_HANDLE_CORE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/espresso_core.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/espresso_core.js',
             [JqueryAssetManager::JS_HANDLE_JQUERY]
         )->setInlineDataCallback(
-            function () {
+            function() {
                 wp_localize_script(
                     CoreAssetManager::JS_HANDLE_CORE,
                     CoreAssetManager::JS_HANDLE_I18N,
@@ -148,16 +148,16 @@ 
         if ($this->template_config->enable_default_style && ! is_admin()) {
             $this->addStylesheet(
                 CoreAssetManager::CSS_HANDLE_DEFAULT,
-                is_readable(EVENT_ESPRESSO_UPLOAD_DIR . 'css/espresso_default.css')
+                is_readable(EVENT_ESPRESSO_UPLOAD_DIR.'css/espresso_default.css')
                     ? EVENT_ESPRESSO_UPLOAD_URL . 'css/espresso_default.css'
-                    : EE_GLOBAL_ASSETS_URL . 'css/espresso_default.css',
+                    : EE_GLOBAL_ASSETS_URL.'css/espresso_default.css',
                 ['dashicons']
             );
             //Load custom style sheet if available
             if ($this->template_config->custom_style_sheet !== null) {
                 $this->addStylesheet(
                     CoreAssetManager::CSS_HANDLE_CUSTOM,
-                    EVENT_ESPRESSO_UPLOAD_URL . 'css/' . $this->template_config->custom_style_sheet,
+                    EVENT_ESPRESSO_UPLOAD_URL.'css/'.$this->template_config->custom_style_sheet,
                     [CoreAssetManager::CSS_HANDLE_DEFAULT]
                 );
             }

core/domain/services/contexts/RequestTypeContextCheckerInterface.php

Indentation +111 added lines, -111 removed lines

@@ -14,151 +14,151 @@
  */
 interface RequestTypeContextCheckerInterface extends InterminableInterface
 {
-    /**
-     * true if the current request involves some form of activation
-     *
-     * @return bool
-     */
-    public function isActivation();
+	/**
+	 * true if the current request involves some form of activation
+	 *
+	 * @return bool
+	 */
+	public function isActivation();
 
 
-    /**
-     * @param $is_activation
-     */
-    public function setIsActivation($is_activation);
+	/**
+	 * @param $is_activation
+	 */
+	public function setIsActivation($is_activation);
 
 
-    /**
-     * true if the current request is for the admin and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdmin();
+	/**
+	 * true if the current request is for the admin and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdmin();
 
 
-    /**
-     * true if the current request is for the admin AND is being made via AJAX
-     * and the ajax request contains the request parameter "ee_admin_ajax"
-     *
-     * @return bool
-     */
-    public function isAdminAjax();
+	/**
+	 * true if the current request is for the admin AND is being made via AJAX
+	 * and the ajax request contains the request parameter "ee_admin_ajax"
+	 *
+	 * @return bool
+	 */
+	public function isAdminAjax();
 
 
-    /**
-     * true if the current request is being made via AJAX... any AJAX
-     *
-     * @return bool
-     */
-    public function isAjax();
+	/**
+	 * true if the current request is being made via AJAX... any AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAjax();
 
 
-    /**
-     * true if the current request is for the EE REST API
-     *
-     * @return bool
-     */
-    public function isApi();
+	/**
+	 * true if the current request is for the EE REST API
+	 *
+	 * @return bool
+	 */
+	public function isApi();
 
 
-    /**
-     * true if the current request is from the command line
-     *
-     * @return bool
-     */
-    public function isCli();
+	/**
+	 * true if the current request is from the command line
+	 *
+	 * @return bool
+	 */
+	public function isCli();
 
 
-    /**
-     * true if the current request is for a WP_Cron
-     *
-     * @return bool
-     */
-    public function isCron();
+	/**
+	 * true if the current request is for a WP_Cron
+	 *
+	 * @return bool
+	 */
+	public function isCron();
 
 
-    /**
-     * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isEeAjax();
+	/**
+	 * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isEeAjax();
 
 
-    /**
-     * true if the current request is for a feed (ie: RSS)
-     *
-     * @return bool
-     */
-    public function isFeed();
+	/**
+	 * true if the current request is for a feed (ie: RSS)
+	 *
+	 * @return bool
+	 */
+	public function isFeed();
 
 
-    /**
-     * true if the current request is for the frontend and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontend();
+	/**
+	 * true if the current request is for the frontend and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontend();
 
 
-    /**
-     * @return bool
-     */
-    public function isFrontAjax();
+	/**
+	 * @return bool
+	 */
+	public function isFrontAjax();
 
-    /**
-     * @return bool
-     */
-    public function isGQL();
+	/**
+	 * @return bool
+	 */
+	public function isGQL();
 
 
-    /**
-     * @return bool
-     */
-    public function isIframe();
+	/**
+	 * @return bool
+	 */
+	public function isIframe();
 
 
-    /**
-     * true if the current request is being made via AJAX but is NOT for EE related logic
-     *
-     * @return bool
-     */
-    public function isOtherAjax();
+	/**
+	 * true if the current request is being made via AJAX but is NOT for EE related logic
+	 *
+	 * @return bool
+	 */
+	public function isOtherAjax();
 
 
-    /**
-     * true if the current request is occurring while unit testing
-     *
-     * @return bool
-     */
-    public function isUnitTesting();
+	/**
+	 * true if the current request is occurring while unit testing
+	 *
+	 * @return bool
+	 */
+	public function isUnitTesting();
 
-    /**
-     * true if the current request is for the WP REST API
-     *
-     * @return bool
-     */
-    public function isWordPressApi();
+	/**
+	 * true if the current request is for the WP REST API
+	 *
+	 * @return bool
+	 */
+	public function isWordPressApi();
 
 
-    /**
-     * true if the current request is being made via AJAX for the WP Heartbeat
-     *
-     * @return bool
-     */
-    public function isWordPressHeartbeat();
+	/**
+	 * true if the current request is being made via AJAX for the WP Heartbeat
+	 *
+	 * @return bool
+	 */
+	public function isWordPressHeartbeat();
 
 
-    /**
-     * true if the current request is a loopback sent from WP core to test for errors
-     *
-     * @return bool
-     */
-    public function isWordPressScrape();
+	/**
+	 * true if the current request is a loopback sent from WP core to test for errors
+	 *
+	 * @return bool
+	 */
+	public function isWordPressScrape();
 
 
-    /**
-     * @return string
-     */
-    public function slug();
+	/**
+	 * @return string
+	 */
+	public function slug();
 }

core/domain/services/contexts/RequestTypeContextFactory.php

Indentation +120 added lines, -120 removed lines

@@ -16,128 +16,128 @@
  */
 class RequestTypeContextFactory implements RequestTypeContextFactoryInterface
 {
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RequestTypeContextFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * RequestTypeContextFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create($slug): RequestTypeContext
-    {
-        switch ($slug) {
-            case RequestTypeContext::ACTIVATION:
-                $description = esc_html__(
-                    'The current request is for some form of activation',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::API:
-                $description = esc_html__(
-                    'The current request is for the EE REST API',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_FRONT:
-                $description = esc_html__(
-                    'The current request is for the frontend via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_HEARTBEAT:
-                $description = esc_html__(
-                    'The current request is for the WP Heartbeat',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_OTHER:
-                $description = esc_html__(
-                    'The current request is for non-EE related code via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CRON:
-                $description = esc_html__(
-                    'The current request is for a WP_Cron',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CLI:
-                $description = esc_html__(
-                    'The current request is from the command line',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::IFRAME:
-                $description = esc_html__(
-                    'The current request is for an iframe',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FEED:
-                $description = esc_html__(
-                    'The current request is for a feed (ie: RSS)',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::GQL:
-                $description = esc_html__(
-                    'The current request is for the EE GraphQL Manager',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::WP_API:
-                $description = esc_html__(
-                    'The current request is for the WordPress REST API',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::WP_SCRAPE:
-                $description = esc_html__(
-                    'The current request is for a WordPress loopback scrape',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FRONTEND:
-            default:
-                $description = esc_html__(
-                    'The current request is for the frontend',
-                    'event_espresso'
-                );
-                break;
-        }
-        // we're using the Loader with sharing turned on,
-        // so that the generated RequestTypeContext object is accessible anywhere
-        // by simply requesting it again from the loader
-        return $this->loader->getShared(
-            'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
-            array($slug, $description)
-        );
-    }
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create($slug): RequestTypeContext
+	{
+		switch ($slug) {
+			case RequestTypeContext::ACTIVATION:
+				$description = esc_html__(
+					'The current request is for some form of activation',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::API:
+				$description = esc_html__(
+					'The current request is for the EE REST API',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_FRONT:
+				$description = esc_html__(
+					'The current request is for the frontend via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_HEARTBEAT:
+				$description = esc_html__(
+					'The current request is for the WP Heartbeat',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_OTHER:
+				$description = esc_html__(
+					'The current request is for non-EE related code via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CRON:
+				$description = esc_html__(
+					'The current request is for a WP_Cron',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CLI:
+				$description = esc_html__(
+					'The current request is from the command line',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::IFRAME:
+				$description = esc_html__(
+					'The current request is for an iframe',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FEED:
+				$description = esc_html__(
+					'The current request is for a feed (ie: RSS)',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::GQL:
+				$description = esc_html__(
+					'The current request is for the EE GraphQL Manager',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::WP_API:
+				$description = esc_html__(
+					'The current request is for the WordPress REST API',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::WP_SCRAPE:
+				$description = esc_html__(
+					'The current request is for a WordPress loopback scrape',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FRONTEND:
+			default:
+				$description = esc_html__(
+					'The current request is for the frontend',
+					'event_espresso'
+				);
+				break;
+		}
+		// we're using the Loader with sharing turned on,
+		// so that the generated RequestTypeContext object is accessible anywhere
+		// by simply requesting it again from the loader
+		return $this->loader->getShared(
+			'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
+			array($slug, $description)
+		);
+	}
 }