eventespresso / event-espresso-core

core/services/request/RequestInterface.php

Indentation +218 added lines, -218 removed lines

@@ -15,224 +15,224 @@
  */
 interface RequestInterface extends RequestTypeContextCheckerInterface
 {
-    /**
-     * @param RequestTypeContextCheckerInterface $type
-     */
-    public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type);
+	/**
+	 * @param RequestTypeContextCheckerInterface $type
+	 */
+	public function setRequestTypeContextChecker(RequestTypeContextCheckerInterface $type);
 
 
-    /**
-     * @return array
-     */
-    public function getParams();
-
-
-    /**
-     * @return array
-     */
-    public function postParams();
-
-
-    /**
-     * @return array
-     */
-    public function cookieParams();
-
-
-    /**
-     * @return array
-     */
-    public function serverParams();
-
-
-    /**
-     * @param string $key
-     * @param mixed|null $default
-     * @return array|int|float|string
-     */
-    public function getServerParam($key, $default = null);
-
-
-    /**
-     * @param string                 $key
-     * @param array|int|float|string $value
-     * @param bool                   $set_global_too
-     * @return void
-     */
-    public function setServerParam(string $key, $value, bool $set_global_too = false);
-
-
-    /**
-     * @param string $key
-     * @return bool
-     */
-    public function serverParamIsSet($key);
-
-
-    /**
-     * @return array
-     */
-    public function filesParams();
-
-
-    /**
-     * returns sanitized contents of $_REQUEST
-     *
-     * @return array
-     */
-    public function requestParams();
-
-
-    /**
-     * @param string $key
-     * @param string $value
-     * @param bool   $override_ee
-     * @return void
-     */
-    public function setRequestParam($key, $value, $override_ee = false);
-
-
-    /**
-     * returns   the value for a request param if the given key exists
-     *
-     * @param string     $key
-     * @param mixed|null $default
-     * @param string     $type      the expected data type for the parameter's value, ie: string, int, bool, etc
-     * @param bool       $is_array  if true, then parameter value will be treated as an array of $type
-     * @param string     $delimiter for CSV type strings that should be returned as an array
-     * @return array|bool|float|int|string
-     */
-    public function getRequestParam($key, $default = null, $type = DataType::STRING, $is_array = false, $delimiter = '');
-
-
-    /**
-     * check if param exists
-     *
-     * @param string $key
-     * @return bool
-     */
-    public function requestParamIsSet($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 mixed|null $default
-     * @param string     $type      the expected data type for the parameter's value, ie: string, int, bool, etc
-     * @param bool       $is_array  if true, then parameter value will be treated as an array of $type
-     * @param string     $delimiter for CSV type strings that should be returned as an array
-     * @return array|bool|float|int|string
-     */
-    public function getMatch($pattern, $default = null, $type = DataType::STRING, $is_array = false, $delimiter = '');
-
-
-    /**
-     * check if a request parameter exists whose key matches the supplied wildcard pattern
-     * wildcards can be either of the following:
-     *      ? to represent a single character of any type
-     *      * to represent one or more characters of any type
-     * returns true if a match is found or false if not
-     *
-     * @param string $pattern
-     * @return false|int
-     */
-    public function matches($pattern);
-
-
-    /**
-     * remove param
-     *
-     * @param string $key
-     * @param bool   $unset_from_global_too
-     */
-    public function unSetRequestParam($key, $unset_from_global_too = false);
-
-
-    /**
-     * remove params
-     *
-     * @param array $keys
-     * @param bool  $unset_from_global_too
-     */
-    public function unSetRequestParams(array $keys, $unset_from_global_too = false);
-
-
-    /**
-     * @param string $key
-     * @param bool   $unset_from_global_too
-     * @return void
-     */
-    public function unSetServerParam(string $key, bool $unset_from_global_too = false);
-
-
-    /**
-     * @return string
-     */
-    public function ipAddress();
-
-
-    /**
-     * @param boolean $relativeToWpRoot    whether or not to return the uri relative to WordPress' home URL.
-     * @param boolean $remove_query_params whether or not to return the uri with all query params removed.
-     * @return string
-     */
-    public function requestUri($relativeToWpRoot = false, $remove_query_params = false);
-
-
-    /**
-     * @return string
-     */
-    public function userAgent();
-
-
-    /**
-     * @param string $user_agent
-     */
-    public function setUserAgent($user_agent = '');
-
-
-    /**
-     * @return bool
-     */
-    public function isBot();
-
-
-    /**
-     * @param bool $is_bot
-     */
-    public function setIsBot($is_bot);
-
-
-    /**
-     * returns the path portion of the current request URI with both the WP Root (home_url()) and query params removed
-     *
-     * @return string
-     * @since   $VID:$
-     */
-    public function requestPath();
-
-
-    /**
-     * returns true if the last segment of the current request path (without params) matches the provided string
-     *
-     * @param string $uri_segment
-     * @return bool
-     * @since   $VID:$
-     */
-    public function currentPageIs($uri_segment);
-
-
-    /**
-     * merges the incoming array of parameters into the existing request parameters
-     *
-     * @param array $request_params
-     * @return mixed
-     * @since   4.10.24.p
-     */
-    public function mergeRequestParams(array $request_params);
+	/**
+	 * @return array
+	 */
+	public function getParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function postParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function cookieParams();
+
+
+	/**
+	 * @return array
+	 */
+	public function serverParams();
+
+
+	/**
+	 * @param string $key
+	 * @param mixed|null $default
+	 * @return array|int|float|string
+	 */
+	public function getServerParam($key, $default = null);
+
+
+	/**
+	 * @param string                 $key
+	 * @param array|int|float|string $value
+	 * @param bool                   $set_global_too
+	 * @return void
+	 */
+	public function setServerParam(string $key, $value, bool $set_global_too = false);
+
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	public function serverParamIsSet($key);
+
+
+	/**
+	 * @return array
+	 */
+	public function filesParams();
+
+
+	/**
+	 * returns sanitized contents of $_REQUEST
+	 *
+	 * @return array
+	 */
+	public function requestParams();
+
+
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @param bool   $override_ee
+	 * @return void
+	 */
+	public function setRequestParam($key, $value, $override_ee = false);
+
+
+	/**
+	 * returns   the value for a request param if the given key exists
+	 *
+	 * @param string     $key
+	 * @param mixed|null $default
+	 * @param string     $type      the expected data type for the parameter's value, ie: string, int, bool, etc
+	 * @param bool       $is_array  if true, then parameter value will be treated as an array of $type
+	 * @param string     $delimiter for CSV type strings that should be returned as an array
+	 * @return array|bool|float|int|string
+	 */
+	public function getRequestParam($key, $default = null, $type = DataType::STRING, $is_array = false, $delimiter = '');
+
+
+	/**
+	 * check if param exists
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function requestParamIsSet($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 mixed|null $default
+	 * @param string     $type      the expected data type for the parameter's value, ie: string, int, bool, etc
+	 * @param bool       $is_array  if true, then parameter value will be treated as an array of $type
+	 * @param string     $delimiter for CSV type strings that should be returned as an array
+	 * @return array|bool|float|int|string
+	 */
+	public function getMatch($pattern, $default = null, $type = DataType::STRING, $is_array = false, $delimiter = '');
+
+
+	/**
+	 * check if a request parameter exists whose key matches the supplied wildcard pattern
+	 * wildcards can be either of the following:
+	 *      ? to represent a single character of any type
+	 *      * to represent one or more characters of any type
+	 * returns true if a match is found or false if not
+	 *
+	 * @param string $pattern
+	 * @return false|int
+	 */
+	public function matches($pattern);
+
+
+	/**
+	 * remove param
+	 *
+	 * @param string $key
+	 * @param bool   $unset_from_global_too
+	 */
+	public function unSetRequestParam($key, $unset_from_global_too = false);
+
+
+	/**
+	 * remove params
+	 *
+	 * @param array $keys
+	 * @param bool  $unset_from_global_too
+	 */
+	public function unSetRequestParams(array $keys, $unset_from_global_too = false);
+
+
+	/**
+	 * @param string $key
+	 * @param bool   $unset_from_global_too
+	 * @return void
+	 */
+	public function unSetServerParam(string $key, bool $unset_from_global_too = false);
+
+
+	/**
+	 * @return string
+	 */
+	public function ipAddress();
+
+
+	/**
+	 * @param boolean $relativeToWpRoot    whether or not to return the uri relative to WordPress' home URL.
+	 * @param boolean $remove_query_params whether or not to return the uri with all query params removed.
+	 * @return string
+	 */
+	public function requestUri($relativeToWpRoot = false, $remove_query_params = false);
+
+
+	/**
+	 * @return string
+	 */
+	public function userAgent();
+
+
+	/**
+	 * @param string $user_agent
+	 */
+	public function setUserAgent($user_agent = '');
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBot();
+
+
+	/**
+	 * @param bool $is_bot
+	 */
+	public function setIsBot($is_bot);
+
+
+	/**
+	 * returns the path portion of the current request URI with both the WP Root (home_url()) and query params removed
+	 *
+	 * @return string
+	 * @since   $VID:$
+	 */
+	public function requestPath();
+
+
+	/**
+	 * returns true if the last segment of the current request path (without params) matches the provided string
+	 *
+	 * @param string $uri_segment
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function currentPageIs($uri_segment);
+
+
+	/**
+	 * merges the incoming array of parameters into the existing request parameters
+	 *
+	 * @param array $request_params
+	 * @return mixed
+	 * @since   4.10.24.p
+	 */
+	public function mergeRequestParams(array $request_params);
 }

core/services/routing/RouteInterface.php

Indentation +36 added lines, -36 removed lines

@@ -18,50 +18,50 @@
  */
 interface RouteInterface
 {
-    /**
-     * @return JsonDataNode
-     */
-    public function dataNode(): ?JsonDataNode;
+	/**
+	 * @return JsonDataNode
+	 */
+	public function dataNode(): ?JsonDataNode;
 
 
-    /**
-     * final method called by RouteHandler on Route which in turn calls requestHandler()
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function handleRequest(): bool;
+	/**
+	 * final method called by RouteHandler on Route which in turn calls requestHandler()
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function handleRequest(): bool;
 
 
-    /**
-     * a place to run any setup required for matchesCurrentRequest() which runs immediately after
-     *
-     * @since $VID:$
-     */
-    public function initialize();
+	/**
+	 * a place to run any setup required for matchesCurrentRequest() which runs immediately after
+	 *
+	 * @since $VID:$
+	 */
+	public function initialize();
 
 
-    /**
-     * returns true if the route has already been handled
-     *
-     * @return bool
-     */
-    public function isHandled(): bool;
+	/**
+	 * returns true if the route has already been handled
+	 *
+	 * @return bool
+	 */
+	public function isHandled(): bool;
 
 
-    /**
-     * returns true if the route has not yet been handled
-     *
-     * @return bool
-     */
-    public function isNotHandled(): bool;
+	/**
+	 * returns true if the route has not yet been handled
+	 *
+	 * @return bool
+	 */
+	public function isNotHandled(): bool;
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest(): bool;
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest(): bool;
 }

core/services/json/JsonDataNodeInterface.php

Indentation +45 added lines, -45 removed lines

@@ -18,61 +18,61 @@
  */
 interface JsonDataNodeInterface extends JsonSerializable
 {
-    /**
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    public function addDataNode(JsonDataNode $data_node);
+	/**
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	public function addDataNode(JsonDataNode $data_node);
 
 
-    /**
-     * the actual data in key value array format
-     *
-     * @return array
-     */
-    public function data();
+	/**
+	 * the actual data in key value array format
+	 *
+	 * @return array
+	 */
+	public function data();
 
 
-    /**
-     * specifies the domain (use case) that this route defines
-     * ! IMPORTANT !
-     * only one domain can be set pre request
-     *
-     * @return string
-     */
-    public function domain();
+	/**
+	 * specifies the domain (use case) that this route defines
+	 * ! IMPORTANT !
+	 * only one domain can be set pre request
+	 *
+	 * @return string
+	 */
+	public function domain();
 
 
-    /**
-     * !!! IMPORTANT !!!
-     * JsonDataNode::setInitialized(true) needs to be called once initialization is complete
-     * else you're a bad person and bad things will happen to you !!!
-     *
-     * @since $VID:$
-     */
-    public function initialize();
+	/**
+	 * !!! IMPORTANT !!!
+	 * JsonDataNode::setInitialized(true) needs to be called once initialization is complete
+	 * else you're a bad person and bad things will happen to you !!!
+	 *
+	 * @since $VID:$
+	 */
+	public function initialize();
 
 
-    /**
-     * true if the data node has been initialized,
-     * which entails retrieving the required data and adding it to the data node data array
-     *
-     * @return bool
-     */
-    public function isInitialized();
+	/**
+	 * true if the data node has been initialized,
+	 * which entails retrieving the required data and adding it to the data node data array
+	 *
+	 * @return bool
+	 */
+	public function isInitialized();
 
 
-    /**
-     * true if the data node has NOT been initialized
-     *
-     * @return bool
-     */
-    public function isNotInitialized();
+	/**
+	 * true if the data node has NOT been initialized
+	 *
+	 * @return bool
+	 */
+	public function isNotInitialized();
 
 
-    /**
-     * @return string
-     * @since $VID:$
-     */
-    public function nodeName();
+	/**
+	 * @return string
+	 * @since $VID:$
+	 */
+	public function nodeName();
 }

core/services/json/JsonConfig.php

Indentation +187 added lines, -187 removed lines

@@ -16,191 +16,191 @@
  */
 abstract class JsonConfig
 {
-    /**
-     * @var boolean $has_changes
-     */
-    private $has_changes = false;
-
-    /**
-     * @var string $option_name
-     */
-    private $option_name;
-
-
-    /**
-     * SettingsConfig constructor.
-     *
-     * @param array $defaults
-     */
-    public function __construct(array $defaults)
-    {
-        $this->setOptionName();
-        $this->load($defaults);
-        $this->clearChanges();
-    }
-
-
-    /**
-     * @return array
-     */
-    abstract protected function getProperties();
-
-
-    /**
-     * converts property name to:
-     *      camelCase for getters ex: show_expired => showExpired
-     *      PascalCase for setters ex: show_expired => ShowExpired
-     *
-     * @param string $string
-     * @param false  $camelCase
-     * @return string|string[]
-     * @since   $VID:$
-     */
-    private function convertCase($string, $camelCase = false)
-    {
-        $string = str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
-        if ($camelCase) {
-            $string = lcfirst($string);
-        }
-        return $string;
-    }
-
-
-    /**
-     * @param string $property
-     * @param bool   $getter
-     * @return string
-     */
-    private function createGetterSetter($property, $getter = true)
-    {
-        $setterOrGetter = $this->convertCase($property, $getter);
-        // if not a getter, prepend with "set". ex: Show_expired => setShowExpired
-        $setterOrGetter = ! $getter ? 'set' . $setterOrGetter : $setterOrGetter;
-        return $this->isValidMethod($setterOrGetter) ? $setterOrGetter : '';
-    }
-
-
-    /**
-     * @param string $method
-     * @return bool
-     * @throws DomainException
-     */
-    private function isValidMethod($method)
-    {
-        if (method_exists($this, $method)) {
-            return true;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__('Missing %1$s method on JsonConfig class %2$s.', 'event_espresso'),
-                $method,
-                get_class($this)
-            )
-        );
-    }
-
-
-    /**
-     * converts class name to option name by changing backslashes to dashes
-     */
-    private function setOptionName()
-    {
-        $this->option_name = str_replace(['EventEspresso', '\\'], ['ee', '-'], get_class($this));
-    }
-
-
-    /**
-     * retrieves WP option for class, decodes the data, and resigns values to properties
-     *
-     * @param array $defaults
-     */
-    protected function load(array $defaults)
-    {
-        $config = get_option($this->option_name, '{}');
-        $config = (array) json_decode($config) + $defaults;
-        foreach ($this->getProperties() as $property => $value) {
-            if ($property === 'option_name') {
-                continue;
-            }
-            // convert to PascalCase and prepend with "set". ex: show_expired => setShowExpired
-            $setter = $this->createGetterSetter($property, false);
-            $value  = array_key_exists($property, $config) ? $config[ $property ] : null;
-            $this->{$setter}($value);
-        }
-    }
-
-
-    /**
-     * updates property value and marks changes if property value has changed
-     *
-     * @param string $property
-     * @param mixed  $value
-     */
-    protected function setProperty($property, $value)
-    {
-        $this->markChanges($this->{$property} === $value);
-        $this->{$property} = $value;
-    }
-
-
-    /**
-     * will only toggle has_changes to true otherwise keeps existing value (ie: will never toggle to false)
-     * why? this allows this method to be fed with the result of a conditional
-     * that compares an incoming value in a setter with it's previously set value.
-     * ie: if $x = 1 and you call setX(1) then the value has not really changed.
-     *
-     * @param bool $changes
-     * @since   $VID:$
-     */
-    protected function markChanges($changes = true)
-    {
-        $this->has_changes = filter_var($changes, FILTER_VALIDATE_BOOLEAN) ? true : $this->has_changes;
-    }
-
-
-    /**
-     * resets $has_changes flag to false but does NOT actually reset any data
-     */
-    public function clearChanges()
-    {
-        $this->has_changes = false;
-    }
-
-
-    /**
-     * flag for marking that changes have been made to property data
-     *
-     * @return bool
-     */
-    public function hasChanges()
-    {
-        return $this->has_changes;
-    }
-
-
-    /**
-     * encodes all property data to JSON and saves it to a WP option
-     */
-    public function update()
-    {
-        $config_exists = get_option($this->option_name);
-        if ($config_exists && ! $this->has_changes) {
-            return;
-        }
-        $config = [];
-        foreach ($this->getProperties() as $property => $value) {
-            if ($property === 'option_name') {
-                continue;
-            }
-            $getter = $this->createGetterSetter($property);
-            $config[ $property ] = $this->{$getter}();
-        }
-        $config = wp_json_encode($config);
-        if ($config_exists) {
-            update_option($this->option_name, $config);
-        } else {
-            add_option($this->option_name, $config, '', 'no');
-        }
-        $this->clearChanges();
-    }
+	/**
+	 * @var boolean $has_changes
+	 */
+	private $has_changes = false;
+
+	/**
+	 * @var string $option_name
+	 */
+	private $option_name;
+
+
+	/**
+	 * SettingsConfig constructor.
+	 *
+	 * @param array $defaults
+	 */
+	public function __construct(array $defaults)
+	{
+		$this->setOptionName();
+		$this->load($defaults);
+		$this->clearChanges();
+	}
+
+
+	/**
+	 * @return array
+	 */
+	abstract protected function getProperties();
+
+
+	/**
+	 * converts property name to:
+	 *      camelCase for getters ex: show_expired => showExpired
+	 *      PascalCase for setters ex: show_expired => ShowExpired
+	 *
+	 * @param string $string
+	 * @param false  $camelCase
+	 * @return string|string[]
+	 * @since   $VID:$
+	 */
+	private function convertCase($string, $camelCase = false)
+	{
+		$string = str_replace(' ', '', ucwords(str_replace('_', ' ', $string)));
+		if ($camelCase) {
+			$string = lcfirst($string);
+		}
+		return $string;
+	}
+
+
+	/**
+	 * @param string $property
+	 * @param bool   $getter
+	 * @return string
+	 */
+	private function createGetterSetter($property, $getter = true)
+	{
+		$setterOrGetter = $this->convertCase($property, $getter);
+		// if not a getter, prepend with "set". ex: Show_expired => setShowExpired
+		$setterOrGetter = ! $getter ? 'set' . $setterOrGetter : $setterOrGetter;
+		return $this->isValidMethod($setterOrGetter) ? $setterOrGetter : '';
+	}
+
+
+	/**
+	 * @param string $method
+	 * @return bool
+	 * @throws DomainException
+	 */
+	private function isValidMethod($method)
+	{
+		if (method_exists($this, $method)) {
+			return true;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__('Missing %1$s method on JsonConfig class %2$s.', 'event_espresso'),
+				$method,
+				get_class($this)
+			)
+		);
+	}
+
+
+	/**
+	 * converts class name to option name by changing backslashes to dashes
+	 */
+	private function setOptionName()
+	{
+		$this->option_name = str_replace(['EventEspresso', '\\'], ['ee', '-'], get_class($this));
+	}
+
+
+	/**
+	 * retrieves WP option for class, decodes the data, and resigns values to properties
+	 *
+	 * @param array $defaults
+	 */
+	protected function load(array $defaults)
+	{
+		$config = get_option($this->option_name, '{}');
+		$config = (array) json_decode($config) + $defaults;
+		foreach ($this->getProperties() as $property => $value) {
+			if ($property === 'option_name') {
+				continue;
+			}
+			// convert to PascalCase and prepend with "set". ex: show_expired => setShowExpired
+			$setter = $this->createGetterSetter($property, false);
+			$value  = array_key_exists($property, $config) ? $config[ $property ] : null;
+			$this->{$setter}($value);
+		}
+	}
+
+
+	/**
+	 * updates property value and marks changes if property value has changed
+	 *
+	 * @param string $property
+	 * @param mixed  $value
+	 */
+	protected function setProperty($property, $value)
+	{
+		$this->markChanges($this->{$property} === $value);
+		$this->{$property} = $value;
+	}
+
+
+	/**
+	 * will only toggle has_changes to true otherwise keeps existing value (ie: will never toggle to false)
+	 * why? this allows this method to be fed with the result of a conditional
+	 * that compares an incoming value in a setter with it's previously set value.
+	 * ie: if $x = 1 and you call setX(1) then the value has not really changed.
+	 *
+	 * @param bool $changes
+	 * @since   $VID:$
+	 */
+	protected function markChanges($changes = true)
+	{
+		$this->has_changes = filter_var($changes, FILTER_VALIDATE_BOOLEAN) ? true : $this->has_changes;
+	}
+
+
+	/**
+	 * resets $has_changes flag to false but does NOT actually reset any data
+	 */
+	public function clearChanges()
+	{
+		$this->has_changes = false;
+	}
+
+
+	/**
+	 * flag for marking that changes have been made to property data
+	 *
+	 * @return bool
+	 */
+	public function hasChanges()
+	{
+		return $this->has_changes;
+	}
+
+
+	/**
+	 * encodes all property data to JSON and saves it to a WP option
+	 */
+	public function update()
+	{
+		$config_exists = get_option($this->option_name);
+		if ($config_exists && ! $this->has_changes) {
+			return;
+		}
+		$config = [];
+		foreach ($this->getProperties() as $property => $value) {
+			if ($property === 'option_name') {
+				continue;
+			}
+			$getter = $this->createGetterSetter($property);
+			$config[ $property ] = $this->{$getter}();
+		}
+		$config = wp_json_encode($config);
+		if ($config_exists) {
+			update_option($this->option_name, $config);
+		} else {
+			add_option($this->option_name, $config, '', 'no');
+		}
+		$this->clearChanges();
+	}
 }

core/services/converters/json/ModelObjectToJsonConverterInterface.php

Indentation +46 added lines, -46 removed lines

@@ -12,50 +12,50 @@
  */
 interface ModelObjectToJsonConverterInterface
 {
-    /**
-     * @param array $entities
-     * @return array
-     * @since $VID:$
-     */
-    public function convertAndEncodeArrayOf(array $entities);
-
-
-    /**
-     * @param $entity
-     * @return false|string
-     * @since $VID:$
-     */
-    public function convertAndEncode($entity);
-
-
-    /**
-     * @param array $entities
-     * @return array
-     * @since $VID:$
-     */
-    public function convertArrayOf(array $entities);
-
-
-    /**
-     * @param $entity
-     * @return array
-     * @since $VID:$
-     */
-    public function convert($entity);
-
-
-    /**
-     * @param array $entities
-     * @return array
-     * @since $VID:$
-     */
-    public function encodeArrayOf(array $entities);
-
-
-    /**
-     * @param array $entity_array
-     * @return false|string
-     * @since $VID:$
-     */
-    public function encode(array $entity_array);
+	/**
+	 * @param array $entities
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function convertAndEncodeArrayOf(array $entities);
+
+
+	/**
+	 * @param $entity
+	 * @return false|string
+	 * @since $VID:$
+	 */
+	public function convertAndEncode($entity);
+
+
+	/**
+	 * @param array $entities
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function convertArrayOf(array $entities);
+
+
+	/**
+	 * @param $entity
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function convert($entity);
+
+
+	/**
+	 * @param array $entities
+	 * @return array
+	 * @since $VID:$
+	 */
+	public function encodeArrayOf(array $entities);
+
+
+	/**
+	 * @param array $entity_array
+	 * @return false|string
+	 * @since $VID:$
+	 */
+	public function encode(array $entity_array);
 }

core/helpers/EEH_Array.helper.php

Indentation +290 added lines, -290 removed lines

@@ -11,313 +11,313 @@
  */
 class EEH_Array extends EEH_Base
 {
-    /**
-     * This method basically works the same as the PHP core function array_diff except it allows you to compare arrays
-     * of EE_Base_Class objects NOTE: This will ONLY work on an array of EE_Base_Class objects
-     *
-     * @uses array_udiff core php function for setting up our own array comparison
-     * @uses self::_compare_objects as the custom method for array_udiff
-     * @param  array $array1 an array of objects
-     * @param  array $array2 an array of objects
-     * @return array         an array of objects found in array 1 that aren't found in array 2.
-     */
-    public static function object_array_diff($array1, $array2)
-    {
-        return array_udiff($array1, $array2, array('self', '_compare_objects'));
-    }
+	/**
+	 * This method basically works the same as the PHP core function array_diff except it allows you to compare arrays
+	 * of EE_Base_Class objects NOTE: This will ONLY work on an array of EE_Base_Class objects
+	 *
+	 * @uses array_udiff core php function for setting up our own array comparison
+	 * @uses self::_compare_objects as the custom method for array_udiff
+	 * @param  array $array1 an array of objects
+	 * @param  array $array2 an array of objects
+	 * @return array         an array of objects found in array 1 that aren't found in array 2.
+	 */
+	public static function object_array_diff($array1, $array2)
+	{
+		return array_udiff($array1, $array2, array('self', '_compare_objects'));
+	}
 
-    /**
-     * Given that $arr is an array, determines if it's associative or numerically AND sequentially indexed
-     *
-     * @param array $array
-     * @return boolean
-     */
-    public static function is_associative_array(array $array): bool
-    {
-        return ! empty($array) && array_keys($array) !== range(0, count($array) - 1);
-    }
+	/**
+	 * Given that $arr is an array, determines if it's associative or numerically AND sequentially indexed
+	 *
+	 * @param array $array
+	 * @return boolean
+	 */
+	public static function is_associative_array(array $array): bool
+	{
+		return ! empty($array) && array_keys($array) !== range(0, count($array) - 1);
+	}
 
-    /**
-     * Gets an item from the array and leave the array intact. Use in place of end()
-     * when you don't want to change the array
-     *
-     * @param array $arr
-     * @return mixed what ever is in the array
-     */
-    public static function get_one_item_from_array($arr)
-    {
-        $item = end($arr);
-        reset($arr);
-        return $item;
-    }
+	/**
+	 * Gets an item from the array and leave the array intact. Use in place of end()
+	 * when you don't want to change the array
+	 *
+	 * @param array $arr
+	 * @return mixed what ever is in the array
+	 */
+	public static function get_one_item_from_array($arr)
+	{
+		$item = end($arr);
+		reset($arr);
+		return $item;
+	}
 
-    /**
-     * Detects if this is a multi-dimensional array
-     * meaning that at least one top-level value is an array. Eg [ [], ...]
-     *
-     * @param mixed $arr
-     * @return boolean
-     */
-    public static function is_multi_dimensional_array($arr)
-    {
-        if (is_array($arr)) {
-            foreach ($arr as $item) {
-                if (is_array($item)) {
-                    return true; // yep, there's at least 2 levels to this array
-                }
-            }
-        }
-        return false; // there's only 1 level, or it's not an array at all!
-    }
+	/**
+	 * Detects if this is a multi-dimensional array
+	 * meaning that at least one top-level value is an array. Eg [ [], ...]
+	 *
+	 * @param mixed $arr
+	 * @return boolean
+	 */
+	public static function is_multi_dimensional_array($arr)
+	{
+		if (is_array($arr)) {
+			foreach ($arr as $item) {
+				if (is_array($item)) {
+					return true; // yep, there's at least 2 levels to this array
+				}
+			}
+		}
+		return false; // there's only 1 level, or it's not an array at all!
+	}
 
-    /**
-     * Shorthand for isset( $arr[ $index ] ) ? $arr[ $index ] : $default
-     *
-     * @param array $arr
-     * @param mixed $index
-     * @param mixed $default
-     * @return mixed
-     */
-    public static function is_set($arr, $index, $default)
-    {
-        return isset($arr[ $index ]) ? $arr[ $index ] : $default;
-    }
+	/**
+	 * Shorthand for isset( $arr[ $index ] ) ? $arr[ $index ] : $default
+	 *
+	 * @param array $arr
+	 * @param mixed $index
+	 * @param mixed $default
+	 * @return mixed
+	 */
+	public static function is_set($arr, $index, $default)
+	{
+		return isset($arr[ $index ]) ? $arr[ $index ] : $default;
+	}
 
-    /**
-     * Exactly like `maybe_unserialize`, but also accounts for a WP bug: http://core.trac.wordpress.org/ticket/26118
-     *
-     * @param mixed $value usually a string, but could be an array or object
-     * @return mixed the UN-serialized data
-     */
-    public static function maybe_unserialize($value)
-    {
-        $data = maybe_unserialize($value);
-        // it's possible that this still has serialized data if it's the session.
-        //  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesn't unserialize this automatically.
-        $token = 'C';
-        $data = is_string($data) ? trim($data) : $data;
-        if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
-            return unserialize($data);
-        } else {
-            return $data;
-        }
-    }
+	/**
+	 * Exactly like `maybe_unserialize`, but also accounts for a WP bug: http://core.trac.wordpress.org/ticket/26118
+	 *
+	 * @param mixed $value usually a string, but could be an array or object
+	 * @return mixed the UN-serialized data
+	 */
+	public static function maybe_unserialize($value)
+	{
+		$data = maybe_unserialize($value);
+		// it's possible that this still has serialized data if it's the session.
+		//  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesn't unserialize this automatically.
+		$token = 'C';
+		$data = is_string($data) ? trim($data) : $data;
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
+			return unserialize($data);
+		} else {
+			return $data;
+		}
+	}
 
 
-    /**
-     * insert_into_array
-     *
-     * @param array        $target_array the array to insert new data into
-     * @param array        $array_to_insert the new data to be inserted
-     * @param int|string|null $offset a known key within $target_array where new data will be inserted
-     * @param bool         $add_before whether to add new data before or after the offset key
-     * @param bool         $preserve_keys whether or not to reset numerically indexed arrays
-     * @return array
-     */
-    public static function insert_into_array(
-        array $target_array = array(),
-        array $array_to_insert = array(),
-        $offset = null,
-        bool $add_before = true,
-        bool $preserve_keys = true
-    ) {
-        $target_array_keys = array_keys($target_array);
-        // if no offset key was supplied
-        if (empty($offset)) {
-            // use start or end of $target_array based on whether we are adding before or not
-            $offset = $add_before ? 0 : count($target_array);
-        }
-        // if offset key is a string, then find the corresponding numeric location for that element
-        $offset = is_int($offset) ? $offset : array_search($offset, $target_array_keys, true);
-        // add one to the offset if adding after
-        $offset = $add_before ? $offset : $offset + 1;
-        // but ensure offset does not exceed the length of the array
-        $offset = $offset > count($target_array) ? count($target_array) : $offset;
-        // reindex array ???
-        if ($preserve_keys) {
-            // take a slice of the target array from the beginning till the offset,
-            // then add the new data
-            // then add another slice that starts at the offset and goes till the end
-            return array_slice($target_array, 0, $offset, true) + $array_to_insert + array_slice(
-                $target_array,
-                $offset,
-                null,
-                true
-            );
-        } else {
-            // since we don't want to preserve keys, we can use array_splice
-            array_splice($target_array, $offset, 0, $array_to_insert);
-            return $target_array;
-        }
-    }
+	/**
+	 * insert_into_array
+	 *
+	 * @param array        $target_array the array to insert new data into
+	 * @param array        $array_to_insert the new data to be inserted
+	 * @param int|string|null $offset a known key within $target_array where new data will be inserted
+	 * @param bool         $add_before whether to add new data before or after the offset key
+	 * @param bool         $preserve_keys whether or not to reset numerically indexed arrays
+	 * @return array
+	 */
+	public static function insert_into_array(
+		array $target_array = array(),
+		array $array_to_insert = array(),
+		$offset = null,
+		bool $add_before = true,
+		bool $preserve_keys = true
+	) {
+		$target_array_keys = array_keys($target_array);
+		// if no offset key was supplied
+		if (empty($offset)) {
+			// use start or end of $target_array based on whether we are adding before or not
+			$offset = $add_before ? 0 : count($target_array);
+		}
+		// if offset key is a string, then find the corresponding numeric location for that element
+		$offset = is_int($offset) ? $offset : array_search($offset, $target_array_keys, true);
+		// add one to the offset if adding after
+		$offset = $add_before ? $offset : $offset + 1;
+		// but ensure offset does not exceed the length of the array
+		$offset = $offset > count($target_array) ? count($target_array) : $offset;
+		// reindex array ???
+		if ($preserve_keys) {
+			// take a slice of the target array from the beginning till the offset,
+			// then add the new data
+			// then add another slice that starts at the offset and goes till the end
+			return array_slice($target_array, 0, $offset, true) + $array_to_insert + array_slice(
+				$target_array,
+				$offset,
+				null,
+				true
+			);
+		} else {
+			// since we don't want to preserve keys, we can use array_splice
+			array_splice($target_array, $offset, 0, $array_to_insert);
+			return $target_array;
+		}
+	}
 
 
-    /**
-     * array_merge() is slow and should never be used while looping over data
-     * if you don't need to preserve keys from all arrays, then using a foreach loop is much faster
-     * so really this acts more like array_replace( $array1, $array2 )
-     * or a union with the arrays flipped ( $array2 + $array1 )
-     * this saves a few lines of code and improves readability
-     *
-     * @param array $array1
-     * @param array $array2
-     * @return array
-     */
-    public static function merge_arrays_and_overwrite_keys(array $array1, array $array2)
-    {
-        foreach ($array2 as $key => $value) {
-            $array1[ $key ] = $value;
-        }
-        return $array1;
-    }
+	/**
+	 * array_merge() is slow and should never be used while looping over data
+	 * if you don't need to preserve keys from all arrays, then using a foreach loop is much faster
+	 * so really this acts more like array_replace( $array1, $array2 )
+	 * or a union with the arrays flipped ( $array2 + $array1 )
+	 * this saves a few lines of code and improves readability
+	 *
+	 * @param array $array1
+	 * @param array $array2
+	 * @return array
+	 */
+	public static function merge_arrays_and_overwrite_keys(array $array1, array $array2)
+	{
+		foreach ($array2 as $key => $value) {
+			$array1[ $key ] = $value;
+		}
+		return $array1;
+	}
 
 
-    /**
-     * given a flat array like $array = array('A', 'B', 'C')
-     * will convert into a multidimensional array like $array[A][B][C]
-     * if $final_value is provided and is anything other than null,
-     * then that will be set as the value for the innermost array key
-     * like so: $array[A][B][C] = $final_value
-     *
-     * @param array $flat_array
-     * @param mixed $final_value
-     * @return array
-     */
-    public static function convert_array_values_to_keys(array $flat_array, $final_value = null)
-    {
-        $multidimensional = array();
-        $reference = &$multidimensional;
-        foreach ($flat_array as $key) {
-            $reference[ $key ] = array();
-            $reference = &$reference[ $key ];
-        }
-        if ($final_value !== null) {
-            $reference = $final_value;
-        }
-        return $multidimensional;
-    }
+	/**
+	 * given a flat array like $array = array('A', 'B', 'C')
+	 * will convert into a multidimensional array like $array[A][B][C]
+	 * if $final_value is provided and is anything other than null,
+	 * then that will be set as the value for the innermost array key
+	 * like so: $array[A][B][C] = $final_value
+	 *
+	 * @param array $flat_array
+	 * @param mixed $final_value
+	 * @return array
+	 */
+	public static function convert_array_values_to_keys(array $flat_array, $final_value = null)
+	{
+		$multidimensional = array();
+		$reference = &$multidimensional;
+		foreach ($flat_array as $key) {
+			$reference[ $key ] = array();
+			$reference = &$reference[ $key ];
+		}
+		if ($final_value !== null) {
+			$reference = $final_value;
+		}
+		return $multidimensional;
+	}
 
 
-    /**
-     * @see http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
-     * @param array $array
-     * @return bool
-     */
-    public static function is_array_numerically_and_sequentially_indexed(array $array)
-    {
-        return empty($array) || array_keys($array) === range(0, count($array) - 1);
-    }
+	/**
+	 * @see http://stackoverflow.com/questions/173400/how-to-check-if-php-array-is-associative-or-sequential
+	 * @param array $array
+	 * @return bool
+	 */
+	public static function is_array_numerically_and_sequentially_indexed(array $array)
+	{
+		return empty($array) || array_keys($array) === range(0, count($array) - 1);
+	}
 
 
-    /**
-     * recursively walks through an array and adds slashes to all no array elements
-     *
-     * @param mixed $element
-     * @return array|string
-     * @since   4.10.29.p
-     */
-    public static function addSlashesRecursively($element)
-    {
-        if (is_array($element)) {
-            foreach ($element as $key => $value) {
-                $element[ $key ] = EEH_Array::addSlashesRecursively($value);
-            }
-            return $element;
-        }
-        return is_string($element) ? addslashes($element) : $element;
-    }
+	/**
+	 * recursively walks through an array and adds slashes to all no array elements
+	 *
+	 * @param mixed $element
+	 * @return array|string
+	 * @since   4.10.29.p
+	 */
+	public static function addSlashesRecursively($element)
+	{
+		if (is_array($element)) {
+			foreach ($element as $key => $value) {
+				$element[ $key ] = EEH_Array::addSlashesRecursively($value);
+			}
+			return $element;
+		}
+		return is_string($element) ? addslashes($element) : $element;
+	}
 
 
-    /**
-     * link https://stackoverflow.com/a/3877494
-     *
-     * @param array $array_1
-     * @param array $array_2
-     * @return array
-     * @since   $VID:$
-     */
-    public static function array_diff_recursive(array $array_1, array $array_2): array
-    {
-        $diff = [];
-        foreach ($array_1 as $key => $value) {
-            if (array_key_exists($key, $array_2)) {
-                if (is_array($value)) {
-                    $inner_diff = EEH_Array::array_diff_recursive($value, $array_2[ $key ]);
-                    if (count($inner_diff)) {
-                        $diff[ $key ] = $inner_diff;
-                    }
-                } else {
-                    if ($value != $array_2[ $key ]) {
-                        $diff[ $key ] = $value;
-                    }
-                }
-            } else {
-                $diff[ $key ] = $value;
-            }
-        }
-        return $diff;
-    }
+	/**
+	 * link https://stackoverflow.com/a/3877494
+	 *
+	 * @param array $array_1
+	 * @param array $array_2
+	 * @return array
+	 * @since   $VID:$
+	 */
+	public static function array_diff_recursive(array $array_1, array $array_2): array
+	{
+		$diff = [];
+		foreach ($array_1 as $key => $value) {
+			if (array_key_exists($key, $array_2)) {
+				if (is_array($value)) {
+					$inner_diff = EEH_Array::array_diff_recursive($value, $array_2[ $key ]);
+					if (count($inner_diff)) {
+						$diff[ $key ] = $inner_diff;
+					}
+				} else {
+					if ($value != $array_2[ $key ]) {
+						$diff[ $key ] = $value;
+					}
+				}
+			} else {
+				$diff[ $key ] = $value;
+			}
+		}
+		return $diff;
+	}
 
 
-    /**
-     * converts multidimensional arrays into a single depth associative array
-     * or converts arrays of any depth into a readable string representation
-     *
-     *  $example = [
-     *      'a' => 'A',
-     *      'b' => 'B',
-     *      'c' => [
-     *          'd' => 'D',
-     *          'e' => 'E',
-     *          'f' => [ 'G', 'H', 'I' ],
-     *      ],
-     *      [ 'J', 'K' ],
-     *      'L',
-     *      'M',
-     *      'n' => [
-     *          'o' => 'P'
-     *      ],
-     *  ];
-     *
-     *  print_r( EEH_Array::flattenArray($example) );
-     *
-     *  Array (
-     *      [a] => A
-     *      [b] => B
-     *      [c] => [ d:D, e:E, f:[ G, H, I ] ]
-     *      [0] => [ J, K ]
-     *      [1] => L
-     *      [2] => M
-     *      [n] => [ o:P ]
-     *  )
-     *
-     *  print_r( EEH_Array::flattenArray($example, true) );
-     *
-     *  "a:A, b:B, c:[ d:D, e:E, f:[ G, H, I ] ], [ J, K ], L, M, n:[ o:P ]"
-     *
-     * @param array $array      the array to be flattened
-     * @param bool  $to_string  [true] will flatten the entire array down into a string
-     *                          [false] will only flatten sub-arrays down into strings and return a array
-     * @param bool  $top_level  used for formatting purposes only, best to leave this alone as it's set internally
-     * @return array|false|string
-     * @since $VID:$
-     */
-    public static function flattenArray(array $array, bool $to_string = false, bool $top_level = true)
-    {
-        $flat_array = [];
-        foreach ($array as $key => $value) {
-            $flat_array[ $key ] = is_array($value)
-                ? EEH_Array::flattenArray($value, true, false)
-                : $value;
-        }
-        if (! $to_string) {
-            return $flat_array;
-        }
-        $flat = '';
-        foreach ($flat_array as $key => $value) {
-            $flat .= is_int($key) ? "$value, " : "$key:$value, ";
-        }
-        $flat = substr($flat, 0, -2);
-        return $top_level ? $flat : "[ $flat ]";
-    }
+	/**
+	 * converts multidimensional arrays into a single depth associative array
+	 * or converts arrays of any depth into a readable string representation
+	 *
+	 *  $example = [
+	 *      'a' => 'A',
+	 *      'b' => 'B',
+	 *      'c' => [
+	 *          'd' => 'D',
+	 *          'e' => 'E',
+	 *          'f' => [ 'G', 'H', 'I' ],
+	 *      ],
+	 *      [ 'J', 'K' ],
+	 *      'L',
+	 *      'M',
+	 *      'n' => [
+	 *          'o' => 'P'
+	 *      ],
+	 *  ];
+	 *
+	 *  print_r( EEH_Array::flattenArray($example) );
+	 *
+	 *  Array (
+	 *      [a] => A
+	 *      [b] => B
+	 *      [c] => [ d:D, e:E, f:[ G, H, I ] ]
+	 *      [0] => [ J, K ]
+	 *      [1] => L
+	 *      [2] => M
+	 *      [n] => [ o:P ]
+	 *  )
+	 *
+	 *  print_r( EEH_Array::flattenArray($example, true) );
+	 *
+	 *  "a:A, b:B, c:[ d:D, e:E, f:[ G, H, I ] ], [ J, K ], L, M, n:[ o:P ]"
+	 *
+	 * @param array $array      the array to be flattened
+	 * @param bool  $to_string  [true] will flatten the entire array down into a string
+	 *                          [false] will only flatten sub-arrays down into strings and return a array
+	 * @param bool  $top_level  used for formatting purposes only, best to leave this alone as it's set internally
+	 * @return array|false|string
+	 * @since $VID:$
+	 */
+	public static function flattenArray(array $array, bool $to_string = false, bool $top_level = true)
+	{
+		$flat_array = [];
+		foreach ($array as $key => $value) {
+			$flat_array[ $key ] = is_array($value)
+				? EEH_Array::flattenArray($value, true, false)
+				: $value;
+		}
+		if (! $to_string) {
+			return $flat_array;
+		}
+		$flat = '';
+		foreach ($flat_array as $key => $value) {
+			$flat .= is_int($key) ? "$value, " : "$key:$value, ";
+		}
+		$flat = substr($flat, 0, -2);
+		return $top_level ? $flat : "[ $flat ]";
+	}
 }

core/services/json/JsonDataHandler.php

Indentation +342 added lines, -342 removed lines

@@ -14,346 +14,346 @@
  */
 class JsonDataHandler
 {
-    const DATA_TYPE_ARRAY     = 'array';
-
-    const DATA_TYPE_OBJECT    = 'object';
-
-    const DATA_TYPE_USE_FLAGS = 'flags';
-
-    const NO_ERROR_MSG        = 'No error';
-
-    /**
-     * @var string|null
-     */
-    private $data_type = null;
-
-    /**
-     * @var array|stdClass|null
-     */
-    private $decoded_data = null;
-
-    /**
-     * 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 = 0;
-
-    /**
-     * @var int
-     */
-    private $depth = 512;
-
-    /**
-     * @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 = 0;
-
-    /**
-     * @var int
-     */
-    private $last_error_code = JSON_ERROR_NONE;
-
-    /**
-     * @var string
-     */
-    private $last_error_msg = JsonDataHandler::NO_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 ?: 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 string|null
-     */
-    public function dataType(): ?string
-    {
-        return $this->data_type;
-    }
-
-
-    /**
-     * @return bool|null
-     */
-    private function asAssociative(): ?bool
-    {
-        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 array|string $json
-     * @return array|mixed|stdClass
-     */
-    public function decodeJson($json)
-    {
-        $this->resetErrors();
-        if ($this->isJson($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();
-        } else {
-            $this->decoded_data    = $json;
-            $this->last_error_code = JSON_ERROR_NONE;
-            $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-        }
-        return $this->decoded_data;
-    }
-
-
-    /**
-     * @param $data
-     * @return string
-     */
-    public function encodeData($data): string
-    {
-        $this->resetErrors();
-        if ($this->isJson($data)) {
-            $this->encoded_data = $data;
-            $this->last_error_code = JSON_ERROR_NONE;
-            $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-        } else {
-            $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 bool $reset
-     * @return int
-     */
-    public function getLastErrorCode(bool $reset = false): int
-    {
-        $last_error = $this->last_error_code;
-        if ($reset) {
-            $this->resetErrors();
-        }
-        return $last_error;
-    }
-
-
-    /**
-     * @param bool $reset
-     * @return string
-     */
-    public function getLastErrorMessage(bool $reset = false): string
-    {
-        $last_error = $this->last_error_msg;
-        if ($reset) {
-            $this->resetErrors();
-        }
-        return $last_error;
-    }
-
-
-    /**
-     * @param array|string $maybe_json
-     * @return bool
-     */
-    public function isJson($maybe_json): bool
-    {
-        if (! is_string($maybe_json)) {
-            return false;
-        }
-        $decoded = json_decode($maybe_json, $this->asAssociative(), $this->depth, $this->decode_flags);
-        return json_last_error() === JSON_ERROR_NONE && ! ($decoded === null && ! empty($maybe_json));
-    }
-
-
-    /**
-     * @since $VID:$
-     */
-    public function resetErrors()
-    {
-        $this->last_error_code = JSON_ERROR_NONE;
-        $this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
-    }
+	const DATA_TYPE_ARRAY     = 'array';
+
+	const DATA_TYPE_OBJECT    = 'object';
+
+	const DATA_TYPE_USE_FLAGS = 'flags';
+
+	const NO_ERROR_MSG        = 'No error';
+
+	/**
+	 * @var string|null
+	 */
+	private $data_type = null;
+
+	/**
+	 * @var array|stdClass|null
+	 */
+	private $decoded_data = null;
+
+	/**
+	 * 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 = 0;
+
+	/**
+	 * @var int
+	 */
+	private $depth = 512;
+
+	/**
+	 * @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 = 0;
+
+	/**
+	 * @var int
+	 */
+	private $last_error_code = JSON_ERROR_NONE;
+
+	/**
+	 * @var string
+	 */
+	private $last_error_msg = JsonDataHandler::NO_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 ?: 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 string|null
+	 */
+	public function dataType(): ?string
+	{
+		return $this->data_type;
+	}
+
+
+	/**
+	 * @return bool|null
+	 */
+	private function asAssociative(): ?bool
+	{
+		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 array|string $json
+	 * @return array|mixed|stdClass
+	 */
+	public function decodeJson($json)
+	{
+		$this->resetErrors();
+		if ($this->isJson($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();
+		} else {
+			$this->decoded_data    = $json;
+			$this->last_error_code = JSON_ERROR_NONE;
+			$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+		}
+		return $this->decoded_data;
+	}
+
+
+	/**
+	 * @param $data
+	 * @return string
+	 */
+	public function encodeData($data): string
+	{
+		$this->resetErrors();
+		if ($this->isJson($data)) {
+			$this->encoded_data = $data;
+			$this->last_error_code = JSON_ERROR_NONE;
+			$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+		} else {
+			$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 bool $reset
+	 * @return int
+	 */
+	public function getLastErrorCode(bool $reset = false): int
+	{
+		$last_error = $this->last_error_code;
+		if ($reset) {
+			$this->resetErrors();
+		}
+		return $last_error;
+	}
+
+
+	/**
+	 * @param bool $reset
+	 * @return string
+	 */
+	public function getLastErrorMessage(bool $reset = false): string
+	{
+		$last_error = $this->last_error_msg;
+		if ($reset) {
+			$this->resetErrors();
+		}
+		return $last_error;
+	}
+
+
+	/**
+	 * @param array|string $maybe_json
+	 * @return bool
+	 */
+	public function isJson($maybe_json): bool
+	{
+		if (! is_string($maybe_json)) {
+			return false;
+		}
+		$decoded = json_decode($maybe_json, $this->asAssociative(), $this->depth, $this->decode_flags);
+		return json_last_error() === JSON_ERROR_NONE && ! ($decoded === null && ! empty($maybe_json));
+	}
+
+
+	/**
+	 * @since $VID:$
+	 */
+	public function resetErrors()
+	{
+		$this->last_error_code = JSON_ERROR_NONE;
+		$this->last_error_msg  = JsonDataHandler::NO_ERROR_MSG;
+	}
 }

core/domain/entities/routing/handlers/admin/WordPressPluginsPage.php

Indentation +68 added lines, -68 removed lines

@@ -17,77 +17,77 @@
  */
 class WordPressPluginsPage extends AdminRoute
 {
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return $pagenow === 'plugins.php' && ($this->request->isAdmin() || $this->request->isAdminAjax());
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return $pagenow === 'plugins.php' && ($this->request->isAdmin() || $this->request->isAdminAjax());
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\assets\WordPressPluginsPageAssetManager',
-            [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\data_nodes\domains\WordPressPluginsPageData',
-            [
-                'EventEspresso\core\domain\services\admin\ExitModal'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\ExitModal',
-            ['EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\admin\PluginUpsells',
-            ['EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache]
-        );
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\assets\WordPressPluginsPageAssetManager',
+			[
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EE_Currency_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EE_Template_Config'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\Domain'                   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\Registry'        => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\data_nodes\domains\WordPressPluginsPageData',
+			[
+				'EventEspresso\core\domain\services\admin\ExitModal'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\ExitModal',
+			['EventEspresso\core\services\assets\Registry' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\admin\PluginUpsells',
+			['EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache]
+		);
 
-        $this->loader->getShared(
-            'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData'
-        );
-        /** @var WordPressPluginsPageData $data_node */
-        $data_node = $this->loader->getShared(
-            'EventEspresso\core\domain\entities\routing\data_nodes\domains\WordPressPluginsPageData'
-        );
-        $this->setDataNode($data_node);
-        /** @var PluginUpsells $plugin_upsells */
-        $plugin_upsells = $this->loader->getShared('EventEspresso\core\domain\services\admin\PluginUpsells');
-        $plugin_upsells->decafUpsells();
-    }
+		$this->loader->getShared(
+			'EventEspresso\core\domain\entities\routing\data_nodes\EventEspressoData'
+		);
+		/** @var WordPressPluginsPageData $data_node */
+		$data_node = $this->loader->getShared(
+			'EventEspresso\core\domain\entities\routing\data_nodes\domains\WordPressPluginsPageData'
+		);
+		$this->setDataNode($data_node);
+		/** @var PluginUpsells $plugin_upsells */
+		$plugin_upsells = $this->loader->getShared('EventEspresso\core\domain\services\admin\PluginUpsells');
+		$plugin_upsells->decafUpsells();
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler(): bool
-    {
-        /** @var WordPressPluginsPageAssetManager $asset_manager */
-        $asset_manager = $this->loader->getShared(
-            'EventEspresso\core\domain\services\assets\WordPressPluginsPageAssetManager'
-        );
-        add_action('admin_enqueue_scripts', [$asset_manager, 'enqueueAssets']);
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler(): bool
+	{
+		/** @var WordPressPluginsPageAssetManager $asset_manager */
+		$asset_manager = $this->loader->getShared(
+			'EventEspresso\core\domain\services\assets\WordPressPluginsPageAssetManager'
+		);
+		add_action('admin_enqueue_scripts', [$asset_manager, 'enqueueAssets']);
+		return true;
+	}
 }

core/admin/EE_Admin_Page_Menu_Group.core.php

Indentation +16 added lines, -16 removed lines

@@ -10,22 +10,22 @@
  */
 class EE_Admin_Page_Menu_Group extends AdminMenuGroup
 {
-    /**
-     * @return string
-     * @deprecated $VID:$
-     */
-    protected function _add_menu_page(): string
-    {
-        return $this->registerMenuItem();
-    }
+	/**
+	 * @return string
+	 * @deprecated $VID:$
+	 */
+	protected function _add_menu_page(): string
+	{
+		return $this->registerMenuItem();
+	}
 
 
-    /**
-     * @return string
-     * @deprecated $VID:$
-     */
-    private function _group_link(): string
-    {
-        return $this->groupLink();
-    }
+	/**
+	 * @return string
+	 * @deprecated $VID:$
+	 */
+	private function _group_link(): string
+	{
+		return $this->groupLink();
+	}
 }