eventespresso / event-espresso-core

core/services/validators/JsonValidator.php

Spacing +6 added lines, -6 removed lines

@@ -32,19 +32,19 @@ 
      */
     public function isValid($file, $func, $line)
     {
-        if (! defined('JSON_ERROR_RECURSION')) {
+        if ( ! defined('JSON_ERROR_RECURSION')) {
             define('JSON_ERROR_RECURSION', 6);
         }
-        if (! defined('JSON_ERROR_INF_OR_NAN')) {
+        if ( ! defined('JSON_ERROR_INF_OR_NAN')) {
             define('JSON_ERROR_INF_OR_NAN', 7);
         }
-        if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
+        if ( ! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
             define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
         }
-        if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
+        if ( ! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
             define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
         }
-        if (! defined('JSON_ERROR_UTF16')) {
+        if ( ! defined('JSON_ERROR_UTF16')) {
             define('JSON_ERROR_UTF16', 10);
         }
         switch (json_last_error()) {
@@ -84,7 +84,7 @@ 
                 $error = ': Unknown error';
                 break;
         }
-        EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
+        EE_Error::add_error('JSON decoding failed'.$error, $file, $func, $line);
         return false;
     }
 }

Indentation +72 added lines, -72 removed lines

@@ -18,76 +18,76 @@
 class JsonValidator
 {
 
-    /**
-     * Call this method IMMEDIATELY after json_decode() and
-     * it will will return true if the decoded JSON was valid,
-     * or return false after adding an error if not valid.
-     * The actual JSON file does not need to be supplied,
-     * but details re: code execution location are required.
-     * ex:
-     * JsonValidator::isValid(__FILE__, __METHOD__, __LINE__)
-     *
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @return boolean
-     * @since 4.9.70.p
-     */
-    public function isValid($file, $func, $line)
-    {
-        if (! defined('JSON_ERROR_RECURSION')) {
-            define('JSON_ERROR_RECURSION', 6);
-        }
-        if (! defined('JSON_ERROR_INF_OR_NAN')) {
-            define('JSON_ERROR_INF_OR_NAN', 7);
-        }
-        if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
-            define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
-        }
-        if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
-            define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
-        }
-        if (! defined('JSON_ERROR_UTF16')) {
-            define('JSON_ERROR_UTF16', 10);
-        }
-        switch (json_last_error()) {
-            case JSON_ERROR_NONE:
-                return true;
-            case JSON_ERROR_DEPTH:
-                $error = ': Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $error = ': Invalid or malformed JSON';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $error = ': Control character error, possible malformed JSON';
-                break;
-            case JSON_ERROR_SYNTAX:
-                $error = ': Syntax error, malformed JSON';
-                break;
-            case JSON_ERROR_UTF8:
-                $error = ': Malformed UTF-8 characters, possible malformed JSON';
-                break;
-            case JSON_ERROR_RECURSION:
-                $error = ': One or more recursive references in the value to be encoded';
-                break;
-            case JSON_ERROR_INF_OR_NAN:
-                $error = ': One or more NAN or INF values in the value to be encoded';
-                break;
-            case JSON_ERROR_UNSUPPORTED_TYPE:
-                $error = ': A value of a type that cannot be encoded was given';
-                break;
-            case JSON_ERROR_INVALID_PROPERTY_NAME:
-                $error = ': A property name that cannot be encoded was given';
-                break;
-            case JSON_ERROR_UTF16:
-                $error = ': Malformed UTF-16 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $error = ': Unknown error';
-                break;
-        }
-        EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
-        return false;
-    }
+	/**
+	 * Call this method IMMEDIATELY after json_decode() and
+	 * it will will return true if the decoded JSON was valid,
+	 * or return false after adding an error if not valid.
+	 * The actual JSON file does not need to be supplied,
+	 * but details re: code execution location are required.
+	 * ex:
+	 * JsonValidator::isValid(__FILE__, __METHOD__, __LINE__)
+	 *
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @return boolean
+	 * @since 4.9.70.p
+	 */
+	public function isValid($file, $func, $line)
+	{
+		if (! defined('JSON_ERROR_RECURSION')) {
+			define('JSON_ERROR_RECURSION', 6);
+		}
+		if (! defined('JSON_ERROR_INF_OR_NAN')) {
+			define('JSON_ERROR_INF_OR_NAN', 7);
+		}
+		if (! defined('JSON_ERROR_UNSUPPORTED_TYPE')) {
+			define('JSON_ERROR_UNSUPPORTED_TYPE', 8);
+		}
+		if (! defined('JSON_ERROR_INVALID_PROPERTY_NAME')) {
+			define('JSON_ERROR_INVALID_PROPERTY_NAME', 9);
+		}
+		if (! defined('JSON_ERROR_UTF16')) {
+			define('JSON_ERROR_UTF16', 10);
+		}
+		switch (json_last_error()) {
+			case JSON_ERROR_NONE:
+				return true;
+			case JSON_ERROR_DEPTH:
+				$error = ': Maximum stack depth exceeded';
+				break;
+			case JSON_ERROR_STATE_MISMATCH:
+				$error = ': Invalid or malformed JSON';
+				break;
+			case JSON_ERROR_CTRL_CHAR:
+				$error = ': Control character error, possible malformed JSON';
+				break;
+			case JSON_ERROR_SYNTAX:
+				$error = ': Syntax error, malformed JSON';
+				break;
+			case JSON_ERROR_UTF8:
+				$error = ': Malformed UTF-8 characters, possible malformed JSON';
+				break;
+			case JSON_ERROR_RECURSION:
+				$error = ': One or more recursive references in the value to be encoded';
+				break;
+			case JSON_ERROR_INF_OR_NAN:
+				$error = ': One or more NAN or INF values in the value to be encoded';
+				break;
+			case JSON_ERROR_UNSUPPORTED_TYPE:
+				$error = ': A value of a type that cannot be encoded was given';
+				break;
+			case JSON_ERROR_INVALID_PROPERTY_NAME:
+				$error = ': A property name that cannot be encoded was given';
+				break;
+			case JSON_ERROR_UTF16:
+				$error = ': Malformed UTF-16 characters, possibly incorrectly encoded';
+				break;
+			default:
+				$error = ': Unknown error';
+				break;
+		}
+		EE_Error::add_error('JSON decoding failed' . $error, $file, $func, $line);
+		return false;
+	}
 }

core/domain/services/blocks/EventAttendeesBlockRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $template_args['attributes'] = $attributes;
         $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
         return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
+            $this->templateRootPath().'event-attendees.php',
             $template_args,
             true
         );

Indentation +118 added lines, -118 removed lines

@@ -20,133 +20,133 @@
 class EventAttendeesBlockRenderer extends BlockRenderer
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    private $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	private $attendee_model;
 
-    public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
-    {
-        $this->attendee_model = $attendee_model;
-        parent::__construct($domain);
-    }
+	public function __construct(DomainInterface $domain, EEM_Attendee $attendee_model)
+	{
+		$this->attendee_model = $attendee_model;
+		parent::__construct($domain);
+	}
 
 
-    /**
-     * Renders the block.
-     *
-     * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
-     *                           query and the template output.
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     */
-    public function render(array $attributes)
-    {
-        $attributes = $this->parseGlobalIDs($attributes);
-        $template_args['attributes'] = $attributes;
-        $template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
-        return EEH_Template::display_template(
-            $this->templateRootPath() . 'event-attendees.php',
-            $template_args,
-            true
-        );
-    }
+	/**
+	 * Renders the block.
+	 *
+	 * @param array $attributes  Expect already validated and sanitized array of attributes for use in generating the
+	 *                           query and the template output.
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 */
+	public function render(array $attributes)
+	{
+		$attributes = $this->parseGlobalIDs($attributes);
+		$template_args['attributes'] = $attributes;
+		$template_args['attendees'] = $this->attendee_model->get_all($this->getQueryParams($attributes));
+		return EEH_Template::display_template(
+			$this->templateRootPath() . 'event-attendees.php',
+			$template_args,
+			true
+		);
+	}
 
 
-    /**
-     * Get query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function parseGlobalIDs(array $attributes)
-    {
-        // if ticket ID is set, then that's all we need to run the query
-        $ticket = isset($attributes['ticket']) ? $attributes['ticket'] : '';
-        $datetime = isset($attributes['datetime']) ? $attributes['datetime'] : '';
-        $event = isset($attributes['event']) ? $attributes['event'] : '';
-        if ($ticket !== '') {
-            $ticketId = $this->parseGUID($ticket);
-            $attributes['ticketId'] = $ticketId;
-        } elseif ($datetime !== '') {
-            $datetimeId = $this->parseGUID($datetime);
-            $attributes['datetimeId'] = $datetimeId;
-        } elseif ($event !== '') {
-            $eventId = $this->parseGUID($event);
-            $attributes['eventId'] = $eventId;
-        }
-        // remove unnecessary data so it doesn't get added to the query vars
-        unset($attributes['ticket'], $attributes['datetime'], $attributes['event']);
-        return $attributes;
-    }
+	/**
+	 * Get query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function parseGlobalIDs(array $attributes)
+	{
+		// if ticket ID is set, then that's all we need to run the query
+		$ticket = isset($attributes['ticket']) ? $attributes['ticket'] : '';
+		$datetime = isset($attributes['datetime']) ? $attributes['datetime'] : '';
+		$event = isset($attributes['event']) ? $attributes['event'] : '';
+		if ($ticket !== '') {
+			$ticketId = $this->parseGUID($ticket);
+			$attributes['ticketId'] = $ticketId;
+		} elseif ($datetime !== '') {
+			$datetimeId = $this->parseGUID($datetime);
+			$attributes['datetimeId'] = $datetimeId;
+		} elseif ($event !== '') {
+			$eventId = $this->parseGUID($event);
+			$attributes['eventId'] = $eventId;
+		}
+		// remove unnecessary data so it doesn't get added to the query vars
+		unset($attributes['ticket'], $attributes['datetime'], $attributes['event']);
+		return $attributes;
+	}
 
 
-    /**
-     * Get query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getQueryParams(array $attributes)
-    {
-        return array(
-            0 => $this->getWhereQueryPart($attributes),
-            'default_where_conditions' => 'this_model_only',
-            'limit' => $attributes['limit'],
-            'group_by' => array('ATT_ID'),
-            'order_by' => $this->getOrderByQueryPart($attributes)
-        );
-    }
+	/**
+	 * Get query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getQueryParams(array $attributes)
+	{
+		return array(
+			0 => $this->getWhereQueryPart($attributes),
+			'default_where_conditions' => 'this_model_only',
+			'limit' => $attributes['limit'],
+			'group_by' => array('ATT_ID'),
+			'order_by' => $this->getOrderByQueryPart($attributes)
+		);
+	}
 
 
-    /**
-     * Get where query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getWhereQueryPart(array $attributes)
-    {
-        $where = array();
-        if ($attributes['ticketId'] > 0) {
-            $where['Registration.TKT_ID'] = $attributes['ticketId'];
-        } elseif ($attributes['datetimeId'] > 0) {
-            $where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
-        } else {
-            $where['Registration.EVT_ID'] = $attributes['eventId'];
-        }
-        $where['Registration.STS_ID'] = $attributes['status'];
-        return $where;
-    }
+	/**
+	 * Get where query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getWhereQueryPart(array $attributes)
+	{
+		$where = array();
+		if ($attributes['ticketId'] > 0) {
+			$where['Registration.TKT_ID'] = $attributes['ticketId'];
+		} elseif ($attributes['datetimeId'] > 0) {
+			$where['Registration.Ticket.Datetime.DTT_ID'] = $attributes['datetimeId'];
+		} else {
+			$where['Registration.EVT_ID'] = $attributes['eventId'];
+		}
+		$where['Registration.STS_ID'] = $attributes['status'];
+		return $where;
+	}
 
 
-    /**
-     * Get order by query part for query parameters for model query.
-     *
-     * @param array $attributes
-     * @return array
-     */
-    private function getOrderByQueryPart(array $attributes)
-    {
-        $order = $attributes['order'];
-        switch ($attributes['orderBy']) {
-            case 'id':
-                $order_by = array('ATT_ID' => $order);
-                break;
-            case 'lastNameOnly':
-                $order_by = array('ATT_lname' => $order);
-                break;
-            case 'firstNameOnly':
-                $order_by = array('ATT_fname' => $order);
-                break;
-            case 'firstThenLastName':
-                $order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
-                break;
-            default:
-                $order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
-                break;
-        }
-        return $order_by;
-    }
+	/**
+	 * Get order by query part for query parameters for model query.
+	 *
+	 * @param array $attributes
+	 * @return array
+	 */
+	private function getOrderByQueryPart(array $attributes)
+	{
+		$order = $attributes['order'];
+		switch ($attributes['orderBy']) {
+			case 'id':
+				$order_by = array('ATT_ID' => $order);
+				break;
+			case 'lastNameOnly':
+				$order_by = array('ATT_lname' => $order);
+				break;
+			case 'firstNameOnly':
+				$order_by = array('ATT_fname' => $order);
+				break;
+			case 'firstThenLastName':
+				$order_by = array('ATT_fname' => $order, 'ATT_lname' => $order);
+				break;
+			default:
+				$order_by = array('ATT_lname' => $order, 'ATT_fname' => $order);
+				break;
+		}
+		return $order_by;
+	}
 }

core/services/blocks/BlockRendererInterface.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
 interface BlockRendererInterface
 {
 
-    /**
-     * This receives an array of attributes and returns rendered content for the block using those attributes.
-     *
-     * @param array $attributes
-     * @return string Rendered Content
-     */
-    public function render(array $attributes);
+	/**
+	 * This receives an array of attributes and returns rendered content for the block using those attributes.
+	 *
+	 * @param array $attributes
+	 * @return string Rendered Content
+	 */
+	public function render(array $attributes);
 }

core/services/blocks/BlockRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
      */
     private function setTemplateRootPath()
     {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+        $this->template_root_path = $this->domain->pluginPath().'ui/blocks/';
     }
 
 

Indentation +44 added lines, -44 removed lines

@@ -15,57 +15,57 @@
 abstract class BlockRenderer implements BlockRendererInterface
 {
 
-    /**
-     * @var DomainInterface
-     */
-    protected $domain;
+	/**
+	 * @var DomainInterface
+	 */
+	protected $domain;
 
-    /**
-     * @var string
-     */
-    private $template_root_path;
+	/**
+	 * @var string
+	 */
+	private $template_root_path;
 
 
-    /**
-     * BlockRenderer constructor.
-     *
-     * @param DomainInterface $domain
-     */
-    public function __construct(DomainInterface $domain)
-    {
-        $this->domain = $domain;
-        $this->setTemplateRootPath();
-    }
+	/**
+	 * BlockRenderer constructor.
+	 *
+	 * @param DomainInterface $domain
+	 */
+	public function __construct(DomainInterface $domain)
+	{
+		$this->domain = $domain;
+		$this->setTemplateRootPath();
+	}
 
 
-    /**
-     * Sets the root path to the main block template.
-     */
-    private function setTemplateRootPath()
-    {
-        $this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
-    }
+	/**
+	 * Sets the root path to the main block template.
+	 */
+	private function setTemplateRootPath()
+	{
+		$this->template_root_path = $this->domain->pluginPath() . 'ui/blocks/';
+	}
 
 
-    /**
-     * Exposes the root path for the main block template.
-     * @return string
-     */
-    public function templateRootPath()
-    {
-        return $this->template_root_path;
-    }
+	/**
+	 * Exposes the root path for the main block template.
+	 * @return string
+	 */
+	public function templateRootPath()
+	{
+		return $this->template_root_path;
+	}
 
 
-    /**
-     * converts GraphQL GUID into EE DB ID
-     *
-     * @param string $GUID
-     * @return int
-     */
-    protected function parseGUID($GUID)
-    {
-        $parts = Relay::fromGlobalId($GUID);
-        return ! empty($parts['id']) ? $parts['id'] : 0;
-    }
+	/**
+	 * converts GraphQL GUID into EE DB ID
+	 *
+	 * @param string $GUID
+	 * @return int
+	 */
+	protected function parseGUID($GUID)
+	{
+		$parts = Relay::fromGlobalId($GUID);
+		return ! empty($parts['id']) ? $parts['id'] : 0;
+	}
 }

ui/blocks/event-attendees.php

Spacing +5 added lines, -5 removed lines

@@ -23,14 +23,14 @@
                 )
                 : '';
             $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+                ? $attributes['avatarClass'].' contact-avatar-img avatar'
                 : 'contact-avatar-img avatar';
             $gravatar = $gravatar !== ''
                 ? '<div class="contact-image-wrap-div">'
-                    . '<img class="' . $gravatar_class . '"'
-                    . ' width="' . $attributes['avatarSize'] . '"'
-                    . ' height="' . $attributes['avatarSize'] . '"'
-                    . ' src="' . $gravatar . '" alt="contact avatar">'
+                    . '<img class="'.$gravatar_class.'"'
+                    . ' width="'.$attributes['avatarSize'].'"'
+                    . ' height="'.$attributes['avatarSize'].'"'
+                    . ' src="'.$gravatar.'" alt="contact avatar">'
                     . '</div>'
                 : '';
             echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";

Indentation +24 added lines, -24 removed lines

@@ -11,29 +11,29 @@
 <div id="ee-block-event-attendees" class="ee-core-blocks event-espresso-blocks event-attendees">
     <ul>
         <?php
-        foreach ($attendees as $attendee) {
-            $gravatar = $attributes['showGravatar']
-                ? get_avatar_url(
-                    $attendee->email(),
-                    array(
-                        'width'   => $attributes['avatarSize'],
-                        'height'  => $attributes['avatarSize']
-                    )
-                )
-                : '';
-            $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
-                : 'contact-avatar-img avatar';
-            $gravatar = $gravatar !== ''
-                ? '<div class="contact-image-wrap-div">'
-                    . '<img class="' . $gravatar_class . '"'
-                    . ' width="' . $attributes['avatarSize'] . '"'
-                    . ' height="' . $attributes['avatarSize'] . '"'
-                    . ' src="' . $gravatar . '" alt="contact avatar">'
-                    . '</div>'
-                : '';
-            echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";
-        }
-        ?>
+		foreach ($attendees as $attendee) {
+			$gravatar = $attributes['showGravatar']
+				? get_avatar_url(
+					$attendee->email(),
+					array(
+						'width'   => $attributes['avatarSize'],
+						'height'  => $attributes['avatarSize']
+					)
+				)
+				: '';
+			$gravatar_class = $attributes['avatarClass']
+				? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+				: 'contact-avatar-img avatar';
+			$gravatar = $gravatar !== ''
+				? '<div class="contact-image-wrap-div">'
+					. '<img class="' . $gravatar_class . '"'
+					. ' width="' . $attributes['avatarSize'] . '"'
+					. ' height="' . $attributes['avatarSize'] . '"'
+					. ' src="' . $gravatar . '" alt="contact avatar">'
+					. '</div>'
+				: '';
+			echo "<li>{$gravatar}<span>{$attendee->full_name()}</span>";
+		}
+		?>
     </ul>
 </div>

core/EE_Network_Config.core.php

Indentation +197 added lines, -197 removed lines

@@ -14,180 +14,180 @@ 
 final class EE_Network_Config
 {
 
-    /**
-     * @var EE_Network_Config $_instance
-     */
-    private static $_instance;
-
-    /**
-     * addons can add their specific network_config objects to this property
-     *
-     * @var EE_Config_Base[] $addons
-     */
-    public $addons;
-
-    /**
-     * @var EE_Network_Core_Config $core
-     */
-    public $core;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @return EE_Network_Config instance
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EE_Network_Config) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * class constructor
-     */
-    private function __construct()
-    {
-        do_action('AHEE__EE_Network_Config__construct__begin', $this);
-        // set defaults
-        $this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
-        $this->addons = array();
-
-        $this->_load_config();
-
-        // construct__end hook
-        do_action('AHEE__EE_Network_Config__construct__end', $this);
-    }
-
-
-    /**
-     * load EE Network Config options
-     *
-     * @return void
-     */
-    private function _load_config()
-    {
-        // load network config start hook
-        do_action('AHEE__EE_Network_Config___load_config__start', $this);
-        $config = $this->get_config();
-        foreach ($config as $config_prop => $settings) {
-            if ($config_prop === 'core' && ! $settings instanceof EE_Network_Core_Config) {
-                $core = new EE_Network_Core_Config();
-                foreach ($settings as $prop => $setting) {
-                    if (property_exists($core, $prop)) {
-                        $core->{$prop} = $setting;
-                    }
-                }
-                $settings = $core;
-                add_filter('FHEE__EE_Network_Config___load_config__update_network_config', '__return_true');
-            }
-            if (is_object($settings) && property_exists($this, $config_prop)) {
-                $this->{$config_prop} = apply_filters(
-                    'FHEE__EE_Network_Config___load_config__config_settings',
-                    $settings,
-                    $config_prop,
-                    $this
-                );
-                if (method_exists($settings, 'populate')) {
-                    $this->{$config_prop}->populate();
-                }
-                if (method_exists($settings, 'do_hooks')) {
-                    $this->{$config_prop}->do_hooks();
-                }
-            }
-        }
-        if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
-            $this->update_config();
-        }
-
-        // load network config end hook
-        do_action('AHEE__EE_Network_Config___load_config__end', $this);
-    }
-
-
-    /**
-     * get_config
-     *
-     * @return array of network config stuff
-     */
-    public function get_config()
-    {
-        // grab network configuration
-        $CFG = get_site_option('ee_network_config', array());
-        $CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
-        return $CFG;
-    }
-
-
-    /**
-     * update_config
-     *
-     * @param bool $add_success
-     * @param bool $add_error
-     * @return bool success
-     */
-    public function update_config($add_success = false, $add_error = true)
-    {
-        do_action('AHEE__EE_Network_Config__update_config__begin', $this);
-
-        // need to bust cache for comparing original if this is a multisite install
-        if (is_multisite()) {
-            global $current_site;
-            $cache_key = $current_site->id . ':ee_network_config';
-            wp_cache_delete($cache_key, 'site-options');
-        }
-
-        // we have to compare existing saved config with config in memory because if there is no difference that means
-        // that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
-        // there were 0 records updated because of no change vs false because some error produced problems with the update.
-        $original = get_site_option('ee_network_config');
-
-        if ($original == $this) {
-            return true;
-        }
-        // update
-        $saved = update_site_option('ee_network_config', $this);
-
-        do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
-        // if config remains the same or was updated successfully
-        if ($saved) {
-            if ($add_success) {
-                $msg = is_multisite() ? __(
-                    'The Event Espresso Network Configuration Settings have been successfully updated.',
-                    'event_espresso'
-                ) : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
-                EE_Error::add_success($msg);
-            }
-            return true;
-        }
-        if ($add_error) {
-            $msg = is_multisite() ? __(
-                'The Event Espresso Network Configuration Settings were not updated.',
-                'event_espresso'
-            ) : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-        }
-        return false;
-    }
-
-
-    /**
-     * __sleep
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        return apply_filters(
-            'FHEE__EE_Network_Config__sleep',
-            array(
-                'core',
-            )
-        );
-    }
+	/**
+	 * @var EE_Network_Config $_instance
+	 */
+	private static $_instance;
+
+	/**
+	 * addons can add their specific network_config objects to this property
+	 *
+	 * @var EE_Config_Base[] $addons
+	 */
+	public $addons;
+
+	/**
+	 * @var EE_Network_Core_Config $core
+	 */
+	public $core;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @return EE_Network_Config instance
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (! self::$_instance instanceof EE_Network_Config) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * class constructor
+	 */
+	private function __construct()
+	{
+		do_action('AHEE__EE_Network_Config__construct__begin', $this);
+		// set defaults
+		$this->core = apply_filters('FHEE__EE_Network_Config___construct__core', new EE_Network_Core_Config());
+		$this->addons = array();
+
+		$this->_load_config();
+
+		// construct__end hook
+		do_action('AHEE__EE_Network_Config__construct__end', $this);
+	}
+
+
+	/**
+	 * load EE Network Config options
+	 *
+	 * @return void
+	 */
+	private function _load_config()
+	{
+		// load network config start hook
+		do_action('AHEE__EE_Network_Config___load_config__start', $this);
+		$config = $this->get_config();
+		foreach ($config as $config_prop => $settings) {
+			if ($config_prop === 'core' && ! $settings instanceof EE_Network_Core_Config) {
+				$core = new EE_Network_Core_Config();
+				foreach ($settings as $prop => $setting) {
+					if (property_exists($core, $prop)) {
+						$core->{$prop} = $setting;
+					}
+				}
+				$settings = $core;
+				add_filter('FHEE__EE_Network_Config___load_config__update_network_config', '__return_true');
+			}
+			if (is_object($settings) && property_exists($this, $config_prop)) {
+				$this->{$config_prop} = apply_filters(
+					'FHEE__EE_Network_Config___load_config__config_settings',
+					$settings,
+					$config_prop,
+					$this
+				);
+				if (method_exists($settings, 'populate')) {
+					$this->{$config_prop}->populate();
+				}
+				if (method_exists($settings, 'do_hooks')) {
+					$this->{$config_prop}->do_hooks();
+				}
+			}
+		}
+		if (apply_filters('FHEE__EE_Network_Config___load_config__update_network_config', false)) {
+			$this->update_config();
+		}
+
+		// load network config end hook
+		do_action('AHEE__EE_Network_Config___load_config__end', $this);
+	}
+
+
+	/**
+	 * get_config
+	 *
+	 * @return array of network config stuff
+	 */
+	public function get_config()
+	{
+		// grab network configuration
+		$CFG = get_site_option('ee_network_config', array());
+		$CFG = apply_filters('FHEE__EE_Network_Config__get_config__CFG', $CFG);
+		return $CFG;
+	}
+
+
+	/**
+	 * update_config
+	 *
+	 * @param bool $add_success
+	 * @param bool $add_error
+	 * @return bool success
+	 */
+	public function update_config($add_success = false, $add_error = true)
+	{
+		do_action('AHEE__EE_Network_Config__update_config__begin', $this);
+
+		// need to bust cache for comparing original if this is a multisite install
+		if (is_multisite()) {
+			global $current_site;
+			$cache_key = $current_site->id . ':ee_network_config';
+			wp_cache_delete($cache_key, 'site-options');
+		}
+
+		// we have to compare existing saved config with config in memory because if there is no difference that means
+		// that the method executed fine but there just was no update.  WordPress doesn't distinguish between false because
+		// there were 0 records updated because of no change vs false because some error produced problems with the update.
+		$original = get_site_option('ee_network_config');
+
+		if ($original == $this) {
+			return true;
+		}
+		// update
+		$saved = update_site_option('ee_network_config', $this);
+
+		do_action('AHEE__EE_Network_Config__update_config__end', $this, $saved);
+		// if config remains the same or was updated successfully
+		if ($saved) {
+			if ($add_success) {
+				$msg = is_multisite() ? __(
+					'The Event Espresso Network Configuration Settings have been successfully updated.',
+					'event_espresso'
+				) : __('Extra Event Espresso Configuration settings were successfully updated.', 'event_espresso');
+				EE_Error::add_success($msg);
+			}
+			return true;
+		}
+		if ($add_error) {
+			$msg = is_multisite() ? __(
+				'The Event Espresso Network Configuration Settings were not updated.',
+				'event_espresso'
+			) : __('Extra Event Espresso Network Configuration settings were not updated.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+		}
+		return false;
+	}
+
+
+	/**
+	 * __sleep
+	 *
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		return apply_filters(
+			'FHEE__EE_Network_Config__sleep',
+			array(
+				'core',
+			)
+		);
+	}
 }
 
 
@@ -197,27 +197,27 @@ 
 class EE_Network_Core_Config extends EE_Config_Base
 {
 
-    /**
-     * PUE site license key
-     *
-     * @var string $site_license_key
-     */
-    public $site_license_key;
-
-    /**
-     * This indicates whether messages system processing should be done on the same request or not.
-     *
-     * @var boolean $do_messages_on_same_request
-     */
-    public $do_messages_on_same_request;
-
-
-    /**
-     * EE_Network_Core_Config constructor.
-     */
-    public function __construct()
-    {
-        $this->site_license_key = '';
-        $this->do_messages_on_same_request = false;
-    }
+	/**
+	 * PUE site license key
+	 *
+	 * @var string $site_license_key
+	 */
+	public $site_license_key;
+
+	/**
+	 * This indicates whether messages system processing should be done on the same request or not.
+	 *
+	 * @var boolean $do_messages_on_same_request
+	 */
+	public $do_messages_on_same_request;
+
+
+	/**
+	 * EE_Network_Core_Config constructor.
+	 */
+	public function __construct()
+	{
+		$this->site_license_key = '';
+		$this->do_messages_on_same_request = false;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EE_Network_Config) {
+        if ( ! self::$_instance instanceof EE_Network_Config) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -136,7 +136,7 @@ 
         // need to bust cache for comparing original if this is a multisite install
         if (is_multisite()) {
             global $current_site;
-            $cache_key = $current_site->id . ':ee_network_config';
+            $cache_key = $current_site->id.':ee_network_config';
             wp_cache_delete($cache_key, 'site-options');
         }
 

core/services/assets/BlockAssetManagerInterface.php

Indentation +38 added lines, -38 removed lines

@@ -12,42 +12,42 @@
  */
 interface BlockAssetManagerInterface
 {
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function assetNamespace();
-
-    /**
-     * @since 4.9.71.p
-     * @return void
-     */
-    public function setAssetHandles();
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function getEditorScriptHandle();
-
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function getEditorStyleHandle();
-
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function getScriptHandle();
-
-
-    /**
-     * @since 4.9.71.p
-     * @return string
-     */
-    public function getStyleHandle();
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function assetNamespace();
+
+	/**
+	 * @since 4.9.71.p
+	 * @return void
+	 */
+	public function setAssetHandles();
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function getEditorScriptHandle();
+
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function getEditorStyleHandle();
+
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function getScriptHandle();
+
+
+	/**
+	 * @since 4.9.71.p
+	 * @return string
+	 */
+	public function getStyleHandle();
 }
\ No newline at end of file

core/services/dependencies/DependencyResolverInterface.php

Indentation +11 added lines, -11 removed lines

@@ -15,16 +15,16 @@
  */
 interface DependencyResolverInterface
 {
-    /**
-     * Used to configure and/or setup any aliases or recursions required by the DependencyResolver
-     *
-     * @since 4.9.71.p
-     */
-    public function initialize();
+	/**
+	 * Used to configure and/or setup any aliases or recursions required by the DependencyResolver
+	 *
+	 * @since 4.9.71.p
+	 */
+	public function initialize();
 
-    /**
-     * @param string $fqcn Fully Qualified Class Name
-     * @since 4.9.71.p
-     */
-    public function resolveDependenciesForClass($fqcn);
+	/**
+	 * @param string $fqcn Fully Qualified Class Name
+	 * @since 4.9.71.p
+	 */
+	public function resolveDependenciesForClass($fqcn);
 }

core/libraries/rest_api/RestIncomingQueryParamContext.php

Indentation +51 added lines, -51 removed lines

@@ -18,61 +18,61 @@
  */
 class RestIncomingQueryParamContext
 {
-    /**
-     * @var EEM_Base
-     */
-    private $model;
-    /**
-     * @var string
-     */
-    private $requested_version;
-    /**
-     * @var boolean
-     */
-    private $writing;
+	/**
+	 * @var EEM_Base
+	 */
+	private $model;
+	/**
+	 * @var string
+	 */
+	private $requested_version;
+	/**
+	 * @var boolean
+	 */
+	private $writing;
 
-    /**
-     * RestIncomingQueryParamContext constructor.
-     * @param EEM_Base $model
-     * @param string $requested_version
-     * @param boolean $writing
-     */
-    public function __construct(EEM_Base $model, $requested_version, $writing)
-    {
-        $this->model = $model;
-        $this->requested_version = (string) $requested_version;
-        $this->writing = filter_var($writing, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * RestIncomingQueryParamContext constructor.
+	 * @param EEM_Base $model
+	 * @param string $requested_version
+	 * @param boolean $writing
+	 */
+	public function __construct(EEM_Base $model, $requested_version, $writing)
+	{
+		$this->model = $model;
+		$this->requested_version = (string) $requested_version;
+		$this->writing = filter_var($writing, FILTER_VALIDATE_BOOLEAN);
+	}
 
-    /**
-     * Gets the model currently being requested, eg class EEM_Event
-     * @since 4.9.72.p
-     * @return EEM_Base
-     */
-    public function getModel()
-    {
-        return $this->model;
-    }
+	/**
+	 * Gets the model currently being requested, eg class EEM_Event
+	 * @since 4.9.72.p
+	 * @return EEM_Base
+	 */
+	public function getModel()
+	{
+		return $this->model;
+	}
 
-    /**
-     * Gets the version being requested, eg 4.8.36
-     * @since 4.9.72.p
-     * @return string
-     */
-    public function getRequestedVersion()
-    {
-        return $this->requested_version;
-    }
+	/**
+	 * Gets the version being requested, eg 4.8.36
+	 * @since 4.9.72.p
+	 * @return string
+	 */
+	public function getRequestedVersion()
+	{
+		return $this->requested_version;
+	}
 
-    /**
-     * Gets if the current request is for a writing request or just simple read
-     * @since 4.9.72.p
-     * @return bool
-     */
-    public function isWriting()
-    {
-        return $this->writing;
-    }
+	/**
+	 * Gets if the current request is for a writing request or just simple read
+	 * @since 4.9.72.p
+	 * @return bool
+	 */
+	public function isWriting()
+	{
+		return $this->writing;
+	}
 }
 // End of file RestIncomingQueryParamContext.php
 // Location: EventEspresso\core\libraries\rest_api/RestIncomingQueryParamContext.php