eventespresso / event-espresso-core

core/EE_Module_Request_Router.core.php

Doc Comments +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
      * this method instantiates modules and calls the method that was defined when the route was registered
      *
      * @param string $module_name
-     * @return EED_Module|object|null
+     * @return null|EED_Module
      * @throws ReflectionException
      */
     public static function module_factory($module_name)
@@ -252,7 +252,7 @@ 
 
 
     /**
-     * @param $current_route
+     * @param string $current_route
      * @return string
      */
     public function get_view($current_route)

Indentation +235 added lines, -235 removed lines

@@ -15,255 +15,255 @@
 final class EE_Module_Request_Router implements InterminableInterface
 {
 
-    /**
-     * @var EE_Request $request
-     */
-    private $request;
+	/**
+	 * @var EE_Request $request
+	 */
+	private $request;
 
-    /**
-     * @var array $_previous_routes
-     */
-    private static $_previous_routes = array();
+	/**
+	 * @var array $_previous_routes
+	 */
+	private static $_previous_routes = array();
 
-    /**
-     * @var WP_Query $WP_Query
-     */
-    public $WP_Query;
+	/**
+	 * @var WP_Query $WP_Query
+	 */
+	public $WP_Query;
 
 
-    /**
-     * EE_Module_Request_Router constructor.
-     *
-     * @param EE_Request $request
-     */
-    public function __construct(EE_Request $request)
-    {
-        $this->request = $request;
-    }
+	/**
+	 * EE_Module_Request_Router constructor.
+	 *
+	 * @param EE_Request $request
+	 */
+	public function __construct(EE_Request $request)
+	{
+		$this->request = $request;
+	}
 
 
-    /**
-     * on the first call  to this method, it checks the EE_Request_Handler for a "route"
-     * on subsequent calls to this method,
-     * instead of checking the EE_Request_Handler for a route, it checks the previous routes array,
-     * and checks if the last called route has any forwarding routes registered for it
-     *
-     * @param WP_Query $WP_Query
-     * @return NULL|string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_route(WP_Query $WP_Query)
-    {
-        $this->WP_Query = $WP_Query;
-        // assume this if first route being called
-        $previous_route = false;
-        // but is it really ???
-        if (! empty(self::$_previous_routes)) {
-            // get last run route
-            $previous_routes = array_values(self::$_previous_routes);
-            $previous_route = array_pop($previous_routes);
-        }
-        //  has another route already been run ?
-        if ($previous_route) {
-            // check if  forwarding has been set
-            $current_route = $this->get_forward($previous_route);
-            try {
-                // check for recursive forwarding
-                if (isset(self::$_previous_routes[ $current_route ])) {
-                    throw new EE_Error(
-                        sprintf(
-                            __(
-                                'An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.',
-                                'event_espresso'
-                            ),
-                            $current_route
-                        )
-                    );
-                }
-            } catch (EE_Error $e) {
-                $e->get_error();
-                return null;
-            }
-        } else {
-            // first route called
-            $current_route = null;
-            // grab all routes
-            $routes = EE_Config::get_routes();
-            foreach ($routes as $key => $route) {
-                // first determine if route key uses w?ldc*rds
-                $uses_wildcards = strpos($key, '?') !== false
-                                  || strpos($key, '*') !== false;
-                // check request for module route
-                $route_found = $uses_wildcards
-                    ? $this->request->matches($key)
-                    : $this->request->is_set($key);
-                if ($route_found) {
-                    $current_route = $uses_wildcards
-                        ? $this->request->getMatch($key)
-                        : $this->request->get($key);
-                    $current_route = sanitize_text_field($current_route);
-                    if ($current_route) {
-                        $current_route = array($key, $current_route);
-                        break;
-                    }
-                }
-            }
-        }
-        // sorry, but I can't read what you route !
-        if (empty($current_route)) {
-            return null;
-        }
-        // add route to previous routes array
-        self::$_previous_routes[] = $current_route;
-        return $current_route;
-    }
+	/**
+	 * on the first call  to this method, it checks the EE_Request_Handler for a "route"
+	 * on subsequent calls to this method,
+	 * instead of checking the EE_Request_Handler for a route, it checks the previous routes array,
+	 * and checks if the last called route has any forwarding routes registered for it
+	 *
+	 * @param WP_Query $WP_Query
+	 * @return NULL|string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_route(WP_Query $WP_Query)
+	{
+		$this->WP_Query = $WP_Query;
+		// assume this if first route being called
+		$previous_route = false;
+		// but is it really ???
+		if (! empty(self::$_previous_routes)) {
+			// get last run route
+			$previous_routes = array_values(self::$_previous_routes);
+			$previous_route = array_pop($previous_routes);
+		}
+		//  has another route already been run ?
+		if ($previous_route) {
+			// check if  forwarding has been set
+			$current_route = $this->get_forward($previous_route);
+			try {
+				// check for recursive forwarding
+				if (isset(self::$_previous_routes[ $current_route ])) {
+					throw new EE_Error(
+						sprintf(
+							__(
+								'An error occurred. The %s route has already been called, and therefore can not be forwarded to, because an infinite loop would be created and break the interweb.',
+								'event_espresso'
+							),
+							$current_route
+						)
+					);
+				}
+			} catch (EE_Error $e) {
+				$e->get_error();
+				return null;
+			}
+		} else {
+			// first route called
+			$current_route = null;
+			// grab all routes
+			$routes = EE_Config::get_routes();
+			foreach ($routes as $key => $route) {
+				// first determine if route key uses w?ldc*rds
+				$uses_wildcards = strpos($key, '?') !== false
+								  || strpos($key, '*') !== false;
+				// check request for module route
+				$route_found = $uses_wildcards
+					? $this->request->matches($key)
+					: $this->request->is_set($key);
+				if ($route_found) {
+					$current_route = $uses_wildcards
+						? $this->request->getMatch($key)
+						: $this->request->get($key);
+					$current_route = sanitize_text_field($current_route);
+					if ($current_route) {
+						$current_route = array($key, $current_route);
+						break;
+					}
+				}
+			}
+		}
+		// sorry, but I can't read what you route !
+		if (empty($current_route)) {
+			return null;
+		}
+		// add route to previous routes array
+		self::$_previous_routes[] = $current_route;
+		return $current_route;
+	}
 
 
-    /**
-     * this method simply takes a valid route, and resolves what module class method the route points to
-     *
-     * @param string $key
-     * @param string $current_route
-     * @return mixed EED_Module | boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function resolve_route($key, $current_route)
-    {
-        // get module method that route has been mapped to
-        $module_method = EE_Config::get_route($current_route, $key);
-        // verify result was returned
-        if (empty($module_method)) {
-            $msg = sprintf(
-                __('The requested route %s could not be mapped to any registered modules.', 'event_espresso'),
-                $current_route
-            );
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // verify that result is an array
-        if (! is_array($module_method)) {
-            $msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // grab module name
-        $module_name = $module_method[0];
-        // verify that a class method was registered properly
-        if (! isset($module_method[1])) {
-            $msg = sprintf(
-                __('A class method for the %s  route has not been properly registered.', 'event_espresso'),
-                $current_route
-            );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // grab method
-        $method = $module_method[1];
-        // verify that class exists
-        if (! class_exists($module_name)) {
-            $msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // verify that method exists
-        if (! method_exists($module_name, $method)) {
-            $msg = sprintf(
-                __('The class method %s for the %s route is in invalid.', 'event_espresso'),
-                $method,
-                $current_route
-            );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
-            return false;
-        }
-        // instantiate module and call route method
-        return $this->_module_router($module_name, $method);
-    }
+	/**
+	 * this method simply takes a valid route, and resolves what module class method the route points to
+	 *
+	 * @param string $key
+	 * @param string $current_route
+	 * @return mixed EED_Module | boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function resolve_route($key, $current_route)
+	{
+		// get module method that route has been mapped to
+		$module_method = EE_Config::get_route($current_route, $key);
+		// verify result was returned
+		if (empty($module_method)) {
+			$msg = sprintf(
+				__('The requested route %s could not be mapped to any registered modules.', 'event_espresso'),
+				$current_route
+			);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// verify that result is an array
+		if (! is_array($module_method)) {
+			$msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// grab module name
+		$module_name = $module_method[0];
+		// verify that a class method was registered properly
+		if (! isset($module_method[1])) {
+			$msg = sprintf(
+				__('A class method for the %s  route has not been properly registered.', 'event_espresso'),
+				$current_route
+			);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// grab method
+		$method = $module_method[1];
+		// verify that class exists
+		if (! class_exists($module_name)) {
+			$msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// verify that method exists
+		if (! method_exists($module_name, $method)) {
+			$msg = sprintf(
+				__('The class method %s for the %s route is in invalid.', 'event_espresso'),
+				$method,
+				$current_route
+			);
+			EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+			return false;
+		}
+		// instantiate module and call route method
+		return $this->_module_router($module_name, $method);
+	}
 
 
-    /**
-     * this method instantiates modules and calls the method that was defined when the route was registered
-     *
-     * @param string $module_name
-     * @return EED_Module|object|null
-     * @throws ReflectionException
-     */
-    public static function module_factory($module_name)
-    {
-        if ($module_name === 'EED_Module') {
-            EE_Error::add_error(
-                sprintf(
-                    __(
-                        'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.',
-                        'event_espresso'
-                    ),
-                    $module_name
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return null;
-        }
-        // instantiate module class
-        $module = new $module_name();
-        // ensure that class is actually a module
-        if (! $module instanceof EED_Module) {
-            EE_Error::add_error(
-                sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return null;
-        }
-        return $module;
-    }
+	/**
+	 * this method instantiates modules and calls the method that was defined when the route was registered
+	 *
+	 * @param string $module_name
+	 * @return EED_Module|object|null
+	 * @throws ReflectionException
+	 */
+	public static function module_factory($module_name)
+	{
+		if ($module_name === 'EED_Module') {
+			EE_Error::add_error(
+				sprintf(
+					__(
+						'EED_Module is an abstract parent class an can not be instantiated. Please provide a proper module name.',
+						'event_espresso'
+					),
+					$module_name
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return null;
+		}
+		// instantiate module class
+		$module = new $module_name();
+		// ensure that class is actually a module
+		if (! $module instanceof EED_Module) {
+			EE_Error::add_error(
+				sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return null;
+		}
+		return $module;
+	}
 
 
-    /**
-     * this method instantiates modules and calls the method that was defined when the route was registered
-     *
-     * @param string $module_name
-     * @param string $method
-     * @return EED_Module|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _module_router($module_name, $method)
-    {
-        // instantiate module class
-        $module = EE_Module_Request_Router::module_factory($module_name);
-        if ($module instanceof EED_Module) {
-            // and call whatever action the route was for
-            try {
-                call_user_func(array($module, $method), $this->WP_Query);
-            } catch (EE_Error $e) {
-                $e->get_error();
-                return null;
-            }
-        }
-        return $module;
-    }
+	/**
+	 * this method instantiates modules and calls the method that was defined when the route was registered
+	 *
+	 * @param string $module_name
+	 * @param string $method
+	 * @return EED_Module|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _module_router($module_name, $method)
+	{
+		// instantiate module class
+		$module = EE_Module_Request_Router::module_factory($module_name);
+		if ($module instanceof EED_Module) {
+			// and call whatever action the route was for
+			try {
+				call_user_func(array($module, $method), $this->WP_Query);
+			} catch (EE_Error $e) {
+				$e->get_error();
+				return null;
+			}
+		}
+		return $module;
+	}
 
 
-    /**
-     * @param $current_route
-     * @return string
-     */
-    public function get_forward($current_route)
-    {
-        return EE_Config::get_forward($current_route);
-    }
+	/**
+	 * @param $current_route
+	 * @return string
+	 */
+	public function get_forward($current_route)
+	{
+		return EE_Config::get_forward($current_route);
+	}
 
 
-    /**
-     * @param $current_route
-     * @return string
-     */
-    public function get_view($current_route)
-    {
-        return EE_Config::get_view($current_route);
-    }
+	/**
+	 * @param $current_route
+	 * @return string
+	 */
+	public function get_view($current_route)
+	{
+		return EE_Config::get_view($current_route);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -59,7 +59,7 @@ 
         // assume this if first route being called
         $previous_route = false;
         // but is it really ???
-        if (! empty(self::$_previous_routes)) {
+        if ( ! empty(self::$_previous_routes)) {
             // get last run route
             $previous_routes = array_values(self::$_previous_routes);
             $previous_route = array_pop($previous_routes);
@@ -70,7 +70,7 @@ 
             $current_route = $this->get_forward($previous_route);
             try {
                 // check for recursive forwarding
-                if (isset(self::$_previous_routes[ $current_route ])) {
+                if (isset(self::$_previous_routes[$current_route])) {
                     throw new EE_Error(
                         sprintf(
                             __(
@@ -143,38 +143,38 @@ 
             return false;
         }
         // verify that result is an array
-        if (! is_array($module_method)) {
+        if ( ! is_array($module_method)) {
             $msg = sprintf(__('The %s  route has not been properly registered.', 'event_espresso'), $current_route);
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // grab module name
         $module_name = $module_method[0];
         // verify that a class method was registered properly
-        if (! isset($module_method[1])) {
+        if ( ! isset($module_method[1])) {
             $msg = sprintf(
                 __('A class method for the %s  route has not been properly registered.', 'event_espresso'),
                 $current_route
             );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // grab method
         $method = $module_method[1];
         // verify that class exists
-        if (! class_exists($module_name)) {
+        if ( ! class_exists($module_name)) {
             $msg = sprintf(__('The requested %s class could not be found.', 'event_espresso'), $module_name);
             EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // verify that method exists
-        if (! method_exists($module_name, $method)) {
+        if ( ! method_exists($module_name, $method)) {
             $msg = sprintf(
                 __('The class method %s for the %s route is in invalid.', 'event_espresso'),
                 $method,
                 $current_route
             );
-            EE_Error::add_error($msg . '||' . $msg, __FILE__, __FUNCTION__, __LINE__);
+            EE_Error::add_error($msg.'||'.$msg, __FILE__, __FUNCTION__, __LINE__);
             return false;
         }
         // instantiate module and call route method
@@ -209,7 +209,7 @@ 
         // instantiate module class
         $module = new $module_name();
         // ensure that class is actually a module
-        if (! $module instanceof EED_Module) {
+        if ( ! $module instanceof EED_Module) {
             EE_Error::add_error(
                 sprintf(__('The requested %s module is not of the class EED_Module.', 'event_espresso'), $module_name),
                 __FILE__,

core/interfaces/EEI_Request_Decorator.interface.php

Indentation +18 added lines, -18 removed lines

@@ -9,24 +9,24 @@
 interface EEI_Request_Decorator
 {
 
-    /**
-     * converts a Request to a Response
-     * can perform their logic either before or after the core application has run like so:
-     *    public function handle_request( EE_Request $request, EE_Response $response ) {
-     *        $this->request = $request;
-     *        $this->response = $response;
-     *      // logic performed BEFORE core app has run
-     *      $this->process_request_stack( $this->request, $this->response );
-     *      // logic performed AFTER core app has run
-     *      return $response;
-     *    }
-     *
-     * @deprecated 4.9.53
-     * @param    EE_Request $request
-     * @param    EE_Response   $response
-     * @return    EE_Response
-     */
-    public function handle_request(EE_Request $request, EE_Response $response);
+	/**
+	 * converts a Request to a Response
+	 * can perform their logic either before or after the core application has run like so:
+	 *    public function handle_request( EE_Request $request, EE_Response $response ) {
+	 *        $this->request = $request;
+	 *        $this->response = $response;
+	 *      // logic performed BEFORE core app has run
+	 *      $this->process_request_stack( $this->request, $this->response );
+	 *      // logic performed AFTER core app has run
+	 *      return $response;
+	 *    }
+	 *
+	 * @deprecated 4.9.53
+	 * @param    EE_Request $request
+	 * @param    EE_Response   $response
+	 * @return    EE_Response
+	 */
+	public function handle_request(EE_Request $request, EE_Response $response);
 
 
 }

core/services/request/LegacyRequestInterface.php

Indentation +87 added lines, -87 removed lines

@@ -15,125 +15,125 @@
 interface LegacyRequestInterface
 {
 
-    /**
-     * @return array
-     */
-    public function get_params();
+	/**
+	 * @return array
+	 */
+	public function get_params();
 
 
-    /**
-     * @return array
-     */
-    public function post_params();
+	/**
+	 * @return array
+	 */
+	public function post_params();
 
 
-    /**
-     * @return array
-     */
-    public function cookie_params();
+	/**
+	 * @return array
+	 */
+	public function cookie_params();
 
 
-    /**
-     * @return array
-     */
-    public function server_params();
+	/**
+	 * @return array
+	 */
+	public function server_params();
 
 
-    /**
-     * returns contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function params();
+	/**
+	 * returns contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function params();
 
 
-    /**
-     * @param      $key
-     * @param      $value
-     * @param bool $override_ee
-     * @return    void
-     */
-    public function set($key, $value, $override_ee = false);
+	/**
+	 * @param      $key
+	 * @param      $value
+	 * @param bool $override_ee
+	 * @return    void
+	 */
+	public function set($key, $value, $override_ee = false);
 
 
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @param       $key
-     * @param null  $default
-     * @return mixed
-     */
-    public function get($key, $default = null);
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @param       $key
+	 * @param null  $default
+	 * @return mixed
+	 */
+	public function get($key, $default = null);
 
 
-    /**
-     * check if param exists
-     *
-     * @param       $key
-     * @return bool
-     */
-    public function is_set($key);
+	/**
+	 * check if param exists
+	 *
+	 * @param       $key
+	 * @return bool
+	 */
+	public function is_set($key);
 
 
-    /**
-     * remove param
-     *
-     * @param      $key
-     * @param bool $unset_from_global_too
-     */
-    public function un_set($key, $unset_from_global_too = false);
+	/**
+	 * remove param
+	 *
+	 * @param      $key
+	 * @param bool $unset_from_global_too
+	 */
+	public function un_set($key, $unset_from_global_too = false);
 
 
-    /**
-     * @return string
-     */
-    public function ip_address();
+	/**
+	 * @return string
+	 */
+	public function ip_address();
 
 
-    /**
-     * @return bool
-     */
-    public function isAdmin();
+	/**
+	 * @return bool
+	 */
+	public function isAdmin();
 
 
-    /**
-     * @return mixed
-     */
-    public function isAjax();
+	/**
+	 * @return mixed
+	 */
+	public function isAjax();
 
 
-    /**
-     * @return mixed
-     */
-    public function isFrontAjax();
+	/**
+	 * @return mixed
+	 */
+	public function isFrontAjax();
 
 
-    /**
-     * @return mixed|string
-     */
-    public function requestUri();
+	/**
+	 * @return mixed|string
+	 */
+	public function requestUri();
 
 
-    /**
-     * @return string
-     */
-    public function userAgent();
+	/**
+	 * @return string
+	 */
+	public function userAgent();
 
 
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '');
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '');
 
 
-    /**
-     * @return bool
-     */
-    public function isBot();
+	/**
+	 * @return bool
+	 */
+	public function isBot();
 
 
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot);
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot);
 }

core/services/request/Response.php

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function setNotice($key, $value)
     {
-        $this->notice[ $key ] = $value;
+        $this->notice[$key] = $value;
     }
 
 
@@ -69,7 +69,7 @@ 
      */
     public function getNotice($key)
     {
-        return isset($this->notice[ $key ]) ? $this->notice[ $key ] : null;
+        return isset($this->notice[$key]) ? $this->notice[$key] : null;
     }
 
 
@@ -90,7 +90,7 @@ 
      */
     public function addOutput($string, $append = true)
     {
-        $this->output = $append ? $this->output . $string : $string . $this->output;
+        $this->output = $append ? $this->output.$string : $string.$this->output;
     }
 
 

Indentation +115 added lines, -115 removed lines

@@ -16,119 +16,119 @@
 class Response implements ResponseInterface, ReservedInstanceInterface
 {
 
-    /**
-     * @var array $notice
-     */
-    protected $notice = array();
-
-    /**
-     * rendered output to be returned to WP
-     *
-     * @var string $output
-     */
-    protected $output = '';
-
-    /**
-     * @var bool
-     */
-    protected $request_terminated = false;
-
-    /**
-     * @var bool $deactivate_plugin
-     */
-    protected $deactivate_plugin = false;
-
-
-    /**
-     * EE_Response constructor.
-     */
-    public function __construct()
-    {
-        $this->terminateRequest(false);
-    }
-
-
-    /**
-     * @param $key
-     * @param $value
-     * @return    void
-     */
-    public function setNotice($key, $value)
-    {
-        $this->notice[ $key ] = $value;
-    }
-
-
-    /**
-     * @param $key
-     * @return    mixed
-     */
-    public function getNotice($key)
-    {
-        return isset($this->notice[ $key ]) ? $this->notice[ $key ] : null;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getNotices()
-    {
-        return $this->notice;
-    }
-
-
-    /**
-     * @param string $string
-     * @param bool   $append
-     */
-    public function addOutput($string, $append = true)
-    {
-        $this->output = $append ? $this->output . $string : $string . $this->output;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getOutput()
-    {
-        return $this->output;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function requestTerminated()
-    {
-        return $this->request_terminated;
-    }
-
-
-    /**
-     * @param boolean $request_terminated
-     */
-    public function terminateRequest($request_terminated = true)
-    {
-        $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function pluginDeactivated()
-    {
-        return $this->deactivate_plugin;
-    }
-
-
-    /**
-     * sets $deactivate_plugin to true
-     */
-    public function deactivatePlugin()
-    {
-        $this->deactivate_plugin = true;
-    }
+	/**
+	 * @var array $notice
+	 */
+	protected $notice = array();
+
+	/**
+	 * rendered output to be returned to WP
+	 *
+	 * @var string $output
+	 */
+	protected $output = '';
+
+	/**
+	 * @var bool
+	 */
+	protected $request_terminated = false;
+
+	/**
+	 * @var bool $deactivate_plugin
+	 */
+	protected $deactivate_plugin = false;
+
+
+	/**
+	 * EE_Response constructor.
+	 */
+	public function __construct()
+	{
+		$this->terminateRequest(false);
+	}
+
+
+	/**
+	 * @param $key
+	 * @param $value
+	 * @return    void
+	 */
+	public function setNotice($key, $value)
+	{
+		$this->notice[ $key ] = $value;
+	}
+
+
+	/**
+	 * @param $key
+	 * @return    mixed
+	 */
+	public function getNotice($key)
+	{
+		return isset($this->notice[ $key ]) ? $this->notice[ $key ] : null;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getNotices()
+	{
+		return $this->notice;
+	}
+
+
+	/**
+	 * @param string $string
+	 * @param bool   $append
+	 */
+	public function addOutput($string, $append = true)
+	{
+		$this->output = $append ? $this->output . $string : $string . $this->output;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getOutput()
+	{
+		return $this->output;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function requestTerminated()
+	{
+		return $this->request_terminated;
+	}
+
+
+	/**
+	 * @param boolean $request_terminated
+	 */
+	public function terminateRequest($request_terminated = true)
+	{
+		$this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function pluginDeactivated()
+	{
+		return $this->deactivate_plugin;
+	}
+
+
+	/**
+	 * sets $deactivate_plugin to true
+	 */
+	public function deactivatePlugin()
+	{
+		$this->deactivate_plugin = true;
+	}
 }

core/services/request/middleware/PreProductionVersionWarning.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     public function preProductionVersionAdminNotice()
     {
         new PersistentAdminNotice(
-            'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION,
+            'preProductionVersionAdminNotice_'.EVENT_ESPRESSO_VERSION,
             $this->warningNotice()
         );
     }

Indentation +79 added lines, -79 removed lines

@@ -18,91 +18,91 @@
 class PreProductionVersionWarning extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        $this->displayPreProductionVersionWarning();
-        $this->response = $this->processRequestStack($this->request, $this->response);
-        return $this->response;
-    }
+	/**
+	 * converts a Request to a Response
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		$this->displayPreProductionVersionWarning();
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 
 
-    /**
-     * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
-     *
-     * @return void
-     */
-    public function displayPreProductionVersionWarning()
-    {
-        // skip AJAX requests
-        if ($this->request->isAjax()) {
-            return;
-        }
-        // skip stable releases
-        if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') {
-            return;
-        }
-        // site admin has authorized use of non-stable release candidate for production
-        if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
-            return;
-        }
-        // post release candidate warning
-        if ($this->request->isAdmin()) {
-            add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999);
-        } else {
-            add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10);
-        }
-    }
+	/**
+	 * displays message on frontend of site notifying admin that EE has been temporarily placed into maintenance mode
+	 *
+	 * @return void
+	 */
+	public function displayPreProductionVersionWarning()
+	{
+		// skip AJAX requests
+		if ($this->request->isAjax()) {
+			return;
+		}
+		// skip stable releases
+		if (substr(EVENT_ESPRESSO_VERSION, -5) !== '.beta') {
+			return;
+		}
+		// site admin has authorized use of non-stable release candidate for production
+		if (defined('ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE') && ALLOW_NON_STABLE_RELEASE_ON_LIVE_SITE) {
+			return;
+		}
+		// post release candidate warning
+		if ($this->request->isAdmin()) {
+			add_action('admin_notices', array($this, 'preProductionVersionAdminNotice'), -999);
+		} else {
+			add_action('shutdown', array($this, 'preProductionVersionWarningNotice'), 10);
+		}
+	}
 
 
-    /**
-     * displays admin notice that current version of EE is not a stable release
-     *
-     * @return void
-     * @throws InvalidDataTypeException
-     */
-    public function preProductionVersionAdminNotice()
-    {
-        new PersistentAdminNotice(
-            'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION,
-            $this->warningNotice()
-        );
-    }
+	/**
+	 * displays admin notice that current version of EE is not a stable release
+	 *
+	 * @return void
+	 * @throws InvalidDataTypeException
+	 */
+	public function preProductionVersionAdminNotice()
+	{
+		new PersistentAdminNotice(
+			'preProductionVersionAdminNotice_' . EVENT_ESPRESSO_VERSION,
+			$this->warningNotice()
+		);
+	}
 
 
-    /**
-     * displays message on frontend of site notifying admin that current version of EE is not a stable release
-     *
-     * @return void
-     */
-    public function preProductionVersionWarningNotice()
-    {
-        echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>';
-        echo $this->warningNotice();
-        echo '</p></div>';
-    }
+	/**
+	 * displays message on frontend of site notifying admin that current version of EE is not a stable release
+	 *
+	 * @return void
+	 */
+	public function preProductionVersionWarningNotice()
+	{
+		echo '<div id="ee-release-candidate-notice-dv" class="ee-really-important-notice-dv"><p>';
+		echo $this->warningNotice();
+		echo '</p></div>';
+	}
 
 
-    /**
-     * @return string
-     */
-    private function warningNotice()
-    {
-        return sprintf(
-            esc_html__(
-                'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.',
-                'event_espresso'
-            ),
-            '<strong>',
-            '</strong>'
-        );
-    }
+	/**
+	 * @return string
+	 */
+	private function warningNotice()
+	{
+		return sprintf(
+			esc_html__(
+				'This version of Event Espresso is for testing and/or evaluation purposes only. It is %1$snot%2$s considered a stable release and should therefore %1$snot%2$s be activated on a live or production website.',
+				'event_espresso'
+			),
+			'<strong>',
+			'</strong>'
+		);
+	}
 }

core/request_stack/EE_Request.core.php

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 +355 added lines, -355 removed lines

@@ -18,359 +18,359 @@
 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);
-    }
-
-
-    /**
-     * check if a request parameter exists whose key that matches the supplied wildcard pattern
-     * and return the value for the first match found
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     *
-     * @param string     $pattern
-     * @param null|mixed $default
-     * @return false|int
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public function getMatch($pattern, $default = null)
-    {
-        return $this->request()->getMatch($pattern, $default);
-    }
-
-
-    /**
-     * check if a request parameter exists whose key matches the supplied wildcard pattern
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     * returns true if a match is found or false if not
-     *
-     * @param string $pattern
-     * @return false|int
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public function matches($pattern)
-    {
-        return $this->request()->matches($pattern);
-    }
+	/**
+	 * @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);
+	}
+
+
+	/**
+	 * check if a request parameter exists whose key that matches the supplied wildcard pattern
+	 * and return the value for the first match found
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 *
+	 * @param string     $pattern
+	 * @param null|mixed $default
+	 * @return false|int
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public function getMatch($pattern, $default = null)
+	{
+		return $this->request()->getMatch($pattern, $default);
+	}
+
+
+	/**
+	 * check if a request parameter exists whose key matches the supplied wildcard pattern
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 * returns true if a match is found or false if not
+	 *
+	 * @param string $pattern
+	 * @return false|int
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public function matches($pattern)
+	{
+		return $this->request()->matches($pattern);
+	}
 }

core/services/request/RequestStack.php

Indentation +45 added lines, -45 removed lines

@@ -19,59 +19,59 @@
 class RequestStack
 {
 
-    /**
-     * @var RequestDecoratorInterface $request_stack_app
-     */
-    protected $request_stack_app;
+	/**
+	 * @var RequestDecoratorInterface $request_stack_app
+	 */
+	protected $request_stack_app;
 
-    /**
-     * @var RequestStackCoreAppInterface $core_app
-     */
-    protected $core_app;
+	/**
+	 * @var RequestStackCoreAppInterface $core_app
+	 */
+	protected $core_app;
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
 
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
 
 
-    /**
-     * @param RequestDecoratorInterface    $request_stack_app
-     * @param RequestStackCoreAppInterface $core_app
-     */
-    public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
-    {
-        $this->request_stack_app = $request_stack_app;
-        $this->core_app      = $core_app;
-    }
+	/**
+	 * @param RequestDecoratorInterface    $request_stack_app
+	 * @param RequestStackCoreAppInterface $core_app
+	 */
+	public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
+	{
+		$this->request_stack_app = $request_stack_app;
+		$this->core_app      = $core_app;
+	}
 
 
-    /**
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        return $this->request_stack_app->handleRequest($request, $response);
-    }
+	/**
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		return $this->request_stack_app->handleRequest($request, $response);
+	}
 
 
-    /**
-     * handle_response
-     * executes the handle_response() method on the RequestStackCoreAppInterface object
-     * after the request stack has been fully processed
-     */
-    public function handleResponse()
-    {
-        $this->core_app->handleResponse($this->request, $this->response);
-    }
+	/**
+	 * handle_response
+	 * executes the handle_response() method on the RequestStackCoreAppInterface object
+	 * after the request stack has been fully processed
+	 */
+	public function handleResponse()
+	{
+		$this->core_app->handleResponse($this->request, $this->response);
+	}
 }
 // Location: RequestStack.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
     public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
     {
         $this->request_stack_app = $request_stack_app;
-        $this->core_app      = $core_app;
+        $this->core_app = $core_app;
     }
 
 

core/services/collections/iterators/CollectionFilterCallbackIterator.php

Indentation +47 added lines, -47 removed lines

@@ -9,51 +9,51 @@
 class CollectionFilterCallbackIterator extends FilterIterator
 {
 
-    /**
-     * Used for determining whether the iterated object in the Collection is "valid" or not.
-     * @var Closure
-     */
-    private $acceptance_callback;
-
-
-    /**
-     * CollectionFilterCallbackIterator constructor.
-     *
-     * @param Collection $collection
-     * @param Closure    $acceptance_callback  The closure will receive an instance of whatever object is stored on the
-     *                                         collection when iterating over the collection and should return boolean.
-     */
-    public function __construct(Collection $collection, Closure $acceptance_callback)
-    {
-        $this->acceptance_callback = $acceptance_callback;
-        parent::__construct($collection);
-    }
-
-    /**
-     * Check whether the current element of the iterator is acceptable
-     *
-     * @link  http://php.net/manual/en/filteriterator.accept.php
-     * @return bool true if the current element is acceptable, otherwise false.
-     */
-    public function accept()
-    {
-        $acceptance_callback = $this->acceptance_callback;
-        return $acceptance_callback($this->getInnerIterator()->current());
-    }
-
-
-
-    /**
-     * Returns a filtered array of objects from the collection using the provided acceptance callback
-     * @return array
-     */
-    public function getFiltered()
-    {
-        $filtered_array = array();
-        $this->rewind();
-        foreach ($this as $filtered_object) {
-            $filtered_array[] = $filtered_object;
-        }
-        return $filtered_array;
-    }
+	/**
+	 * Used for determining whether the iterated object in the Collection is "valid" or not.
+	 * @var Closure
+	 */
+	private $acceptance_callback;
+
+
+	/**
+	 * CollectionFilterCallbackIterator constructor.
+	 *
+	 * @param Collection $collection
+	 * @param Closure    $acceptance_callback  The closure will receive an instance of whatever object is stored on the
+	 *                                         collection when iterating over the collection and should return boolean.
+	 */
+	public function __construct(Collection $collection, Closure $acceptance_callback)
+	{
+		$this->acceptance_callback = $acceptance_callback;
+		parent::__construct($collection);
+	}
+
+	/**
+	 * Check whether the current element of the iterator is acceptable
+	 *
+	 * @link  http://php.net/manual/en/filteriterator.accept.php
+	 * @return bool true if the current element is acceptable, otherwise false.
+	 */
+	public function accept()
+	{
+		$acceptance_callback = $this->acceptance_callback;
+		return $acceptance_callback($this->getInnerIterator()->current());
+	}
+
+
+
+	/**
+	 * Returns a filtered array of objects from the collection using the provided acceptance callback
+	 * @return array
+	 */
+	public function getFiltered()
+	{
+		$filtered_array = array();
+		$this->rewind();
+		foreach ($this as $filtered_object) {
+			$filtered_array[] = $filtered_object;
+		}
+		return $filtered_array;
+	}
 }

core/EE_Load_Espresso_Core.core.php

Unused Use Statements -5 removed lines

@@ -1,12 +1,7 @@
 <?php
 
-use EventEspresso\core\domain\DomainFactory;
-use EventEspresso\core\domain\values\FilePath;
-use EventEspresso\core\domain\values\FullyQualifiedName;
-use EventEspresso\core\domain\values\Version;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidInterfaceException;
-use EventEspresso\core\services\loaders\LoaderFactory;
 use EventEspresso\core\services\request\RequestDecoratorInterface;
 use EventEspresso\core\services\request\RequestInterface;
 use EventEspresso\core\services\request\RequestStackCoreAppInterface;

Indentation +110 added lines, -110 removed lines

@@ -27,114 +27,114 @@
 class EE_Load_Espresso_Core implements RequestDecoratorInterface, RequestStackCoreAppInterface
 {
 
-    /**
-     * @var RequestInterface $request
-     */
-    protected $request;
-
-    /**
-     * @var ResponseInterface $response
-     */
-    protected $response;
-
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
-
-    /**
-     * @var EE_Registry $registry
-     */
-    protected $registry;
-
-
-    /**
-     * EE_Load_Espresso_Core constructor
-     *
-     * @param EE_Registry       $registry
-     * @param EE_Dependency_Map $dependency_map
-     * @throws EE_Error
-     */
-    public function __construct(EE_Registry $registry, EE_Dependency_Map $dependency_map)
-    {
-        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\RequestStackCoreApp',
-                '\core\services\request',
-                'EventEspresso\core\services\request'
-            ),
-            '4.9.53'
-        );
-    }
-
-
-    /**
-     * 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 EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-    }
-
-
-    /**
-     * @return RequestInterface
-     */
-    public function request()
-    {
-    }
-
-
-    /**
-     * @return ResponseInterface
-     */
-    public function response()
-    {
-    }
-
-
-    /**
-     * @return EE_Dependency_Map
-     * @throws EE_Error
-     */
-    public function dependency_map()
-    {
-    }
-
-
-    /**
-     * @return EE_Registry
-     * @throws EE_Error
-     */
-    public function registry()
-    {
-    }
-
-
-    /**
-     * 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)
-    {
-    }
+	/**
+	 * @var RequestInterface $request
+	 */
+	protected $request;
+
+	/**
+	 * @var ResponseInterface $response
+	 */
+	protected $response;
+
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
+
+	/**
+	 * @var EE_Registry $registry
+	 */
+	protected $registry;
+
+
+	/**
+	 * EE_Load_Espresso_Core constructor
+	 *
+	 * @param EE_Registry       $registry
+	 * @param EE_Dependency_Map $dependency_map
+	 * @throws EE_Error
+	 */
+	public function __construct(EE_Registry $registry, EE_Dependency_Map $dependency_map)
+	{
+		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\RequestStackCoreApp',
+				'\core\services\request',
+				'EventEspresso\core\services\request'
+			),
+			'4.9.53'
+		);
+	}
+
+
+	/**
+	 * 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 EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+	}
+
+
+	/**
+	 * @return RequestInterface
+	 */
+	public function request()
+	{
+	}
+
+
+	/**
+	 * @return ResponseInterface
+	 */
+	public function response()
+	{
+	}
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 * @throws EE_Error
+	 */
+	public function dependency_map()
+	{
+	}
+
+
+	/**
+	 * @return EE_Registry
+	 * @throws EE_Error
+	 */
+	public function registry()
+	{
+	}
+
+
+	/**
+	 * 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)
+	{
+	}
 }