eventespresso / event-espresso-core

core/exceptions/IpnException.php

Indentation +50 added lines, -50 removed lines

@@ -15,66 +15,66 @@
 class IpnException extends \LogicException
 {
 
-    const DUPLICATE = 1;
+	const DUPLICATE = 1;
 
-    const UNABLE_TO_VALIDATE = 2;
+	const UNABLE_TO_VALIDATE = 2;
 
-    const UNSUPPORTED = 3;
+	const UNSUPPORTED = 3;
 
-    /**
-     * @var \EE_Payment
-     */
-    protected $payment;
+	/**
+	 * @var \EE_Payment
+	 */
+	protected $payment;
 
-    /**
-     * @var mixed IPN data, usually an array or object
-     */
-    protected $ipn_data;
+	/**
+	 * @var mixed IPN data, usually an array or object
+	 */
+	protected $ipn_data;
 
 
-    public function __construct(
-        $message,
-        $code = 0,
-        \Exception $previous = null,
-        \EE_Payment $payment = null,
-        $ipn_data = array()
-    ) {
-        parent::__construct($message, $code, $previous);
-        $this->payment = $payment;
-        $this->ipn_data = $ipn_data;
-    }
+	public function __construct(
+		$message,
+		$code = 0,
+		\Exception $previous = null,
+		\EE_Payment $payment = null,
+		$ipn_data = array()
+	) {
+		parent::__construct($message, $code, $previous);
+		$this->payment = $payment;
+		$this->ipn_data = $ipn_data;
+	}
 
 
-    /**
-     * Gets the payment associated with this IPN, if known
-     *
-     * @return \EE_Payment
-     */
-    public function getPayment()
-    {
-        return $this->payment;
-    }
+	/**
+	 * Gets the payment associated with this IPN, if known
+	 *
+	 * @return \EE_Payment
+	 */
+	public function getPayment()
+	{
+		return $this->payment;
+	}
 
 
-    /**
-     * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
-     *
-     * @return array
-     * @throws \EE_Error
-     */
-    public function getPaymentProperties()
-    {
-        return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
-    }
+	/**
+	 * Returns the payment's properties as an array (even if there is no payment, in which case it's an empty array)
+	 *
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	public function getPaymentProperties()
+	{
+		return $this->getPayment() instanceof \EE_Payment ? $this->getPayment()->model_field_array() : array();
+	}
 
 
-    /**
-     * Returns an array, object, or string, however, the IPN data was received
-     *
-     * @return mixed
-     */
-    public function getIpnData()
-    {
-        return $this->ipn_data;
-    }
+	/**
+	 * Returns an array, object, or string, however, the IPN data was received
+	 *
+	 * @return mixed
+	 */
+	public function getIpnData()
+	{
+		return $this->ipn_data;
+	}
 }

core/exceptions/InvalidSessionDataException.php

Indentation +14 added lines, -14 removed lines

@@ -12,18 +12,18 @@
 class InvalidSessionDataException extends \Exception
 {
 
-    /**
-     * InvalidInterfaceException constructor.
-     *
-     * @param string     $message
-     * @param int        $code
-     * @param \Exception $previous
-     */
-    public function __construct($message = '', $code = 0, \Exception $previous = null)
-    {
-        if (empty($message)) {
-            $message = esc_html__('The session data is either missing or invalid.', 'event_espresso');
-        }
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * InvalidInterfaceException constructor.
+	 *
+	 * @param string     $message
+	 * @param int        $code
+	 * @param \Exception $previous
+	 */
+	public function __construct($message = '', $code = 0, \Exception $previous = null)
+	{
+		if (empty($message)) {
+			$message = esc_html__('The session data is either missing or invalid.', 'event_espresso');
+		}
+		parent::__construct($message, $code, $previous);
+	}
 }

core/exceptions/ExceptionLogger.php

Indentation +33 added lines, -33 removed lines

@@ -14,39 +14,39 @@
 {
 
 
-    /**
-     * ExceptionLogger constructor.
-     *
-     * @param \Exception $exception
-     */
-    public function __construct(\Exception $exception)
-    {
-        $this->log($exception);
-    }
+	/**
+	 * ExceptionLogger constructor.
+	 *
+	 * @param \Exception $exception
+	 */
+	public function __construct(\Exception $exception)
+	{
+		$this->log($exception);
+	}
 
 
-    /**
-     * write exception details to log file
-     *
-     * @param \Exception $exception
-     * @param int        $time
-     */
-    public function log(\Exception $exception, $time = 0)
-    {
-        if (! $time) {
-            $time = time();
-        }
-        $exception_log = '----------------------------------------------------------------------------------------';
-        $exception_log .= PHP_EOL;
-        $exception_log .= '[' . date('Y-m-d H:i:s', $time) . ']  Exception Details' . PHP_EOL;
-        $exception_log .= 'Message: ' . $exception->getMessage() . PHP_EOL;
-        $exception_log .= 'Code: ' . $exception->getCode() . PHP_EOL;
-        $exception_log .= 'File: ' . $exception->getFile() . PHP_EOL;
-        $exception_log .= 'Line No: ' . $exception->getLine() . PHP_EOL;
-        $exception_log .= 'Stack trace: ' . PHP_EOL;
-        $exception_log .= $exception->getTraceAsString() . PHP_EOL;
-        $exception_log .= '----------------------------------------------------------------------------------------';
-        $exception_log .= PHP_EOL;
-        error_log($exception_log);
-    }
+	/**
+	 * write exception details to log file
+	 *
+	 * @param \Exception $exception
+	 * @param int        $time
+	 */
+	public function log(\Exception $exception, $time = 0)
+	{
+		if (! $time) {
+			$time = time();
+		}
+		$exception_log = '----------------------------------------------------------------------------------------';
+		$exception_log .= PHP_EOL;
+		$exception_log .= '[' . date('Y-m-d H:i:s', $time) . ']  Exception Details' . PHP_EOL;
+		$exception_log .= 'Message: ' . $exception->getMessage() . PHP_EOL;
+		$exception_log .= 'Code: ' . $exception->getCode() . PHP_EOL;
+		$exception_log .= 'File: ' . $exception->getFile() . PHP_EOL;
+		$exception_log .= 'Line No: ' . $exception->getLine() . PHP_EOL;
+		$exception_log .= 'Stack trace: ' . PHP_EOL;
+		$exception_log .= $exception->getTraceAsString() . PHP_EOL;
+		$exception_log .= '----------------------------------------------------------------------------------------';
+		$exception_log .= PHP_EOL;
+		error_log($exception_log);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -33,18 +33,18 @@
      */
     public function log(\Exception $exception, $time = 0)
     {
-        if (! $time) {
+        if ( ! $time) {
             $time = time();
         }
         $exception_log = '----------------------------------------------------------------------------------------';
         $exception_log .= PHP_EOL;
-        $exception_log .= '[' . date('Y-m-d H:i:s', $time) . ']  Exception Details' . PHP_EOL;
-        $exception_log .= 'Message: ' . $exception->getMessage() . PHP_EOL;
-        $exception_log .= 'Code: ' . $exception->getCode() . PHP_EOL;
-        $exception_log .= 'File: ' . $exception->getFile() . PHP_EOL;
-        $exception_log .= 'Line No: ' . $exception->getLine() . PHP_EOL;
-        $exception_log .= 'Stack trace: ' . PHP_EOL;
-        $exception_log .= $exception->getTraceAsString() . PHP_EOL;
+        $exception_log .= '['.date('Y-m-d H:i:s', $time).']  Exception Details'.PHP_EOL;
+        $exception_log .= 'Message: '.$exception->getMessage().PHP_EOL;
+        $exception_log .= 'Code: '.$exception->getCode().PHP_EOL;
+        $exception_log .= 'File: '.$exception->getFile().PHP_EOL;
+        $exception_log .= 'Line No: '.$exception->getLine().PHP_EOL;
+        $exception_log .= 'Stack trace: '.PHP_EOL;
+        $exception_log .= $exception->getTraceAsString().PHP_EOL;
         $exception_log .= '----------------------------------------------------------------------------------------';
         $exception_log .= PHP_EOL;
         error_log($exception_log);

core/services/formatters/FormatterBase.php

Indentation +22 added lines, -22 removed lines

@@ -15,26 +15,26 @@
 abstract class FormatterBase implements FormatterInterface
 {
 
-    /**
-     * Recursively applies the formatting to all VALUES in this multi-dimensional array
-     *
-     * @param array $input
-     * @return array
-     * @throws InvalidDataTypeException if $input is not an array
-     */
-    public function formatArray($input)
-    {
-        if (! is_array($input)) {
-            throw new InvalidDataTypeException('input', $input, 'array');
-        }
-        // we can use $this inside the closure in PHP 5.3, so pass in a variable pointing to this instead
-        $formatter = $this;
-        array_walk_recursive(
-            $input,
-            function (&$value, $key) use ($formatter) {
-                $value = $formatter->format($value);
-            }
-        );
-        return $input;
-    }
+	/**
+	 * Recursively applies the formatting to all VALUES in this multi-dimensional array
+	 *
+	 * @param array $input
+	 * @return array
+	 * @throws InvalidDataTypeException if $input is not an array
+	 */
+	public function formatArray($input)
+	{
+		if (! is_array($input)) {
+			throw new InvalidDataTypeException('input', $input, 'array');
+		}
+		// we can use $this inside the closure in PHP 5.3, so pass in a variable pointing to this instead
+		$formatter = $this;
+		array_walk_recursive(
+			$input,
+			function (&$value, $key) use ($formatter) {
+				$value = $formatter->format($value);
+			}
+		);
+		return $input;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -24,14 +24,14 @@
      */
     public function formatArray($input)
     {
-        if (! is_array($input)) {
+        if ( ! is_array($input)) {
             throw new InvalidDataTypeException('input', $input, 'array');
         }
         // we can use $this inside the closure in PHP 5.3, so pass in a variable pointing to this instead
         $formatter = $this;
         array_walk_recursive(
             $input,
-            function (&$value, $key) use ($formatter) {
+            function(&$value, $key) use ($formatter) {
                 $value = $formatter->format($value);
             }
         );

core/services/formatters/LeaveAlone.php

Indentation +21 added lines, -21 removed lines

@@ -15,26 +15,26 @@
 class LeaveAlone extends FormatterBase
 {
 
-    /**
-     * Removes the emojis from the inputted string
-     *
-     * @param string|int|float $input anything easily cast into a string
-     * @return string
-     * @throws InvalidDataTypeException if $input is not a string
-     */
-    public function format($input)
-    {
-        return $input;
-    }
+	/**
+	 * Removes the emojis from the inputted string
+	 *
+	 * @param string|int|float $input anything easily cast into a string
+	 * @return string
+	 * @throws InvalidDataTypeException if $input is not a string
+	 */
+	public function format($input)
+	{
+		return $input;
+	}
 
-    /**
-     * Just returns the inputted $input array
-     *
-     * @param array $input
-     * @return array
-     */
-    public function formatArray($input)
-    {
-        return $input;
-    }
+	/**
+	 * Just returns the inputted $input array
+	 *
+	 * @param array $input
+	 * @return array
+	 */
+	public function formatArray($input)
+	{
+		return $input;
+	}
 }

core/services/request/RequestStackCoreApp.php

Spacing +4 added lines, -4 removed lines

@@ -53,10 +53,10 @@ 
     {
         $this->request = $request;
         $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+        espresso_load_required('EE_Base', EE_CORE.'EE_Base.core.php');
+        espresso_load_required('EE_Deprecated', EE_CORE.'EE_Deprecated.core.php');
         // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+        espresso_load_required('EEH_Class_Tools', EE_HELPERS.'EEH_Class_Tools.helper.php');
         do_action(
             'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
         );
@@ -83,7 +83,7 @@ 
     {
         espresso_load_required(
             'EE_Bootstrap',
-            EE_CORE . 'EE_Bootstrap.core.php'
+            EE_CORE.'EE_Bootstrap.core.php'
         );
         add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
         add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);

Indentation +81 added lines, -81 removed lines

@@ -24,92 +24,92 @@
 class RequestStackCoreApp implements RequestDecoratorInterface, RequestStackCoreAppInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
 
-    /**
-     * handle
-     * sets hooks for running rest of system
-     * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
-     * starting EE Addons from any other point may lead to problems
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidClassException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
-        // workarounds for PHP < 5.3
-        espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
-        do_action(
-            'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
-        );
-        // legacy action for backwards compatibility
-        do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
-        $this->setupFramework();
-        $loader = LoaderFactory::getLoader();
-        $capabilities_checker = $loader->getShared(
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            [EE_Capabilities::instance()]
-        );
-        $loader->getShared(
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager',
-            ['', $capabilities_checker, $request]
-        );
-        // WP cron jobs
-        $loader->getShared('EE_Cron_Tasks');
-        $loader->getShared('EE_System');
-        return $this->response;
-    }
+	/**
+	 * handle
+	 * sets hooks for running rest of system
+	 * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
+	 * starting EE Addons from any other point may lead to problems
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 * @throws InvalidClassException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
+		espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+		// workarounds for PHP < 5.3
+		espresso_load_required('EEH_Class_Tools', EE_HELPERS . 'EEH_Class_Tools.helper.php');
+		do_action(
+			'EE_EventEspresso_core_services_request_RequestStackCoreApp__handle_request__initialize_core_loading'
+		);
+		// legacy action for backwards compatibility
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
+		$this->setupFramework();
+		$loader = LoaderFactory::getLoader();
+		$capabilities_checker = $loader->getShared(
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			[EE_Capabilities::instance()]
+		);
+		$loader->getShared(
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager',
+			['', $capabilities_checker, $request]
+		);
+		// WP cron jobs
+		$loader->getShared('EE_Cron_Tasks');
+		$loader->getShared('EE_System');
+		return $this->response;
+	}
 
 
-    /**
-     * set framework for the rest of EE to hook into when loading
-     *
-     * @throws EE_Error
-     */
-    private function setupFramework()
-    {
-        espresso_load_required(
-            'EE_Bootstrap',
-            EE_CORE . 'EE_Bootstrap.core.php'
-        );
-        add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
-        add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
-    }
+	/**
+	 * set framework for the rest of EE to hook into when loading
+	 *
+	 * @throws EE_Error
+	 */
+	private function setupFramework()
+	{
+		espresso_load_required(
+			'EE_Bootstrap',
+			EE_CORE . 'EE_Bootstrap.core.php'
+		);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
+		add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
+	}
 
 
-    /**
-     * called after the request stack has been fully processed
-     * if any of the middleware apps has requested the plugin be deactivated, then we do that now
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     */
-    public function handleResponse(RequestInterface $request, ResponseInterface $response)
-    {
-        if ($response->pluginDeactivated()) {
-            espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
-        }
-    }
+	/**
+	 * called after the request stack has been fully processed
+	 * if any of the middleware apps has requested the plugin be deactivated, then we do that now
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 */
+	public function handleResponse(RequestInterface $request, ResponseInterface $response)
+	{
+		if ($response->pluginDeactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
+		}
+	}
 }

core/services/request/InvalidRequestStackMiddlewareException.php

Indentation +29 added lines, -29 removed lines

@@ -15,33 +15,33 @@
 class InvalidRequestStackMiddlewareException extends InvalidDataTypeException
 {
 
-    /**
-     * @param  mixed    $middleware_app_class
-     * @param  string   $message
-     * @param int       $code
-     * @param Exception $previous
-     */
-    public function __construct($middleware_app_class, $message = '', $code = 0, Exception $previous = null)
-    {
-        if (is_array($middleware_app_class)) {
-            $middleware_app_class = reset($middleware_app_class);
-        }
-        if (empty($message)) {
-            $message = sprintf(
-                esc_html__(
-                    'The supplied Request Stack Middleware class "%1$s" is invalid or could no be found.',
-                    'event_espresso'
-                ),
-                $middleware_app_class
-            );
-        }
-        parent::__construct(
-            '$middleware_app_class',
-            $middleware_app_class,
-            'EventEspresso\core\services\request\middleware\Middleware',
-            $message,
-            $code,
-            $previous
-        );
-    }
+	/**
+	 * @param  mixed    $middleware_app_class
+	 * @param  string   $message
+	 * @param int       $code
+	 * @param Exception $previous
+	 */
+	public function __construct($middleware_app_class, $message = '', $code = 0, Exception $previous = null)
+	{
+		if (is_array($middleware_app_class)) {
+			$middleware_app_class = reset($middleware_app_class);
+		}
+		if (empty($message)) {
+			$message = sprintf(
+				esc_html__(
+					'The supplied Request Stack Middleware class "%1$s" is invalid or could no be found.',
+					'event_espresso'
+				),
+				$middleware_app_class
+			);
+		}
+		parent::__construct(
+			'$middleware_app_class',
+			$middleware_app_class,
+			'EventEspresso\core\services\request\middleware\Middleware',
+			$message,
+			$code,
+			$previous
+		);
+	}
 }

core/services/request/RequestStackBuilder.php

Indentation +87 added lines, -87 removed lines

@@ -20,97 +20,97 @@
 class RequestStackBuilder extends SplDoublyLinkedList
 {
 
-    /**
-     * @type LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RequestStackBuilder constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-        $this->setIteratorMode(SplDoublyLinkedList::IT_MODE_LIFO | SplDoublyLinkedList::IT_MODE_KEEP);
-    }
+	/**
+	 * RequestStackBuilder constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+		$this->setIteratorMode(SplDoublyLinkedList::IT_MODE_LIFO | SplDoublyLinkedList::IT_MODE_KEEP);
+	}
 
 
-    /**
-     * builds decorated middleware stack
-     * by continuously injecting previous middleware app into the next
-     *
-     * @param RequestStackCoreAppInterface $application
-     * @return RequestStack
-     * @throws Exception
-     */
-    public function resolve(RequestStackCoreAppInterface $application)
-    {
-        $core_app = $application;
-        // NOW... because the RequestStack is following the decorator pattern,
-        // the first stack app we add will end up at the center of the stack,
-        // and will end up being the last item to actually run, but we don't want that!
-        // Basically we're dealing with TWO stacks, and transferring items from one to the other,
-        // BUT... we want the final stack to be in the same order as the first.
-        // So we need to reverse the iterator mode when transferring items,
-        // because if we don't, the second stack will end  up in the incorrect order.
-        $this->setIteratorMode(SplDoublyLinkedList::IT_MODE_FIFO | SplDoublyLinkedList::IT_MODE_KEEP);
-        for ($this->rewind(); $this->valid(); $this->next()) {
-            try {
-                $middleware_app = $this->validateMiddlewareAppDetails($this->current(), true);
-                $middleware_app_class = array_shift($middleware_app);
-                $middleware_app_args = is_array($middleware_app) ? $middleware_app : array();
-                $middleware_app_args = array($application, $this->loader) + $middleware_app_args;
-                $application = $this->loader->getShared($middleware_app_class, $middleware_app_args);
-            } catch (InvalidRequestStackMiddlewareException $exception) {
-                if (WP_DEBUG) {
-                    new ExceptionStackTraceDisplay($exception);
-                    continue;
-                }
-                error_log($exception->getMessage());
-            }
-        }
-        return new RequestStack($application, $core_app);
-    }
+	/**
+	 * builds decorated middleware stack
+	 * by continuously injecting previous middleware app into the next
+	 *
+	 * @param RequestStackCoreAppInterface $application
+	 * @return RequestStack
+	 * @throws Exception
+	 */
+	public function resolve(RequestStackCoreAppInterface $application)
+	{
+		$core_app = $application;
+		// NOW... because the RequestStack is following the decorator pattern,
+		// the first stack app we add will end up at the center of the stack,
+		// and will end up being the last item to actually run, but we don't want that!
+		// Basically we're dealing with TWO stacks, and transferring items from one to the other,
+		// BUT... we want the final stack to be in the same order as the first.
+		// So we need to reverse the iterator mode when transferring items,
+		// because if we don't, the second stack will end  up in the incorrect order.
+		$this->setIteratorMode(SplDoublyLinkedList::IT_MODE_FIFO | SplDoublyLinkedList::IT_MODE_KEEP);
+		for ($this->rewind(); $this->valid(); $this->next()) {
+			try {
+				$middleware_app = $this->validateMiddlewareAppDetails($this->current(), true);
+				$middleware_app_class = array_shift($middleware_app);
+				$middleware_app_args = is_array($middleware_app) ? $middleware_app : array();
+				$middleware_app_args = array($application, $this->loader) + $middleware_app_args;
+				$application = $this->loader->getShared($middleware_app_class, $middleware_app_args);
+			} catch (InvalidRequestStackMiddlewareException $exception) {
+				if (WP_DEBUG) {
+					new ExceptionStackTraceDisplay($exception);
+					continue;
+				}
+				error_log($exception->getMessage());
+			}
+		}
+		return new RequestStack($application, $core_app);
+	}
 
 
-    /**
-     * Ensures that the app details that have been pushed onto RequestStackBuilder
-     * are all ordered correctly so that the middleware can be properly constructed
-     *
-     * @param array $middleware_app
-     * @param bool  $recurse
-     * @return array
-     * @throws InvalidRequestStackMiddlewareException
-     */
-    protected function validateMiddlewareAppDetails(array $middleware_app, $recurse = false)
-    {
-        $middleware_app_class = reset($middleware_app);
-        // is array empty ?
-        if ($middleware_app_class === false) {
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // are the class and arguments in the wrong order ?
-        if (is_array($middleware_app_class)) {
-            if ($recurse === true) {
-                return $this->validateMiddlewareAppDetails(array_reverse($middleware_app));
-            }
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // is filter callback working like legacy middleware and sending a numerically indexed array ?
-        if (is_int($middleware_app_class)) {
-            if ($recurse === true) {
-                $middleware_app = array_reverse($middleware_app);
-                return $this->validateMiddlewareAppDetails(array(reset($middleware_app), array()));
-            }
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        // is $middleware_app_class a valid FQCN (or class is already loaded) ?
-        if (! class_exists($middleware_app_class)) {
-            throw new InvalidRequestStackMiddlewareException($middleware_app_class);
-        }
-        return $middleware_app;
-    }
+	/**
+	 * Ensures that the app details that have been pushed onto RequestStackBuilder
+	 * are all ordered correctly so that the middleware can be properly constructed
+	 *
+	 * @param array $middleware_app
+	 * @param bool  $recurse
+	 * @return array
+	 * @throws InvalidRequestStackMiddlewareException
+	 */
+	protected function validateMiddlewareAppDetails(array $middleware_app, $recurse = false)
+	{
+		$middleware_app_class = reset($middleware_app);
+		// is array empty ?
+		if ($middleware_app_class === false) {
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// are the class and arguments in the wrong order ?
+		if (is_array($middleware_app_class)) {
+			if ($recurse === true) {
+				return $this->validateMiddlewareAppDetails(array_reverse($middleware_app));
+			}
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// is filter callback working like legacy middleware and sending a numerically indexed array ?
+		if (is_int($middleware_app_class)) {
+			if ($recurse === true) {
+				$middleware_app = array_reverse($middleware_app);
+				return $this->validateMiddlewareAppDetails(array(reset($middleware_app), array()));
+			}
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		// is $middleware_app_class a valid FQCN (or class is already loaded) ?
+		if (! class_exists($middleware_app_class)) {
+			throw new InvalidRequestStackMiddlewareException($middleware_app_class);
+		}
+		return $middleware_app;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
             throw new InvalidRequestStackMiddlewareException($middleware_app_class);
         }
         // is $middleware_app_class a valid FQCN (or class is already loaded) ?
-        if (! class_exists($middleware_app_class)) {
+        if ( ! class_exists($middleware_app_class)) {
             throw new InvalidRequestStackMiddlewareException($middleware_app_class);
         }
         return $middleware_app;

core/services/request/middleware/BotDetector.php

Indentation +19 added lines, -19 removed lines

@@ -17,23 +17,23 @@
 class BotDetector extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        /** @var CrawlerDetect $CrawlerDetect */
-        $CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
-        // Check and record the user agent of the current 'visitor'
-        $this->request->setIsBot($CrawlerDetect->isCrawler());
-        $this->request->setUserAgent($CrawlerDetect->userAgent());
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		/** @var CrawlerDetect $CrawlerDetect */
+		$CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
+		// Check and record the user agent of the current 'visitor'
+		$this->request->setIsBot($CrawlerDetect->isCrawler());
+		$this->request->setUserAgent($CrawlerDetect->userAgent());
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }