eventespresso / event-espresso-core

core/domain/entities/routing/data_nodes/core/Api.php

Indentation +34 added lines, -34 removed lines

@@ -18,38 +18,38 @@
  */
 class Api extends JsonDataNode
 {
-    const NODE_NAME = 'api';
-
-
-    /**
-     * @param JsonDataNodeValidator $validator
-     */
-    public function __construct(JsonDataNodeValidator $validator)
-    {
-        parent::__construct($validator);
-        $this->setNodeName(Api::NODE_NAME);
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since $VID:$
-     */
-    public function initialize()
-    {
-        $this->addData('restApiNonce', wp_create_nonce('wp_rest'));
-        $this->addData('restApiBaseUrl', rest_url());
-        $this->addData('restApiRouteUrl', rest_url('ee/v4.8.36/'));
-        $this->addData('restApiCollectionEndpoints', EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName());
-        $this->addData('restApiPrimaryKeys', EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName());
-
-        // route can be something like 'graphql'
-        $route = trim(Router::$route, '/');
-        // make sure we are dealing with sane folks
-        $has_pretty_permalinks = (bool) get_option('permalink_structure');
-        // if pretty permalinks, use '/graphql' otherwise '?graphql=1'
-        $graphqlEndpoint = $has_pretty_permalinks ? site_url($route) : add_query_arg($route, 1, site_url());
-        $this->addData('graphqlEndpoint', esc_url($graphqlEndpoint));
-        $this->setInitialized(true);
-    }
+	const NODE_NAME = 'api';
+
+
+	/**
+	 * @param JsonDataNodeValidator $validator
+	 */
+	public function __construct(JsonDataNodeValidator $validator)
+	{
+		parent::__construct($validator);
+		$this->setNodeName(Api::NODE_NAME);
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	public function initialize()
+	{
+		$this->addData('restApiNonce', wp_create_nonce('wp_rest'));
+		$this->addData('restApiBaseUrl', rest_url());
+		$this->addData('restApiRouteUrl', rest_url('ee/v4.8.36/'));
+		$this->addData('restApiCollectionEndpoints', EED_Core_Rest_Api::getCollectionRoutesIndexedByModelName());
+		$this->addData('restApiPrimaryKeys', EED_Core_Rest_Api::getPrimaryKeyNamesIndexedByModelName());
+
+		// route can be something like 'graphql'
+		$route = trim(Router::$route, '/');
+		// make sure we are dealing with sane folks
+		$has_pretty_permalinks = (bool) get_option('permalink_structure');
+		// if pretty permalinks, use '/graphql' otherwise '?graphql=1'
+		$graphqlEndpoint = $has_pretty_permalinks ? site_url($route) : add_query_arg($route, 1, site_url());
+		$this->addData('graphqlEndpoint', esc_url($graphqlEndpoint));
+		$this->setInitialized(true);
+	}
 }

core/domain/services/contexts/RequestTypeContextDetector.php

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
     /**
      * @param string $globalRouteCondition
-     * @param mixed  $default
+     * @param boolean  $default
      * @return mixed
      */
     private function getGlobalRouteCondition(string $globalRouteCondition, $default)

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use EventEspresso\core\services\request\RequestInterface;
 use EventEspresso\core\domain\entities\contexts\RequestTypeContext;
 use InvalidArgumentException;
-use WPGraphQL\Router;
 
 /**
  * Class RequestTypeContextDetector

Indentation +219 added lines, -219 removed lines

@@ -20,250 +20,250 @@
 class RequestTypeContextDetector
 {
 
-    /**
-     * @var GraphQLEndpoint $gql_endpoint
-     */
-    private $gql_endpoint;
+	/**
+	 * @var GraphQLEndpoint $gql_endpoint
+	 */
+	private $gql_endpoint;
 
-    /**
-     * @var RequestTypeContextFactoryInterface $factory
-     */
-    private $factory;
+	/**
+	 * @var RequestTypeContextFactoryInterface $factory
+	 */
+	private $factory;
 
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
 
-    /**
-     * @var array $globalRouteConditions
-     */
-    private $globalRouteConditions;
+	/**
+	 * @var array $globalRouteConditions
+	 */
+	private $globalRouteConditions;
 
 
-    /**
-     * RequestTypeContextDetector constructor.
-     *
-     * @param GraphQLEndpoint                    $gql_endpoint
-     * @param RequestInterface                   $request
-     * @param RequestTypeContextFactoryInterface $factory
-     * @param array                              $globalRouteConditions an array for injecting values that would
-     *                                                                  otherwise be defined as global constants
-     *                                                                  or other global variables for the current
-     *                                                                  request route such as DOING_AJAX
-     */
-    public function __construct(
-        GraphQLEndpoint $gql_endpoint,
-        RequestInterface $request,
-        RequestTypeContextFactoryInterface $factory,
-        array $globalRouteConditions = []
-    ) {
-        $this->gql_endpoint = $gql_endpoint;
-        $this->request = $request;
-        $this->factory = $factory;
-        $this->globalRouteConditions = $globalRouteConditions;
-    }
+	/**
+	 * RequestTypeContextDetector constructor.
+	 *
+	 * @param GraphQLEndpoint                    $gql_endpoint
+	 * @param RequestInterface                   $request
+	 * @param RequestTypeContextFactoryInterface $factory
+	 * @param array                              $globalRouteConditions an array for injecting values that would
+	 *                                                                  otherwise be defined as global constants
+	 *                                                                  or other global variables for the current
+	 *                                                                  request route such as DOING_AJAX
+	 */
+	public function __construct(
+		GraphQLEndpoint $gql_endpoint,
+		RequestInterface $request,
+		RequestTypeContextFactoryInterface $factory,
+		array $globalRouteConditions = []
+	) {
+		$this->gql_endpoint = $gql_endpoint;
+		$this->request = $request;
+		$this->factory = $factory;
+		$this->globalRouteConditions = $globalRouteConditions;
+	}
 
 
-    /**
-     * @param string $globalRouteCondition
-     * @param mixed  $default
-     * @return mixed
-     */
-    private function getGlobalRouteCondition(string $globalRouteCondition, $default)
-    {
-        return isset($this->globalRouteConditions[ $globalRouteCondition ])
-            ? $this->globalRouteConditions[ $globalRouteCondition ]
-            : $default;
-    }
+	/**
+	 * @param string $globalRouteCondition
+	 * @param mixed  $default
+	 * @return mixed
+	 */
+	private function getGlobalRouteCondition(string $globalRouteCondition, $default)
+	{
+		return isset($this->globalRouteConditions[ $globalRouteCondition ])
+			? $this->globalRouteConditions[ $globalRouteCondition ]
+			: $default;
+	}
 
 
-    /**
-     * @return RequestTypeContext
-     * @throws InvalidArgumentException
-     */
-    public function detectRequestTypeContext()
-    {
-        // Detect error scrapes
-        if ($this->isWordPressErrorScrape()) {
-            return $this->factory->create(RequestTypeContext::WP_SCRAPE);
-        }
-        // Detect activations
-        if ($this->isWordPressActivationRequest()) {
-            return $this->factory->create(RequestTypeContext::ACTIVATION);
-        }
-        // Detect EE REST API
-        if ($this->isEspressoRestApiRequest()) {
-            return $this->factory->create(RequestTypeContext::API);
-        }
-        // Detect WP REST API
-        if ($this->isWordPressRestApiRequest()) {
-            return $this->factory->create(RequestTypeContext::WP_API);
-        }
-        // Detect EE GraphQL
-        if ($this->isEspressoGraphQLRequest()) {
-            return $this->factory->create(RequestTypeContext::GQL);
-        }
-        // Detect AJAX
-        if ($this->getGlobalRouteCondition('DOING_AJAX', false)) {
-            if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_FRONT);
-            }
-            if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
-            }
-            if ($this->request->getRequestParam('action') === 'heartbeat') {
-                return $this->factory->create(RequestTypeContext::AJAX_HEARTBEAT);
-            }
-            return $this->factory->create(RequestTypeContext::AJAX_OTHER);
-        }
-        // Detect WP_Cron
-        if ($this->isCronRequest()) {
-            return $this->factory->create(RequestTypeContext::CRON);
-        }
-        // Detect command line requests
-        if ($this->getGlobalRouteCondition('WP_CLI', false)) {
-            return $this->factory->create(RequestTypeContext::CLI);
-        }
-        // detect WordPress admin (ie: "Dashboard")
-        if ($this->getGlobalRouteCondition('is_admin', false)) {
-            return $this->factory->create(RequestTypeContext::ADMIN);
-        }
-        // Detect iFrames
-        if ($this->isIframeRoute()) {
-            return $this->factory->create(RequestTypeContext::IFRAME);
-        }
-        // Detect Feeds
-        if ($this->isFeedRequest()) {
-            return $this->factory->create(RequestTypeContext::FEED);
-        }
-        // and by process of elimination...
-        return $this->factory->create(RequestTypeContext::FRONTEND);
-    }
+	/**
+	 * @return RequestTypeContext
+	 * @throws InvalidArgumentException
+	 */
+	public function detectRequestTypeContext()
+	{
+		// Detect error scrapes
+		if ($this->isWordPressErrorScrape()) {
+			return $this->factory->create(RequestTypeContext::WP_SCRAPE);
+		}
+		// Detect activations
+		if ($this->isWordPressActivationRequest()) {
+			return $this->factory->create(RequestTypeContext::ACTIVATION);
+		}
+		// Detect EE REST API
+		if ($this->isEspressoRestApiRequest()) {
+			return $this->factory->create(RequestTypeContext::API);
+		}
+		// Detect WP REST API
+		if ($this->isWordPressRestApiRequest()) {
+			return $this->factory->create(RequestTypeContext::WP_API);
+		}
+		// Detect EE GraphQL
+		if ($this->isEspressoGraphQLRequest()) {
+			return $this->factory->create(RequestTypeContext::GQL);
+		}
+		// Detect AJAX
+		if ($this->getGlobalRouteCondition('DOING_AJAX', false)) {
+			if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_FRONT);
+			}
+			if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
+			}
+			if ($this->request->getRequestParam('action') === 'heartbeat') {
+				return $this->factory->create(RequestTypeContext::AJAX_HEARTBEAT);
+			}
+			return $this->factory->create(RequestTypeContext::AJAX_OTHER);
+		}
+		// Detect WP_Cron
+		if ($this->isCronRequest()) {
+			return $this->factory->create(RequestTypeContext::CRON);
+		}
+		// Detect command line requests
+		if ($this->getGlobalRouteCondition('WP_CLI', false)) {
+			return $this->factory->create(RequestTypeContext::CLI);
+		}
+		// detect WordPress admin (ie: "Dashboard")
+		if ($this->getGlobalRouteCondition('is_admin', false)) {
+			return $this->factory->create(RequestTypeContext::ADMIN);
+		}
+		// Detect iFrames
+		if ($this->isIframeRoute()) {
+			return $this->factory->create(RequestTypeContext::IFRAME);
+		}
+		// Detect Feeds
+		if ($this->isFeedRequest()) {
+			return $this->factory->create(RequestTypeContext::FEED);
+		}
+		// and by process of elimination...
+		return $this->factory->create(RequestTypeContext::FRONTEND);
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isWordPressErrorScrape()
-    {
-        return (
-                   $this->request->getRequestParam('wp_scrape_key') !== null
-                   && $this->request->getRequestParam('wp_scrape_nonce') !== null
-               )
-               || (
-                   $this->request->getRequestParam('action') === 'error_scrape'
-                   && $this->request->getRequestParam('_wpnonce') !== null
-               );
-    }
+	/**
+	 * @return bool
+	 */
+	private function isWordPressErrorScrape()
+	{
+		return (
+				   $this->request->getRequestParam('wp_scrape_key') !== null
+				   && $this->request->getRequestParam('wp_scrape_nonce') !== null
+			   )
+			   || (
+				   $this->request->getRequestParam('action') === 'error_scrape'
+				   && $this->request->getRequestParam('_wpnonce') !== null
+			   );
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isWordPressActivationRequest()
-    {
-        $action = $this->request->getRequestParam('action');
-        $plugins_page_actions = [
-            'activate',
-            'activate-multi',
-            'activate-selected',
-            'deactivate',
-            'deactivate-multi',
-            'deactivate-selected',
-            'delete-selected',
-            'disable-auto-update-selected',
-            'enable-auto-update-selected',
-            'update-selected',
-        ];
-        return $this->uriPathMatches('wp-admin/plugins.php')
-               && ($action === 'true' || in_array($action, $plugins_page_actions, true));
-    }
+	/**
+	 * @return bool
+	 */
+	private function isWordPressActivationRequest()
+	{
+		$action = $this->request->getRequestParam('action');
+		$plugins_page_actions = [
+			'activate',
+			'activate-multi',
+			'activate-selected',
+			'deactivate',
+			'deactivate-multi',
+			'deactivate-selected',
+			'delete-selected',
+			'disable-auto-update-selected',
+			'enable-auto-update-selected',
+			'update-selected',
+		];
+		return $this->uriPathMatches('wp-admin/plugins.php')
+			   && ($action === 'true' || in_array($action, $plugins_page_actions, true));
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isEspressoRestApiRequest()
-    {
-        // Check for URLs like http://mysite.com/?rest_route=/ee... and http://mysite.com/wp-json/ee/...
-        return strpos(
-            $this->request->getRequestParam('rest_route', false),
-            '/' . Domain::API_NAMESPACE
-        ) === 0
-            || $this->uriPathMatches(trim(rest_get_url_prefix(), '/') . '/' . Domain::API_NAMESPACE);
-    }
+	/**
+	 * @return bool
+	 */
+	private function isEspressoRestApiRequest()
+	{
+		// Check for URLs like http://mysite.com/?rest_route=/ee... and http://mysite.com/wp-json/ee/...
+		return strpos(
+			$this->request->getRequestParam('rest_route', false),
+			'/' . Domain::API_NAMESPACE
+		) === 0
+			|| $this->uriPathMatches(trim(rest_get_url_prefix(), '/') . '/' . Domain::API_NAMESPACE);
+	}
 
 
-    /**
-     * Checks for URLs like https://mysite.com/graphql
-     *
-     * @return bool
-     */
-    private function isEspressoGraphQLRequest()
-    {
-        if ($this->gql_endpoint->isGraphqlRequest()) {
-            return true;
-        }
-        $gql_endpoint = $this->gql_endpoint->getEndpoint();
-        return $this->uriPathMatches($gql_endpoint) || $this->request->requestParamIsSet($gql_endpoint);
-    }
+	/**
+	 * Checks for URLs like https://mysite.com/graphql
+	 *
+	 * @return bool
+	 */
+	private function isEspressoGraphQLRequest()
+	{
+		if ($this->gql_endpoint->isGraphqlRequest()) {
+			return true;
+		}
+		$gql_endpoint = $this->gql_endpoint->getEndpoint();
+		return $this->uriPathMatches($gql_endpoint) || $this->request->requestParamIsSet($gql_endpoint);
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isWordPressRestApiRequest()
-    {
-        // Check for URLs like http://mysite.com/?rest_route=/.. and http://mysite.com/wp-json/...
-        return $this->request->getRequestParam('rest_route', false)
-               || $this->uriPathMatches(trim(rest_get_url_prefix(), '/'));
-    }
+	/**
+	 * @return bool
+	 */
+	private function isWordPressRestApiRequest()
+	{
+		// Check for URLs like http://mysite.com/?rest_route=/.. and http://mysite.com/wp-json/...
+		return $this->request->getRequestParam('rest_route', false)
+			   || $this->uriPathMatches(trim(rest_get_url_prefix(), '/'));
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isCronRequest()
-    {
-        return $this->uriPathMatches('wp-cron.php');
-    }
+	/**
+	 * @return bool
+	 */
+	private function isCronRequest()
+	{
+		return $this->uriPathMatches('wp-cron.php');
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isFeedRequest()
-    {
-        return $this->uriPathMatches('feed');
-    }
+	/**
+	 * @return bool
+	 */
+	private function isFeedRequest()
+	{
+		return $this->uriPathMatches('feed');
+	}
 
 
-    /**
-     * @param string $component
-     * @return bool
-     */
-    private function uriPathMatches($component)
-    {
-        $request_uri = $this->request->requestUri(true);
-        $parts = explode('?', $request_uri);
-        $path = trim(reset($parts), '/');
-        return strpos($path, $component) === 0;
-    }
+	/**
+	 * @param string $component
+	 * @return bool
+	 */
+	private function uriPathMatches($component)
+	{
+		$request_uri = $this->request->requestUri(true);
+		$parts = explode('?', $request_uri);
+		$path = trim(reset($parts), '/');
+		return strpos($path, $component) === 0;
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isIframeRoute()
-    {
-        $is_iframe_route = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
-            $this->request->getRequestParam('event_list', '') === 'iframe'
-            || $this->request->getRequestParam('ticket_selector', '') === 'iframe'
-            || $this->request->getRequestParam('calendar', '') === 'iframe',
-            $this
-        );
-        return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @return bool
+	 */
+	private function isIframeRoute()
+	{
+		$is_iframe_route = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
+			$this->request->getRequestParam('event_list', '') === 'iframe'
+			|| $this->request->getRequestParam('ticket_selector', '') === 'iframe'
+			|| $this->request->getRequestParam('calendar', '') === 'iframe',
+			$this
+		);
+		return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -72,8 +72,8 @@ 
      */
     private function getGlobalRouteCondition(string $globalRouteCondition, $default)
     {
-        return isset($this->globalRouteConditions[ $globalRouteCondition ])
-            ? $this->globalRouteConditions[ $globalRouteCondition ]
+        return isset($this->globalRouteConditions[$globalRouteCondition])
+            ? $this->globalRouteConditions[$globalRouteCondition]
             : $default;
     }
 
@@ -189,9 +189,9 @@ 
         // Check for URLs like http://mysite.com/?rest_route=/ee... and http://mysite.com/wp-json/ee/...
         return strpos(
             $this->request->getRequestParam('rest_route', false),
-            '/' . Domain::API_NAMESPACE
+            '/'.Domain::API_NAMESPACE
         ) === 0
-            || $this->uriPathMatches(trim(rest_get_url_prefix(), '/') . '/' . Domain::API_NAMESPACE);
+            || $this->uriPathMatches(trim(rest_get_url_prefix(), '/').'/'.Domain::API_NAMESPACE);
     }
 
 

core/services/graphql/GraphQLEndpoint.php

Doc Comments +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 
 
     /**
-     * @return false|mixed|void
+     * @return string
      */
     public function getEndpoint()
     {
@@ -48,7 +48,7 @@ 
 
 
     /**
-     * @return mixed|void|bool
+     * @return boolean
      */
     public function isGraphqlRequest()
     {

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use EventEspresso\core\services\database\WordPressOption;
 use Throwable;
 use WPGraphQL;
-use WPGraphQL\Data\Config;
 use WPGraphQL\Router;
 
 /**

Indentation +68 added lines, -68 removed lines

@@ -18,82 +18,82 @@
  */
 class GraphQLEndpoint extends WordPressOption
 {
-    const DEFAULT_ENDPOINT = 'graphql';
+	const DEFAULT_ENDPOINT = 'graphql';
 
-    const OPTION_NAME      = 'ee-graphql-endpoint';
+	const OPTION_NAME      = 'ee-graphql-endpoint';
 
-    /**
-     * @var boolean
-     */
-    private $is_gql_request;
+	/**
+	 * @var boolean
+	 */
+	private $is_gql_request;
 
 
-    /**
-     * GraphQLEndpoint constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(GraphQLEndpoint::OPTION_NAME, GraphQLEndpoint::DEFAULT_ENDPOINT, true);
-        add_action('graphql_register_settings', [$this, 'verifyAndSetEndpoint'], 20);
-    }
+	/**
+	 * GraphQLEndpoint constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(GraphQLEndpoint::OPTION_NAME, GraphQLEndpoint::DEFAULT_ENDPOINT, true);
+		add_action('graphql_register_settings', [$this, 'verifyAndSetEndpoint'], 20);
+	}
 
 
-    /**
-     * @return false|mixed|void
-     */
-    public function getEndpoint()
-    {
-        return $this->loadOption();
-    }
+	/**
+	 * @return false|mixed|void
+	 */
+	public function getEndpoint()
+	{
+		return $this->loadOption();
+	}
 
 
-    /**
-     * @return mixed|void|bool
-     */
-    public function isGraphqlRequest()
-    {
-        if (! isset($this->is_gql_request)) {
-            // grab the GQL endpoint that we saved in the future... wait... wut?
-            $endpoint = $this->getEndpoint();
-            if (! class_exists('WPGraphQL')) {
-                require_once EE_THIRD_PARTY . 'wp-graphql/src/Router.php';
-            }
-            // set our saved endpoint on the WP GQL Pouter class
-            // don't worry, this is a static property that they overwrite when they initialize things,
-            // and we are essentially getting the value from them anyways, so it should be ok (fingers crossed)
-            Router::$route = $endpoint;
-            // now call their function for checking if this is a GQL request
-            // because they use a bunch of filters and stuff we don't want to duplicate here
-            $this->is_gql_request = Router::is_graphql_http_request();
-        }
-        return $this->is_gql_request;
-    }
+	/**
+	 * @return mixed|void|bool
+	 */
+	public function isGraphqlRequest()
+	{
+		if (! isset($this->is_gql_request)) {
+			// grab the GQL endpoint that we saved in the future... wait... wut?
+			$endpoint = $this->getEndpoint();
+			if (! class_exists('WPGraphQL')) {
+				require_once EE_THIRD_PARTY . 'wp-graphql/src/Router.php';
+			}
+			// set our saved endpoint on the WP GQL Pouter class
+			// don't worry, this is a static property that they overwrite when they initialize things,
+			// and we are essentially getting the value from them anyways, so it should be ok (fingers crossed)
+			Router::$route = $endpoint;
+			// now call their function for checking if this is a GQL request
+			// because they use a bunch of filters and stuff we don't want to duplicate here
+			$this->is_gql_request = Router::is_graphql_http_request();
+		}
+		return $this->is_gql_request;
+	}
 
 
-    /**
-     * callback hooked into the graphql_register_settings action
-     * basically grabs the value for the 'graphql_endpoint' setting and saves it to our own WP option.
-     *
-     * i know, i know, i know...
-     * WHY are we saving the graphql_endpoint to a WP option if WP GraphQL is already doing the same ?!?!
-     *
-     * Because we perform our request type detection during `plugins_loaded`,
-     * but they don't settle on their endpoint until `after_setup_theme` has run,
-     * which is too late for us, so we are just going to save this separately so that we have it.
-     * Oh, and this will essentially recheck this value on EVERY request
-     * but will only update our saved value if it has actually changed
-     */
-    public function verifyAndSetEndpoint()
-    {
-        try {
-            $this->updateOption(
-                get_graphql_setting(
-                    'graphql_endpoint',
-                    apply_filters('graphql_endpoint', GraphQLEndpoint::DEFAULT_ENDPOINT)
-                )
-            );
-        } catch (Throwable $t) {
-            // eat it
-        }
-    }
+	/**
+	 * callback hooked into the graphql_register_settings action
+	 * basically grabs the value for the 'graphql_endpoint' setting and saves it to our own WP option.
+	 *
+	 * i know, i know, i know...
+	 * WHY are we saving the graphql_endpoint to a WP option if WP GraphQL is already doing the same ?!?!
+	 *
+	 * Because we perform our request type detection during `plugins_loaded`,
+	 * but they don't settle on their endpoint until `after_setup_theme` has run,
+	 * which is too late for us, so we are just going to save this separately so that we have it.
+	 * Oh, and this will essentially recheck this value on EVERY request
+	 * but will only update our saved value if it has actually changed
+	 */
+	public function verifyAndSetEndpoint()
+	{
+		try {
+			$this->updateOption(
+				get_graphql_setting(
+					'graphql_endpoint',
+					apply_filters('graphql_endpoint', GraphQLEndpoint::DEFAULT_ENDPOINT)
+				)
+			);
+		} catch (Throwable $t) {
+			// eat it
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -52,11 +52,11 @@
      */
     public function isGraphqlRequest()
     {
-        if (! isset($this->is_gql_request)) {
+        if ( ! isset($this->is_gql_request)) {
             // grab the GQL endpoint that we saved in the future... wait... wut?
             $endpoint = $this->getEndpoint();
-            if (! class_exists('WPGraphQL')) {
-                require_once EE_THIRD_PARTY . 'wp-graphql/src/Router.php';
+            if ( ! class_exists('WPGraphQL')) {
+                require_once EE_THIRD_PARTY.'wp-graphql/src/Router.php';
             }
             // set our saved endpoint on the WP GQL Pouter class
             // don't worry, this is a static property that they overwrite when they initialize things,

core/services/database/WordPressOption.php

Indentation +130 added lines, -130 removed lines

@@ -15,134 +15,134 @@
  */
 abstract class WordPressOption
 {
-    const NOT_SET_YET    = 'wordpress-option-value-not-yet-set';
-
-    /**
-     * WordPress makes it difficult to determine if an option was successfully saved or not
-     * which is sometimes really important to know if the information you are saving is critical.
-     * The following options allow us to have a better chance of knowing when an update actually failed
-     * or when it just didn't update because the value hasn't changed, but everything is safe.
-     */
-    const UPDATE_SUCCESS = 1;
-
-    const UPDATE_NONE    = 0;
-
-    const UPDATE_ERROR   = -1;
-
-    /**
-     * @var boolean
-     */
-    private $autoload;
-
-    /**
-     * @var mixed
-     */
-    private $default_value;
-
-    /**
-     * @var string
-     */
-    private $option_name;
-
-    /**
-     * @var mixed
-     */
-    private $value = WordPressOption::NOT_SET_YET;
-
-
-    /**
-     * WordPressOption constructor.
-     *
-     * @param bool   $autoload
-     * @param mixed  $default_value
-     * @param string $option_name
-     */
-    public function __construct(string $option_name, $default_value, bool $autoload = false)
-    {
-        $this->setAutoload($autoload);
-        $this->setDefaultValue($default_value);
-        $this->setOptionName($option_name);
-    }
-
-
-    /**
-     * @param bool|string $autoload
-     */
-    public function setAutoload($autoload): void
-    {
-        $this->autoload = filter_var($autoload, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param mixed $default_value
-     */
-    public function setDefaultValue($default_value): void
-    {
-        $this->default_value = $default_value;
-    }
-
-
-    /**
-     * @param string $option_name
-     */
-    public function setOptionName(string $option_name): void
-    {
-        $this->option_name = sanitize_key($option_name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getOptionName(): string
-    {
-        return $this->option_name;
-    }
-
-
-    /**
-     * @return false|mixed|void
-     */
-    public function loadOption()
-    {
-        if ($this->value === WordPressOption::NOT_SET_YET) {
-            $this->value = get_option($this->option_name, $this->default_value);
-        }
-        return $this->value;
-    }
-
-
-    /**
-     * @param $value
-     * @return int
-     */
-    public function updateOption($value) : int
-    {
-        // don't update if value has not changed since last update
-        if ($value === $this->value) {
-            return WordPressOption::UPDATE_NONE;
-        }
-        // because the options for updating differ when adding an option for the first time
-        // we use the WordPressOption::NOT_SET_YET to determine if things already exist in the db
-        if (get_option($this->option_name, WordPressOption::NOT_SET_YET) === WordPressOption::NOT_SET_YET) {
-            $updated = add_option($this->option_name, $value, '', $this->autoload());
-        } else {
-            $updated = update_option($this->option_name, $value);
-        }
-        if ($updated) {
-            $this->value = $value;
-            return WordPressOption::UPDATE_SUCCESS;
-        }
-        return WordPressOption::UPDATE_ERROR;
-    }
-
-
-    /**
-     * @return string
-     */
-    private function autoload() : string
-    {
-        return $this->autoload ? 'yes' : 'no';
-    }
+	const NOT_SET_YET    = 'wordpress-option-value-not-yet-set';
+
+	/**
+	 * WordPress makes it difficult to determine if an option was successfully saved or not
+	 * which is sometimes really important to know if the information you are saving is critical.
+	 * The following options allow us to have a better chance of knowing when an update actually failed
+	 * or when it just didn't update because the value hasn't changed, but everything is safe.
+	 */
+	const UPDATE_SUCCESS = 1;
+
+	const UPDATE_NONE    = 0;
+
+	const UPDATE_ERROR   = -1;
+
+	/**
+	 * @var boolean
+	 */
+	private $autoload;
+
+	/**
+	 * @var mixed
+	 */
+	private $default_value;
+
+	/**
+	 * @var string
+	 */
+	private $option_name;
+
+	/**
+	 * @var mixed
+	 */
+	private $value = WordPressOption::NOT_SET_YET;
+
+
+	/**
+	 * WordPressOption constructor.
+	 *
+	 * @param bool   $autoload
+	 * @param mixed  $default_value
+	 * @param string $option_name
+	 */
+	public function __construct(string $option_name, $default_value, bool $autoload = false)
+	{
+		$this->setAutoload($autoload);
+		$this->setDefaultValue($default_value);
+		$this->setOptionName($option_name);
+	}
+
+
+	/**
+	 * @param bool|string $autoload
+	 */
+	public function setAutoload($autoload): void
+	{
+		$this->autoload = filter_var($autoload, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param mixed $default_value
+	 */
+	public function setDefaultValue($default_value): void
+	{
+		$this->default_value = $default_value;
+	}
+
+
+	/**
+	 * @param string $option_name
+	 */
+	public function setOptionName(string $option_name): void
+	{
+		$this->option_name = sanitize_key($option_name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getOptionName(): string
+	{
+		return $this->option_name;
+	}
+
+
+	/**
+	 * @return false|mixed|void
+	 */
+	public function loadOption()
+	{
+		if ($this->value === WordPressOption::NOT_SET_YET) {
+			$this->value = get_option($this->option_name, $this->default_value);
+		}
+		return $this->value;
+	}
+
+
+	/**
+	 * @param $value
+	 * @return int
+	 */
+	public function updateOption($value) : int
+	{
+		// don't update if value has not changed since last update
+		if ($value === $this->value) {
+			return WordPressOption::UPDATE_NONE;
+		}
+		// because the options for updating differ when adding an option for the first time
+		// we use the WordPressOption::NOT_SET_YET to determine if things already exist in the db
+		if (get_option($this->option_name, WordPressOption::NOT_SET_YET) === WordPressOption::NOT_SET_YET) {
+			$updated = add_option($this->option_name, $value, '', $this->autoload());
+		} else {
+			$updated = update_option($this->option_name, $value);
+		}
+		if ($updated) {
+			$this->value = $value;
+			return WordPressOption::UPDATE_SUCCESS;
+		}
+		return WordPressOption::UPDATE_ERROR;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function autoload() : string
+	{
+		return $this->autoload ? 'yes' : 'no';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  */
 abstract class WordPressOption
 {
-    const NOT_SET_YET    = 'wordpress-option-value-not-yet-set';
+    const NOT_SET_YET = 'wordpress-option-value-not-yet-set';
 
     /**
      * WordPress makes it difficult to determine if an option was successfully saved or not

core/services/json/JsonDataHandler.php

Indentation +293 added lines, -293 removed lines

@@ -14,297 +14,297 @@
  */
 class JsonDataHandler
 {
-    const DATA_TYPE_ARRAY     = 'array';
-
-    const DATA_TYPE_OBJECT    = 'object';
-
-    const DATA_TYPE_USE_FLAGS = 'flags';
-
-    /**
-     * @var string
-     */
-    private $data_type;
-
-    /**
-     * @var array|stdClass
-     */
-    private $decoded_data;
-
-    /**
-     * JSON_BIGINT_AS_STRING,
-     * JSON_INVALID_UTF8_IGNORE,
-     * JSON_INVALID_UTF8_SUBSTITUTE,
-     * JSON_OBJECT_AS_ARRAY,
-     * JSON_THROW_ON_ERROR
-     *
-     * @var int
-     */
-    private $decode_flags;
-
-    /**
-     * @var int
-     */
-    private $depth;
-
-    /**
-     * @var string
-     */
-    private $encoded_data;
-
-    /**
-     * JSON_FORCE_OBJECT,
-     * JSON_HEX_QUOT,
-     * JSON_HEX_TAG,
-     * JSON_HEX_AMP,
-     * JSON_HEX_APOS,
-     * JSON_INVALID_UTF8_IGNORE,
-     * JSON_INVALID_UTF8_SUBSTITUTE,
-     * JSON_NUMERIC_CHECK,
-     * JSON_PARTIAL_OUTPUT_ON_ERROR,
-     * JSON_PRESERVE_ZERO_FRACTION,
-     * JSON_PRETTY_PRINT,
-     * JSON_UNESCAPED_LINE_TERMINATORS,
-     * JSON_UNESCAPED_SLASHES,
-     * JSON_UNESCAPED_UNICODE,
-     * JSON_THROW_ON_ERROR.
-     *
-     * @var int
-     */
-    private $encode_flags;
-
-    /**
-     * @var int
-     */
-    private $last_error_code;
-
-    /**
-     * @var string
-     */
-    private $last_error_msg;
-
-
-    /**
-     * JsonDataHandler constructor.
-     */
-    public function __construct()
-    {
-        if (!defined('JSON_INVALID_UTF8_IGNORE')) {
-            define('JSON_INVALID_UTF8_IGNORE', 1048576);
-        }
-        if (!defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
-            define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
-        }
-        if (!defined('JSON_THROW_ON_ERROR')) {
-            define('JSON_THROW_ON_ERROR', 4194304);
-        }
-    }
-
-
-    /**
-     * set $data_type, $decode_flags, $encode_flags, and depth all in one shot
-     *
-     * @param string $data_type
-     * @param int    $decode_flags
-     * @param int    $encode_flags
-     * @param int    $depth
-     */
-    public function configure(
-        string $data_type = JsonDataHandler::DATA_TYPE_USE_FLAGS,
-        int $decode_flags = 0,
-        int $encode_flags = 0,
-        int $depth = 512
-    ) {
-        $this->setDataType($data_type);
-        $this->setDecodeFlags($decode_flags);
-        $this->setDepth($depth);
-        $this->setEncodeFlags($encode_flags);
-    }
-
-
-    /**
-     * @param string $data_type
-     */
-    public function setDataType(string $data_type): void
-    {
-        $this->data_type = $data_type === JsonDataHandler::DATA_TYPE_ARRAY
-                           || $data_type === JsonDataHandler::DATA_TYPE_OBJECT
-                           || $data_type === JsonDataHandler::DATA_TYPE_USE_FLAGS
-            ? $data_type
-            : JsonDataHandler::DATA_TYPE_USE_FLAGS;
-    }
-
-
-    /**
-     * One or more Bitmask values:
-     * JSON_BIGINT_AS_STRING,
-     * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
-     * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
-     * JSON_OBJECT_AS_ARRAY,
-     * JSON_THROW_ON_ERROR              PHP >= 7.3
-     *
-     * pass multiple values separated with |
-     * ex: JSON_BIGINT_AS_STRING | JSON_INVALID_UTF8_IGNORE | JSON_OBJECT_AS_ARRAY
-     *
-     * @param int $decode_flags
-     */
-    public function setDecodeFlags(int $decode_flags): void
-    {
-        $this->decode_flags = $decode_flags === JSON_BIGINT_AS_STRING
-                              || $decode_flags === JSON_OBJECT_AS_ARRAY
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
-                              || $decode_flags === JSON_INVALID_UTF8_IGNORE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
-                              || $decode_flags === JSON_INVALID_UTF8_SUBSTITUTE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
-                              || $decode_flags === JSON_THROW_ON_ERROR
-            ? $decode_flags
-            : 0;
-    }
-
-
-    /**
-     * @param int $depth
-     */
-    public function setDepth(int $depth): void
-    {
-        $depth = absint($depth);
-        $this->depth = $depth ? $depth : 512;
-    }
-
-
-    /**
-     * One or more Bitmask values:
-     * JSON_FORCE_OBJECT,
-     * JSON_HEX_QUOT,
-     * JSON_HEX_TAG,
-     * JSON_HEX_AMP,
-     * JSON_HEX_APOS,
-     * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
-     * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
-     * JSON_NUMERIC_CHECK,
-     * JSON_PARTIAL_OUTPUT_ON_ERROR,
-     * JSON_PRESERVE_ZERO_FRACTION,
-     * JSON_PRETTY_PRINT,
-     * JSON_UNESCAPED_LINE_TERMINATORS,
-     * JSON_UNESCAPED_SLASHES,
-     * JSON_UNESCAPED_UNICODE,
-     * JSON_THROW_ON_ERROR.             PHP >= 7.3
-     *
-     * pass multiple values separated with |
-     * ex: JSON_FORCE_OBJECT | JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR
-     *
-     * @param int $encode_flags
-     */
-    public function setEncodeFlags(int $encode_flags): void
-    {
-        $this->encode_flags = $encode_flags === JSON_FORCE_OBJECT
-                              || $encode_flags === JSON_HEX_QUOT
-                              || $encode_flags === JSON_HEX_TAG
-                              || $encode_flags === JSON_HEX_AMP
-                              || $encode_flags === JSON_HEX_APOS
-                              || $encode_flags === JSON_NUMERIC_CHECK
-                              || $encode_flags === JSON_PARTIAL_OUTPUT_ON_ERROR
-                              || $encode_flags === JSON_PRESERVE_ZERO_FRACTION
-                              || $encode_flags === JSON_PRETTY_PRINT
-                              || $encode_flags === JSON_UNESCAPED_LINE_TERMINATORS
-                              || $encode_flags === JSON_UNESCAPED_SLASHES
-                              || $encode_flags === JSON_UNESCAPED_UNICODE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
-                              || $encode_flags === JSON_INVALID_UTF8_IGNORE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
-                              || $encode_flags === JSON_INVALID_UTF8_SUBSTITUTE
-                              // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
-                              || $encode_flags === JSON_THROW_ON_ERROR
-            ? $encode_flags
-            : 0;
-    }
-
-
-    /**
-     * @return bool|null
-     */
-    private function asAssociative()
-    {
-        switch ($this->data_type) {
-            case JsonDataHandler::DATA_TYPE_ARRAY:
-                return true;
-            case JsonDataHandler::DATA_TYPE_OBJECT:
-                return false;
-            case JsonDataHandler::DATA_TYPE_USE_FLAGS:
-                return null;
-        }
-        return null;
-    }
-
-
-    /**
-     * @param string $json
-     * @return array|mixed|stdClass
-     */
-    public function decodeJson(string $json)
-    {
-        $this->decoded_data    = json_decode($json, $this->asAssociative(), $this->depth, $this->decode_flags);
-        $this->last_error_code = json_last_error();
-        $this->last_error_msg  = json_last_error_msg();
-        return $this->decoded_data;
-    }
-
-
-    /**
-     * @param $data
-     * @return false|string
-     */
-    public function encodeData($data)
-    {
-        $this->encoded_data    = json_encode($data, $this->encode_flags, $this->depth);
-        $this->last_error_code = json_last_error();
-        $this->last_error_msg  = json_last_error_msg();
-        return $this->encoded_data;
-    }
-
-
-    /**
-     * @return array|stdClass
-     */
-    public function getDecodedData()
-    {
-        return $this->decoded_data;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getEncodedData(): string
-    {
-        return $this->encoded_data;
-    }
-
-
-    /**
-     * @param false $reset
-     * @return int
-     */
-    public function getLastErrorCode($reset = false)
-    {
-        $last_error = $this->last_error_code;
-        if ($reset) {
-            $this->last_error_code = JSON_ERROR_NONE;
-        }
-        return $last_error;
-    }
-
-
-    /**
-     * @param false $reset
-     * @return string
-     */
-    public function getLastErrorMessage($reset = false)
-    {
-        $last_error = $this->last_error_msg;
-        if ($reset) {
-            $this->last_error_msg = '';
-        }
-        return $last_error;
-    }
+	const DATA_TYPE_ARRAY     = 'array';
+
+	const DATA_TYPE_OBJECT    = 'object';
+
+	const DATA_TYPE_USE_FLAGS = 'flags';
+
+	/**
+	 * @var string
+	 */
+	private $data_type;
+
+	/**
+	 * @var array|stdClass
+	 */
+	private $decoded_data;
+
+	/**
+	 * JSON_BIGINT_AS_STRING,
+	 * JSON_INVALID_UTF8_IGNORE,
+	 * JSON_INVALID_UTF8_SUBSTITUTE,
+	 * JSON_OBJECT_AS_ARRAY,
+	 * JSON_THROW_ON_ERROR
+	 *
+	 * @var int
+	 */
+	private $decode_flags;
+
+	/**
+	 * @var int
+	 */
+	private $depth;
+
+	/**
+	 * @var string
+	 */
+	private $encoded_data;
+
+	/**
+	 * JSON_FORCE_OBJECT,
+	 * JSON_HEX_QUOT,
+	 * JSON_HEX_TAG,
+	 * JSON_HEX_AMP,
+	 * JSON_HEX_APOS,
+	 * JSON_INVALID_UTF8_IGNORE,
+	 * JSON_INVALID_UTF8_SUBSTITUTE,
+	 * JSON_NUMERIC_CHECK,
+	 * JSON_PARTIAL_OUTPUT_ON_ERROR,
+	 * JSON_PRESERVE_ZERO_FRACTION,
+	 * JSON_PRETTY_PRINT,
+	 * JSON_UNESCAPED_LINE_TERMINATORS,
+	 * JSON_UNESCAPED_SLASHES,
+	 * JSON_UNESCAPED_UNICODE,
+	 * JSON_THROW_ON_ERROR.
+	 *
+	 * @var int
+	 */
+	private $encode_flags;
+
+	/**
+	 * @var int
+	 */
+	private $last_error_code;
+
+	/**
+	 * @var string
+	 */
+	private $last_error_msg;
+
+
+	/**
+	 * JsonDataHandler constructor.
+	 */
+	public function __construct()
+	{
+		if (!defined('JSON_INVALID_UTF8_IGNORE')) {
+			define('JSON_INVALID_UTF8_IGNORE', 1048576);
+		}
+		if (!defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
+			define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
+		}
+		if (!defined('JSON_THROW_ON_ERROR')) {
+			define('JSON_THROW_ON_ERROR', 4194304);
+		}
+	}
+
+
+	/**
+	 * set $data_type, $decode_flags, $encode_flags, and depth all in one shot
+	 *
+	 * @param string $data_type
+	 * @param int    $decode_flags
+	 * @param int    $encode_flags
+	 * @param int    $depth
+	 */
+	public function configure(
+		string $data_type = JsonDataHandler::DATA_TYPE_USE_FLAGS,
+		int $decode_flags = 0,
+		int $encode_flags = 0,
+		int $depth = 512
+	) {
+		$this->setDataType($data_type);
+		$this->setDecodeFlags($decode_flags);
+		$this->setDepth($depth);
+		$this->setEncodeFlags($encode_flags);
+	}
+
+
+	/**
+	 * @param string $data_type
+	 */
+	public function setDataType(string $data_type): void
+	{
+		$this->data_type = $data_type === JsonDataHandler::DATA_TYPE_ARRAY
+						   || $data_type === JsonDataHandler::DATA_TYPE_OBJECT
+						   || $data_type === JsonDataHandler::DATA_TYPE_USE_FLAGS
+			? $data_type
+			: JsonDataHandler::DATA_TYPE_USE_FLAGS;
+	}
+
+
+	/**
+	 * One or more Bitmask values:
+	 * JSON_BIGINT_AS_STRING,
+	 * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
+	 * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
+	 * JSON_OBJECT_AS_ARRAY,
+	 * JSON_THROW_ON_ERROR              PHP >= 7.3
+	 *
+	 * pass multiple values separated with |
+	 * ex: JSON_BIGINT_AS_STRING | JSON_INVALID_UTF8_IGNORE | JSON_OBJECT_AS_ARRAY
+	 *
+	 * @param int $decode_flags
+	 */
+	public function setDecodeFlags(int $decode_flags): void
+	{
+		$this->decode_flags = $decode_flags === JSON_BIGINT_AS_STRING
+							  || $decode_flags === JSON_OBJECT_AS_ARRAY
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
+							  || $decode_flags === JSON_INVALID_UTF8_IGNORE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
+							  || $decode_flags === JSON_INVALID_UTF8_SUBSTITUTE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
+							  || $decode_flags === JSON_THROW_ON_ERROR
+			? $decode_flags
+			: 0;
+	}
+
+
+	/**
+	 * @param int $depth
+	 */
+	public function setDepth(int $depth): void
+	{
+		$depth = absint($depth);
+		$this->depth = $depth ? $depth : 512;
+	}
+
+
+	/**
+	 * One or more Bitmask values:
+	 * JSON_FORCE_OBJECT,
+	 * JSON_HEX_QUOT,
+	 * JSON_HEX_TAG,
+	 * JSON_HEX_AMP,
+	 * JSON_HEX_APOS,
+	 * JSON_INVALID_UTF8_IGNORE,        PHP >= 7.2
+	 * JSON_INVALID_UTF8_SUBSTITUTE,    PHP >= 7.2
+	 * JSON_NUMERIC_CHECK,
+	 * JSON_PARTIAL_OUTPUT_ON_ERROR,
+	 * JSON_PRESERVE_ZERO_FRACTION,
+	 * JSON_PRETTY_PRINT,
+	 * JSON_UNESCAPED_LINE_TERMINATORS,
+	 * JSON_UNESCAPED_SLASHES,
+	 * JSON_UNESCAPED_UNICODE,
+	 * JSON_THROW_ON_ERROR.             PHP >= 7.3
+	 *
+	 * pass multiple values separated with |
+	 * ex: JSON_FORCE_OBJECT | JSON_INVALID_UTF8_IGNORE | JSON_THROW_ON_ERROR
+	 *
+	 * @param int $encode_flags
+	 */
+	public function setEncodeFlags(int $encode_flags): void
+	{
+		$this->encode_flags = $encode_flags === JSON_FORCE_OBJECT
+							  || $encode_flags === JSON_HEX_QUOT
+							  || $encode_flags === JSON_HEX_TAG
+							  || $encode_flags === JSON_HEX_AMP
+							  || $encode_flags === JSON_HEX_APOS
+							  || $encode_flags === JSON_NUMERIC_CHECK
+							  || $encode_flags === JSON_PARTIAL_OUTPUT_ON_ERROR
+							  || $encode_flags === JSON_PRESERVE_ZERO_FRACTION
+							  || $encode_flags === JSON_PRETTY_PRINT
+							  || $encode_flags === JSON_UNESCAPED_LINE_TERMINATORS
+							  || $encode_flags === JSON_UNESCAPED_SLASHES
+							  || $encode_flags === JSON_UNESCAPED_UNICODE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_ignoreFound
+							  || $encode_flags === JSON_INVALID_UTF8_IGNORE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_invalid_utf8_substituteFound
+							  || $encode_flags === JSON_INVALID_UTF8_SUBSTITUTE
+							  // phpcs:ignore PHPCompatibility.Constants.NewConstants.json_throw_on_errorFound
+							  || $encode_flags === JSON_THROW_ON_ERROR
+			? $encode_flags
+			: 0;
+	}
+
+
+	/**
+	 * @return bool|null
+	 */
+	private function asAssociative()
+	{
+		switch ($this->data_type) {
+			case JsonDataHandler::DATA_TYPE_ARRAY:
+				return true;
+			case JsonDataHandler::DATA_TYPE_OBJECT:
+				return false;
+			case JsonDataHandler::DATA_TYPE_USE_FLAGS:
+				return null;
+		}
+		return null;
+	}
+
+
+	/**
+	 * @param string $json
+	 * @return array|mixed|stdClass
+	 */
+	public function decodeJson(string $json)
+	{
+		$this->decoded_data    = json_decode($json, $this->asAssociative(), $this->depth, $this->decode_flags);
+		$this->last_error_code = json_last_error();
+		$this->last_error_msg  = json_last_error_msg();
+		return $this->decoded_data;
+	}
+
+
+	/**
+	 * @param $data
+	 * @return false|string
+	 */
+	public function encodeData($data)
+	{
+		$this->encoded_data    = json_encode($data, $this->encode_flags, $this->depth);
+		$this->last_error_code = json_last_error();
+		$this->last_error_msg  = json_last_error_msg();
+		return $this->encoded_data;
+	}
+
+
+	/**
+	 * @return array|stdClass
+	 */
+	public function getDecodedData()
+	{
+		return $this->decoded_data;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getEncodedData(): string
+	{
+		return $this->encoded_data;
+	}
+
+
+	/**
+	 * @param false $reset
+	 * @return int
+	 */
+	public function getLastErrorCode($reset = false)
+	{
+		$last_error = $this->last_error_code;
+		if ($reset) {
+			$this->last_error_code = JSON_ERROR_NONE;
+		}
+		return $last_error;
+	}
+
+
+	/**
+	 * @param false $reset
+	 * @return string
+	 */
+	public function getLastErrorMessage($reset = false)
+	{
+		$last_error = $this->last_error_msg;
+		if ($reset) {
+			$this->last_error_msg = '';
+		}
+		return $last_error;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -88,13 +88,13 @@
      */
     public function __construct()
     {
-        if (!defined('JSON_INVALID_UTF8_IGNORE')) {
+        if ( ! defined('JSON_INVALID_UTF8_IGNORE')) {
             define('JSON_INVALID_UTF8_IGNORE', 1048576);
         }
-        if (!defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
+        if ( ! defined('JSON_INVALID_UTF8_SUBSTITUTE')) {
             define('JSON_INVALID_UTF8_SUBSTITUTE', 2097152);
         }
-        if (!defined('JSON_THROW_ON_ERROR')) {
+        if ( ! defined('JSON_THROW_ON_ERROR')) {
             define('JSON_THROW_ON_ERROR', 4194304);
         }
     }

core/services/json/JsonDataWordpressOption.php

Indentation +83 added lines, -83 removed lines

@@ -16,87 +16,87 @@
 abstract class JsonDataWordpressOption extends WordPressOption
 {
 
-    /**
-     * @var array
-     */
-    private $options;
-
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
-
-
-    /**
-     * JsonDataWordpressOption constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param string          $option_name
-     * @param                 $default_value
-     */
-    public function __construct(JsonDataHandler $json_data_handler, string $option_name, $default_value)
-    {
-        $this->json_data_handler = $json_data_handler;
-        $this->json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        parent::__construct($option_name, $default_value);
-    }
-
-
-    /**
-     * @param $options
-     */
-    private function update($options)
-    {
-        if ($this->updateOption($this->json_data_handler->encodeData($options))) {
-            $this->options = $options;
-        }
-    }
-
-
-    /**
-     * @param string $property
-     * @param mixed  $value
-     * @return void
-     */
-    public function addProperty(string $property, $value)
-    {
-        $options = $this->getAll();
-        $options->{$property} = $value;
-        $this->update($options);
-    }
-
-
-    /**
-     * @param string $property
-     * @return mixed
-     */
-    public function getProperty(string $property)
-    {
-        $options = $this->getAll();
-        return property_exists($options, $property) ? $options->{$property} : null;
-    }
-
-
-    /**
-     * @return array|mixed|stdClass
-     */
-    public function getAll()
-    {
-        if (empty($this->options)) {
-            $this->options = $this->json_data_handler->decodeJson($this->loadOption());
-        }
-        return $this->options;
-    }
-
-
-    /**
-     * @param string $property
-     * @return void
-     */
-    public function removeProperty(string $property)
-    {
-        $options = $this->getAll();
-        unset($options->{$property});
-        $this->update($options);
-    }
+	/**
+	 * @var array
+	 */
+	private $options;
+
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
+
+
+	/**
+	 * JsonDataWordpressOption constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param string          $option_name
+	 * @param                 $default_value
+	 */
+	public function __construct(JsonDataHandler $json_data_handler, string $option_name, $default_value)
+	{
+		$this->json_data_handler = $json_data_handler;
+		$this->json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		parent::__construct($option_name, $default_value);
+	}
+
+
+	/**
+	 * @param $options
+	 */
+	private function update($options)
+	{
+		if ($this->updateOption($this->json_data_handler->encodeData($options))) {
+			$this->options = $options;
+		}
+	}
+
+
+	/**
+	 * @param string $property
+	 * @param mixed  $value
+	 * @return void
+	 */
+	public function addProperty(string $property, $value)
+	{
+		$options = $this->getAll();
+		$options->{$property} = $value;
+		$this->update($options);
+	}
+
+
+	/**
+	 * @param string $property
+	 * @return mixed
+	 */
+	public function getProperty(string $property)
+	{
+		$options = $this->getAll();
+		return property_exists($options, $property) ? $options->{$property} : null;
+	}
+
+
+	/**
+	 * @return array|mixed|stdClass
+	 */
+	public function getAll()
+	{
+		if (empty($this->options)) {
+			$this->options = $this->json_data_handler->decodeJson($this->loadOption());
+		}
+		return $this->options;
+	}
+
+
+	/**
+	 * @param string $property
+	 * @return void
+	 */
+	public function removeProperty(string $property)
+	{
+		$options = $this->getAll();
+		unset($options->{$property});
+		$this->update($options);
+	}
 }

core/services/request/middleware/SetRequestTypeContextChecker.php

Indentation +43 added lines, -43 removed lines

@@ -20,47 +20,47 @@
 class SetRequestTypeContextChecker extends Middleware
 {
 
-    /**
-     * converts a Request to a Response
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     * @throws InvalidArgumentException
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        /** @var GraphQLEndpoint $gql_endpoint */
-        $gql_endpoint = $this->loader->getShared('EventEspresso\core\services\graphql\GraphQLEndpoint');
-        /** @var RequestTypeContextFactoryInterface $request_type_context_factory */
-        $request_type_context_factory = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
-            [$this->loader]
-        );
-        /** @var RequestTypeContextDetector $request_type_context_detector */
-        $request_type_context_detector = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
-            [
-                $gql_endpoint,
-                $this->request,
-                $request_type_context_factory,
-                [
-                    'DOING_AJAX' => defined('DOING_AJAX') && DOING_AJAX,
-                    'WP_CLI'     => defined('WP_CLI') && WP_CLI,
-                    'is_admin'   => is_admin(),
-                ],
-            ]
-        );
-        $request_type_context = $request_type_context_detector->detectRequestTypeContext();
-        $request_type_context->setIsUnitTesting(defined('EE_TESTS_DIR'));
-        $request_type_context_checker = $this->loader->getShared(
-            'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
-            [$request_type_context]
-        );
-        $this->request->setRequestTypeContextChecker($request_type_context_checker);
-        $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
+	 * @throws InvalidArgumentException
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		/** @var GraphQLEndpoint $gql_endpoint */
+		$gql_endpoint = $this->loader->getShared('EventEspresso\core\services\graphql\GraphQLEndpoint');
+		/** @var RequestTypeContextFactoryInterface $request_type_context_factory */
+		$request_type_context_factory = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextFactory',
+			[$this->loader]
+		);
+		/** @var RequestTypeContextDetector $request_type_context_detector */
+		$request_type_context_detector = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextDetector',
+			[
+				$gql_endpoint,
+				$this->request,
+				$request_type_context_factory,
+				[
+					'DOING_AJAX' => defined('DOING_AJAX') && DOING_AJAX,
+					'WP_CLI'     => defined('WP_CLI') && WP_CLI,
+					'is_admin'   => is_admin(),
+				],
+			]
+		);
+		$request_type_context = $request_type_context_detector->detectRequestTypeContext();
+		$request_type_context->setIsUnitTesting(defined('EE_TESTS_DIR'));
+		$request_type_context_checker = $this->loader->getShared(
+			'EventEspresso\core\domain\services\contexts\RequestTypeContextChecker',
+			[$request_type_context]
+		);
+		$this->request->setRequestTypeContextChecker($request_type_context_checker);
+		$this->response = $this->processRequestStack($this->request, $this->response);
+		return $this->response;
+	}
 }