eventespresso / event-espresso-core

core/services/container/SharedCoffeeMaker.php

Indentation +37 added lines, -37 removed lines

@@ -18,43 +18,43 @@
 {
 
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_SHARED;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_SHARED;
+	}
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        $this->resolveClassAndFilepath($recipe);
-        $reflector = $this->injector()->getReflectionClass($recipe->fqcn());
-        $method = $this->resolveInstantiationMethod($reflector);
-        switch ($method) {
-            case 'instance':
-            case 'new_instance':
-            case 'new_instance_from_db':
-                $service = call_user_func_array(
-                    array($reflector->getName(), $method),
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
-                );
-                break;
-            case 'newInstance':
-                $service = $reflector->newInstance();
-                break;
-            case 'newInstanceArgs':
-            default:
-                $service = $reflector->newInstanceArgs(
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
-                );
-        }
-        return $this->coffeePot()->addService($recipe->identifier(), $service);
-    }
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		$this->resolveClassAndFilepath($recipe);
+		$reflector = $this->injector()->getReflectionClass($recipe->fqcn());
+		$method = $this->resolveInstantiationMethod($reflector);
+		switch ($method) {
+			case 'instance':
+			case 'new_instance':
+			case 'new_instance_from_db':
+				$service = call_user_func_array(
+					array($reflector->getName(), $method),
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
+				);
+				break;
+			case 'newInstance':
+				$service = $reflector->newInstance();
+				break;
+			case 'newInstanceArgs':
+			default:
+				$service = $reflector->newInstanceArgs(
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
+				);
+		}
+		return $this->coffeePot()->addService($recipe->identifier(), $service);
+	}
 }

core/services/container/LoadOnlyCoffeeMaker.php

Indentation +17 added lines, -17 removed lines

@@ -21,23 +21,23 @@
 class LoadOnlyCoffeeMaker extends CoffeeMaker
 {
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_LOAD_ONLY;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_LOAD_ONLY;
+	}
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     * @throws InvalidClassException
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        return $this->resolveClassAndFilepath($recipe);
-    }
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 * @throws InvalidClassException
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		return $this->resolveClassAndFilepath($recipe);
+	}
 }

core/services/payment_methods/gateways/GatewayDataFormatter.php

Indentation +101 added lines, -101 removed lines

@@ -14,115 +14,115 @@
 class GatewayDataFormatter implements GatewayDataFormatterInterface
 {
 
-    /**
-     * Gets the text to use for a gateway's line item name when this is a partial payment
-     *
-     * @param \EEI_Payment $payment
-     * @return string
-     */
-    public function formatPartialPaymentLineItemName(\EEI_Payment $payment)
-    {
-        return apply_filters(
-            'EEG_Paypal_Pro__do_direct_payment__partial_amount_line_item_name',
-            $payment->get_first_event_name(),
-            $this,
-            $payment
-        );
-    }
+	/**
+	 * Gets the text to use for a gateway's line item name when this is a partial payment
+	 *
+	 * @param \EEI_Payment $payment
+	 * @return string
+	 */
+	public function formatPartialPaymentLineItemName(\EEI_Payment $payment)
+	{
+		return apply_filters(
+			'EEG_Paypal_Pro__do_direct_payment__partial_amount_line_item_name',
+			$payment->get_first_event_name(),
+			$this,
+			$payment
+		);
+	}
 
 
-    /**
-     * Gets the text to use for a gateway's line item description when this is a partial payment
-     *
-     * @param \EEI_Payment $payment
-     * @return string
-     */
-    public function formatPartialPaymentLineItemDesc(\EEI_Payment $payment)
-    {
-        return apply_filters(
-            'FHEE__EE_Gateway___partial_payment_desc',
-            sprintf(
-                __('Payment of %1$s for %2$s', "event_espresso"),
-                $payment->get_pretty('PAY_amount', 'no_currency_code'),
-                $payment->get_first_event_name()
-            ),
-            $this,
-            $payment
-        );
-    }
+	/**
+	 * Gets the text to use for a gateway's line item description when this is a partial payment
+	 *
+	 * @param \EEI_Payment $payment
+	 * @return string
+	 */
+	public function formatPartialPaymentLineItemDesc(\EEI_Payment $payment)
+	{
+		return apply_filters(
+			'FHEE__EE_Gateway___partial_payment_desc',
+			sprintf(
+				__('Payment of %1$s for %2$s', "event_espresso"),
+				$payment->get_pretty('PAY_amount', 'no_currency_code'),
+				$payment->get_first_event_name()
+			),
+			$this,
+			$payment
+		);
+	}
 
 
-    /**
-     * Gets the name to use for a line item when sending line items to the gateway
-     *
-     * @param \EEI_Line_Item $line_item
-     * @param \EEI_Payment   $payment
-     * @return string
-     */
-    public function formatLineItemName(\EEI_Line_Item $line_item, \EEI_Payment $payment)
-    {
-        return apply_filters(
-            'FHEE__EE_gateway___line_item_name',
-            sprintf(
-                _x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'),
-                $line_item->name(),
-                $line_item->ticket_event_name()
-            ),
-            $this,
-            $line_item,
-            $payment
-        );
-    }
+	/**
+	 * Gets the name to use for a line item when sending line items to the gateway
+	 *
+	 * @param \EEI_Line_Item $line_item
+	 * @param \EEI_Payment   $payment
+	 * @return string
+	 */
+	public function formatLineItemName(\EEI_Line_Item $line_item, \EEI_Payment $payment)
+	{
+		return apply_filters(
+			'FHEE__EE_gateway___line_item_name',
+			sprintf(
+				_x('%1$s for %2$s', 'Ticket for Event', 'event_espresso'),
+				$line_item->name(),
+				$line_item->ticket_event_name()
+			),
+			$this,
+			$line_item,
+			$payment
+		);
+	}
 
 
-    /**
-     * Gets the description to use for a line item when sending line items to the gateway
-     *
-     * @param \EEI_Line_Item $line_item
-     * @param \EEI_Payment   $payment
-     * @return string
-     */
-    public function formatLineItemDesc(\EEI_Line_Item $line_item, \EEI_Payment $payment)
-    {
-        return apply_filters(
-            'FHEE__EE_Gateway___line_item_desc',
-            $line_item->desc(),
-            $this,
-            $line_item,
-            $payment
-        );
-    }
+	/**
+	 * Gets the description to use for a line item when sending line items to the gateway
+	 *
+	 * @param \EEI_Line_Item $line_item
+	 * @param \EEI_Payment   $payment
+	 * @return string
+	 */
+	public function formatLineItemDesc(\EEI_Line_Item $line_item, \EEI_Payment $payment)
+	{
+		return apply_filters(
+			'FHEE__EE_Gateway___line_item_desc',
+			$line_item->desc(),
+			$this,
+			$line_item,
+			$payment
+		);
+	}
 
 
-    /**
-     * Gets the order description that should generally be sent to gateways
-     *
-     * @param \EEI_Payment $payment
-     * @return string
-     */
-    public function formatOrderDescription(\EEI_Payment $payment)
-    {
-        return apply_filters(
-            'FHEE__EE_Gateway___order_description',
-            sprintf(
-                __('Event Registrations from %1$s for %2$s', "event_espresso"),
-                wp_specialchars_decode(get_bloginfo(), ENT_QUOTES),
-                $payment->get_first_event_name()
-            ),
-            $this,
-            $payment
-        );
-    }
+	/**
+	 * Gets the order description that should generally be sent to gateways
+	 *
+	 * @param \EEI_Payment $payment
+	 * @return string
+	 */
+	public function formatOrderDescription(\EEI_Payment $payment)
+	{
+		return apply_filters(
+			'FHEE__EE_Gateway___order_description',
+			sprintf(
+				__('Event Registrations from %1$s for %2$s', "event_espresso"),
+				wp_specialchars_decode(get_bloginfo(), ENT_QUOTES),
+				$payment->get_first_event_name()
+			),
+			$this,
+			$payment
+		);
+	}
 
 
-    /**
-     * Formats the amount so it can generally be sent to gateways
-     *
-     * @param float $amount
-     * @return string
-     */
-    public function formatCurrency($amount)
-    {
-        return number_format($amount, 2, '.', '');
-    }
+	/**
+	 * Formats the amount so it can generally be sent to gateways
+	 *
+	 * @param float $amount
+	 * @return string
+	 */
+	public function formatCurrency($amount)
+	{
+		return number_format($amount, 2, '.', '');
+	}
 }

core/services/progress_steps/ProgressStep.php

Spacing +5 added lines, -5 removed lines

@@ -121,7 +121,7 @@ 
      */
     protected function setId($id = '')
     {
-        if (! is_string($id)) {
+        if ( ! is_string($id)) {
             throw new InvalidDataTypeException('$id', $id, 'string');
         }
         $this->id = $id;
@@ -144,7 +144,7 @@ 
      */
     protected function setOrder($order = 0)
     {
-        if (! is_int($order)) {
+        if ( ! is_int($order)) {
             throw new InvalidDataTypeException('$order', $order, 'integer');
         }
         $this->order = $order;
@@ -173,11 +173,11 @@ 
      */
     protected function setHtmlClass($html_class)
     {
-        if (! is_string($html_class)) {
+        if ( ! is_string($html_class)) {
             throw new InvalidDataTypeException('$html_class', $html_class, 'string');
         }
         if (strpos($html_class, 'progress-step-') === false) {
-            $html_class = 'progress-step-' . $html_class;
+            $html_class = 'progress-step-'.$html_class;
         }
         $this->html_class = $html_class;
     }
@@ -199,7 +199,7 @@ 
      */
     protected function setText($text)
     {
-        if (! is_string($text)) {
+        if ( ! is_string($text)) {
             throw new InvalidDataTypeException('$text', $text, 'string');
         }
         $this->text = $text;

Indentation +186 added lines, -186 removed lines

@@ -18,190 +18,190 @@
 {
 
 
-    /**
-     * @var boolean $current
-     */
-    private $current = false;
-
-
-    /**
-     * @var boolean $completed
-     */
-    private $completed = false;
-
-
-    /**
-     * @var string $html_class
-     */
-    private $html_class;
-
-    /**
-     * @var string $id
-     */
-    private $id = '';
-
-    /**
-     * @var int $order
-     */
-    private $order = 0;
-
-    /**
-     * @var string $text
-     */
-    private $text = '';
-
-
-    /**
-     * ProgressStep constructor
-     *
-     * @param int    $order
-     * @param string $id
-     * @param string $html_class
-     * @param string $text
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($order, $id, $html_class, $text)
-    {
-        $this->setOrder($order);
-        $this->setId($id);
-        $this->setHtmlClass($html_class);
-        $this->setText($text);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function isCurrent()
-    {
-        return $this->current;
-    }
-
-
-    /**
-     * @param boolean $current
-     */
-    public function setIsCurrent($current = true)
-    {
-        $this->current = filter_var($current, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function isCompleted()
-    {
-        return $this->completed;
-    }
-
-
-    /**
-     * @param boolean $completed
-     */
-    public function setIsCompleted($completed = true)
-    {
-        $this->completed = filter_var($completed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function id()
-    {
-        return $this->id;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $id
-     * @throws InvalidDataTypeException
-     */
-    protected function setId($id = '')
-    {
-        if (! is_string($id)) {
-            throw new InvalidDataTypeException('$id', $id, 'string');
-        }
-        $this->id = $id;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function order()
-    {
-        return $this->order;
-    }
-
-
-    /**
-     * @access protected
-     * @param int $order
-     * @throws InvalidDataTypeException
-     */
-    protected function setOrder($order = 0)
-    {
-        if (! is_int($order)) {
-            throw new InvalidDataTypeException('$order', $order, 'integer');
-        }
-        $this->order = $order;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function htmlClass()
-    {
-        $html_class = $this->html_class;
-        if ($this->isCurrent()) {
-            $html_class .= ' progress-step-active';
-        } elseif ($this->isCompleted()) {
-            $html_class .= ' progress-step-completed';
-        }
-        return $html_class;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $html_class
-     * @throws InvalidDataTypeException
-     */
-    protected function setHtmlClass($html_class)
-    {
-        if (! is_string($html_class)) {
-            throw new InvalidDataTypeException('$html_class', $html_class, 'string');
-        }
-        if (strpos($html_class, 'progress-step-') === false) {
-            $html_class = 'progress-step-' . $html_class;
-        }
-        $this->html_class = $html_class;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function text()
-    {
-        return $this->text;
-    }
-
-
-    /**
-     * @access protected
-     * @param string $text
-     * @throws InvalidDataTypeException
-     */
-    protected function setText($text)
-    {
-        if (! is_string($text)) {
-            throw new InvalidDataTypeException('$text', $text, 'string');
-        }
-        $this->text = $text;
-    }
+	/**
+	 * @var boolean $current
+	 */
+	private $current = false;
+
+
+	/**
+	 * @var boolean $completed
+	 */
+	private $completed = false;
+
+
+	/**
+	 * @var string $html_class
+	 */
+	private $html_class;
+
+	/**
+	 * @var string $id
+	 */
+	private $id = '';
+
+	/**
+	 * @var int $order
+	 */
+	private $order = 0;
+
+	/**
+	 * @var string $text
+	 */
+	private $text = '';
+
+
+	/**
+	 * ProgressStep constructor
+	 *
+	 * @param int    $order
+	 * @param string $id
+	 * @param string $html_class
+	 * @param string $text
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($order, $id, $html_class, $text)
+	{
+		$this->setOrder($order);
+		$this->setId($id);
+		$this->setHtmlClass($html_class);
+		$this->setText($text);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function isCurrent()
+	{
+		return $this->current;
+	}
+
+
+	/**
+	 * @param boolean $current
+	 */
+	public function setIsCurrent($current = true)
+	{
+		$this->current = filter_var($current, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function isCompleted()
+	{
+		return $this->completed;
+	}
+
+
+	/**
+	 * @param boolean $completed
+	 */
+	public function setIsCompleted($completed = true)
+	{
+		$this->completed = filter_var($completed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function id()
+	{
+		return $this->id;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $id
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setId($id = '')
+	{
+		if (! is_string($id)) {
+			throw new InvalidDataTypeException('$id', $id, 'string');
+		}
+		$this->id = $id;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function order()
+	{
+		return $this->order;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param int $order
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setOrder($order = 0)
+	{
+		if (! is_int($order)) {
+			throw new InvalidDataTypeException('$order', $order, 'integer');
+		}
+		$this->order = $order;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function htmlClass()
+	{
+		$html_class = $this->html_class;
+		if ($this->isCurrent()) {
+			$html_class .= ' progress-step-active';
+		} elseif ($this->isCompleted()) {
+			$html_class .= ' progress-step-completed';
+		}
+		return $html_class;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $html_class
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setHtmlClass($html_class)
+	{
+		if (! is_string($html_class)) {
+			throw new InvalidDataTypeException('$html_class', $html_class, 'string');
+		}
+		if (strpos($html_class, 'progress-step-') === false) {
+			$html_class = 'progress-step-' . $html_class;
+		}
+		$this->html_class = $html_class;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function text()
+	{
+		return $this->text;
+	}
+
+
+	/**
+	 * @access protected
+	 * @param string $text
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setText($text)
+	{
+		if (! is_string($text)) {
+			throw new InvalidDataTypeException('$text', $text, 'string');
+		}
+		$this->text = $text;
+	}
 }

core/services/progress_steps/ProgressStepCollection.php

Indentation +9 added lines, -9 removed lines

@@ -17,13 +17,13 @@
 class ProgressStepCollection extends Collection
 {
 
-    /**
-     * ProgressStepCollection constructor.
-     *
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
-    }
+	/**
+	 * ProgressStepCollection constructor.
+	 *
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
+	}
 }

core/services/progress_steps/ProgressStepManager.php

Indentation +223 added lines, -223 removed lines

@@ -26,227 +26,227 @@
 class ProgressStepManager
 {
 
-    /**
-     * @var ProgressStepInterface[] $collection
-     */
-    private $collection;
-
-    /**
-     * @var string $default_step
-     */
-    private $default_step;
-
-    /**
-     * the key used for the URL param that denotes the current form step
-     * defaults to 'ee-form-step'
-     *
-     * @var string $form_step_url_key
-     */
-    private $form_step_url_key = '';
-
-    /**
-     * @var ProgressStepsDisplayInterface $display_strategy
-     */
-    private $display_strategy;
-
-    /**
-     * @var EE_Request $request
-     */
-    private $request;
-
-
-    /**
-     * ProgressStepManager constructor
-     *
-     * @param string              $display_strategy_name
-     * @param string              $default_step
-     * @param string              $form_step_url_key
-     * @param CollectionInterface $collection
-     * @param \EE_Request         $request
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function __construct(
-        $display_strategy_name = 'number_bubbles',
-        $default_step = '',
-        $form_step_url_key = '',
-        CollectionInterface $collection = null,
-        EE_Request $request = null
-    ) {
-        $this->setDisplayStrategy($display_strategy_name);
-        $this->setDefaultStep($default_step);
-        $this->setFormStepUrlKey($form_step_url_key);
-        if (! $collection instanceof CollectionInterface) {
-            $collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
-        }
-        $this->collection = $collection;
-        if (! $request instanceof EE_Request) {
-            $request = \EE_Registry::instance()->load_core('Request');
-        }
-        $this->request = $request;
-    }
-
-
-    /**
-     * @param string $display_strategy_name
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
-    {
-        if (! is_string($display_strategy_name)) {
-            throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
-        }
-        // build up FQCN from incoming display strategy folder name
-        $display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-        $display_strategy_class .= $display_strategy_name . '\\';
-        $display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
-        $display_strategy_class .= 'ProgressStepsDisplay';
-        $display_strategy_class = apply_filters(
-            'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
-            $display_strategy_class
-        );
-        if (! class_exists($display_strategy_class)) {
-            throw new InvalidClassException($display_strategy_class);
-        }
-        $display_strategy = new $display_strategy_class();
-        if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
-            throw new InvalidClassException(
-                $display_strategy_class,
-                sprintf(
-                    __('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
-                    $display_strategy_class,
-                    '\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
-                )
-            );
-        }
-        $this->display_strategy = $display_strategy;
-    }
-
-
-    /**
-     * @param string $default_step
-     * @throws InvalidDataTypeException
-     */
-    public function setDefaultStep($default_step)
-    {
-        if (! is_string($default_step)) {
-            throw new InvalidDataTypeException('$default_step', $default_step, 'string');
-        }
-        $this->default_step = $default_step;
-    }
-
-
-    /**
-     * @param string $form_step_url_key
-     * @throws InvalidDataTypeException
-     */
-    public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
-    {
-        if (! is_string($form_step_url_key)) {
-            throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
-        }
-        $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
-    }
-
-
-    /**
-     * @param string $step
-     * @throws InvalidIdentifierException
-     */
-    public function setCurrentStep($step = '')
-    {
-        // use incoming value if it's set, otherwise use request param if it's set, otherwise use default
-        $step = ! empty($step)
-            ? $step
-            : $this->request->get($this->form_step_url_key, $this->default_step);
-        // grab the step previously known as current, in case we need to revert
-        $current_current_step = $this->collection->current();
-        // verify that requested step exists
-        if (! $this->collection->has($step)) {
-            throw new InvalidIdentifierException($step, $this->default_step);
-        }
-        if ($this->collection->setCurrent($step)) {
-            // if the old boss is the same as the new boss, then nothing changes
-            if ($this->collection->current() !== $current_current_step) {
-                $current_current_step->setIsCurrent(false);
-            }
-            $this->collection->current()->setIsCurrent();
-        } else {
-            $this->collection->setCurrent($current_current_step->id());
-            $current_current_step->setIsCurrent(true);
-        }
-    }
-
-
-    /**
-     * setPreviousStepsCompleted
-     */
-    public function setPreviousStepsCompleted()
-    {
-        $current_current_step = $this->collection->current();
-        $this->collection->rewind();
-        while ($this->collection->valid()) {
-            if ($this->collection->current() === $current_current_step) {
-                break;
-            }
-            $this->setCurrentStepCompleted();
-            $this->collection->next();
-        }
-        $this->collection->setCurrentUsingObject($current_current_step);
-        return false;
-    }
-
-
-    /**
-     * @return ProgressStepInterface
-     */
-    public function currentStep()
-    {
-        return $this->collection->current();
-    }
-
-
-    /**
-     * @return ProgressStepInterface
-     */
-    public function nextStep()
-    {
-        return $this->collection->next();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function enqueueStylesAndScripts()
-    {
-        $this->display_strategy->enqueueStylesAndScripts();
-    }
-
-
-    /**
-     * echos out HTML
-     *
-     * @return string
-     */
-    public function displaySteps()
-    {
-        return \EEH_Template::display_template(
-            $this->display_strategy->getTemplate(),
-            array('progress_steps' => $this->collection),
-            true
-        );
-    }
-
-
-    /**
-     * @param bool $completed
-     * @return \EventEspresso\core\services\progress_steps\ProgressStepInterface
-     */
-    public function setCurrentStepCompleted($completed = true)
-    {
-        return $this->collection->current()->setIsCompleted($completed);
-    }
+	/**
+	 * @var ProgressStepInterface[] $collection
+	 */
+	private $collection;
+
+	/**
+	 * @var string $default_step
+	 */
+	private $default_step;
+
+	/**
+	 * the key used for the URL param that denotes the current form step
+	 * defaults to 'ee-form-step'
+	 *
+	 * @var string $form_step_url_key
+	 */
+	private $form_step_url_key = '';
+
+	/**
+	 * @var ProgressStepsDisplayInterface $display_strategy
+	 */
+	private $display_strategy;
+
+	/**
+	 * @var EE_Request $request
+	 */
+	private $request;
+
+
+	/**
+	 * ProgressStepManager constructor
+	 *
+	 * @param string              $display_strategy_name
+	 * @param string              $default_step
+	 * @param string              $form_step_url_key
+	 * @param CollectionInterface $collection
+	 * @param \EE_Request         $request
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct(
+		$display_strategy_name = 'number_bubbles',
+		$default_step = '',
+		$form_step_url_key = '',
+		CollectionInterface $collection = null,
+		EE_Request $request = null
+	) {
+		$this->setDisplayStrategy($display_strategy_name);
+		$this->setDefaultStep($default_step);
+		$this->setFormStepUrlKey($form_step_url_key);
+		if (! $collection instanceof CollectionInterface) {
+			$collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
+		}
+		$this->collection = $collection;
+		if (! $request instanceof EE_Request) {
+			$request = \EE_Registry::instance()->load_core('Request');
+		}
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @param string $display_strategy_name
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
+	{
+		if (! is_string($display_strategy_name)) {
+			throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
+		}
+		// build up FQCN from incoming display strategy folder name
+		$display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
+		$display_strategy_class .= $display_strategy_name . '\\';
+		$display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
+		$display_strategy_class .= 'ProgressStepsDisplay';
+		$display_strategy_class = apply_filters(
+			'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
+			$display_strategy_class
+		);
+		if (! class_exists($display_strategy_class)) {
+			throw new InvalidClassException($display_strategy_class);
+		}
+		$display_strategy = new $display_strategy_class();
+		if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
+			throw new InvalidClassException(
+				$display_strategy_class,
+				sprintf(
+					__('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
+					$display_strategy_class,
+					'\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
+				)
+			);
+		}
+		$this->display_strategy = $display_strategy;
+	}
+
+
+	/**
+	 * @param string $default_step
+	 * @throws InvalidDataTypeException
+	 */
+	public function setDefaultStep($default_step)
+	{
+		if (! is_string($default_step)) {
+			throw new InvalidDataTypeException('$default_step', $default_step, 'string');
+		}
+		$this->default_step = $default_step;
+	}
+
+
+	/**
+	 * @param string $form_step_url_key
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
+	{
+		if (! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
+		}
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
+	}
+
+
+	/**
+	 * @param string $step
+	 * @throws InvalidIdentifierException
+	 */
+	public function setCurrentStep($step = '')
+	{
+		// use incoming value if it's set, otherwise use request param if it's set, otherwise use default
+		$step = ! empty($step)
+			? $step
+			: $this->request->get($this->form_step_url_key, $this->default_step);
+		// grab the step previously known as current, in case we need to revert
+		$current_current_step = $this->collection->current();
+		// verify that requested step exists
+		if (! $this->collection->has($step)) {
+			throw new InvalidIdentifierException($step, $this->default_step);
+		}
+		if ($this->collection->setCurrent($step)) {
+			// if the old boss is the same as the new boss, then nothing changes
+			if ($this->collection->current() !== $current_current_step) {
+				$current_current_step->setIsCurrent(false);
+			}
+			$this->collection->current()->setIsCurrent();
+		} else {
+			$this->collection->setCurrent($current_current_step->id());
+			$current_current_step->setIsCurrent(true);
+		}
+	}
+
+
+	/**
+	 * setPreviousStepsCompleted
+	 */
+	public function setPreviousStepsCompleted()
+	{
+		$current_current_step = $this->collection->current();
+		$this->collection->rewind();
+		while ($this->collection->valid()) {
+			if ($this->collection->current() === $current_current_step) {
+				break;
+			}
+			$this->setCurrentStepCompleted();
+			$this->collection->next();
+		}
+		$this->collection->setCurrentUsingObject($current_current_step);
+		return false;
+	}
+
+
+	/**
+	 * @return ProgressStepInterface
+	 */
+	public function currentStep()
+	{
+		return $this->collection->current();
+	}
+
+
+	/**
+	 * @return ProgressStepInterface
+	 */
+	public function nextStep()
+	{
+		return $this->collection->next();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function enqueueStylesAndScripts()
+	{
+		$this->display_strategy->enqueueStylesAndScripts();
+	}
+
+
+	/**
+	 * echos out HTML
+	 *
+	 * @return string
+	 */
+	public function displaySteps()
+	{
+		return \EEH_Template::display_template(
+			$this->display_strategy->getTemplate(),
+			array('progress_steps' => $this->collection),
+			true
+		);
+	}
+
+
+	/**
+	 * @param bool $completed
+	 * @return \EventEspresso\core\services\progress_steps\ProgressStepInterface
+	 */
+	public function setCurrentStepCompleted($completed = true)
+	{
+		return $this->collection->current()->setIsCompleted($completed);
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -77,11 +77,11 @@ 
         $this->setDisplayStrategy($display_strategy_name);
         $this->setDefaultStep($default_step);
         $this->setFormStepUrlKey($form_step_url_key);
-        if (! $collection instanceof CollectionInterface) {
+        if ( ! $collection instanceof CollectionInterface) {
             $collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
         }
         $this->collection = $collection;
-        if (! $request instanceof EE_Request) {
+        if ( ! $request instanceof EE_Request) {
             $request = \EE_Registry::instance()->load_core('Request');
         }
         $this->request = $request;
@@ -95,23 +95,23 @@ 
      */
     protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
     {
-        if (! is_string($display_strategy_name)) {
+        if ( ! is_string($display_strategy_name)) {
             throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
         }
         // build up FQCN from incoming display strategy folder name
         $display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-        $display_strategy_class .= $display_strategy_name . '\\';
+        $display_strategy_class .= $display_strategy_name.'\\';
         $display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
         $display_strategy_class .= 'ProgressStepsDisplay';
         $display_strategy_class = apply_filters(
             'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
             $display_strategy_class
         );
-        if (! class_exists($display_strategy_class)) {
+        if ( ! class_exists($display_strategy_class)) {
             throw new InvalidClassException($display_strategy_class);
         }
         $display_strategy = new $display_strategy_class();
-        if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
+        if ( ! $display_strategy instanceof ProgressStepsDisplayInterface) {
             throw new InvalidClassException(
                 $display_strategy_class,
                 sprintf(
@@ -131,7 +131,7 @@ 
      */
     public function setDefaultStep($default_step)
     {
-        if (! is_string($default_step)) {
+        if ( ! is_string($default_step)) {
             throw new InvalidDataTypeException('$default_step', $default_step, 'string');
         }
         $this->default_step = $default_step;
@@ -144,7 +144,7 @@ 
      */
     public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
     {
-        if (! is_string($form_step_url_key)) {
+        if ( ! is_string($form_step_url_key)) {
             throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
         }
         $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
@@ -164,7 +164,7 @@ 
         // grab the step previously known as current, in case we need to revert
         $current_current_step = $this->collection->current();
         // verify that requested step exists
-        if (! $this->collection->has($step)) {
+        if ( ! $this->collection->has($step)) {
             throw new InvalidIdentifierException($step, $this->default_step);
         }
         if ($this->collection->setCurrent($step)) {

core/services/loaders/LoaderDecorator.php

Indentation +13 added lines, -13 removed lines

@@ -14,19 +14,19 @@
 {
 
 
-    /**
-     * @var LoaderDecoratorInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderDecoratorInterface $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * LoaderDecorator constructor.
-     *
-     * @param LoaderDecoratorInterface $loader
-     */
-    public function __construct(LoaderDecoratorInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * LoaderDecorator constructor.
+	 *
+	 * @param LoaderDecoratorInterface $loader
+	 */
+	public function __construct(LoaderDecoratorInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 }

core/services/locators/Locator.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
 abstract class Locator implements LocatorInterface, Countable
 {
 
-    /**
-     * @var array $flags
-     */
-    protected $flags = array();
-
-
-    /**
-     * FileLocator constructor.
-     *
-     * @access public
-     * @param array $flags controls how files are found and/or file data is returned
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function __construct($flags = array())
-    {
-        if (empty($flags)) {
-            $flags = array(
-                FilesystemIterator::SKIP_DOTS,
-                FilesystemIterator::UNIX_PATHS,
-                FilesystemIterator::CURRENT_AS_PATHNAME,
-            );
-        }
-        $this->setFlags($flags);
-    }
-
-
-    /**
-     * @see    http://php.net/manual/en/class.filesystemiterator.php#filesystemiterator.constants
-     * @access public
-     * @param array $flags
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function setFlags($flags)
-    {
-        if (! is_array($flags)) {
-            throw new InvalidDataTypeException('$flags', $flags, 'array');
-        }
-        $this->flags = $flags;
-    }
+	/**
+	 * @var array $flags
+	 */
+	protected $flags = array();
+
+
+	/**
+	 * FileLocator constructor.
+	 *
+	 * @access public
+	 * @param array $flags controls how files are found and/or file data is returned
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function __construct($flags = array())
+	{
+		if (empty($flags)) {
+			$flags = array(
+				FilesystemIterator::SKIP_DOTS,
+				FilesystemIterator::UNIX_PATHS,
+				FilesystemIterator::CURRENT_AS_PATHNAME,
+			);
+		}
+		$this->setFlags($flags);
+	}
+
+
+	/**
+	 * @see    http://php.net/manual/en/class.filesystemiterator.php#filesystemiterator.constants
+	 * @access public
+	 * @param array $flags
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function setFlags($flags)
+	{
+		if (! is_array($flags)) {
+			throw new InvalidDataTypeException('$flags', $flags, 'array');
+		}
+		$this->flags = $flags;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     public function setFlags($flags)
     {
-        if (! is_array($flags)) {
+        if ( ! is_array($flags)) {
             throw new InvalidDataTypeException('$flags', $flags, 'array');
         }
         $this->flags = $flags;

core/services/shortcodes/ShortcodesManager.php

Indentation +199 added lines, -199 removed lines

@@ -29,203 +29,203 @@
 class ShortcodesManager
 {
 
-    /**
-     * @var LegacyShortcodesManager $legacy_shortcodes_manager
-     */
-    private $legacy_shortcodes_manager;
-
-    /**
-     * @var ShortcodeInterface[] $shortcodes
-     */
-    private $shortcodes;
-
-
-    /**
-     * ShortcodesManager constructor
-     *
-     * @param LegacyShortcodesManager $legacy_shortcodes_manager
-     */
-    public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager)
-    {
-        $this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
-        // assemble a list of installed and active shortcodes
-        add_action(
-            'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-            array($this, 'registerShortcodes'),
-            999
-        );
-        //  call add_shortcode() for all installed shortcodes
-        add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'addShortcodes'));
-        // check content for shortcodes the old way
-        add_action('parse_query', array($this->legacy_shortcodes_manager, 'initializeShortcodes'), 5);
-        // check content for shortcodes the NEW more efficient way
-        add_action('template_redirect', array($this, 'templateRedirect'), 999);
-    }
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    public function getShortcodes()
-    {
-        if (! $this->shortcodes instanceof CollectionInterface) {
-            $this->shortcodes = $this->loadShortcodesCollection();
-        }
-        return $this->shortcodes;
-    }
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadShortcodesCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-                // collection name
-                'shortcodes',
-                // collection interface
-                'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                array('EventEspresso\core\domain\entities\shortcodes'),
-                // filepaths to classes to add
-                array(),
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
-
-
-    /**
-     * @return void
-     * @throws DomainException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    public function registerShortcodes()
-    {
-        try {
-            $this->shortcodes = apply_filters(
-                'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
-                $this->getShortcodes()
-            );
-            if (! $this->shortcodes instanceof CollectionInterface) {
-                throw new InvalidEntityException(
-                    $this->shortcodes,
-                    'CollectionInterface',
-                    sprintf(
-                        esc_html__(
-                            'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
-                            'event_espresso'
-                        ),
-                        is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
-                    )
-                );
-            }
-            $this->legacy_shortcodes_manager->registerShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public function addShortcodes()
-    {
-        try {
-            // cycle thru shortcode folders
-            foreach ($this->shortcodes as $shortcode) {
-                /** @var ShortcodeInterface $shortcode */
-                if ($shortcode instanceof EnqueueAssetsInterface) {
-                    add_action('wp_enqueue_scripts', array($shortcode, 'registerScriptsAndStylesheets'), 10);
-                    add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
-                }
-                // add_shortcode() if it has not already been added
-                if (! shortcode_exists($shortcode->getTag())) {
-                    add_shortcode($shortcode->getTag(), array($shortcode, 'processShortcodeCallback'));
-                }
-            }
-            $this->legacy_shortcodes_manager->addShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * callback for the "template_redirect" hook point
-     * checks posts for EE shortcodes, and initializes them,
-     * then toggles filter switch that loads core default assets
-     *
-     * @return void
-     */
-    public function templateRedirect()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts)) {
-            return;
-        }
-        $load_assets = false;
-        // array of posts displayed in current request
-        $posts = is_array($wp_query->posts) ? $wp_query->posts : array($wp_query->posts);
-        foreach ($posts as $post) {
-            // now check post content and excerpt for EE shortcodes
-            $load_assets = $this->parseContentForShortcodes($post->post_content)
-                ? true
-                : $load_assets;
-        }
-        if ($load_assets) {
-            $this->legacy_shortcodes_manager->registry()->REQ->set_espresso_page(true);
-            add_filter('FHEE_load_css', '__return_true');
-            add_filter('FHEE_load_js', '__return_true');
-        }
-    }
-
-
-    /**
-     * checks supplied content against list of shortcodes,
-     * then initializes any found shortcodes, and returns true.
-     * returns false if no shortcodes found.
-     *
-     * @param string $content
-     * @return bool
-     */
-    public function parseContentForShortcodes($content)
-    {
-        $has_shortcode = false;
-        if (empty($this->shortcodes)) {
-            return $has_shortcode;
-        }
-        foreach ($this->shortcodes as $shortcode) {
-            /** @var ShortcodeInterface $shortcode */
-            if (has_shortcode($content, $shortcode->getTag())) {
-                $shortcode->initializeShortcode();
-                $has_shortcode = true;
-            }
-        }
-        return $has_shortcode;
-    }
+	/**
+	 * @var LegacyShortcodesManager $legacy_shortcodes_manager
+	 */
+	private $legacy_shortcodes_manager;
+
+	/**
+	 * @var ShortcodeInterface[] $shortcodes
+	 */
+	private $shortcodes;
+
+
+	/**
+	 * ShortcodesManager constructor
+	 *
+	 * @param LegacyShortcodesManager $legacy_shortcodes_manager
+	 */
+	public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager)
+	{
+		$this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
+		// assemble a list of installed and active shortcodes
+		add_action(
+			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
+			array($this, 'registerShortcodes'),
+			999
+		);
+		//  call add_shortcode() for all installed shortcodes
+		add_action('AHEE__EE_System__core_loaded_and_ready', array($this, 'addShortcodes'));
+		// check content for shortcodes the old way
+		add_action('parse_query', array($this->legacy_shortcodes_manager, 'initializeShortcodes'), 5);
+		// check content for shortcodes the NEW more efficient way
+		add_action('template_redirect', array($this, 'templateRedirect'), 999);
+	}
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	public function getShortcodes()
+	{
+		if (! $this->shortcodes instanceof CollectionInterface) {
+			$this->shortcodes = $this->loadShortcodesCollection();
+		}
+		return $this->shortcodes;
+	}
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadShortcodesCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+				// collection name
+				'shortcodes',
+				// collection interface
+				'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				array('EventEspresso\core\domain\entities\shortcodes'),
+				// filepaths to classes to add
+				array(),
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	public function registerShortcodes()
+	{
+		try {
+			$this->shortcodes = apply_filters(
+				'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
+				$this->getShortcodes()
+			);
+			if (! $this->shortcodes instanceof CollectionInterface) {
+				throw new InvalidEntityException(
+					$this->shortcodes,
+					'CollectionInterface',
+					sprintf(
+						esc_html__(
+							'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
+							'event_espresso'
+						),
+						is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
+					)
+				);
+			}
+			$this->legacy_shortcodes_manager->registerShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function addShortcodes()
+	{
+		try {
+			// cycle thru shortcode folders
+			foreach ($this->shortcodes as $shortcode) {
+				/** @var ShortcodeInterface $shortcode */
+				if ($shortcode instanceof EnqueueAssetsInterface) {
+					add_action('wp_enqueue_scripts', array($shortcode, 'registerScriptsAndStylesheets'), 10);
+					add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
+				}
+				// add_shortcode() if it has not already been added
+				if (! shortcode_exists($shortcode->getTag())) {
+					add_shortcode($shortcode->getTag(), array($shortcode, 'processShortcodeCallback'));
+				}
+			}
+			$this->legacy_shortcodes_manager->addShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * callback for the "template_redirect" hook point
+	 * checks posts for EE shortcodes, and initializes them,
+	 * then toggles filter switch that loads core default assets
+	 *
+	 * @return void
+	 */
+	public function templateRedirect()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts)) {
+			return;
+		}
+		$load_assets = false;
+		// array of posts displayed in current request
+		$posts = is_array($wp_query->posts) ? $wp_query->posts : array($wp_query->posts);
+		foreach ($posts as $post) {
+			// now check post content and excerpt for EE shortcodes
+			$load_assets = $this->parseContentForShortcodes($post->post_content)
+				? true
+				: $load_assets;
+		}
+		if ($load_assets) {
+			$this->legacy_shortcodes_manager->registry()->REQ->set_espresso_page(true);
+			add_filter('FHEE_load_css', '__return_true');
+			add_filter('FHEE_load_js', '__return_true');
+		}
+	}
+
+
+	/**
+	 * checks supplied content against list of shortcodes,
+	 * then initializes any found shortcodes, and returns true.
+	 * returns false if no shortcodes found.
+	 *
+	 * @param string $content
+	 * @return bool
+	 */
+	public function parseContentForShortcodes($content)
+	{
+		$has_shortcode = false;
+		if (empty($this->shortcodes)) {
+			return $has_shortcode;
+		}
+		foreach ($this->shortcodes as $shortcode) {
+			/** @var ShortcodeInterface $shortcode */
+			if (has_shortcode($content, $shortcode->getTag())) {
+				$shortcode->initializeShortcode();
+				$has_shortcode = true;
+			}
+		}
+		return $has_shortcode;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
      */
     public function getShortcodes()
     {
-        if (! $this->shortcodes instanceof CollectionInterface) {
+        if ( ! $this->shortcodes instanceof CollectionInterface) {
             $this->shortcodes = $this->loadShortcodesCollection();
         }
         return $this->shortcodes;
@@ -130,7 +130,7 @@ 
                 'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
                 $this->getShortcodes()
             );
-            if (! $this->shortcodes instanceof CollectionInterface) {
+            if ( ! $this->shortcodes instanceof CollectionInterface) {
                 throw new InvalidEntityException(
                     $this->shortcodes,
                     'CollectionInterface',
@@ -164,7 +164,7 @@ 
                     add_action('wp_enqueue_scripts', array($shortcode, 'enqueueStylesheets'), 11);
                 }
                 // add_shortcode() if it has not already been added
-                if (! shortcode_exists($shortcode->getTag())) {
+                if ( ! shortcode_exists($shortcode->getTag())) {
                     add_shortcode($shortcode->getTag(), array($shortcode, 'processShortcodeCallback'));
                 }
             }