eventespresso / event-espresso-core

core/services/container/CoffeeMaker.php

Indentation +160 added lines, -160 removed lines

@@ -6,7 +6,7 @@ 
 use EventEspresso\core\services\container\exceptions\InstantiationException;
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -23,165 +23,165 @@ 
 abstract class CoffeeMaker implements CoffeeMakerInterface
 {
 
-    /**
-     * Indicates that CoffeeMaker should construct a NEW entity instance from the provided arguments (if given)
-     */
-    const BREW_NEW = 'new';
-
-    /**
-     * Indicates that CoffeeMaker should always return a SHARED instance
-     */
-    const BREW_SHARED = 'shared';
-
-    /**
-     * Indicates that CoffeeMaker should only load the file/class/interface but NOT instantiate
-     */
-    const BREW_LOAD_ONLY = 'load_only';
-
-
-    /**
-     * @var CoffeePotInterface $coffee_pot
-     */
-    private $coffee_pot;
-
-    /**
-     * @var DependencyInjector $injector
-     */
-    private $injector;
-
-
-
-    /**
-     * @return array
-     */
-    public static function getTypes()
-    {
-        return (array)apply_filters(
-            'FHEE__EventEspresso\core\services\container\CoffeeMaker__getTypes',
-            array(
-                CoffeeMaker::BREW_NEW,
-                CoffeeMaker::BREW_SHARED,
-                CoffeeMaker::BREW_LOAD_ONLY,
-            )
-        );
-    }
-
-
-
-    /**
-     * @param $type
-     * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
-     */
-    public static function validateType($type)
-    {
-        $types = CoffeeMaker::getTypes();
-        if ( ! in_array($type, $types, true)) {
-            throw new InvalidIdentifierException(
-                is_object($type) ? get_class($type) : gettype($type),
-                __(
-                    'recipe type (one of the class constants on \EventEspresso\core\services\container\CoffeeMaker)',
-                    'event_espresso'
-                )
-            );
-        }
-        return $type;
-    }
-
-
-
-    /**
-     * CoffeeMaker constructor.
-     *
-     * @param CoffeePotInterface $coffee_pot
-     * @param InjectorInterface  $injector
-     */
-    public function __construct(CoffeePotInterface $coffee_pot, InjectorInterface $injector)
-    {
-        $this->coffee_pot = $coffee_pot;
-        $this->injector = $injector;
-    }
-
-
-
-    /**
-     * @return \EventEspresso\core\services\container\CoffeePotInterface
-     */
-    protected function coffeePot()
-    {
-        return $this->coffee_pot;
-    }
-
-
-
-    /**
-     * @return \EventEspresso\core\services\container\DependencyInjector
-     */
-    protected function injector()
-    {
-        return $this->injector;
-    }
-
-
-
-    /**
-     * Examines the constructor to determine which method should be used for instantiation
-     *
-     * @param \ReflectionClass $reflector
-     * @return mixed
-     * @throws InstantiationException
-     */
-    protected function resolveInstantiationMethod(\ReflectionClass $reflector)
-    {
-        if ($reflector->getConstructor() === null) {
-            return 'NewInstance';
-        }
-        if ($reflector->isInstantiable()) {
-            return 'NewInstanceArgs';
-        }
-        if (method_exists($reflector->getName(), 'instance')) {
-            return 'instance';
-        }
-        if (method_exists($reflector->getName(), 'new_instance')) {
-            return 'new_instance';
-        }
-        if (method_exists($reflector->getName(), 'new_instance_from_db')) {
-            return 'new_instance_from_db';
-        }
-        throw new InstantiationException($reflector->getName());
-    }
-
-
-
-    /**
-     * Ensures files for classes that are not PSR-4 compatible are loaded
-     * and then verifies that classes exist where applicable
-     *
-     * @param RecipeInterface $recipe
-     * @return bool
-     * @throws InvalidClassException
-     */
-    protected function resolveClassAndFilepath(RecipeInterface $recipe)
-    {
-        $paths = $recipe->paths();
-        if ( ! empty($paths)) {
-            foreach ($paths as $path) {
-                if (strpos($path, '*') === false && is_readable($path)) {
-                    require_once($path);
-                }
-            }
-        }
-        // re: using "false" for class_exists() second param:
-        // if a class name is not already known to PHP, then class_exists() will run through
-        // all of the registered spl_autoload functions until it either finds the class,
-        // or gets to the end of the registered spl_autoload functions.
-        // When the second parameter is true, it will also attempt to load the class file,
-        // but it will also trigger an error if the class can not be loaded.
-        // We don't want that extra error in the mix, so we have set the second param to "false"
-        if ($recipe->type() !== CoffeeMaker::BREW_LOAD_ONLY && ! class_exists($recipe->fqcn(), false)) {
-            throw new InvalidClassException($recipe->identifier());
-        }
-        return true;
-    }
+	/**
+	 * Indicates that CoffeeMaker should construct a NEW entity instance from the provided arguments (if given)
+	 */
+	const BREW_NEW = 'new';
+
+	/**
+	 * Indicates that CoffeeMaker should always return a SHARED instance
+	 */
+	const BREW_SHARED = 'shared';
+
+	/**
+	 * Indicates that CoffeeMaker should only load the file/class/interface but NOT instantiate
+	 */
+	const BREW_LOAD_ONLY = 'load_only';
+
+
+	/**
+	 * @var CoffeePotInterface $coffee_pot
+	 */
+	private $coffee_pot;
+
+	/**
+	 * @var DependencyInjector $injector
+	 */
+	private $injector;
+
+
+
+	/**
+	 * @return array
+	 */
+	public static function getTypes()
+	{
+		return (array)apply_filters(
+			'FHEE__EventEspresso\core\services\container\CoffeeMaker__getTypes',
+			array(
+				CoffeeMaker::BREW_NEW,
+				CoffeeMaker::BREW_SHARED,
+				CoffeeMaker::BREW_LOAD_ONLY,
+			)
+		);
+	}
+
+
+
+	/**
+	 * @param $type
+	 * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
+	 */
+	public static function validateType($type)
+	{
+		$types = CoffeeMaker::getTypes();
+		if ( ! in_array($type, $types, true)) {
+			throw new InvalidIdentifierException(
+				is_object($type) ? get_class($type) : gettype($type),
+				__(
+					'recipe type (one of the class constants on \EventEspresso\core\services\container\CoffeeMaker)',
+					'event_espresso'
+				)
+			);
+		}
+		return $type;
+	}
+
+
+
+	/**
+	 * CoffeeMaker constructor.
+	 *
+	 * @param CoffeePotInterface $coffee_pot
+	 * @param InjectorInterface  $injector
+	 */
+	public function __construct(CoffeePotInterface $coffee_pot, InjectorInterface $injector)
+	{
+		$this->coffee_pot = $coffee_pot;
+		$this->injector = $injector;
+	}
+
+
+
+	/**
+	 * @return \EventEspresso\core\services\container\CoffeePotInterface
+	 */
+	protected function coffeePot()
+	{
+		return $this->coffee_pot;
+	}
+
+
+
+	/**
+	 * @return \EventEspresso\core\services\container\DependencyInjector
+	 */
+	protected function injector()
+	{
+		return $this->injector;
+	}
+
+
+
+	/**
+	 * Examines the constructor to determine which method should be used for instantiation
+	 *
+	 * @param \ReflectionClass $reflector
+	 * @return mixed
+	 * @throws InstantiationException
+	 */
+	protected function resolveInstantiationMethod(\ReflectionClass $reflector)
+	{
+		if ($reflector->getConstructor() === null) {
+			return 'NewInstance';
+		}
+		if ($reflector->isInstantiable()) {
+			return 'NewInstanceArgs';
+		}
+		if (method_exists($reflector->getName(), 'instance')) {
+			return 'instance';
+		}
+		if (method_exists($reflector->getName(), 'new_instance')) {
+			return 'new_instance';
+		}
+		if (method_exists($reflector->getName(), 'new_instance_from_db')) {
+			return 'new_instance_from_db';
+		}
+		throw new InstantiationException($reflector->getName());
+	}
+
+
+
+	/**
+	 * Ensures files for classes that are not PSR-4 compatible are loaded
+	 * and then verifies that classes exist where applicable
+	 *
+	 * @param RecipeInterface $recipe
+	 * @return bool
+	 * @throws InvalidClassException
+	 */
+	protected function resolveClassAndFilepath(RecipeInterface $recipe)
+	{
+		$paths = $recipe->paths();
+		if ( ! empty($paths)) {
+			foreach ($paths as $path) {
+				if (strpos($path, '*') === false && is_readable($path)) {
+					require_once($path);
+				}
+			}
+		}
+		// re: using "false" for class_exists() second param:
+		// if a class name is not already known to PHP, then class_exists() will run through
+		// all of the registered spl_autoload functions until it either finds the class,
+		// or gets to the end of the registered spl_autoload functions.
+		// When the second parameter is true, it will also attempt to load the class file,
+		// but it will also trigger an error if the class can not be loaded.
+		// We don't want that extra error in the mix, so we have set the second param to "false"
+		if ($recipe->type() !== CoffeeMaker::BREW_LOAD_ONLY && ! class_exists($recipe->fqcn(), false)) {
+			throw new InvalidClassException($recipe->identifier());
+		}
+		return true;
+	}
 
 
 

core/services/bootstrap/BootstrapRequestResponseObjects.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     {
         espresso_load_required(
             'EE_Request',
-            EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
+            EE_CORE.'request_stack'.DS.'EE_Request.core.php'
         );
         $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
         $this->legacy_request->setRequest($this->request);

Indentation +76 added lines, -76 removed lines

@@ -29,81 +29,81 @@
 class BootstrapRequestResponseObjects
 {
 
-    /**
-     * @type LegacyRequestInterface $legacy_request
-     */
-    protected $legacy_request;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
-
-
-    /**
-     * BootstrapRequestResponseObjects constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @return void
-     */
-    public function buildRequestResponse()
-    {
-        // load our Request and Response objects
-        $this->request  = new Request($_GET, $_POST, $_COOKIE, $_SERVER);
-        $this->response = new Response();
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    public function shareRequestResponse()
-    {
-        $this->loader->share('EventEspresso\core\services\request\Request', $this->request);
-        $this->loader->share('EventEspresso\core\services\request\Response', $this->response);
-        EE_Dependency_Map::instance()->setRequest($this->request);
-        EE_Dependency_Map::instance()->setResponse($this->response);
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    public function setupLegacyRequest()
-    {
-        espresso_load_required(
-            'EE_Request',
-            EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
-        );
-        $this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
-        $this->legacy_request->setRequest($this->request);
-        $this->legacy_request->admin      = $this->request->isAdmin();
-        $this->legacy_request->ajax       = $this->request->isAjax();
-        $this->legacy_request->front_ajax = $this->request->isFrontAjax();
-        EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
-        $this->loader->share('EE_Request', $this->legacy_request);
-        $this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
-    }
+	/**
+	 * @type LegacyRequestInterface $legacy_request
+	 */
+	protected $legacy_request;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
+
+
+	/**
+	 * BootstrapRequestResponseObjects constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function buildRequestResponse()
+	{
+		// load our Request and Response objects
+		$this->request  = new Request($_GET, $_POST, $_COOKIE, $_SERVER);
+		$this->response = new Response();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	public function shareRequestResponse()
+	{
+		$this->loader->share('EventEspresso\core\services\request\Request', $this->request);
+		$this->loader->share('EventEspresso\core\services\request\Response', $this->response);
+		EE_Dependency_Map::instance()->setRequest($this->request);
+		EE_Dependency_Map::instance()->setResponse($this->response);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	public function setupLegacyRequest()
+	{
+		espresso_load_required(
+			'EE_Request',
+			EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
+		);
+		$this->legacy_request = new EE_Request($_GET, $_POST, $_COOKIE, $_SERVER);
+		$this->legacy_request->setRequest($this->request);
+		$this->legacy_request->admin      = $this->request->isAdmin();
+		$this->legacy_request->ajax       = $this->request->isAjax();
+		$this->legacy_request->front_ajax = $this->request->isFrontAjax();
+		EE_Dependency_Map::instance()->setLegacyRequest($this->legacy_request);
+		$this->loader->share('EE_Request', $this->legacy_request);
+		$this->loader->share('EventEspresso\core\services\request\LegacyRequestInterface', $this->legacy_request);
+	}
 }
 

core/services/bootstrap/BootstrapDependencyInjectionContainer.php

Spacing +2 added lines, -2 removed lines

@@ -67,13 +67,13 @@
         // EE_Dependency_Map: info about how to load classes required by other classes
         espresso_load_required(
             'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
+            EE_CORE.'EE_Dependency_Map.core.php'
         );
         $this->dependency_map = EE_Dependency_Map::instance();
         // EE_Registry: central repository for classes (legacy)
         espresso_load_required(
             'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
+            EE_CORE.'EE_Registry.core.php'
         );
         $this->registry = EE_Registry::instance($this->dependency_map);
     }

Indentation +93 added lines, -93 removed lines

@@ -26,98 +26,98 @@
 class BootstrapDependencyInjectionContainer
 {
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @type LoaderInterface $loader
-     */
-    protected $loader;
-
-    /**
-     * @var EE_Registry $registry
-     */
-    protected $registry;
-
-
-    /**
-     * Can't use this just yet until we exorcise some more of our singleton usage from core
-     */
-    public function buildDependencyInjectionContainer()
-    {
-        // build DI container
-        // $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
-        // $OpenCoffeeShop->addRecipes();
-        // $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
-    }
-
-
-    /**
-     * Setups  EE_Registry and EE_Dependency_Map
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function buildLegacyDependencyInjectionContainer()
-    {
-        // EE_Dependency_Map: info about how to load classes required by other classes
-        espresso_load_required(
-            'EE_Dependency_Map',
-            EE_CORE . 'EE_Dependency_Map.core.php'
-        );
-        $this->dependency_map = EE_Dependency_Map::instance();
-        // EE_Registry: central repository for classes (legacy)
-        espresso_load_required(
-            'EE_Registry',
-            EE_CORE . 'EE_Registry.core.php'
-        );
-        $this->registry = EE_Registry::instance($this->dependency_map);
-    }
-
-
-    /**
-     * Performs initial setup for the generic Loader
-     *
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function buildLoader()
-    {
-        $this->loader = LoaderFactory::getLoader($this->registry);
-        $this->dependency_map->setLoader($this->loader);
-    }
-
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    public function getDependencyMap()
-    {
-        return $this->dependency_map;
-    }
-
-
-    /**
-     * @return EE_Registry
-     */
-    public function getRegistry()
-    {
-        return $this->registry;
-    }
-
-
-
-    /**
-     * @return LoaderInterface
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @type LoaderInterface $loader
+	 */
+	protected $loader;
+
+	/**
+	 * @var EE_Registry $registry
+	 */
+	protected $registry;
+
+
+	/**
+	 * Can't use this just yet until we exorcise some more of our singleton usage from core
+	 */
+	public function buildDependencyInjectionContainer()
+	{
+		// build DI container
+		// $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
+		// $OpenCoffeeShop->addRecipes();
+		// $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
+	}
+
+
+	/**
+	 * Setups  EE_Registry and EE_Dependency_Map
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function buildLegacyDependencyInjectionContainer()
+	{
+		// EE_Dependency_Map: info about how to load classes required by other classes
+		espresso_load_required(
+			'EE_Dependency_Map',
+			EE_CORE . 'EE_Dependency_Map.core.php'
+		);
+		$this->dependency_map = EE_Dependency_Map::instance();
+		// EE_Registry: central repository for classes (legacy)
+		espresso_load_required(
+			'EE_Registry',
+			EE_CORE . 'EE_Registry.core.php'
+		);
+		$this->registry = EE_Registry::instance($this->dependency_map);
+	}
+
+
+	/**
+	 * Performs initial setup for the generic Loader
+	 *
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function buildLoader()
+	{
+		$this->loader = LoaderFactory::getLoader($this->registry);
+		$this->dependency_map->setLoader($this->loader);
+	}
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	public function getDependencyMap()
+	{
+		return $this->dependency_map;
+	}
+
+
+	/**
+	 * @return EE_Registry
+	 */
+	public function getRegistry()
+	{
+		return $this->registry;
+	}
+
+
+
+	/**
+	 * @return LoaderInterface
+	 */
+	public function getLoader()
+	{
+		return $this->loader;
+	}
 
 }

core/middleware/EE_Alpha_Banner_Warning.core.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 	 * @param    EE_Response   $response
 	 * @return    EE_Response
 	 */
-	public function handle_request( EE_Request $request, EE_Response $response ) {
+	public function handle_request(EE_Request $request, EE_Response $response) {
 		$this->_request = $request;
 		$this->_response = $response;
 		$this->display_alpha_banner_warning();
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
 		return $this->_response;
 	}
 

Indentation +52 added lines, -52 removed lines

@@ -14,7 +14,7 @@ 
 
 
 	/**
-     * @deprecated 4.9.53
+	 * @deprecated 4.9.53
 	 * @param 	EE_Request $request
 	 * @param    EE_Response   $response
 	 * @return    EE_Response
@@ -30,71 +30,71 @@ 
 
 
 	/**
-     * @deprecated
-     * @return    string
+	 * @deprecated
+	 * @return    string
 	 */
 	public function display_alpha_banner_warning() {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::displayPreProductionVersionWarning()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 
 
 
 	/**
-     * @deprecated
-     * @return void
+	 * @deprecated
+	 * @return void
 	 */
 	public function alpha_banner_admin_notice() {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionAdminNotice()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 
 
 
 	/**
-     * @deprecated
-     * @return void
+	 * @deprecated
+	 * @return void
 	 */
 	public function alpha_banner_warning_notice() {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.52',
-            '4.10.0'
-        );
-    }
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This method is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\middleware\PreProductionVersionWarning::preProductionVersionWarningNotice()',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.52',
+			'4.10.0'
+		);
+	}
 
 
 }

core/request_stack/EE_Request.core.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      */
     private function request()
     {
-        if($this->request instanceof RequestInterface){
+        if ($this->request instanceof RequestInterface) {
             return $this->request;
         }
         $loader = LoaderFactory::getLoader();

Doc Comments +4 added lines, -4 removed lines

@@ -181,7 +181,7 @@ 
      *
      * @deprecated 4.9.53
      * @param      $key
-     * @param null $default
+     * @param null|string $default
      * @return mixed
      * @throws InvalidArgumentException
      * @throws InvalidDataTypeException
@@ -256,7 +256,7 @@ 
 
     /**
      * @deprecated 4.9.53
-     * @return mixed
+     * @return boolean
      * @throws InvalidArgumentException
      * @throws InvalidDataTypeException
      * @throws InvalidInterfaceException
@@ -269,7 +269,7 @@ 
 
     /**
      * @deprecated 4.9.53
-     * @return mixed
+     * @return boolean
      * @throws InvalidArgumentException
      * @throws InvalidDataTypeException
      * @throws InvalidInterfaceException
@@ -282,7 +282,7 @@ 
 
     /**
      * @deprecated 4.9.53
-     * @return mixed|string
+     * @return string
      * @throws InvalidArgumentException
      * @throws InvalidDataTypeException
      * @throws InvalidInterfaceException

Indentation +325 added lines, -325 removed lines

@@ -22,331 +22,331 @@
 class EE_Request implements LegacyRequestInterface, InterminableInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
-
-    /**
-     * whether current request is for the admin but NOT via AJAX
-     *
-     * @var boolean $admin
-     */
-    public $admin = false;
-
-    /**
-     * whether current request is via AJAX
-     *
-     * @var boolean $ajax
-     */
-    public $ajax = false;
-
-    /**
-     * whether current request is via AJAX from the frontend of the site
-     *
-     * @var boolean $front_ajax
-     */
-    public $front_ajax = false;
-
-
-    /**
-     * @deprecated 4.9.53
-     * @param array $get
-     * @param array $post
-     * @param array $cookie
-     * @param array $server
-     */
-    public function __construct(
-        array $get = array(),
-        array $post = array(),
-        array $cookie = array(),
-        array $server = array()
-    ) {
-    }
-
-
-    /**
-     * @return RequestInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    private function request()
-    {
-        if($this->request instanceof RequestInterface){
-            return $this->request;
-        }
-        $loader = LoaderFactory::getLoader();
-        $this->request = $loader->getShared('EventEspresso\core\services\request\RequestInterface');
-        return $this->request;
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_params()
-    {
-        return $this->request()->getParams();
-    }
-
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function post_params()
-    {
-        return $this->request()->postParams();
-    }
-
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function cookie_params()
-    {
-        return $this->request()->cookieParams();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function server_params()
-    {
-        return $this->request()->serverParams();
-    }
-
-
-
-    /**
-     * returns contents of $_REQUEST
-     *
-     * @deprecated 4.9.53
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function params()
-    {
-        return $this->request()->requestParams();
-    }
-
-
-
-    /**
-     * @deprecated 4.9.53
-     * @param      $key
-     * @param      $value
-     * @param bool $override_ee
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function set($key, $value, $override_ee = false)
-    {
-        $this->request()->setRequestParam($key, $value, $override_ee);
-    }
-
-
-
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @deprecated 4.9.53
-     * @param      $key
-     * @param null $default
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get($key, $default = null)
-    {
-        return $this->request()->getRequestParam($key, $default);
-    }
-
-
-
-    /**
-     * check if param exists
-     *
-     * @deprecated 4.9.53
-     * @param $key
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function is_set($key)
-    {
-        return $this->request()->requestParamIsSet($key);
-    }
-
-
-
-    /**
-     * remove param
-     *
-     * @deprecated 4.9.53
-     * @param      $key
-     * @param bool $unset_from_global_too
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function un_set($key, $unset_from_global_too = false)
-    {
-        $this->request()->unSetRequestParam($key, $unset_from_global_too);
-    }
-
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function ip_address()
-    {
-        return $this->request()->ipAddress();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function isAdmin()
-    {
-        return $this->request()->isAdmin();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function isAjax()
-    {
-        return $this->request()->isAjax();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return mixed
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function isFrontAjax()
-    {
-        return $this->request()->isFrontAjax();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return mixed|string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function requestUri()
-    {
-        return $this->request()->requestUri();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function userAgent()
-    {
-        return $this->request()->userAgent();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @param string $user_agent
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function setUserAgent($user_agent = '')
-    {
-        $this->request()->setUserAgent($user_agent);
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function isBot()
-    {
-        return $this->request()->isBot();
-    }
-
-
-    /**
-     * @deprecated 4.9.53
-     * @param bool $is_bot
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function setIsBot($is_bot)
-    {
-        $this->request()->setIsBot($is_bot);
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
+
+	/**
+	 * whether current request is for the admin but NOT via AJAX
+	 *
+	 * @var boolean $admin
+	 */
+	public $admin = false;
+
+	/**
+	 * whether current request is via AJAX
+	 *
+	 * @var boolean $ajax
+	 */
+	public $ajax = false;
+
+	/**
+	 * whether current request is via AJAX from the frontend of the site
+	 *
+	 * @var boolean $front_ajax
+	 */
+	public $front_ajax = false;
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @param array $get
+	 * @param array $post
+	 * @param array $cookie
+	 * @param array $server
+	 */
+	public function __construct(
+		array $get = array(),
+		array $post = array(),
+		array $cookie = array(),
+		array $server = array()
+	) {
+	}
+
+
+	/**
+	 * @return RequestInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	private function request()
+	{
+		if($this->request instanceof RequestInterface){
+			return $this->request;
+		}
+		$loader = LoaderFactory::getLoader();
+		$this->request = $loader->getShared('EventEspresso\core\services\request\RequestInterface');
+		return $this->request;
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_params()
+	{
+		return $this->request()->getParams();
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function post_params()
+	{
+		return $this->request()->postParams();
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function cookie_params()
+	{
+		return $this->request()->cookieParams();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function server_params()
+	{
+		return $this->request()->serverParams();
+	}
+
+
+
+	/**
+	 * returns contents of $_REQUEST
+	 *
+	 * @deprecated 4.9.53
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function params()
+	{
+		return $this->request()->requestParams();
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @param      $key
+	 * @param      $value
+	 * @param bool $override_ee
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function set($key, $value, $override_ee = false)
+	{
+		$this->request()->setRequestParam($key, $value, $override_ee);
+	}
+
+
+
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @deprecated 4.9.53
+	 * @param      $key
+	 * @param null $default
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get($key, $default = null)
+	{
+		return $this->request()->getRequestParam($key, $default);
+	}
+
+
+
+	/**
+	 * check if param exists
+	 *
+	 * @deprecated 4.9.53
+	 * @param $key
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function is_set($key)
+	{
+		return $this->request()->requestParamIsSet($key);
+	}
+
+
+
+	/**
+	 * remove param
+	 *
+	 * @deprecated 4.9.53
+	 * @param      $key
+	 * @param bool $unset_from_global_too
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function un_set($key, $unset_from_global_too = false)
+	{
+		$this->request()->unSetRequestParam($key, $unset_from_global_too);
+	}
+
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function ip_address()
+	{
+		return $this->request()->ipAddress();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function isAdmin()
+	{
+		return $this->request()->isAdmin();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function isAjax()
+	{
+		return $this->request()->isAjax();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return mixed
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function isFrontAjax()
+	{
+		return $this->request()->isFrontAjax();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return mixed|string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function requestUri()
+	{
+		return $this->request()->requestUri();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function userAgent()
+	{
+		return $this->request()->userAgent();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @param string $user_agent
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function setUserAgent($user_agent = '')
+	{
+		$this->request()->setUserAgent($user_agent);
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function isBot()
+	{
+		return $this->request()->isBot();
+	}
+
+
+	/**
+	 * @deprecated 4.9.53
+	 * @param bool $is_bot
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function setIsBot($is_bot)
+	{
+		$this->request()->setIsBot($is_bot);
+	}
 
 
 

core/request_stack/EE_Request_Stack_Builder.core.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * @deprecated  4.9.53
      */
-	public function resolve( EEI_Request_Decorator $application ) {
+	public function resolve(EEI_Request_Decorator $application) {
 	}
 
 

Indentation +29 added lines, -29 removed lines

@@ -15,45 +15,45 @@
  */
 class EE_Request_Stack_Builder {
 
-    /**
-     * EE_Request_Stack_Builder
-     */
-    public function __construct()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\RequestStackBuilder',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.53'
-        );
-    }
+	/**
+	 * EE_Request_Stack_Builder
+	 */
+	public function __construct()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\RequestStackBuilder',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.53'
+		);
+	}
 
-    /**
-     * @deprecated  4.9.53
-     */
+	/**
+	 * @deprecated  4.9.53
+	 */
 	public function unshift( /*$class_name, $args*/ ) {
-    }
+	}
 
 
 
-    /**
-     * @deprecated  4.9.53
-     */
+	/**
+	 * @deprecated  4.9.53
+	 */
 	public function push( /*$class_name, $args...*/ ) {
 	}
 
 
 
-    /**
-     * @deprecated  4.9.53
-     */
+	/**
+	 * @deprecated  4.9.53
+	 */
 	public function resolve( EEI_Request_Decorator $application ) {
 	}
 

core/request_stack/EE_Response.core.php

Spacing +4 added lines, -4 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 
@@ -72,7 +72,7 @@ 
      */
     public function set_notice($key, $value)
     {
-        $this->_notice[ $key ] = $value;
+        $this->_notice[$key] = $value;
     }
 
 
@@ -84,7 +84,7 @@ 
      */
     public function get_notice($key)
     {
-        return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null;
+        return isset($this->_notice[$key]) ? $this->_notice[$key] : null;
     }
 
 
@@ -107,7 +107,7 @@ 
      */
     public function add_output($string, $append = true)
     {
-        $this->_output = $append ? $this->_output . $string : $string . $this->_output;
+        $this->_output = $append ? $this->_output.$string : $string.$this->_output;
     }
 
 

Indentation +150 added lines, -150 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 
 
@@ -17,158 +17,158 @@ 
 class EE_Response
 {
 
-    /**
-     * @access    protected
-     * @type        array $_notice
-     */
-    protected $_notice = array();
-
-    /**
-     *    rendered output to be returned to WP
-     *
-     * @access    protected
-     * @type        string
-     */
-    protected $_output = '';
-
-    /**
-     * @access    protected
-     * @type        bool
-     */
-    protected $request_terminated = false;
-
-    /**
-     * @access    protected
-     * @type        bool
-     */
-    protected $deactivate_plugin = false;
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @return \EE_Response
-     */
-    public function __construct()
-    {
-        $this->terminate_request(false);
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__(
-                    'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
-                    'event_espresso'
-                ),
-                'EventEspresso\core\services\request\Response',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.53'
-        );
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @param $key
-     * @param $value
-     * @return    void
-     */
-    public function set_notice($key, $value)
-    {
-        $this->_notice[ $key ] = $value;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @param $key
-     * @return    mixed
-     */
-    public function get_notice($key)
-    {
-        return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @return    array
-     */
-    public function get_notices()
-    {
-        return $this->_notice;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @param      $string
-     * @param bool $append
-     */
-    public function add_output($string, $append = true)
-    {
-        $this->_output = $append ? $this->_output . $string : $string . $this->_output;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @return    string
-     */
-    public function get_output()
-    {
-        return $this->_output;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @return boolean
-     */
-    public function request_terminated()
-    {
-        return $this->request_terminated;
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @param boolean $request_terminated
-     */
-    public function terminate_request($request_terminated = true)
-    {
-        $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-
-    /**
-     * @deprecated  4.9.53
-     * @return boolean
-     */
-    public function plugin_deactivated()
-    {
-        return $this->deactivate_plugin;
-    }
+	/**
+	 * @access    protected
+	 * @type        array $_notice
+	 */
+	protected $_notice = array();
+
+	/**
+	 *    rendered output to be returned to WP
+	 *
+	 * @access    protected
+	 * @type        string
+	 */
+	protected $_output = '';
+
+	/**
+	 * @access    protected
+	 * @type        bool
+	 */
+	protected $request_terminated = false;
+
+	/**
+	 * @access    protected
+	 * @type        bool
+	 */
+	protected $deactivate_plugin = false;
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @return \EE_Response
+	 */
+	public function __construct()
+	{
+		$this->terminate_request(false);
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__(
+					'This class is deprecated. Please use %1$s instead. All Event Espresso request stack classes have been moved to %2$s and are now under the %3$s namespace',
+					'event_espresso'
+				),
+				'EventEspresso\core\services\request\Response',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.53'
+		);
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @param $key
+	 * @param $value
+	 * @return    void
+	 */
+	public function set_notice($key, $value)
+	{
+		$this->_notice[ $key ] = $value;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @param $key
+	 * @return    mixed
+	 */
+	public function get_notice($key)
+	{
+		return isset($this->_notice[ $key ]) ? $this->_notice[ $key ] : null;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @return    array
+	 */
+	public function get_notices()
+	{
+		return $this->_notice;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @param      $string
+	 * @param bool $append
+	 */
+	public function add_output($string, $append = true)
+	{
+		$this->_output = $append ? $this->_output . $string : $string . $this->_output;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @return    string
+	 */
+	public function get_output()
+	{
+		return $this->_output;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @return boolean
+	 */
+	public function request_terminated()
+	{
+		return $this->request_terminated;
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @param boolean $request_terminated
+	 */
+	public function terminate_request($request_terminated = true)
+	{
+		$this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+
+	/**
+	 * @deprecated  4.9.53
+	 * @return boolean
+	 */
+	public function plugin_deactivated()
+	{
+		return $this->deactivate_plugin;
+	}
 
 
 
-    /**
-     * @deprecated  4.9.53
-     * sets $deactivate_plugin to true
-     */
-    public function deactivate_plugin()
-    {
-        $this->deactivate_plugin = true;
-    }
+	/**
+	 * @deprecated  4.9.53
+	 * sets $deactivate_plugin to true
+	 */
+	public function deactivate_plugin()
+	{
+		$this->deactivate_plugin = true;
+	}
 
 
 }

core/domain/services/contexts/RequestTypeContextDetector.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
         $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
             ?  trim(rest_get_url_prefix(), '/')
             : 'wp-json';
-        $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
+        $ee_rest_url_prefix .= '/'.Domain::API_NAMESPACE;
         return $this->uriPathMatches($ee_rest_url_prefix);
     }
 

Indentation +127 added lines, -127 removed lines

@@ -23,133 +23,133 @@
 class RequestTypeContextDetector
 {
 
-    /**
-     * @var RequestTypeContextFactory $factory
-     */
-    private $factory;
-
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
-
-
-    /**
-     * RequestTypeContextDetector constructor.
-     *
-     * @param RequestInterface          $request
-     * @param RequestTypeContextFactory $factory
-     */
-    public function __construct(RequestInterface $request, RequestTypeContextFactory $factory)
-    {
-        $this->request = $request;
-        $this->factory = $factory;
-    }
-
-
-    /**
-     * @return RequestTypeContext
-     * @throws InvalidArgumentException
-     */
-    public function detectRequestTypeContext()
-    {
-        // Detect EE REST API
-        if ($this->isEspressoRestApiRequest()) {
-            return $this->factory->create(RequestTypeContext::API);
-        }
-        // Detect AJAX
-        if (defined('DOING_AJAX') && DOING_AJAX) {
-            if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_FRONT);
-            }
-            if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
-            }
-            return $this->factory->create(RequestTypeContext::AJAX_OTHER);
-        }
-        // Detect WP_Cron
-        if ($this->isCronRequest()) {
-            return $this->factory->create(RequestTypeContext::CRON);
-        }
-        // Detect command line requests
-        if (defined('WP_CLI') && WP_CLI) {
-            return $this->factory->create(RequestTypeContext::CLI);
-        }
-        // detect WordPress admin (ie: "Dashboard")
-        if (is_admin()) {
-            return $this->factory->create(RequestTypeContext::ADMIN);
-        }
-        // Detect iFrames
-        if ($this->isIframeRoute()) {
-            return $this->factory->create(RequestTypeContext::IFRAME);
-        }
-        // Detect Feeds
-        if ($this->isFeedRequest()) {
-            return $this->factory->create(RequestTypeContext::FEED);
-        }
-        // and by process of elimination...
-        return $this->factory->create(RequestTypeContext::FRONTEND);
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isEspressoRestApiRequest()
-    {
-        $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
-            ?  trim(rest_get_url_prefix(), '/')
-            : 'wp-json';
-        $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
-        return $this->uriPathMatches($ee_rest_url_prefix);
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isCronRequest()
-    {
-        return $this->uriPathMatches('wp-cron.php');
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isFeedRequest()
-    {
-        return $this->uriPathMatches('feed');
-    }
-
-
-    /**
-     * @param string $component
-     * @return bool
-     */
-    private function uriPathMatches($component)
-    {
-        $request_uri = $this->request->requestUri();
-        $parts       = explode('?', $request_uri);
-        $path        = trim(reset($parts), '/');
-        return strpos($path, $component) === 0;
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isIframeRoute()
-    {
-        $is_iframe_route = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
-            $this->request->getRequestParam('event_list', '') === 'iframe'
-            || $this->request->getRequestParam('ticket_selector', '') === 'iframe'
-            || $this->request->getRequestParam('calendar', '') === 'iframe',
-            $this
-        );
-        return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @var RequestTypeContextFactory $factory
+	 */
+	private $factory;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
+
+
+	/**
+	 * RequestTypeContextDetector constructor.
+	 *
+	 * @param RequestInterface          $request
+	 * @param RequestTypeContextFactory $factory
+	 */
+	public function __construct(RequestInterface $request, RequestTypeContextFactory $factory)
+	{
+		$this->request = $request;
+		$this->factory = $factory;
+	}
+
+
+	/**
+	 * @return RequestTypeContext
+	 * @throws InvalidArgumentException
+	 */
+	public function detectRequestTypeContext()
+	{
+		// Detect EE REST API
+		if ($this->isEspressoRestApiRequest()) {
+			return $this->factory->create(RequestTypeContext::API);
+		}
+		// Detect AJAX
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_FRONT);
+			}
+			if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
+			}
+			return $this->factory->create(RequestTypeContext::AJAX_OTHER);
+		}
+		// Detect WP_Cron
+		if ($this->isCronRequest()) {
+			return $this->factory->create(RequestTypeContext::CRON);
+		}
+		// Detect command line requests
+		if (defined('WP_CLI') && WP_CLI) {
+			return $this->factory->create(RequestTypeContext::CLI);
+		}
+		// detect WordPress admin (ie: "Dashboard")
+		if (is_admin()) {
+			return $this->factory->create(RequestTypeContext::ADMIN);
+		}
+		// Detect iFrames
+		if ($this->isIframeRoute()) {
+			return $this->factory->create(RequestTypeContext::IFRAME);
+		}
+		// Detect Feeds
+		if ($this->isFeedRequest()) {
+			return $this->factory->create(RequestTypeContext::FEED);
+		}
+		// and by process of elimination...
+		return $this->factory->create(RequestTypeContext::FRONTEND);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isEspressoRestApiRequest()
+	{
+		$ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
+			?  trim(rest_get_url_prefix(), '/')
+			: 'wp-json';
+		$ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
+		return $this->uriPathMatches($ee_rest_url_prefix);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isCronRequest()
+	{
+		return $this->uriPathMatches('wp-cron.php');
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isFeedRequest()
+	{
+		return $this->uriPathMatches('feed');
+	}
+
+
+	/**
+	 * @param string $component
+	 * @return bool
+	 */
+	private function uriPathMatches($component)
+	{
+		$request_uri = $this->request->requestUri();
+		$parts       = explode('?', $request_uri);
+		$path        = trim(reset($parts), '/');
+		return strpos($path, $component) === 0;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isIframeRoute()
+	{
+		$is_iframe_route = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
+			$this->request->getRequestParam('event_list', '') === 'iframe'
+			|| $this->request->getRequestParam('ticket_selector', '') === 'iframe'
+			|| $this->request->getRequestParam('calendar', '') === 'iframe',
+			$this
+		);
+		return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
+	}
 
 }
 // Location: RequestTypeContextDetector.php

core/domain/services/contexts/RequestTypeContextChecker.php

Indentation +180 added lines, -180 removed lines

@@ -20,186 +20,186 @@
 class RequestTypeContextChecker extends ContextChecker implements RequestTypeContextCheckerInterface
 {
 
-    /**
-     * @var RequestTypeContext $request_type
-     */
-    private $request_type;
-
-
-    /**
-     * RequestTypeContextChecker constructor.
-     *
-     * @param RequestTypeContext $request_type
-     */
-    public function __construct(RequestTypeContext $request_type)
-    {
-        $this->request_type = $request_type;
-        parent::__construct(
-            'RequestTypeContextChecker',
-            $this->request_type->validRequestTypes()
-        );
-    }
-
-
-    /**
-     * true if the current request involves some form of activation
-     *
-     * @return bool
-     */
-    public function isActivation()
-    {
-        return $this->request_type->isActivation();
-    }
-
-
-    /**
-     * @param $is_activation
-     * @return bool
-     */
-    public function setIsActivation($is_activation)
-    {
-        return $this->request_type->setIsActivation($is_activation);
-    }
-
-
-    /**
-     * true if the current request is for the admin and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdmin()
-    {
-        return $this->request_type->slug() === RequestTypeContext::ADMIN;
-    }
-
-
-    /**
-     * true if the current request is for the admin AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdminAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN;
-    }
-
-
-    /**
-     * true if the current request is being made via AJAX... any AJAX
-     *
-     * @return bool
-     */
-    public function isAjax()
-    {
-        return $this->isEeAjax() || $this->isOtherAjax();
-    }
-
-
-    /**
-     * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isEeAjax()
-    {
-        return $this->isAdminAjax() || $this->isFrontAjax();
-    }
-
-
-    /**
-     * true if the current request is being made via AJAX but is NOT for EE related logic
-     *
-     * @return bool
-     */
-    public function isOtherAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER;
-    }
-
-    /**
-     * true if the current request is for the EE REST API
-     *
-     * @return bool
-     */
-    public function isApi()
-    {
-        return $this->request_type->slug() === RequestTypeContext::API;
-    }
-
-
-    /**
-     * true if the current request is from the command line
-     *
-     * @return bool
-     */
-    public function isCli()
-    {
-        return $this->request_type->slug() === RequestTypeContext::CLI;
-    }
-
-
-    /**
-     * true if the current request is for a WP_Cron
-     *
-     * @return bool
-     */
-    public function isCron()
-    {
-        return $this->request_type->slug() === RequestTypeContext::CRON;
-    }
-
-
-    /**
-     * true if the current request is for a feed (ie: RSS)
-     *
-     * @return bool
-     */
-    public function isFeed()
-    {
-        return $this->request_type->slug() === RequestTypeContext::FEED;
-    }
-
-
-    /**
-     * true if the current request is for the frontend and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontend()
-    {
-        return $this->request_type->slug() === RequestTypeContext::FRONTEND;
-    }
-
-
-    /**
-     * true if the current request is for the frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT;
-    }
-
-
-    /**
-     * true if the current request is for content that is to be displayed within an iframe
-     *
-     * @return bool
-     */
-    public function isIframe()
-    {
-        return $this->request_type->slug() === RequestTypeContext::IFRAME;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->request_type->slug();
-    }
+	/**
+	 * @var RequestTypeContext $request_type
+	 */
+	private $request_type;
+
+
+	/**
+	 * RequestTypeContextChecker constructor.
+	 *
+	 * @param RequestTypeContext $request_type
+	 */
+	public function __construct(RequestTypeContext $request_type)
+	{
+		$this->request_type = $request_type;
+		parent::__construct(
+			'RequestTypeContextChecker',
+			$this->request_type->validRequestTypes()
+		);
+	}
+
+
+	/**
+	 * true if the current request involves some form of activation
+	 *
+	 * @return bool
+	 */
+	public function isActivation()
+	{
+		return $this->request_type->isActivation();
+	}
+
+
+	/**
+	 * @param $is_activation
+	 * @return bool
+	 */
+	public function setIsActivation($is_activation)
+	{
+		return $this->request_type->setIsActivation($is_activation);
+	}
+
+
+	/**
+	 * true if the current request is for the admin and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdmin()
+	{
+		return $this->request_type->slug() === RequestTypeContext::ADMIN;
+	}
+
+
+	/**
+	 * true if the current request is for the admin AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdminAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN;
+	}
+
+
+	/**
+	 * true if the current request is being made via AJAX... any AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAjax()
+	{
+		return $this->isEeAjax() || $this->isOtherAjax();
+	}
+
+
+	/**
+	 * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isEeAjax()
+	{
+		return $this->isAdminAjax() || $this->isFrontAjax();
+	}
+
+
+	/**
+	 * true if the current request is being made via AJAX but is NOT for EE related logic
+	 *
+	 * @return bool
+	 */
+	public function isOtherAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER;
+	}
+
+	/**
+	 * true if the current request is for the EE REST API
+	 *
+	 * @return bool
+	 */
+	public function isApi()
+	{
+		return $this->request_type->slug() === RequestTypeContext::API;
+	}
+
+
+	/**
+	 * true if the current request is from the command line
+	 *
+	 * @return bool
+	 */
+	public function isCli()
+	{
+		return $this->request_type->slug() === RequestTypeContext::CLI;
+	}
+
+
+	/**
+	 * true if the current request is for a WP_Cron
+	 *
+	 * @return bool
+	 */
+	public function isCron()
+	{
+		return $this->request_type->slug() === RequestTypeContext::CRON;
+	}
+
+
+	/**
+	 * true if the current request is for a feed (ie: RSS)
+	 *
+	 * @return bool
+	 */
+	public function isFeed()
+	{
+		return $this->request_type->slug() === RequestTypeContext::FEED;
+	}
+
+
+	/**
+	 * true if the current request is for the frontend and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontend()
+	{
+		return $this->request_type->slug() === RequestTypeContext::FRONTEND;
+	}
+
+
+	/**
+	 * true if the current request is for the frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT;
+	}
+
+
+	/**
+	 * true if the current request is for content that is to be displayed within an iframe
+	 *
+	 * @return bool
+	 */
+	public function isIframe()
+	{
+		return $this->request_type->slug() === RequestTypeContext::IFRAME;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->request_type->slug();
+	}
 
 }
 // Location: RequestTypeContextChecker.php