eventespresso / event-espresso-core

core/exceptions/ExceptionLogger.php

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);

Indentation +33 added lines, -33 removed lines

@@ -12,39 +12,39 @@
  */
 class ExceptionLogger
 {
-    /**
-     * 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);
+	}
 }

core/services/formatters/FormatterBase.php

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

Indentation +22 added lines, -22 removed lines

@@ -14,26 +14,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;
+	}
 }

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

@@ -23,92 +23,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/RequestStackBuilder.php

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;

Indentation +87 added lines, -87 removed lines

@@ -19,97 +19,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;
+	}
 }

core/services/request/middleware/Middleware.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     {
         $this->request = $request;
         $this->response = $response;
-        if (! $this->response->requestTerminated()) {
+        if ( ! $this->response->requestTerminated()) {
             $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
         }
         return $this->response;

Indentation +41 added lines, -41 removed lines

@@ -24,52 +24,52 @@
  */
 abstract class Middleware implements RequestDecoratorInterface
 {
-    /**
-     * @var RequestDecoratorInterface $request_stack_app
-     */
-    protected $request_stack_app;
+	/**
+	 * @var RequestDecoratorInterface $request_stack_app
+	 */
+	protected $request_stack_app;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
-    /**
-     * @var LoaderInterface
-     */
-    protected $loader;
+	/**
+	 * @var LoaderInterface
+	 */
+	protected $loader;
 
 
-    /**
-     * @param RequestDecoratorInterface $request_stack_app
-     * @param LoaderInterface           $loader
-     */
-    public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
-    {
-        $this->request_stack_app = $request_stack_app;
-        $this->loader = $loader;
-    }
+	/**
+	 * @param RequestDecoratorInterface $request_stack_app
+	 * @param LoaderInterface           $loader
+	 */
+	public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
+	{
+		$this->request_stack_app = $request_stack_app;
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * process_request_stack
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        if (! $this->response->requestTerminated()) {
-            $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
-        }
-        return $this->response;
-    }
+	/**
+	 * process_request_stack
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		if (! $this->response->requestTerminated()) {
+			$this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
+		}
+		return $this->response;
+	}
 }

core/services/collections/LooseCollection.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     public function add($object, $identifier = null)
     {
-        if (! is_object($object)) {
+        if ( ! is_object($object)) {
             throw new InvalidEntityException($object, 'object');
         }
         $this->attach($object);

Indentation +31 added lines, -31 removed lines

@@ -14,37 +14,37 @@
  */
 class LooseCollection extends Collection
 {
-    /**
-     * setCollectionInterface
-     *
-     * @access protected
-     * @param  string $collection_interface
-     */
-    protected function setCollectionInterface($collection_interface)
-    {
-        $this->collection_interface = '';
-    }
+	/**
+	 * setCollectionInterface
+	 *
+	 * @access protected
+	 * @param  string $collection_interface
+	 */
+	protected function setCollectionInterface($collection_interface)
+	{
+		$this->collection_interface = '';
+	}
 
 
-    /**
-     * 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()
-     *
-     * @access public
-     * @param  mixed $object
-     * @param  mixed $identifier
-     * @return bool
-     * @throws InvalidEntityException
-     */
-    public function add($object, $identifier = null)
-    {
-        if (! is_object($object)) {
-            throw new InvalidEntityException($object, 'object');
-        }
-        $this->attach($object);
-        $this->setIdentifier($object, $identifier);
-        return $this->contains($object);
-    }
+	/**
+	 * 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()
+	 *
+	 * @access public
+	 * @param  mixed $object
+	 * @param  mixed $identifier
+	 * @return bool
+	 * @throws InvalidEntityException
+	 */
+	public function add($object, $identifier = null)
+	{
+		if (! is_object($object)) {
+			throw new InvalidEntityException($object, 'object');
+		}
+		$this->attach($object);
+		$this->setIdentifier($object, $identifier);
+		return $this->contains($object);
+	}
 }

core/services/notices/AdminNotice.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
     public function __construct(NoticeInterface $notice, $display_now = true)
     {
         $this->notice = $notice;
-        if (! did_action('admin_notices')) {
+        if ( ! did_action('admin_notices')) {
             add_action('admin_notices', array($this, 'displayNotice'));
         } elseif ($display_now) {
             $this->displayNotice();
@@ -108,7 +108,7 @@ 
     {
         $message = $this->notice->message();
         if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+            $message .= '<br/><span class="tiny-text">'.$this->generateErrorCode().'</span>';
         }
         return $message;
     }
@@ -124,8 +124,8 @@ 
     {
         $file = explode('.', basename($this->notice->file()));
         $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
+        $error_code .= ! empty($error_code) ? ' - '.$this->notice->func() : $this->notice->func();
+        $error_code .= ' - '.$this->notice->line();
         return $error_code;
     }
 }

Indentation +111 added lines, -111 removed lines

@@ -14,115 +14,115 @@
  */
 class AdminNotice
 {
-    const ERROR = 'notice-error';
-
-    const WARNING = 'notice-warning';
-
-    const SUCCESS = 'notice-success';
-
-    const INFORMATION = 'notice-info';
-
-    const DISMISSABLE = ' is-dismissible';
-
-    /**
-     * generic system notice to be converted into a WP admin notice
-     *
-     * @var NoticeInterface $notice
-     */
-    private $notice;
-
-
-    /**
-     * AdminNotice constructor.
-     *
-     * @param NoticeInterface $notice
-     * @param bool            $display_now
-     */
-    public function __construct(NoticeInterface $notice, $display_now = true)
-    {
-        $this->notice = $notice;
-        if (! did_action('admin_notices')) {
-            add_action('admin_notices', array($this, 'displayNotice'));
-        } elseif ($display_now) {
-            $this->displayNotice();
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    public function displayNotice()
-    {
-        echo wp_kses($this->getNotice(), AllowedTags::getAllowedTags());
-    }
-
-
-    /**
-     * produces something  like:
-     *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
-     *      <p>YOU DID IT!</p>
-     *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
-     *      notice.</span></button>
-     *  </div>
-     *
-     * @return string
-     */
-    public function getNotice()
-    {
-        return sprintf(
-            '<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
-            $this->getType(),
-            $this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
-            $this->getMessage()
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    private function getType()
-    {
-        switch ($this->notice->type()) {
-            case Notice::ERROR:
-                return AdminNotice::ERROR;
-            case Notice::ATTENTION:
-                return AdminNotice::WARNING;
-            case Notice::SUCCESS:
-                return AdminNotice::SUCCESS;
-            case Notice::INFORMATION:
-            default:
-                return AdminNotice::INFORMATION;
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getMessage()
-    {
-        $message = $this->notice->message();
-        if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
-        }
-        return $message;
-    }
-
-
-    /**
-     * create error code from filepath, function name,
-     * and line number where notice was generated
-     *
-     * @return string
-     */
-    protected function generateErrorCode()
-    {
-        $file = explode('.', basename($this->notice->file()));
-        $error_code = ! empty($file[0]) ? $file[0] : '';
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
-        $error_code .= ' - ' . $this->notice->line();
-        return $error_code;
-    }
+	const ERROR = 'notice-error';
+
+	const WARNING = 'notice-warning';
+
+	const SUCCESS = 'notice-success';
+
+	const INFORMATION = 'notice-info';
+
+	const DISMISSABLE = ' is-dismissible';
+
+	/**
+	 * generic system notice to be converted into a WP admin notice
+	 *
+	 * @var NoticeInterface $notice
+	 */
+	private $notice;
+
+
+	/**
+	 * AdminNotice constructor.
+	 *
+	 * @param NoticeInterface $notice
+	 * @param bool            $display_now
+	 */
+	public function __construct(NoticeInterface $notice, $display_now = true)
+	{
+		$this->notice = $notice;
+		if (! did_action('admin_notices')) {
+			add_action('admin_notices', array($this, 'displayNotice'));
+		} elseif ($display_now) {
+			$this->displayNotice();
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function displayNotice()
+	{
+		echo wp_kses($this->getNotice(), AllowedTags::getAllowedTags());
+	}
+
+
+	/**
+	 * produces something  like:
+	 *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
+	 *      <p>YOU DID IT!</p>
+	 *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
+	 *      notice.</span></button>
+	 *  </div>
+	 *
+	 * @return string
+	 */
+	public function getNotice()
+	{
+		return sprintf(
+			'<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
+			$this->getType(),
+			$this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
+			$this->getMessage()
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function getType()
+	{
+		switch ($this->notice->type()) {
+			case Notice::ERROR:
+				return AdminNotice::ERROR;
+			case Notice::ATTENTION:
+				return AdminNotice::WARNING;
+			case Notice::SUCCESS:
+				return AdminNotice::SUCCESS;
+			case Notice::INFORMATION:
+			default:
+				return AdminNotice::INFORMATION;
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getMessage()
+	{
+		$message = $this->notice->message();
+		if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
+			$message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
+		}
+		return $message;
+	}
+
+
+	/**
+	 * create error code from filepath, function name,
+	 * and line number where notice was generated
+	 *
+	 * @return string
+	 */
+	protected function generateErrorCode()
+	{
+		$file = explode('.', basename($this->notice->file()));
+		$error_code = ! empty($file[0]) ? $file[0] : '';
+		$error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
+		$error_code .= ' - ' . $this->notice->line();
+		return $error_code;
+	}
 }

core/services/container/NewCoffeeMaker.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
             case 'new_instance':
             case 'new_instance_from_db':
                 $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
+                $closure = function($arguments) use ($recipe, $reflector, $method, $injector) {
                     return call_user_func_array(
                         array($reflector->getName(), $method),
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
@@ -52,14 +52,14 @@ 
                 };
                 break;
             case 'newInstance':
-                $closure = function () use ($reflector) {
+                $closure = function() use ($reflector) {
                     return $reflector->newInstance();
                 };
                 break;
             case 'newInstanceArgs':
             default:
                 $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
+                $closure = function($arguments) use ($recipe, $reflector, $injector) {
                     return $reflector->newInstanceArgs(
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
                     );

Indentation +45 added lines, -45 removed lines

@@ -18,51 +18,51 @@
  */
 class NewCoffeeMaker extends CoffeeMaker
 {
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_NEW;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_NEW;
+	}
 
 
-    /**
-     * @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':
-                $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
-                    return call_user_func_array(
-                        array($reflector->getName(), $method),
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
-                    );
-                };
-                break;
-            case 'newInstance':
-                $closure = function () use ($reflector) {
-                    return $reflector->newInstance();
-                };
-                break;
-            case 'newInstanceArgs':
-            default:
-                $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
-                    return $reflector->newInstanceArgs(
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
-                    );
-                };
-        }
-        return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
-    }
+	/**
+	 * @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':
+				$injector = $this->injector();
+				$closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
+					return call_user_func_array(
+						array($reflector->getName(), $method),
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
+					);
+				};
+				break;
+			case 'newInstance':
+				$closure = function () use ($reflector) {
+					return $reflector->newInstance();
+				};
+				break;
+			case 'newInstanceArgs':
+			default:
+				$injector = $this->injector();
+				$closure = function ($arguments) use ($recipe, $reflector, $injector) {
+					return $reflector->newInstanceArgs(
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
+					);
+				};
+		}
+		return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
+	}
 }

core/services/address/formatters/AddressFormatter.php

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 class AddressFormatter
 {
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $formatted_address
-     * @param string $sub
-     * @return mixed
-     */
-    protected function parse_formatted_address(
-        $address,
-        $address2,
-        $city,
-        $state,
-        $zip,
-        $country,
-        $formatted_address,
-        $sub
-    ) {
-        // swap address part placeholders for the real text
-        $formatted_address = str_replace(
-            // find
-            array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
-            // replace
-            array($address, $address2, $city, $state, $zip, $country),
-            // string
-            $formatted_address
-        );
-        // remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-        return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $formatted_address
+	 * @param string $sub
+	 * @return mixed
+	 */
+	protected function parse_formatted_address(
+		$address,
+		$address2,
+		$city,
+		$state,
+		$zip,
+		$country,
+		$formatted_address,
+		$sub
+	) {
+		// swap address part placeholders for the real text
+		$formatted_address = str_replace(
+			// find
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
+			// replace
+			array($address, $address2, $city, $state, $zip, $country),
+			// string
+			$formatted_address
+		);
+		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
+	}
 }