eventespresso / event-espresso-core

core/services/request/Request.php

Indentation +661 added lines, -661 removed lines

@@ -17,665 +17,665 @@
 class Request implements InterminableInterface, RequestInterface, ReservedInstanceInterface
 {
 
-    /**
-     * $_GET parameters
-     *
-     * @var array $get
-     */
-    private $get;
-
-    /**
-     * $_POST parameters
-     *
-     * @var array $post
-     */
-    private $post;
-
-    /**
-     * $_COOKIE parameters
-     *
-     * @var array $cookie
-     */
-    private $cookie;
-
-    /**
-     * $_SERVER parameters
-     *
-     * @var array $server
-     */
-    private $server;
-
-    /**
-     * $_FILES parameters
-     *
-     * @var array $files
-     */
-    private $files;
-
-    /**
-     * $_REQUEST parameters
-     *
-     * @var array $request
-     */
-    private $request;
-
-    /**
-     * @var RequestTypeContextCheckerInterface
-     */
-    private $request_type;
-
-    /**
-     * IP address for request
-     *
-     * @var string $ip_address
-     */
-    private $ip_address;
-
-    /**
-     * @var string $user_agent
-     */
-    private $user_agent;
-
-    /**
-     * true if current user appears to be some kind of bot
-     *
-     * @var bool $is_bot
-     */
-    private $is_bot;
-
-
-    /**
-     * @param array $get
-     * @param array $post
-     * @param array $cookie
-     * @param array $server
-     * @param array $files
-     */
-    public function __construct(array $get, array $post, array $cookie, array $server, array $files = array())
-    {
-        // grab request vars
-        $this->get = $get;
-        $this->post = $post;
-        $this->cookie = $cookie;
-        $this->server = $server;
-        $this->files = $files;
-        $this->request = array_merge($this->get, $this->post);
-        $this->ip_address = $this->visitorIp();
-    }
-
-
-    /**
-     * @param RequestTypeContextCheckerInterface $type
-     */
-    public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type)
-    {
-        $this->request_type = $type;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->get;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function postParams()
-    {
-        return $this->post;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function cookieParams()
-    {
-        return $this->cookie;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function serverParams()
-    {
-        return $this->server;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function filesParams()
-    {
-        return $this->files;
-    }
-
-
-    /**
-     * returns contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function requestParams()
-    {
-        return $this->request;
-    }
-
-
-    /**
-     * @param      $key
-     * @param      $value
-     * @param bool $override_ee
-     * @return    void
-     */
-    public function setRequestParam($key, $value, $override_ee = false)
-    {
-        // don't allow "ee" to be overwritten unless explicitly instructed to do so
-        if ($key !== 'ee'
-            || ($key === 'ee' && empty($this->request['ee']))
-            || ($key === 'ee' && ! empty($this->request['ee']) && $override_ee)
-        ) {
-            $this->request[ $key ] = $value;
-        }
-    }
-
-
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @param       $key
-     * @param null  $default
-     * @return mixed
-     */
-    public function getRequestParam($key, $default = null)
-    {
-        return $this->requestParameterDrillDown($key, $default, 'get');
-    }
-
-
-    /**
-     * check if param exists
-     *
-     * @param       $key
-     * @return bool
-     */
-    public function requestParamIsSet($key)
-    {
-        return $this->requestParameterDrillDown($key);
-    }
-
-
-    /**
-     * 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 mixed
-     */
-    public function getMatch($pattern, $default = null)
-    {
-        return $this->requestParameterDrillDown($pattern, $default, 'match');
-    }
-
-
-    /**
-     * 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 bool
-     */
-    public function matches($pattern)
-    {
-        return $this->requestParameterDrillDown($pattern, null, 'match') !== null;
-    }
-
-
-    /**
-     * @see https://stackoverflow.com/questions/6163055/php-string-matching-with-wildcard
-     * @param string $pattern               A string including wildcards to be converted to a regex pattern
-     *                                      and used to search through the current request's parameter keys
-     * @param array  $request_params        The array of request parameters to search through
-     * @param mixed  $default               [optional] The value to be returned if no match is found.
-     *                                      Default is null
-     * @param string $return                [optional] Controls what kind of value is returned.
-     *                                      Options are:
-     *                                      'bool' will return true or false if match is found or not
-     *                                      'key' will return the first key found that matches the supplied pattern
-     *                                      'value' will return the value for the first request parameter
-     *                                      whose key matches the supplied pattern
-     *                                      Default is 'value'
-     * @return boolean|string
-     */
-    private function match($pattern, array $request_params, $default = null, $return = 'value')
-    {
-        $return = in_array($return, array('bool', 'key', 'value'), true)
-            ? $return
-            : 'is_set';
-        // replace wildcard chars with regex chars
-        $pattern = str_replace(
-            array("\*", "\?"),
-            array('.*', '.'),
-            preg_quote($pattern, '/')
-        );
-        foreach ($request_params as $key => $request_param) {
-            if (preg_match('/^' . $pattern . '$/is', $key)) {
-                // return value for request param
-                if ($return === 'value') {
-                    return $request_params[ $key ];
-                }
-                // or actual key or true just to indicate it was found
-                return $return === 'key' ? $key : true;
-            }
-        }
-        // match not found so return default value or false
-        return $return === 'value' ? $default : false;
-    }
-
-
-    /**
-     * the supplied key can be a simple string to represent a "top-level" request parameter
-     * or represent a key for a request parameter that is nested deeper within the request parameter array,
-     * by using square brackets to surround keys for deeper array elements.
-     * For example :
-     * if the supplied $key was: "first[second][third]"
-     * then this will attempt to drill down into the request parameter array to find a value.
-     * Given the following request parameters:
-     *  array(
-     *      'first' => array(
-     *          'second' => array(
-     *              'third' => 'has a value'
-     *          )
-     *      )
-     *  )
-     * would return true if default parameters were set
-     *
-     * @param string $callback
-     * @param        $key
-     * @param null   $default
-     * @param array  $request_params
-     * @return bool|mixed|null
-     */
-    private function requestParameterDrillDown(
-        $key,
-        $default = null,
-        $callback = 'is_set',
-        array $request_params = array()
-    ) {
-        $callback = in_array($callback, array('is_set', 'get', 'match'), true)
-            ? $callback
-            : 'is_set';
-        $request_params = ! empty($request_params)
-            ? $request_params
-            : $this->request;
-        // does incoming key represent an array like 'first[second][third]'  ?
-        if (strpos($key, '[') !== false) {
-            // turn it into an actual array
-            $key = str_replace(']', '', $key);
-            $keys = explode('[', $key);
-            $key = array_shift($keys);
-            if ($callback === 'match') {
-                $real_key = $this->match($key, $request_params, $default, 'key');
-                $key = $real_key ? $real_key : $key;
-            }
-            // check if top level key exists
-            if (isset($request_params[ $key ])) {
-                // build a new key to pass along like: 'second[third]'
-                // or just 'second' depending on depth of keys
-                $key_string = array_shift($keys);
-                if (! empty($keys)) {
-                    $key_string .= '[' . implode('][', $keys) . ']';
-                }
-                return $this->requestParameterDrillDown(
-                    $key_string,
-                    $default,
-                    $callback,
-                    $request_params[ $key ]
-                );
-            }
-        }
-        if ($callback === 'is_set') {
-            return isset($request_params[ $key ]);
-        }
-        if ($callback === 'match') {
-            return $this->match($key, $request_params, $default);
-        }
-        return isset($request_params[ $key ])
-            ? $request_params[ $key ]
-            : $default;
-    }
-
-
-    /**
-     * remove param
-     *
-     * @param      $key
-     * @param bool $unset_from_global_too
-     */
-    public function unSetRequestParam($key, $unset_from_global_too = false)
-    {
-        // because unset may not actually remove var
-        $this->request[ $key ] = null;
-        unset($this->request[ $key ]);
-        if ($unset_from_global_too) {
-            unset($_REQUEST[ $key ]);
-        }
-    }
-
-
-    /**
-     * remove params
-     *
-     * @param array $keys
-     * @param bool  $unset_from_global_too
-     */
-    public function unSetRequestParams(array $keys, $unset_from_global_too = false)
-    {
-        foreach ($keys as $key) {
-            $this->unSetRequestParam($key, $unset_from_global_too);
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function ipAddress()
-    {
-        return $this->ip_address;
-    }
-
-
-    /**
-     * attempt to get IP address of current visitor from server
-     * plz see: http://stackoverflow.com/a/2031935/1475279
-     *
-     * @access public
-     * @return string
-     */
-    private function visitorIp()
-    {
-        $visitor_ip = '0.0.0.0';
-        $server_keys = array(
-            'HTTP_CLIENT_IP',
-            'HTTP_X_FORWARDED_FOR',
-            'HTTP_X_FORWARDED',
-            'HTTP_X_CLUSTER_CLIENT_IP',
-            'HTTP_FORWARDED_FOR',
-            'HTTP_FORWARDED',
-            'REMOTE_ADDR',
-        );
-        foreach ($server_keys as $key) {
-            if (isset($this->server[ $key ])) {
-                foreach (array_map('trim', explode(',', $this->server[ $key ])) as $ip) {
-                    if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== false) {
-                        $visitor_ip = $ip;
-                    }
-                }
-            }
-        }
-        return $visitor_ip;
-    }
-
-
-    /**
-     * Gets the request's literal URI. Related to `requestUriAfterSiteHomeUri`, see its description for a comparison.
-     * @param boolean $relativeToWpRoot If home_url() is "http://mysite.com/wp/", and a request comes to
-     *                                  "http://mysite.com/wp/wp-json", setting $relativeToWpRoot=true will return
-     *                                  "/wp-json", whereas $relativeToWpRoot=false will return "/wp/wp-json/".
-     * @return string
-     */
-    public function requestUri($relativeToWpRoot = false)
-    {
-        $request_uri = filter_input(
-            INPUT_SERVER,
-            'REQUEST_URI',
-            FILTER_SANITIZE_URL,
-            FILTER_NULL_ON_FAILURE
-        );
-        if (empty($request_uri)) {
-            // fallback sanitization if the above fails
-            $request_uri = wp_sanitize_redirect($this->server['REQUEST_URI']);
-        }
-        if ($relativeToWpRoot) {
-            $home_path = untrailingslashit(
-                parse_url(
-                    home_url(),
-                    PHP_URL_PATH
-                )
-            );
-            $request_uri = str_replace(
-                $home_path,
-                '',
-                $request_uri
-            );
-        }
-        return $request_uri;
-    }
-
-    /**
-     * @return string
-     */
-    public function userAgent()
-    {
-        return $this->user_agent;
-    }
-
-
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '')
-    {
-        if ($user_agent === '' || ! is_string($user_agent)) {
-            $user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? (string) esc_attr($_SERVER['HTTP_USER_AGENT']) : '';
-        }
-        $this->user_agent = $user_agent;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isBot()
-    {
-        return $this->is_bot;
-    }
-
-
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot)
-    {
-        $this->is_bot = filter_var($is_bot, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @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);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAdmin()
-    {
-        return $this->request_type->isAdmin();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAdminAjax()
-    {
-        return $this->request_type->isAdminAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isAjax()
-    {
-        return $this->request_type->isAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isEeAjax()
-    {
-        return $this->request_type->isEeAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isOtherAjax()
-    {
-        return $this->request_type->isOtherAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isApi()
-    {
-        return $this->request_type->isApi();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCli()
-    {
-        return $this->request_type->isCli();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isCron()
-    {
-        return $this->request_type->isCron();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFeed()
-    {
-        return $this->request_type->isFeed();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFrontend()
-    {
-        return $this->request_type->isFrontend();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isFrontAjax()
-    {
-        return $this->request_type->isFrontAjax();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isGQL()
-    {
-        return $this->request_type->isGQL();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isIframe()
-    {
-        return $this->request_type->isIframe();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressApi()
-    {
-        return $this->request_type->isWordPressApi();
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressHeartbeat()
-    {
-        return $this->request_type->isWordPressHeartbeat();
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function isWordPressScrape()
-    {
-        return $this->request_type->isWordPressScrape();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->request_type->slug();
-    }
+	/**
+	 * $_GET parameters
+	 *
+	 * @var array $get
+	 */
+	private $get;
+
+	/**
+	 * $_POST parameters
+	 *
+	 * @var array $post
+	 */
+	private $post;
+
+	/**
+	 * $_COOKIE parameters
+	 *
+	 * @var array $cookie
+	 */
+	private $cookie;
+
+	/**
+	 * $_SERVER parameters
+	 *
+	 * @var array $server
+	 */
+	private $server;
+
+	/**
+	 * $_FILES parameters
+	 *
+	 * @var array $files
+	 */
+	private $files;
+
+	/**
+	 * $_REQUEST parameters
+	 *
+	 * @var array $request
+	 */
+	private $request;
+
+	/**
+	 * @var RequestTypeContextCheckerInterface
+	 */
+	private $request_type;
+
+	/**
+	 * IP address for request
+	 *
+	 * @var string $ip_address
+	 */
+	private $ip_address;
+
+	/**
+	 * @var string $user_agent
+	 */
+	private $user_agent;
+
+	/**
+	 * true if current user appears to be some kind of bot
+	 *
+	 * @var bool $is_bot
+	 */
+	private $is_bot;
+
+
+	/**
+	 * @param array $get
+	 * @param array $post
+	 * @param array $cookie
+	 * @param array $server
+	 * @param array $files
+	 */
+	public function __construct(array $get, array $post, array $cookie, array $server, array $files = array())
+	{
+		// grab request vars
+		$this->get = $get;
+		$this->post = $post;
+		$this->cookie = $cookie;
+		$this->server = $server;
+		$this->files = $files;
+		$this->request = array_merge($this->get, $this->post);
+		$this->ip_address = $this->visitorIp();
+	}
+
+
+	/**
+	 * @param RequestTypeContextCheckerInterface $type
+	 */
+	public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type)
+	{
+		$this->request_type = $type;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getParams()
+	{
+		return $this->get;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function postParams()
+	{
+		return $this->post;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function cookieParams()
+	{
+		return $this->cookie;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function serverParams()
+	{
+		return $this->server;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function filesParams()
+	{
+		return $this->files;
+	}
+
+
+	/**
+	 * returns contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function requestParams()
+	{
+		return $this->request;
+	}
+
+
+	/**
+	 * @param      $key
+	 * @param      $value
+	 * @param bool $override_ee
+	 * @return    void
+	 */
+	public function setRequestParam($key, $value, $override_ee = false)
+	{
+		// don't allow "ee" to be overwritten unless explicitly instructed to do so
+		if ($key !== 'ee'
+			|| ($key === 'ee' && empty($this->request['ee']))
+			|| ($key === 'ee' && ! empty($this->request['ee']) && $override_ee)
+		) {
+			$this->request[ $key ] = $value;
+		}
+	}
+
+
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @param       $key
+	 * @param null  $default
+	 * @return mixed
+	 */
+	public function getRequestParam($key, $default = null)
+	{
+		return $this->requestParameterDrillDown($key, $default, 'get');
+	}
+
+
+	/**
+	 * check if param exists
+	 *
+	 * @param       $key
+	 * @return bool
+	 */
+	public function requestParamIsSet($key)
+	{
+		return $this->requestParameterDrillDown($key);
+	}
+
+
+	/**
+	 * 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 mixed
+	 */
+	public function getMatch($pattern, $default = null)
+	{
+		return $this->requestParameterDrillDown($pattern, $default, 'match');
+	}
+
+
+	/**
+	 * 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 bool
+	 */
+	public function matches($pattern)
+	{
+		return $this->requestParameterDrillDown($pattern, null, 'match') !== null;
+	}
+
+
+	/**
+	 * @see https://stackoverflow.com/questions/6163055/php-string-matching-with-wildcard
+	 * @param string $pattern               A string including wildcards to be converted to a regex pattern
+	 *                                      and used to search through the current request's parameter keys
+	 * @param array  $request_params        The array of request parameters to search through
+	 * @param mixed  $default               [optional] The value to be returned if no match is found.
+	 *                                      Default is null
+	 * @param string $return                [optional] Controls what kind of value is returned.
+	 *                                      Options are:
+	 *                                      'bool' will return true or false if match is found or not
+	 *                                      'key' will return the first key found that matches the supplied pattern
+	 *                                      'value' will return the value for the first request parameter
+	 *                                      whose key matches the supplied pattern
+	 *                                      Default is 'value'
+	 * @return boolean|string
+	 */
+	private function match($pattern, array $request_params, $default = null, $return = 'value')
+	{
+		$return = in_array($return, array('bool', 'key', 'value'), true)
+			? $return
+			: 'is_set';
+		// replace wildcard chars with regex chars
+		$pattern = str_replace(
+			array("\*", "\?"),
+			array('.*', '.'),
+			preg_quote($pattern, '/')
+		);
+		foreach ($request_params as $key => $request_param) {
+			if (preg_match('/^' . $pattern . '$/is', $key)) {
+				// return value for request param
+				if ($return === 'value') {
+					return $request_params[ $key ];
+				}
+				// or actual key or true just to indicate it was found
+				return $return === 'key' ? $key : true;
+			}
+		}
+		// match not found so return default value or false
+		return $return === 'value' ? $default : false;
+	}
+
+
+	/**
+	 * the supplied key can be a simple string to represent a "top-level" request parameter
+	 * or represent a key for a request parameter that is nested deeper within the request parameter array,
+	 * by using square brackets to surround keys for deeper array elements.
+	 * For example :
+	 * if the supplied $key was: "first[second][third]"
+	 * then this will attempt to drill down into the request parameter array to find a value.
+	 * Given the following request parameters:
+	 *  array(
+	 *      'first' => array(
+	 *          'second' => array(
+	 *              'third' => 'has a value'
+	 *          )
+	 *      )
+	 *  )
+	 * would return true if default parameters were set
+	 *
+	 * @param string $callback
+	 * @param        $key
+	 * @param null   $default
+	 * @param array  $request_params
+	 * @return bool|mixed|null
+	 */
+	private function requestParameterDrillDown(
+		$key,
+		$default = null,
+		$callback = 'is_set',
+		array $request_params = array()
+	) {
+		$callback = in_array($callback, array('is_set', 'get', 'match'), true)
+			? $callback
+			: 'is_set';
+		$request_params = ! empty($request_params)
+			? $request_params
+			: $this->request;
+		// does incoming key represent an array like 'first[second][third]'  ?
+		if (strpos($key, '[') !== false) {
+			// turn it into an actual array
+			$key = str_replace(']', '', $key);
+			$keys = explode('[', $key);
+			$key = array_shift($keys);
+			if ($callback === 'match') {
+				$real_key = $this->match($key, $request_params, $default, 'key');
+				$key = $real_key ? $real_key : $key;
+			}
+			// check if top level key exists
+			if (isset($request_params[ $key ])) {
+				// build a new key to pass along like: 'second[third]'
+				// or just 'second' depending on depth of keys
+				$key_string = array_shift($keys);
+				if (! empty($keys)) {
+					$key_string .= '[' . implode('][', $keys) . ']';
+				}
+				return $this->requestParameterDrillDown(
+					$key_string,
+					$default,
+					$callback,
+					$request_params[ $key ]
+				);
+			}
+		}
+		if ($callback === 'is_set') {
+			return isset($request_params[ $key ]);
+		}
+		if ($callback === 'match') {
+			return $this->match($key, $request_params, $default);
+		}
+		return isset($request_params[ $key ])
+			? $request_params[ $key ]
+			: $default;
+	}
+
+
+	/**
+	 * remove param
+	 *
+	 * @param      $key
+	 * @param bool $unset_from_global_too
+	 */
+	public function unSetRequestParam($key, $unset_from_global_too = false)
+	{
+		// because unset may not actually remove var
+		$this->request[ $key ] = null;
+		unset($this->request[ $key ]);
+		if ($unset_from_global_too) {
+			unset($_REQUEST[ $key ]);
+		}
+	}
+
+
+	/**
+	 * remove params
+	 *
+	 * @param array $keys
+	 * @param bool  $unset_from_global_too
+	 */
+	public function unSetRequestParams(array $keys, $unset_from_global_too = false)
+	{
+		foreach ($keys as $key) {
+			$this->unSetRequestParam($key, $unset_from_global_too);
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function ipAddress()
+	{
+		return $this->ip_address;
+	}
+
+
+	/**
+	 * attempt to get IP address of current visitor from server
+	 * plz see: http://stackoverflow.com/a/2031935/1475279
+	 *
+	 * @access public
+	 * @return string
+	 */
+	private function visitorIp()
+	{
+		$visitor_ip = '0.0.0.0';
+		$server_keys = array(
+			'HTTP_CLIENT_IP',
+			'HTTP_X_FORWARDED_FOR',
+			'HTTP_X_FORWARDED',
+			'HTTP_X_CLUSTER_CLIENT_IP',
+			'HTTP_FORWARDED_FOR',
+			'HTTP_FORWARDED',
+			'REMOTE_ADDR',
+		);
+		foreach ($server_keys as $key) {
+			if (isset($this->server[ $key ])) {
+				foreach (array_map('trim', explode(',', $this->server[ $key ])) as $ip) {
+					if ($ip === '127.0.0.1' || filter_var($ip, FILTER_VALIDATE_IP) !== false) {
+						$visitor_ip = $ip;
+					}
+				}
+			}
+		}
+		return $visitor_ip;
+	}
+
+
+	/**
+	 * Gets the request's literal URI. Related to `requestUriAfterSiteHomeUri`, see its description for a comparison.
+	 * @param boolean $relativeToWpRoot If home_url() is "http://mysite.com/wp/", and a request comes to
+	 *                                  "http://mysite.com/wp/wp-json", setting $relativeToWpRoot=true will return
+	 *                                  "/wp-json", whereas $relativeToWpRoot=false will return "/wp/wp-json/".
+	 * @return string
+	 */
+	public function requestUri($relativeToWpRoot = false)
+	{
+		$request_uri = filter_input(
+			INPUT_SERVER,
+			'REQUEST_URI',
+			FILTER_SANITIZE_URL,
+			FILTER_NULL_ON_FAILURE
+		);
+		if (empty($request_uri)) {
+			// fallback sanitization if the above fails
+			$request_uri = wp_sanitize_redirect($this->server['REQUEST_URI']);
+		}
+		if ($relativeToWpRoot) {
+			$home_path = untrailingslashit(
+				parse_url(
+					home_url(),
+					PHP_URL_PATH
+				)
+			);
+			$request_uri = str_replace(
+				$home_path,
+				'',
+				$request_uri
+			);
+		}
+		return $request_uri;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function userAgent()
+	{
+		return $this->user_agent;
+	}
+
+
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '')
+	{
+		if ($user_agent === '' || ! is_string($user_agent)) {
+			$user_agent = isset($_SERVER['HTTP_USER_AGENT']) ? (string) esc_attr($_SERVER['HTTP_USER_AGENT']) : '';
+		}
+		$this->user_agent = $user_agent;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBot()
+	{
+		return $this->is_bot;
+	}
+
+
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot)
+	{
+		$this->is_bot = filter_var($is_bot, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @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);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAdmin()
+	{
+		return $this->request_type->isAdmin();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAdminAjax()
+	{
+		return $this->request_type->isAdminAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isAjax()
+	{
+		return $this->request_type->isAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isEeAjax()
+	{
+		return $this->request_type->isEeAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isOtherAjax()
+	{
+		return $this->request_type->isOtherAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isApi()
+	{
+		return $this->request_type->isApi();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCli()
+	{
+		return $this->request_type->isCli();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isCron()
+	{
+		return $this->request_type->isCron();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFeed()
+	{
+		return $this->request_type->isFeed();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFrontend()
+	{
+		return $this->request_type->isFrontend();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isFrontAjax()
+	{
+		return $this->request_type->isFrontAjax();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isGQL()
+	{
+		return $this->request_type->isGQL();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isIframe()
+	{
+		return $this->request_type->isIframe();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressApi()
+	{
+		return $this->request_type->isWordPressApi();
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressHeartbeat()
+	{
+		return $this->request_type->isWordPressHeartbeat();
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWordPressScrape()
+	{
+		return $this->request_type->isWordPressScrape();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->request_type->slug();
+	}
 }

core/domain/entities/custom_post_types/CustomPostTypeDefinitions.php

Indentation +269 added lines, -269 removed lines

@@ -17,293 +17,293 @@
 class CustomPostTypeDefinitions
 {
 
-    /**
-     * @var EE_Core_Config
-     */
-    public $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	public $core_config;
 
-    /**
-     * @var array $custom_post_types
-     */
-    private $custom_post_types;
+	/**
+	 * @var array $custom_post_types
+	 */
+	private $custom_post_types;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * EspressoCustomPostTypeDefinitions constructor.
-     *
-     * @param EE_Core_Config  $core_config
-     * @param LoaderInterface $loader
-     */
-    public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
-    {
-        $this->core_config = $core_config;
-        $this->loader = $loader;
-        $this->setDefinitions();
-    }
+	/**
+	 * EspressoCustomPostTypeDefinitions constructor.
+	 *
+	 * @param EE_Core_Config  $core_config
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
+	{
+		$this->core_config = $core_config;
+		$this->loader = $loader;
+		$this->setDefinitions();
+	}
 
 
-    /**
-     * defines Espresso Custom Post Types
-     * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
-     * and not part of the WP custom post type api.
-     *
-     * @return void
-     */
-    private function setDefinitions()
-    {
-        $this->custom_post_types = array(
-            'espresso_events'    => array(
-                'singular_name' => esc_html__('Event', 'event_espresso'),
-                'plural_name'   => esc_html__('Events', 'event_espresso'),
-                'singular_slug' => esc_html__('event', 'event_espresso'),
-                'plural_slug'   => $this->core_config->event_cpt_slug,
-                'class_name'    => 'EE_Event',
-                'model_name'    => 'EEM_Event',
-                'args'          => array(
-                    'public'              => true,
-                    'show_in_nav_menus'   => true,
-                    'show_in_graphql'     => true,
-                    'graphql_single_name' => __( 'Event', 'event_espresso' ),
-                    'graphql_plural_name' => __( 'Events', 'event_espresso' ),
-                    'capability_type'     => 'event',
-                    'capabilities'        => array(
-                        'edit_post'              => 'ee_edit_event',
-                        'read_post'              => 'ee_read_event',
-                        'delete_post'            => 'ee_delete_event',
-                        'edit_posts'             => 'ee_edit_events',
-                        'edit_others_posts'      => 'ee_edit_others_events',
-                        'publish_posts'          => 'ee_publish_events',
-                        'read_private_posts'     => 'ee_read_private_events',
-                        'delete_posts'           => 'ee_delete_events',
-                        'delete_private_posts'   => 'ee_delete_private_events',
-                        'delete_published_posts' => 'ee_delete_published_events',
-                        'delete_others_posts'    => 'ee_delete_others_events',
-                        'edit_private_posts'     => 'ee_edit_private_events',
-                        'edit_published_posts'   => 'ee_edit_published_events',
-                    ),
-                    'taxonomies'          => array(
-                        'espresso_event_categories',
-                        'espresso_event_type',
-                        'post_tag',
-                    ),
-                    'page_templates'      => true,
-                ),
-            ),
-            'espresso_venues'    => array(
-                'singular_name' => esc_html__('Venue', 'event_espresso'),
-                'plural_name'   => esc_html__('Venues', 'event_espresso'),
-                'singular_slug' => esc_html__('venue', 'event_espresso'),
-                'plural_slug'   => esc_html__('venues', 'event_espresso'),
-                'class_name'    => 'EE_Venue',
-                'model_name'    => 'EEM_Venue',
-                'args'          => array(
-                    'public'              => true,
-                    'show_in_nav_menus'   => false, // by default this doesn't show for decaf,
-                    'show_in_graphql'     => true,
-                    'graphql_single_name' => __( 'Venue', 'event_espresso' ),
-                    'graphql_plural_name' => __( 'Venues', 'event_espresso' ),
-                    'capability_type'     => 'venue',
-                    'capabilities'        => array(
-                        'edit_post'              => 'ee_edit_venue',
-                        'read_post'              => 'ee_read_venue',
-                        'delete_post'            => 'ee_delete_venue',
-                        'edit_posts'             => 'ee_edit_venues',
-                        'edit_others_posts'      => 'ee_edit_others_venues',
-                        'publish_posts'          => 'ee_publish_venues',
-                        'read_private_posts'     => 'ee_read_private_venues',
-                        'delete_posts'           => 'ee_delete_venues',
-                        'delete_private_posts'   => 'ee_delete_private_venues',
-                        'delete_published_posts' => 'ee_delete_published_venues',
-                        'delete_others_posts'    => 'ee_edit_others_venues',
-                        'edit_private_posts'     => 'ee_edit_private_venues',
-                        'edit_published_posts'   => 'ee_edit_published_venues',
-                    ),
-                    'taxonomies'          => array(
-                        'espresso_venue_categories',
-                        'post_tag',
-                    ),
-                    'page_templates'      => true,
-                ),
-            ),
-            'espresso_attendees' => array(
-                'singular_name' => esc_html__('Contact', 'event_espresso'),
-                'plural_name'   => esc_html__('Contacts', 'event_espresso'),
-                'singular_slug' => esc_html__('contact', 'event_espresso'),
-                'plural_slug'   => esc_html__('contacts', 'event_espresso'),
-                'class_name'    => 'EE_Attendee',
-                'model_name'    => 'EEM_Attendee',
-                'args'          => array(
-                    'public'             => false,
-                    'publicly_queryable' => false,
-                    'hierarchical'       => false,
-                    'has_archive'        => false,
-                    'supports'           => array(
-                        'editor',
-                        'thumbnail',
-                        'excerpt',
-                        'custom-fields',
-                        'comments',
-                    ),
-                    'taxonomies'         => array('post_tag'),
-                    'capability_type'    => 'contact',
-                    'capabilities'       => array(
-                        'edit_post'              => 'ee_edit_contact',
-                        'read_post'              => 'ee_read_contact',
-                        'delete_post'            => 'ee_delete_contact',
-                        'edit_posts'             => 'ee_edit_contacts',
-                        'edit_others_posts'      => 'ee_edit_contacts',
-                        'publish_posts'          => 'ee_edit_contacts',
-                        'read_private_posts'     => 'ee_edit_contacts',
-                        'delete_posts'           => 'ee_delete_contacts',
-                        'delete_private_posts'   => 'ee_delete_contacts',
-                        'delete_published_posts' => 'ee_delete_contacts',
-                        'delete_others_posts'    => 'ee_delete_contacts',
-                        'edit_private_posts'     => 'ee_edit_contacts',
-                        'edit_published_posts'   => 'ee_edit_contacts',
-                    ),
-                ),
-            ),
-        );
-    }
+	/**
+	 * defines Espresso Custom Post Types
+	 * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
+	 * and not part of the WP custom post type api.
+	 *
+	 * @return void
+	 */
+	private function setDefinitions()
+	{
+		$this->custom_post_types = array(
+			'espresso_events'    => array(
+				'singular_name' => esc_html__('Event', 'event_espresso'),
+				'plural_name'   => esc_html__('Events', 'event_espresso'),
+				'singular_slug' => esc_html__('event', 'event_espresso'),
+				'plural_slug'   => $this->core_config->event_cpt_slug,
+				'class_name'    => 'EE_Event',
+				'model_name'    => 'EEM_Event',
+				'args'          => array(
+					'public'              => true,
+					'show_in_nav_menus'   => true,
+					'show_in_graphql'     => true,
+					'graphql_single_name' => __( 'Event', 'event_espresso' ),
+					'graphql_plural_name' => __( 'Events', 'event_espresso' ),
+					'capability_type'     => 'event',
+					'capabilities'        => array(
+						'edit_post'              => 'ee_edit_event',
+						'read_post'              => 'ee_read_event',
+						'delete_post'            => 'ee_delete_event',
+						'edit_posts'             => 'ee_edit_events',
+						'edit_others_posts'      => 'ee_edit_others_events',
+						'publish_posts'          => 'ee_publish_events',
+						'read_private_posts'     => 'ee_read_private_events',
+						'delete_posts'           => 'ee_delete_events',
+						'delete_private_posts'   => 'ee_delete_private_events',
+						'delete_published_posts' => 'ee_delete_published_events',
+						'delete_others_posts'    => 'ee_delete_others_events',
+						'edit_private_posts'     => 'ee_edit_private_events',
+						'edit_published_posts'   => 'ee_edit_published_events',
+					),
+					'taxonomies'          => array(
+						'espresso_event_categories',
+						'espresso_event_type',
+						'post_tag',
+					),
+					'page_templates'      => true,
+				),
+			),
+			'espresso_venues'    => array(
+				'singular_name' => esc_html__('Venue', 'event_espresso'),
+				'plural_name'   => esc_html__('Venues', 'event_espresso'),
+				'singular_slug' => esc_html__('venue', 'event_espresso'),
+				'plural_slug'   => esc_html__('venues', 'event_espresso'),
+				'class_name'    => 'EE_Venue',
+				'model_name'    => 'EEM_Venue',
+				'args'          => array(
+					'public'              => true,
+					'show_in_nav_menus'   => false, // by default this doesn't show for decaf,
+					'show_in_graphql'     => true,
+					'graphql_single_name' => __( 'Venue', 'event_espresso' ),
+					'graphql_plural_name' => __( 'Venues', 'event_espresso' ),
+					'capability_type'     => 'venue',
+					'capabilities'        => array(
+						'edit_post'              => 'ee_edit_venue',
+						'read_post'              => 'ee_read_venue',
+						'delete_post'            => 'ee_delete_venue',
+						'edit_posts'             => 'ee_edit_venues',
+						'edit_others_posts'      => 'ee_edit_others_venues',
+						'publish_posts'          => 'ee_publish_venues',
+						'read_private_posts'     => 'ee_read_private_venues',
+						'delete_posts'           => 'ee_delete_venues',
+						'delete_private_posts'   => 'ee_delete_private_venues',
+						'delete_published_posts' => 'ee_delete_published_venues',
+						'delete_others_posts'    => 'ee_edit_others_venues',
+						'edit_private_posts'     => 'ee_edit_private_venues',
+						'edit_published_posts'   => 'ee_edit_published_venues',
+					),
+					'taxonomies'          => array(
+						'espresso_venue_categories',
+						'post_tag',
+					),
+					'page_templates'      => true,
+				),
+			),
+			'espresso_attendees' => array(
+				'singular_name' => esc_html__('Contact', 'event_espresso'),
+				'plural_name'   => esc_html__('Contacts', 'event_espresso'),
+				'singular_slug' => esc_html__('contact', 'event_espresso'),
+				'plural_slug'   => esc_html__('contacts', 'event_espresso'),
+				'class_name'    => 'EE_Attendee',
+				'model_name'    => 'EEM_Attendee',
+				'args'          => array(
+					'public'             => false,
+					'publicly_queryable' => false,
+					'hierarchical'       => false,
+					'has_archive'        => false,
+					'supports'           => array(
+						'editor',
+						'thumbnail',
+						'excerpt',
+						'custom-fields',
+						'comments',
+					),
+					'taxonomies'         => array('post_tag'),
+					'capability_type'    => 'contact',
+					'capabilities'       => array(
+						'edit_post'              => 'ee_edit_contact',
+						'read_post'              => 'ee_read_contact',
+						'delete_post'            => 'ee_delete_contact',
+						'edit_posts'             => 'ee_edit_contacts',
+						'edit_others_posts'      => 'ee_edit_contacts',
+						'publish_posts'          => 'ee_edit_contacts',
+						'read_private_posts'     => 'ee_edit_contacts',
+						'delete_posts'           => 'ee_delete_contacts',
+						'delete_private_posts'   => 'ee_delete_contacts',
+						'delete_published_posts' => 'ee_delete_contacts',
+						'delete_others_posts'    => 'ee_delete_contacts',
+						'edit_private_posts'     => 'ee_edit_contacts',
+						'edit_published_posts'   => 'ee_edit_contacts',
+					),
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getDefinitions()
-    {
-        return (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            // legacy filter applied for now,
-            // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-            apply_filters(
-                'FHEE__EE_Register_CPTs__get_CPTs__cpts',
-                $this->custom_post_types
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function getDefinitions()
+	{
+		return (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			// legacy filter applied for now,
+			// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+			apply_filters(
+				'FHEE__EE_Register_CPTs__get_CPTs__cpts',
+				$this->custom_post_types
+			)
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomPostTypeSlugs()
-    {
-        return array_keys($this->getDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomPostTypeSlugs()
+	{
+		return array_keys($this->getDefinitions());
+	}
 
 
-    /**
-     * This basically goes through the CPT array and returns only CPT's
-     * that have the ['args']['public'] option set as false
-     *
-     * @return array
-     */
-    public function getPrivateCustomPostTypes()
-    {
-        $private_CPTs = array();
-        foreach ($this->getDefinitions() as $CPT => $details) {
-            if (empty($details['args']['public'])) {
-                $private_CPTs[ $CPT ] = $details;
-            }
-        }
-        return $private_CPTs;
-    }
+	/**
+	 * This basically goes through the CPT array and returns only CPT's
+	 * that have the ['args']['public'] option set as false
+	 *
+	 * @return array
+	 */
+	public function getPrivateCustomPostTypes()
+	{
+		$private_CPTs = array();
+		foreach ($this->getDefinitions() as $CPT => $details) {
+			if (empty($details['args']['public'])) {
+				$private_CPTs[ $CPT ] = $details;
+			}
+		}
+		return $private_CPTs;
+	}
 
 
-    /**
-     * This returns the corresponding model name for cpts registered by EE.
-     *
-     * @param string $post_type_slug    If a slug is included, then attempt to retrieve
-     *                                  the model name for the given cpt slug.
-     *                                  Otherwise if empty, then we'll return
-     *                                  all cpt model names for cpts registered in EE.
-     * @return array                    Empty array if no matching model names for the given slug
-     *                                  or an array of model names indexed by post type slug.
-     */
-    public function getCustomPostTypeModelNames($post_type_slug = '')
-    {
-        $cpts = $this->getDefinitions();
-        // first if slug passed in...
-        if (! empty($post_type_slug)) {
-            // check that slug and cpt match
-            if (! isset($cpts[ $post_type_slug ])) {
-                return array();
-            }
-            if (empty($cpts[ $post_type_slug ]['class_name'])
-                && empty($cpts[ $post_type_slug ]['model_name'])
-            ) {
-                return array();
-            }
-            // k let's get the model name for this cpt.
-            return $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
-        }
-        // if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
-        $cpt_models = array();
-        foreach ($cpts as $slug => $args) {
-            $model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
-            if (! empty($model)) {
-                $cpt_models[ $slug ] = $model;
-            }
-        }
-        return $cpt_models;
-    }
+	/**
+	 * This returns the corresponding model name for cpts registered by EE.
+	 *
+	 * @param string $post_type_slug    If a slug is included, then attempt to retrieve
+	 *                                  the model name for the given cpt slug.
+	 *                                  Otherwise if empty, then we'll return
+	 *                                  all cpt model names for cpts registered in EE.
+	 * @return array                    Empty array if no matching model names for the given slug
+	 *                                  or an array of model names indexed by post type slug.
+	 */
+	public function getCustomPostTypeModelNames($post_type_slug = '')
+	{
+		$cpts = $this->getDefinitions();
+		// first if slug passed in...
+		if (! empty($post_type_slug)) {
+			// check that slug and cpt match
+			if (! isset($cpts[ $post_type_slug ])) {
+				return array();
+			}
+			if (empty($cpts[ $post_type_slug ]['class_name'])
+				&& empty($cpts[ $post_type_slug ]['model_name'])
+			) {
+				return array();
+			}
+			// k let's get the model name for this cpt.
+			return $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
+		}
+		// if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
+		$cpt_models = array();
+		foreach ($cpts as $slug => $args) {
+			$model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
+			if (! empty($model)) {
+				$cpt_models[ $slug ] = $model;
+			}
+		}
+		return $cpt_models;
+	}
 
 
-    /**
-     * @param       $post_type_slug
-     * @param array $cpt
-     * @return array
-     */
-    private function getCustomPostTypeModelName($post_type_slug, array $cpt)
-    {
-        if (! empty($cpt['model_name'])) {
-            return array($post_type_slug => $cpt['model_name']);
-        }
-        if (! empty($cpt['class_name'])) {
-            return array(
-                $post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
-            );
-        }
-        return array();
-    }
+	/**
+	 * @param       $post_type_slug
+	 * @param array $cpt
+	 * @return array
+	 */
+	private function getCustomPostTypeModelName($post_type_slug, array $cpt)
+	{
+		if (! empty($cpt['model_name'])) {
+			return array($post_type_slug => $cpt['model_name']);
+		}
+		if (! empty($cpt['class_name'])) {
+			return array(
+				$post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
+			);
+		}
+		return array();
+	}
 
 
-    /**
-     * @param string $class_name
-     * @return string
-     */
-    private function deriveCptModelNameFromClassName($class_name)
-    {
-        return str_replace('EE', 'EEM', $class_name);
-    }
+	/**
+	 * @param string $class_name
+	 * @return string
+	 */
+	private function deriveCptModelNameFromClassName($class_name)
+	{
+		return str_replace('EE', 'EEM', $class_name);
+	}
 
 
-    /**
-     * This instantiates cpt models related to the cpts registered via EE.
-     *
-     * @since 4.6.16.rc.000
-     * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
-     *                               the cpt matching the given slug.  Otherwise all cpt models will be
-     *                               instantiated (if possible).
-     * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
-     *                               EEM models indexed by post slug.
-     */
-    public function getCustomPostTypeModels($post_type_slug = '')
-    {
-        $cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
-        $instantiated = array();
-        foreach ($cpt_model_names as $slug => $model_name) {
-            $model = $this->loader->getShared($model_name);
-            if ($model instanceof EEM_CPT_Base) {
-                $instantiated[ $slug ] = $model;
-            }
-        }
-        return $instantiated;
-    }
+	/**
+	 * This instantiates cpt models related to the cpts registered via EE.
+	 *
+	 * @since 4.6.16.rc.000
+	 * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
+	 *                               the cpt matching the given slug.  Otherwise all cpt models will be
+	 *                               instantiated (if possible).
+	 * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
+	 *                               EEM models indexed by post slug.
+	 */
+	public function getCustomPostTypeModels($post_type_slug = '')
+	{
+		$cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
+		$instantiated = array();
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$model = $this->loader->getShared($model_name);
+			if ($model instanceof EEM_CPT_Base) {
+				$instantiated[ $slug ] = $model;
+			}
+		}
+		return $instantiated;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -68,8 +68,8 @@ 
                     'public'              => true,
                     'show_in_nav_menus'   => true,
                     'show_in_graphql'     => true,
-                    'graphql_single_name' => __( 'Event', 'event_espresso' ),
-                    'graphql_plural_name' => __( 'Events', 'event_espresso' ),
+                    'graphql_single_name' => __('Event', 'event_espresso'),
+                    'graphql_plural_name' => __('Events', 'event_espresso'),
                     'capability_type'     => 'event',
                     'capabilities'        => array(
                         'edit_post'              => 'ee_edit_event',
@@ -105,8 +105,8 @@ 
                     'public'              => true,
                     'show_in_nav_menus'   => false, // by default this doesn't show for decaf,
                     'show_in_graphql'     => true,
-                    'graphql_single_name' => __( 'Venue', 'event_espresso' ),
-                    'graphql_plural_name' => __( 'Venues', 'event_espresso' ),
+                    'graphql_single_name' => __('Venue', 'event_espresso'),
+                    'graphql_plural_name' => __('Venues', 'event_espresso'),
                     'capability_type'     => 'venue',
                     'capabilities'        => array(
                         'edit_post'              => 'ee_edit_venue',
@@ -209,7 +209,7 @@ 
         $private_CPTs = array();
         foreach ($this->getDefinitions() as $CPT => $details) {
             if (empty($details['args']['public'])) {
-                $private_CPTs[ $CPT ] = $details;
+                $private_CPTs[$CPT] = $details;
             }
         }
         return $private_CPTs;
@@ -230,25 +230,25 @@ 
     {
         $cpts = $this->getDefinitions();
         // first if slug passed in...
-        if (! empty($post_type_slug)) {
+        if ( ! empty($post_type_slug)) {
             // check that slug and cpt match
-            if (! isset($cpts[ $post_type_slug ])) {
+            if ( ! isset($cpts[$post_type_slug])) {
                 return array();
             }
-            if (empty($cpts[ $post_type_slug ]['class_name'])
-                && empty($cpts[ $post_type_slug ]['model_name'])
+            if (empty($cpts[$post_type_slug]['class_name'])
+                && empty($cpts[$post_type_slug]['model_name'])
             ) {
                 return array();
             }
             // k let's get the model name for this cpt.
-            return $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
+            return $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
         }
         // if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
         $cpt_models = array();
         foreach ($cpts as $slug => $args) {
-            $model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
-            if (! empty($model)) {
-                $cpt_models[ $slug ] = $model;
+            $model = $this->getCustomPostTypeModelName($post_type_slug, $cpts[$post_type_slug]);
+            if ( ! empty($model)) {
+                $cpt_models[$slug] = $model;
             }
         }
         return $cpt_models;
@@ -262,10 +262,10 @@ 
      */
     private function getCustomPostTypeModelName($post_type_slug, array $cpt)
     {
-        if (! empty($cpt['model_name'])) {
+        if ( ! empty($cpt['model_name'])) {
             return array($post_type_slug => $cpt['model_name']);
         }
-        if (! empty($cpt['class_name'])) {
+        if ( ! empty($cpt['class_name'])) {
             return array(
                 $post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
             );
@@ -301,7 +301,7 @@ 
         foreach ($cpt_model_names as $slug => $model_name) {
             $model = $this->loader->getShared($model_name);
             if ($model instanceof EEM_CPT_Base) {
-                $instantiated[ $slug ] = $model;
+                $instantiated[$slug] = $model;
             }
         }
         return $instantiated;

core/domain/services/graphql/connection_resolvers/DatetimeConnectionResolver.php

Indentation +19 added lines, -19 removed lines

@@ -56,13 +56,13 @@ 
  */
 class DatetimeConnectionResolver extends AbstractConnectionResolver {
 
-    /**
-     * @return EEM_Datetime
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
+	/**
+	 * @return EEM_Datetime
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
 	public function get_query() {
 		return EEM_Datetime::instance();
 	}
@@ -118,9 +118,9 @@ 
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
-            $this->query_amount
-        ) + 1;
+			max( absint( $first ), absint( $last ), 10 ),
+			$this->query_amount
+		) + 1;
 
 		/**
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
@@ -169,15 +169,15 @@ 
 	}
 
 
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to WP_Query
-     * friendly keys. There's probably a cleaner/more dynamic way to approach this, but
-     * this was quick. I'd be down to explore more dynamic ways to map this, but for
-     * now this gets the job done.
-     *
-     * @param array $query_args
-     * @return array
-     */
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to WP_Query
+	 * friendly keys. There's probably a cleaner/more dynamic way to approach this, but
+	 * this was quick. I'd be down to explore more dynamic ways to map this, but for
+	 * now this gets the job done.
+	 *
+	 * @param array $query_args
+	 * @return array
+	 */
 	public function sanitize_input_fields(array $query_args) {
 
 		$arg_mapping = [

Spacing +12 added lines, -12 removed lines

@@ -74,9 +74,9 @@ 
 	 */
 	public function get_items() {
 
-		$results = $this->query->get_col( $this->query_args );
+		$results = $this->query->get_col($this->query_args);
 
-		return ! empty( $results ) ? $results : [];
+		return ! empty($results) ? $results : [];
 	}
 
 	/**
@@ -90,7 +90,7 @@ 
 	 */
 	public function should_execute() {
 
-		if ( false === $this->should_execute ) {
+		if (false === $this->should_execute) {
 			return false;
 		}
 
@@ -111,14 +111,14 @@ 
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last  = ! empty($this->args['last']) ? $this->args['last'] : null;
+		$first = ! empty($this->args['first']) ? $this->args['first'] : null;
 
 		/**
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
+		    max(absint($first), absint($last), 10),
             $this->query_amount
         ) + 1;
 
@@ -126,8 +126,8 @@ 
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
 		 */
 		$input_fields = [];
-		if ( ! empty( $this->args['where'] ) ) {
-			$input_fields = $this->sanitize_input_fields( $this->args['where'] );
+		if ( ! empty($this->args['where'])) {
+			$input_fields = $this->sanitize_input_fields($this->args['where']);
 		}
 
 		/**
@@ -137,7 +137,7 @@ 
 		 * set the query to pull datetimes that belong to that event.
 		 * We can set more cases for other source types.
 		 */
-		if (is_object( $this->source )) {
+		if (is_object($this->source)) {
 			switch (true) {
 				// It's surely an event
 				case $this->source instanceof Post:
@@ -158,8 +158,8 @@ 
 		/**
 		 * Merge the input_fields with the default query_args
 		 */
-		if ( ! empty( $input_fields ) ) {
-			$query_args = array_merge( $query_args, $input_fields );
+		if ( ! empty($input_fields)) {
+			$query_args = array_merge($query_args, $input_fields);
 		}
 
 		/**
@@ -188,7 +188,7 @@ 
 		/**
 		 * Return the Query Args
 		 */
-		return ! empty( $query_args ) && is_array( $query_args ) ? $query_args : [];
+		return ! empty($query_args) && is_array($query_args) ? $query_args : [];
 
 	}
 

core/domain/services/graphql/connection_resolvers/TicketConnectionResolver.php

Indentation +31 added lines, -31 removed lines

@@ -54,13 +54,13 @@ 
  */
 class TicketConnectionResolver extends AbstractConnectionResolver {
 
-    /**
-     * @return EEM_Ticket
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
+	/**
+	 * @return EEM_Ticket
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
 	public function get_query() {
 		return EEM_Ticket::instance();
 	}
@@ -96,18 +96,18 @@ 
 	}
 
 
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
 	public function get_query_args() {
 
 		$query_args = [];
@@ -122,9 +122,9 @@ 
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
-            $this->query_amount
-        ) + 1;
+			max( absint( $first ), absint( $last ), 10 ),
+			$this->query_amount
+		) + 1;
 
 		/**
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
@@ -159,15 +159,15 @@ 
 	}
 
 
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to WP_Query
-     * friendly keys. There's probably a cleaner/more dynamic way to approach this, but
-     * this was quick. I'd be down to explore more dynamic ways to map this, but for
-     * now this gets the job done.
-     *
-     * @param array $query_args
-     * @return array
-     */
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to WP_Query
+	 * friendly keys. There's probably a cleaner/more dynamic way to approach this, but
+	 * this was quick. I'd be down to explore more dynamic ways to map this, but for
+	 * now this gets the job done.
+	 *
+	 * @param array $query_args
+	 * @return array
+	 */
 	public function sanitize_input_fields(array $query_args) {
 
 		$arg_mapping = [

Spacing +13 added lines, -13 removed lines

@@ -72,9 +72,9 @@ 
 	 */
 	public function get_items() {
 
-		$results = $this->query->get_col( $this->query_args );
+		$results = $this->query->get_col($this->query_args);
 
-		return ! empty( $results ) ? $results : [];
+		return ! empty($results) ? $results : [];
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function should_execute() {
 
-		if ( false === $this->should_execute ) {
+		if (false === $this->should_execute) {
 			return false;
 		}
 
@@ -115,14 +115,14 @@ 
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last  = ! empty($this->args['last']) ? $this->args['last'] : null;
+		$first = ! empty($this->args['first']) ? $this->args['first'] : null;
 
 		/**
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
+		    max(absint($first), absint($last), 10),
             $this->query_amount
         ) + 1;
 
@@ -130,17 +130,17 @@ 
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
 		 */
 		$input_fields = [];
-		if ( ! empty( $this->args['where'] ) ) {
-			$input_fields = $this->sanitize_input_fields( $this->args['where'] );
+		if ( ! empty($this->args['where'])) {
+			$input_fields = $this->sanitize_input_fields($this->args['where']);
 		}
 
 		/**
 		 * Determine where we're at in the Graph and adjust the query context appropriately.
 		 */
-		if (is_object( $this->source )) {
+		if (is_object($this->source)) {
 			switch (true) {
 				case $this->source instanceof EE_Datetime:
-					$query_args[] = [ 'Datetime.DTT_ID' => $this->source->ID() ];
+					$query_args[] = ['Datetime.DTT_ID' => $this->source->ID()];
 					break;
 			}
 		}
@@ -148,8 +148,8 @@ 
 		/**
 		 * Merge the input_fields with the default query_args
 		 */
-		if ( ! empty( $input_fields ) ) {
-			$query_args = array_merge( $query_args, $input_fields );
+		if ( ! empty($input_fields)) {
+			$query_args = array_merge($query_args, $input_fields);
 		}
 
 		/**
@@ -178,7 +178,7 @@ 
 		/**
 		 * Return the Query Args
 		 */
-		return ! empty( $query_args ) && is_array( $query_args ) ? $query_args : [];
+		return ! empty($query_args) && is_array($query_args) ? $query_args : [];
 
 	}
 

core/domain/services/graphql/connection_resolvers/VenueConnectionResolver.php

Indentation +11 added lines, -11 removed lines

@@ -54,13 +54,13 @@ 
  */
 class VenueConnectionResolver extends AbstractConnectionResolver {
 
-    /**
-     * @return EEM_Venue
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
+	/**
+	 * @return EEM_Venue
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
 	public function get_query() {
 		return EEM_Venue::instance();
 	}
@@ -116,9 +116,9 @@ 
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
-            $this->query_amount
-        ) + 1;
+			max( absint( $first ), absint( $last ), 10 ),
+			$this->query_amount
+		) + 1;
 
 		/**
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
@@ -166,7 +166,7 @@ 
 	 * this was quick. I'd be down to explore more dynamic ways to map this, but for
 	 * now this gets the job done.
 	 *
-     * @param array $query_args
+	 * @param array $query_args
 	 * @return array
 	 */
 	public function sanitize_input_fields(array $query_args) {

Spacing +12 added lines, -12 removed lines

@@ -72,9 +72,9 @@ 
 	 */
 	public function get_items() {
 
-		$results = $this->query->get_col( $this->query_args );
+		$results = $this->query->get_col($this->query_args);
 
-		return ! empty( $results ) ? $results : [];
+		return ! empty($results) ? $results : [];
 	}
 
 	/**
@@ -88,7 +88,7 @@ 
 	 */
 	public function should_execute() {
 
-		if ( false === $this->should_execute ) {
+		if (false === $this->should_execute) {
 			return false;
 		}
 
@@ -109,14 +109,14 @@ 
 		/**
 		 * Prepare for later use
 		 */
-		$last  = ! empty( $this->args['last'] ) ? $this->args['last'] : null;
-		$first = ! empty( $this->args['first'] ) ? $this->args['first'] : null;
+		$last  = ! empty($this->args['last']) ? $this->args['last'] : null;
+		$first = ! empty($this->args['first']) ? $this->args['first'] : null;
 
 		/**
 		 * Set limit the highest value of $first and $last, with a (filterable) max of 100
 		 */
 		$query_args['limit'] = min(
-		    max( absint( $first ), absint( $last ), 10 ),
+		    max(absint($first), absint($last), 10),
             $this->query_amount
         ) + 1;
 
@@ -124,8 +124,8 @@ 
 		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
 		 */
 		$input_fields = [];
-		if ( ! empty( $this->args['where'] ) ) {
-			$input_fields = $this->sanitize_input_fields( $this->args['where'] );
+		if ( ! empty($this->args['where'])) {
+			$input_fields = $this->sanitize_input_fields($this->args['where']);
 		}
 
 		/**
@@ -135,7 +135,7 @@ 
 		 * set the query to pull datetimes that belong to that event.
 		 * We can set more cases for other source types.
 		 */
-		if (is_object( $this->source )) {
+		if (is_object($this->source)) {
 			switch (true) {
 				// Assumed to be an event
 				case $this->source instanceof Post:
@@ -150,8 +150,8 @@ 
 		/**
 		 * Merge the input_fields with the default query_args
 		 */
-		if ( ! empty( $input_fields ) ) {
-			$query_args = array_merge( $query_args, $input_fields );
+		if ( ! empty($input_fields)) {
+			$query_args = array_merge($query_args, $input_fields);
 		}
 
 		/**
@@ -179,7 +179,7 @@ 
 		/**
 		 * Return the Query Args
 		 */
-		return ! empty( $query_args ) && is_array( $query_args ) ? $query_args : [];
+		return ! empty($query_args) && is_array($query_args) ? $query_args : [];
 
 	}
 

core/domain/services/graphql/connections/EventDatetimesConnection.php

Indentation +54 added lines, -54 removed lines

@@ -37,66 +37,66 @@
 class EventDatetimesConnection implements ConnectionInterface
 {
 
-    /**
-     * @var EEM_Datetime $model
-     */
-    protected $model;
+	/**
+	 * @var EEM_Datetime $model
+	 */
+	protected $model;
 
 
-    /**
-     * DatetimeConnection constructor.
-     *
-     * @param EEM_Datetime               $model
-     */
-    public function __construct(EEM_Datetime $model)
-    {
-        $this->model = $model;
-    }
+	/**
+	 * DatetimeConnection constructor.
+	 *
+	 * @param EEM_Datetime               $model
+	 */
+	public function __construct(EEM_Datetime $model)
+	{
+		$this->model = $model;
+	}
 
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function config()
-    {
-        return [
-            'fromType'           => 'Event',
-            'toType'             => 'Datetime',
-            'fromFieldName'      => 'datetimes',
-            'connectionTypeName' => 'EventDatetimesConnection',
-            'resolve'            => [$this, 'resolveConnection'],
-            'resolveNode'        => [$this, 'resolveNode']
-        ];
-    }
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function config()
+	{
+		return [
+			'fromType'           => 'Event',
+			'toType'             => 'Datetime',
+			'fromFieldName'      => 'datetimes',
+			'connectionTypeName' => 'EventDatetimesConnection',
+			'resolve'            => [$this, 'resolveConnection'],
+			'resolveNode'        => [$this, 'resolveNode']
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return array
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function resolveConnection($entity, $args, $context, $info)
-    {
-        $resolver = new DatetimeConnectionResolver($entity, $args, $context, $info);
-        return $resolver->get_connection();
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return array
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function resolveConnection($entity, $args, $context, $info)
+	{
+		$resolver = new DatetimeConnectionResolver($entity, $args, $context, $info);
+		return $resolver->get_connection();
+	}
 
 
-    /**
-     * @param $id
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return EE_Base_Class
-     * @since $VID:$
-     */
-    public function resolveNode($id, $args, $context, $info)
-    {
-        return $this->model->get_one_by_ID($id);
-    }
+	/**
+	 * @param $id
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return EE_Base_Class
+	 * @since $VID:$
+	 */
+	public function resolveNode($id, $args, $context, $info)
+	{
+		return $this->model->get_one_by_ID($id);
+	}
 }

core/domain/services/graphql/connections/EventVenuesConnection.php

Indentation +54 added lines, -54 removed lines

@@ -37,66 +37,66 @@
 class EventVenuesConnection implements ConnectionInterface
 {
 
-    /**
-     * @var EEM_Venue $model
-     */
-    protected $model;
+	/**
+	 * @var EEM_Venue $model
+	 */
+	protected $model;
 
 
-    /**
-     * DatetimeConnection constructor.
-     *
-     * @param EEM_Venue $model
-     */
-    public function __construct(EEM_Venue $model)
-    {
-        $this->model = $model;
-    }
+	/**
+	 * DatetimeConnection constructor.
+	 *
+	 * @param EEM_Venue $model
+	 */
+	public function __construct(EEM_Venue $model)
+	{
+		$this->model = $model;
+	}
 
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function config()
-    {
-        return [
-            'fromType'           => 'Event',
-            'toType'             => 'Venue',
-            'fromFieldName'      => 'venues',
-            'connectionTypeName' => 'EventVenuesConnection',
-            'resolve'            => [$this, 'resolveConnection'],
-            'resolveNode'        => [$this, 'resolveNode']
-        ];
-    }
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function config()
+	{
+		return [
+			'fromType'           => 'Event',
+			'toType'             => 'Venue',
+			'fromFieldName'      => 'venues',
+			'connectionTypeName' => 'EventVenuesConnection',
+			'resolve'            => [$this, 'resolveConnection'],
+			'resolveNode'        => [$this, 'resolveNode']
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return array
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function resolveConnection($entity, $args, $context, $info)
-    {
-        $resolver = new VenueConnectionResolver($entity, $args, $context, $info);
-        return $resolver->get_connection();
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return array
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function resolveConnection($entity, $args, $context, $info)
+	{
+		$resolver = new VenueConnectionResolver($entity, $args, $context, $info);
+		return $resolver->get_connection();
+	}
 
 
-    /**
-     * @param $id
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return EE_Base_Class
-     * @since $VID:$
-     */
-    public function resolveNode($id, $args, $context, $info)
-    {
-        return $this->model->get_one_by_ID($id);
-    }
+	/**
+	 * @param $id
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return EE_Base_Class
+	 * @since $VID:$
+	 */
+	public function resolveNode($id, $args, $context, $info)
+	{
+		return $this->model->get_one_by_ID($id);
+	}
 }
\ No newline at end of file

core/domain/services/graphql/connections/TicketDatetimesConnection.php

Indentation +54 added lines, -54 removed lines

@@ -37,66 +37,66 @@
 class TicketDatetimesConnection implements ConnectionInterface
 {
 
-    /**
-     * @var EEM_Datetime $model
-     */
-    protected $model;
+	/**
+	 * @var EEM_Datetime $model
+	 */
+	protected $model;
 
 
-    /**
-     * DatetimeConnection constructor.
-     *
-     * @param EEM_Datetime $model
-     */
-    public function __construct(EEM_Datetime $model)
-    {
-        $this->model = $model;
-    }
+	/**
+	 * DatetimeConnection constructor.
+	 *
+	 * @param EEM_Datetime $model
+	 */
+	public function __construct(EEM_Datetime $model)
+	{
+		$this->model = $model;
+	}
 
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function config()
-    {
-        return [
-            'fromType'           => 'Ticket',
-            'toType'             => 'Datetime',
-            'fromFieldName'      => 'datetimes',
-            'connectionTypeName' => 'TicketDatetimesConnection',
-            'resolve'            => [$this, 'resolveConnection'],
-            'resolveNode'        => [$this, 'resolveNode']
-        ];
-    }
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function config()
+	{
+		return [
+			'fromType'           => 'Ticket',
+			'toType'             => 'Datetime',
+			'fromFieldName'      => 'datetimes',
+			'connectionTypeName' => 'TicketDatetimesConnection',
+			'resolve'            => [$this, 'resolveConnection'],
+			'resolveNode'        => [$this, 'resolveNode']
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return array
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function resolveConnection($entity, $args, $context, $info)
-    {
-        $resolver = new DatetimeConnectionResolver($entity, $args, $context, $info);
-        return $resolver->get_connection();
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return array
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function resolveConnection($entity, $args, $context, $info)
+	{
+		$resolver = new DatetimeConnectionResolver($entity, $args, $context, $info);
+		return $resolver->get_connection();
+	}
 
 
-    /**
-     * @param $id
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return EE_Base_Class
-     * @since $VID:$
-     */
-    public function resolveNode($id, $args, $context, $info)
-    {
-        return $this->model->get_one_by_ID($id);
-    }
+	/**
+	 * @param $id
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return EE_Base_Class
+	 * @since $VID:$
+	 */
+	public function resolveNode($id, $args, $context, $info)
+	{
+		return $this->model->get_one_by_ID($id);
+	}
 }
\ No newline at end of file

core/domain/services/graphql/connections/DatetimeTicketsConnection.php

Indentation +54 added lines, -54 removed lines

@@ -37,66 +37,66 @@
 class DatetimeTicketsConnection implements ConnectionInterface
 {
 
-    /**
-     * @var EEM_Ticket $model
-     */
-    protected $model;
+	/**
+	 * @var EEM_Ticket $model
+	 */
+	protected $model;
 
 
-    /**
-     * DatetimeConnection constructor.
-     *
-     * @param EEM_Ticket $model
-     */
-    public function __construct(EEM_Ticket $model)
-    {
-        $this->model = $model;
-    }
+	/**
+	 * DatetimeConnection constructor.
+	 *
+	 * @param EEM_Ticket $model
+	 */
+	public function __construct(EEM_Ticket $model)
+	{
+		$this->model = $model;
+	}
 
 
-    /**
-     * @return array
-     * @since $VID:$
-     */
-    public function config()
-    {
-        return [
-            'fromType'           => 'Datetime',
-            'toType'             => 'Ticket',
-            'fromFieldName'      => 'tickets',
-            'connectionTypeName' => 'DatetimeTicketsConnection',
-            'resolve'            => [$this, 'resolveConnection'],
-            'resolveNode'        => [$this, 'resolveNode']
-        ];
-    }
+	/**
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function config()
+	{
+		return [
+			'fromType'           => 'Datetime',
+			'toType'             => 'Ticket',
+			'fromFieldName'      => 'tickets',
+			'connectionTypeName' => 'DatetimeTicketsConnection',
+			'resolve'            => [$this, 'resolveConnection'],
+			'resolveNode'        => [$this, 'resolveNode']
+		];
+	}
 
 
-    /**
-     * @param $entity
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return array
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function resolveConnection($entity, $args, $context, $info)
-    {
-        $resolver = new TicketConnectionResolver($entity, $args, $context, $info);
-        return $resolver->get_connection();
-    }
+	/**
+	 * @param $entity
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return array
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function resolveConnection($entity, $args, $context, $info)
+	{
+		$resolver = new TicketConnectionResolver($entity, $args, $context, $info);
+		return $resolver->get_connection();
+	}
 
 
-    /**
-     * @param $id
-     * @param $args
-     * @param $context
-     * @param $info
-     * @return EE_Base_Class
-     * @since $VID:$
-     */
-    public function resolveNode($id, $args, $context, $info)
-    {
-        return $this->model->get_one_by_ID($id);
-    }
+	/**
+	 * @param $id
+	 * @param $args
+	 * @param $context
+	 * @param $info
+	 * @return EE_Base_Class
+	 * @since $VID:$
+	 */
+	public function resolveNode($id, $args, $context, $info)
+	{
+		return $this->model->get_one_by_ID($id);
+	}
 }
\ No newline at end of file