eventespresso / event-espresso-core

core/libraries/form_sections/inputs/EE_State_Select_Input.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
     {
         if (isset($input_settings['value_field_name'])) {
             $this->valueFieldName = $input_settings['value_field_name'];
-            if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
+            if ( ! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
                 throw new InvalidArgumentException(
                     sprintf(
                         esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
@@ -53,7 +53,7 @@ 
             $this
         );
         $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-state-select-js'
+            ? $input_settings['html_class'].' ee-state-select-js'
             : 'ee-state-select-js';
         parent::__construct($state_options, $input_settings);
     }
@@ -83,7 +83,7 @@ 
     public function get_state_answer_options($state_options = null)
     {
         // if passed something that is NOT an array
-        if (! is_array($state_options) || empty($state_options)) {
+        if ( ! is_array($state_options) || empty($state_options)) {
             // get possibly cached list of states
             $states = EEM_State::instance()->get_all_active_states();
         }
@@ -91,12 +91,12 @@ 
             $states = $state_options;
             $state_options = array();
         }
-        if (! empty($states)) {
+        if ( ! empty($states)) {
             // set the default
             $state_options[''][''] = '';
             foreach ($states as $state) {
                 if ($state instanceof EE_State) {
-                    $state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
+                    $state_options[$state->country()->name()][$state->get($this->valueFieldName())] = $state->name();
                 }
             }
         }

Indentation +86 added lines, -86 removed lines

@@ -12,94 +12,94 @@
  */
 class EE_State_Select_Input extends EE_Select_Input
 {
-    /**
-     * @var string the name of the EE_State field to use for option values in the HTML form input.
-     */
-    protected $valueFieldName;
+	/**
+	 * @var string the name of the EE_State field to use for option values in the HTML form input.
+	 */
+	protected $valueFieldName;
 
-    /**
-     * @param EE_State[]|array|null $state_options. If a flat array of string is provided,
-     * $input_settings['value_field_name'] is ignored. If an array of states is passed, that field will be used for
-     * the keys (which will become the option values). If null or empty is passed, all active states will be used,
-     * and $input_settings['value_field_name'] will again be used.     *
-     * @param array $input_settings same as parent, but also {
-     *   @type string $value_field_name the name of the field to use
-     *   for the HTML option values, ie, `STA_ID`, `STA_abbrev`, or `STA_name`.
-     * }
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct($state_options, $input_settings = array())
-    {
-        if (isset($input_settings['value_field_name'])) {
-            $this->valueFieldName = $input_settings['value_field_name'];
-            if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
-                        $this->valueFieldName()
-                    )
-                );
-            }
-        } else {
-            $this->valueFieldName = 'STA_ID';
-        }
-        $state_options = apply_filters(
-            'FHEE__EE_State_Select_Input____construct__state_options',
-            $this->get_state_answer_options($state_options),
-            $this
-        );
-        $input_settings['html_class'] = isset($input_settings['html_class'])
-            ? $input_settings['html_class'] . ' ee-state-select-js'
-            : 'ee-state-select-js';
-        parent::__construct($state_options, $input_settings);
-    }
+	/**
+	 * @param EE_State[]|array|null $state_options. If a flat array of string is provided,
+	 * $input_settings['value_field_name'] is ignored. If an array of states is passed, that field will be used for
+	 * the keys (which will become the option values). If null or empty is passed, all active states will be used,
+	 * and $input_settings['value_field_name'] will again be used.     *
+	 * @param array $input_settings same as parent, but also {
+	 *   @type string $value_field_name the name of the field to use
+	 *   for the HTML option values, ie, `STA_ID`, `STA_abbrev`, or `STA_name`.
+	 * }
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct($state_options, $input_settings = array())
+	{
+		if (isset($input_settings['value_field_name'])) {
+			$this->valueFieldName = $input_settings['value_field_name'];
+			if (! EEM_State::instance()->has_field((string) $this->valueFieldName())) {
+				throw new InvalidArgumentException(
+					sprintf(
+						esc_html__('An invalid state field "%1$s" was specified for the state input\'s option values.', 'event_espresso'),
+						$this->valueFieldName()
+					)
+				);
+			}
+		} else {
+			$this->valueFieldName = 'STA_ID';
+		}
+		$state_options = apply_filters(
+			'FHEE__EE_State_Select_Input____construct__state_options',
+			$this->get_state_answer_options($state_options),
+			$this
+		);
+		$input_settings['html_class'] = isset($input_settings['html_class'])
+			? $input_settings['html_class'] . ' ee-state-select-js'
+			: 'ee-state-select-js';
+		parent::__construct($state_options, $input_settings);
+	}
 
-    /**
-     * Returns the name of the state field used for the HTML option values.
-     * @since 4.10.0.p
-     * @return string
-     */
-    public function valueFieldName()
-    {
-        return $this->valueFieldName;
-    }
+	/**
+	 * Returns the name of the state field used for the HTML option values.
+	 * @since 4.10.0.p
+	 * @return string
+	 */
+	public function valueFieldName()
+	{
+		return $this->valueFieldName;
+	}
 
 
-    /**
-     * get_state_answer_options
-     *
-     * @param array $state_options
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function get_state_answer_options($state_options = null)
-    {
-        // if passed something that is NOT an array
-        if (! is_array($state_options) || empty($state_options)) {
-            // get possibly cached list of states
-            $states = EEM_State::instance()->get_all_active_states();
-        }
-        if (is_array($state_options) && reset($state_options) instanceof EE_State) {
-            $states = $state_options;
-            $state_options = array();
-        }
-        if (! empty($states)) {
-            // set the default
-            $state_options[''][''] = '';
-            foreach ($states as $state) {
-                if ($state instanceof EE_State) {
-                    $state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
-                }
-            }
-        }
-        return $state_options ?? [];
-    }
+	/**
+	 * get_state_answer_options
+	 *
+	 * @param array $state_options
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function get_state_answer_options($state_options = null)
+	{
+		// if passed something that is NOT an array
+		if (! is_array($state_options) || empty($state_options)) {
+			// get possibly cached list of states
+			$states = EEM_State::instance()->get_all_active_states();
+		}
+		if (is_array($state_options) && reset($state_options) instanceof EE_State) {
+			$states = $state_options;
+			$state_options = array();
+		}
+		if (! empty($states)) {
+			// set the default
+			$state_options[''][''] = '';
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$state_options[ $state->country()->name() ][ $state->get($this->valueFieldName()) ] = $state->name();
+				}
+			}
+		}
+		return $state_options ?? [];
+	}
 }

admin_pages/registrations/Registrations_Admin_Page_Init.core.php

Spacing +7 added lines, -7 removed lines

@@ -23,15 +23,15 @@
     public function __construct()
     {
         do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('REG_PG_SLUG')) {
+        if ( ! defined('REG_PG_SLUG')) {
             define('REG_PG_SLUG', 'espresso_registrations');
             define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
-            define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
-            define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
-            define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
-            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
-            define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
-            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
+            define('REG_ADMIN', EE_ADMIN_PAGES.'registrations/');
+            define('REG_ADMIN_URL', admin_url('admin.php?page='.REG_PG_SLUG));
+            define('REG_ASSETS_PATH', REG_ADMIN.'assets/');
+            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL.'registrations/assets/');
+            define('REG_TEMPLATE_PATH', REG_ADMIN.'templates/');
+            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registrations/templates/');
         }
 
         parent::__construct();

Indentation +39 added lines, -39 removed lines

@@ -11,48 +11,48 @@
  */
 class Registrations_Admin_Page_Init extends EE_Admin_Page_CPT_Init
 {
-    /**
-     *        constructor
-     *
-     * @Constructor
-     * @access public
-     * @return void
-     */
-    public function __construct()
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        if (! defined('REG_PG_SLUG')) {
-            define('REG_PG_SLUG', 'espresso_registrations');
-            define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
-            define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
-            define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
-            define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
-            define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
-            define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
-            define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
-        }
+	/**
+	 *        constructor
+	 *
+	 * @Constructor
+	 * @access public
+	 * @return void
+	 */
+	public function __construct()
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		if (! defined('REG_PG_SLUG')) {
+			define('REG_PG_SLUG', 'espresso_registrations');
+			define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
+			define('REG_ADMIN', EE_ADMIN_PAGES . 'registrations/');
+			define('REG_ADMIN_URL', admin_url('admin.php?page=' . REG_PG_SLUG));
+			define('REG_ASSETS_PATH', REG_ADMIN . 'assets/');
+			define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/');
+			define('REG_TEMPLATE_PATH', REG_ADMIN . 'templates/');
+			define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/');
+		}
 
-        parent::__construct();
-    }
+		parent::__construct();
+	}
 
 
-    protected function _set_init_properties()
-    {
-        $this->label = esc_html__('Registrations Overview', 'event_espresso');
-    }
+	protected function _set_init_properties()
+	{
+		$this->label = esc_html__('Registrations Overview', 'event_espresso');
+	}
 
 
-    public function getMenuProperties(): array
-    {
-        return [
-            'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
-            'menu_group'      => 'main',
-            'menu_order'      => 40,
-            'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
-            'parent_slug'     => 'espresso_events',
-            'menu_slug'       => REG_PG_SLUG,
-            'menu_label'      => esc_html__('Registrations', 'event_espresso'),
-            'capability'      => 'ee_read_registrations',
-        ];
-    }
+	public function getMenuProperties(): array
+	{
+		return [
+			'menu_type'       => AdminMenuItem::TYPE_MENU_SUB_ITEM,
+			'menu_group'      => 'main',
+			'menu_order'      => 40,
+			'show_on_menu'    => AdminMenuItem::DISPLAY_BLOG_ONLY,
+			'parent_slug'     => 'espresso_events',
+			'menu_slug'       => REG_PG_SLUG,
+			'menu_label'      => esc_html__('Registrations', 'event_espresso'),
+			'capability'      => 'ee_read_registrations',
+		];
+	}
 }

core/services/bootstrap/BootstrapCore.php

Spacing +4 added lines, -4 removed lines

@@ -199,7 +199,7 @@ 
         // load interfaces
         espresso_load_required(
             'EEH_Autoloader',
-            EE_CORE . 'helpers/EEH_Autoloader.helper.php'
+            EE_CORE.'helpers/EEH_Autoloader.helper.php'
         );
         EEH_Autoloader::instance();
     }
@@ -213,13 +213,13 @@ 
     protected function setAutoloadersForRequiredFiles()
     {
         // load interfaces
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'interfaces', true);
         // load helpers
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
         // register legacy request stack classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'request_stack/');
         // register legacy middleware classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'middleware/');
     }
 
 

Indentation +186 added lines, -186 removed lines

@@ -53,212 +53,212 @@
  */
 class BootstrapCore
 {
-    private LoaderInterface       $loader;
+	private LoaderInterface       $loader;
 
-    protected RequestInterface    $request;
+	protected RequestInterface    $request;
 
-    protected ResponseInterface   $response;
+	protected ResponseInterface   $response;
 
-    protected RequestStackBuilder $request_stack_builder;
+	protected RequestStackBuilder $request_stack_builder;
 
-    protected RequestStack        $request_stack;
+	protected RequestStack        $request_stack;
 
 
-    /**
-     * BootstrapCore constructor.
-     */
-    public function __construct()
-    {
-        do_action('AHEE__EventEspresso_core_services_bootstrap_BootstrapCore___construct');
-        // construct request stack and run middleware apps as soon as all WP plugins are loaded
-        add_action('plugins_loaded', [$this, 'initialize'], 0);
-    }
+	/**
+	 * BootstrapCore constructor.
+	 */
+	public function __construct()
+	{
+		do_action('AHEE__EventEspresso_core_services_bootstrap_BootstrapCore___construct');
+		// construct request stack and run middleware apps as soon as all WP plugins are loaded
+		add_action('plugins_loaded', [$this, 'initialize'], 0);
+	}
 
 
-    /**
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     * @throws InvalidRequestStackMiddlewareException
-     * @throws OutOfBoundsException
-     * @throws ReflectionException
-     * @throws Throwable
-     */
-    public function initialize()
-    {
-        $this->bootstrapDependencyInjectionContainer();
-        $this->bootstrapDomain();
-        $bootstrap_request = $this->bootstrapRequestResponseObjects();
-        add_action(
-            'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
-            [$bootstrap_request, 'setupLegacyRequest']
-        );
-        $this->runRequestStack();
-    }
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidRequestStackMiddlewareException
+	 * @throws OutOfBoundsException
+	 * @throws ReflectionException
+	 * @throws Throwable
+	 */
+	public function initialize()
+	{
+		$this->bootstrapDependencyInjectionContainer();
+		$this->bootstrapDomain();
+		$bootstrap_request = $this->bootstrapRequestResponseObjects();
+		add_action(
+			'EE_Load_Espresso_Core__handle_request__initialize_core_loading',
+			[$bootstrap_request, 'setupLegacyRequest']
+		);
+		$this->runRequestStack();
+	}
 
 
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws OutOfBoundsException
-     */
-    private function bootstrapDependencyInjectionContainer()
-    {
-        $bootstrap_di = new BootstrapDependencyInjectionContainer();
-        $bootstrap_di->buildLegacyDependencyInjectionContainer();
-        $bootstrap_di->buildLoader();
-        $registry       = $bootstrap_di->getRegistry();
-        $dependency_map = $bootstrap_di->getDependencyMap();
-        $dependency_map->initialize();
-        $registry->initialize();
-        $this->loader = $bootstrap_di->getLoader();
-    }
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws OutOfBoundsException
+	 */
+	private function bootstrapDependencyInjectionContainer()
+	{
+		$bootstrap_di = new BootstrapDependencyInjectionContainer();
+		$bootstrap_di->buildLegacyDependencyInjectionContainer();
+		$bootstrap_di->buildLoader();
+		$registry       = $bootstrap_di->getRegistry();
+		$dependency_map = $bootstrap_di->getDependencyMap();
+		$dependency_map->initialize();
+		$registry->initialize();
+		$this->loader = $bootstrap_di->getLoader();
+	}
 
 
-    /**
-     * configures the Domain object for core
-     *
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     * @throws InvalidFilePathException
-     * @throws InvalidInterfaceException
-     */
-    private function bootstrapDomain()
-    {
-        DomainFactory::getEventEspressoCoreDomain();
-    }
+	/**
+	 * configures the Domain object for core
+	 *
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidInterfaceException
+	 */
+	private function bootstrapDomain()
+	{
+		DomainFactory::getEventEspressoCoreDomain();
+	}
 
 
-    /**
-     * sets up the request and response objects
-     *
-     * @return BootstrapRequestResponseObjects
-     * @throws InvalidArgumentException
-     */
-    private function bootstrapRequestResponseObjects(): BootstrapRequestResponseObjects
-    {
-        /** @var BootstrapRequestResponseObjects $bootstrap_request */
-        $bootstrap_request = $this->loader->getShared(
-            'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
-            [$this->loader]
-        );
-        $bootstrap_request->buildRequestResponse();
-        $bootstrap_request->shareRequestResponse();
-        $this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
-        $this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
-        return $bootstrap_request;
-    }
+	/**
+	 * sets up the request and response objects
+	 *
+	 * @return BootstrapRequestResponseObjects
+	 * @throws InvalidArgumentException
+	 */
+	private function bootstrapRequestResponseObjects(): BootstrapRequestResponseObjects
+	{
+		/** @var BootstrapRequestResponseObjects $bootstrap_request */
+		$bootstrap_request = $this->loader->getShared(
+			'EventEspresso\core\services\bootstrap\BootstrapRequestResponseObjects',
+			[$this->loader]
+		);
+		$bootstrap_request->buildRequestResponse();
+		$bootstrap_request->shareRequestResponse();
+		$this->request  = $this->loader->getShared('EventEspresso\core\services\request\Request');
+		$this->response = $this->loader->getShared('EventEspresso\core\services\request\Response');
+		return $bootstrap_request;
+	}
 
 
-    /**
-     * run_request_stack
-     * construct request stack and run middleware apps
-     *
-     * @throws EE_Error
-     * @throws Exception
-     * @throws Throwable
-     */
-    public function runRequestStack()
-    {
-        $this->loadAutoloader();
-        $this->setAutoloadersForRequiredFiles();
-        $this->request_stack_builder = $this->buildRequestStack();
-        $this->request_stack         = $this->request_stack_builder->resolve(
-            new RequestStackCoreApp()
-        );
-        $this->request_stack->handleRequest($this->request, $this->response);
-        $this->request_stack->handleResponse();
-    }
+	/**
+	 * run_request_stack
+	 * construct request stack and run middleware apps
+	 *
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws Throwable
+	 */
+	public function runRequestStack()
+	{
+		$this->loadAutoloader();
+		$this->setAutoloadersForRequiredFiles();
+		$this->request_stack_builder = $this->buildRequestStack();
+		$this->request_stack         = $this->request_stack_builder->resolve(
+			new RequestStackCoreApp()
+		);
+		$this->request_stack->handleRequest($this->request, $this->response);
+		$this->request_stack->handleResponse();
+	}
 
 
-    /**
-     * load_autoloader
-     *
-     * @throws EE_Error
-     */
-    protected function loadAutoloader()
-    {
-        // load interfaces
-        espresso_load_required(
-            'EEH_Autoloader',
-            EE_CORE . 'helpers/EEH_Autoloader.helper.php'
-        );
-        EEH_Autoloader::instance();
-    }
+	/**
+	 * load_autoloader
+	 *
+	 * @throws EE_Error
+	 */
+	protected function loadAutoloader()
+	{
+		// load interfaces
+		espresso_load_required(
+			'EEH_Autoloader',
+			EE_CORE . 'helpers/EEH_Autoloader.helper.php'
+		);
+		EEH_Autoloader::instance();
+	}
 
 
-    /**
-     * load_required_files
-     *
-     * @throws EE_Error
-     */
-    protected function setAutoloadersForRequiredFiles()
-    {
-        // load interfaces
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
-        // load helpers
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-        // register legacy request stack classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
-        // register legacy middleware classes just in case
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
-    }
+	/**
+	 * load_required_files
+	 *
+	 * @throws EE_Error
+	 */
+	protected function setAutoloadersForRequiredFiles()
+	{
+		// load interfaces
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'interfaces', true);
+		// load helpers
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+		// register legacy request stack classes just in case
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'request_stack/');
+		// register legacy middleware classes just in case
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'middleware/');
+	}
 
 
-    /**
-     * build_request_stack
-     *
-     * @return RequestStackBuilder
-     */
-    public function buildRequestStack(): RequestStackBuilder
-    {
-        $request_stack_builder = new RequestStackBuilder($this->loader);
-        /**
-         * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
-         * so items at the beginning of the final middleware stack will run last.
-         * First parameter is the middleware classname, second is an array of arguments
-         */
-        $stack_apps = apply_filters(
-            'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
-            [
-                // first in last out
-                BotDetector::class                 => [],
-                DetectFileEditorRequest::class     => [],
-                PreProductionVersionWarning::class => [],
-                RecommendedVersions::class         => [],
-                // last in first out
-                DetectLogin::class                 => [],
-            ]
-        );
-        // legacy filter for backwards compatibility
-        $stack_apps = apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
-            $stack_apps
-        );
-        // load middleware onto stack : FILO (First In Last Out)
-        // items at the beginning of the $stack_apps array will run last
-        foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
-            $request_stack_builder->push([$stack_app, $stack_app_args]);
-        }
-        // finally, we'll add this on its own because we need it to always be part of the stack
-        // and we also need it to always run first because the rest of the system relies on it
-        $request_stack_builder->push(
-            [SetRequestTypeContextChecker::class, []]
-        );
-        return apply_filters(
-            'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
-            $request_stack_builder
-        );
-    }
+	/**
+	 * build_request_stack
+	 *
+	 * @return RequestStackBuilder
+	 */
+	public function buildRequestStack(): RequestStackBuilder
+	{
+		$request_stack_builder = new RequestStackBuilder($this->loader);
+		/**
+		 * ! IMPORTANT ! The middleware stack operates FILO : FIRST IN LAST OUT
+		 * so items at the beginning of the final middleware stack will run last.
+		 * First parameter is the middleware classname, second is an array of arguments
+		 */
+		$stack_apps = apply_filters(
+			'FHEE__EventEspresso_core_services_bootstrap_BootstrapCore__buildRequestStack__stack_apps',
+			[
+				// first in last out
+				BotDetector::class                 => [],
+				DetectFileEditorRequest::class     => [],
+				PreProductionVersionWarning::class => [],
+				RecommendedVersions::class         => [],
+				// last in first out
+				DetectLogin::class                 => [],
+			]
+		);
+		// legacy filter for backwards compatibility
+		$stack_apps = apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__stack_apps',
+			$stack_apps
+		);
+		// load middleware onto stack : FILO (First In Last Out)
+		// items at the beginning of the $stack_apps array will run last
+		foreach ((array) $stack_apps as $stack_app => $stack_app_args) {
+			$request_stack_builder->push([$stack_app, $stack_app_args]);
+		}
+		// finally, we'll add this on its own because we need it to always be part of the stack
+		// and we also need it to always run first because the rest of the system relies on it
+		$request_stack_builder->push(
+			[SetRequestTypeContextChecker::class, []]
+		);
+		return apply_filters(
+			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
+			$request_stack_builder
+		);
+	}
 }

core/services/container/OpenCoffeeShop.php

Spacing +8 added lines, -8 removed lines

@@ -129,8 +129,8 @@ 
                 array(),
                 CoffeeMaker::BREW_LOAD_ONLY,
                 array(
-                    EE_INTERFACES . '*.php',
-                    EE_INTERFACES . '*.interfaces.php',
+                    EE_INTERFACES.'*.php',
+                    EE_INTERFACES.'*.interfaces.php',
                 )
             )
         );
@@ -142,7 +142,7 @@ 
                 array(),
                 array(),
                 CoffeeMaker::BREW_SHARED,
-                EE_MODELS . '*.model.php'
+                EE_MODELS.'*.model.php'
             )
         );
         // add a wildcard recipe for loading core classes
@@ -154,10 +154,10 @@ 
                 array(),
                 CoffeeMaker::BREW_SHARED,
                 array(
-                    EE_CORE . '*.core.php',
-                    EE_ADMIN . '*.core.php',
-                    EE_CPTS . '*.core.php',
-                    EE_CORE . 'data_migration_scripts/*.core.php',
+                    EE_CORE.'*.core.php',
+                    EE_ADMIN.'*.core.php',
+                    EE_CPTS.'*.core.php',
+                    EE_CORE.'data_migration_scripts/*.core.php',
                 )
             )
         );
@@ -169,7 +169,7 @@ 
                 array(),
                 array(),
                 CoffeeMaker::BREW_LOAD_ONLY,
-                array(EE_ADMIN . '*.core.php')
+                array(EE_ADMIN.'*.core.php')
             )
         );
         // add a wildcard recipe for loading core classes

Indentation +178 added lines, -178 removed lines

@@ -19,192 +19,192 @@
  */
 class OpenCoffeeShop
 {
-    /**
-     * @var CoffeeShop $CoffeeShop
-     */
-    private $CoffeeShop;
+	/**
+	 * @var CoffeeShop $CoffeeShop
+	 */
+	private $CoffeeShop;
 
 
-    /**
-     * OpenCoffeeShop constructor
-     *
-     * @throws InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        // instantiate the DI container
-        $this->CoffeeShop = new CoffeeShop();
-    }
+	/**
+	 * OpenCoffeeShop constructor
+	 *
+	 * @throws InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		// instantiate the DI container
+		$this->CoffeeShop = new CoffeeShop();
+	}
 
 
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @return CoffeeShop
-     */
-    public function CoffeeShop()
-    {
-        return $this->CoffeeShop;
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @return CoffeeShop
+	 */
+	public function CoffeeShop()
+	{
+		return $this->CoffeeShop;
+	}
 
 
-    /**
-     * configure coffee makers which control the different kinds of brews
-     * ( shared services, new factory objects, etc )
-     *
-     * @throws InvalidEntityException
-     */
-    public function setupCoffeeMakers()
-    {
-        // create a dependency injector class for resolving class constructor arguments
-        $DependencyInjector = new DependencyInjector(
-            $this->CoffeeShop,
-            new \EEH_Array()
-        );
-        // and some coffeemakers, one for creating new instances
-        $this->CoffeeShop->addCoffeeMaker(
-            new NewCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_NEW
-        );
-        // one for shared services
-        $this->CoffeeShop->addCoffeeMaker(
-            new SharedCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_SHARED
-        );
-        // and one for classes that only get loaded
-        $this->CoffeeShop->addCoffeeMaker(
-            new LoadOnlyCoffeeMaker($this->CoffeeShop, $DependencyInjector),
-            CoffeeMaker::BREW_LOAD_ONLY
-        );
-    }
+	/**
+	 * configure coffee makers which control the different kinds of brews
+	 * ( shared services, new factory objects, etc )
+	 *
+	 * @throws InvalidEntityException
+	 */
+	public function setupCoffeeMakers()
+	{
+		// create a dependency injector class for resolving class constructor arguments
+		$DependencyInjector = new DependencyInjector(
+			$this->CoffeeShop,
+			new \EEH_Array()
+		);
+		// and some coffeemakers, one for creating new instances
+		$this->CoffeeShop->addCoffeeMaker(
+			new NewCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_NEW
+		);
+		// one for shared services
+		$this->CoffeeShop->addCoffeeMaker(
+			new SharedCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_SHARED
+		);
+		// and one for classes that only get loaded
+		$this->CoffeeShop->addCoffeeMaker(
+			new LoadOnlyCoffeeMaker($this->CoffeeShop, $DependencyInjector),
+			CoffeeMaker::BREW_LOAD_ONLY
+		);
+	}
 
 
-    /**
-     * Recipes define how to load legacy classes
-     *
-     * @throws InvalidIdentifierException
-     */
-    public function addRecipes()
-    {
-        // add default recipe, which should handle loading for most PSR-4 compatible classes
-        // as long as they are not type hinting for interfaces
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                Recipe::DEFAULT_ID
-            )
-        );
-        // PSR-4 compatible class with aliases
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'CommandHandlerManager',
-                'EventEspresso\core\services\commands\CommandHandlerManager',
-                array(
-                    'CommandHandlerManagerInterface',
-                    'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
-                ),
-                array(),
-                CoffeeMaker::BREW_SHARED
-            )
-        );
-        // PSR-4 compatible class with aliases, which dependency on CommandHandlerManager
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'CommandBus',
-                'EventEspresso\core\services\commands\CommandBus',
-                array(
-                    'CommandBusInterface',
-                    'EventEspresso\core\services\commands\CommandBusInterface',
-                ),
-                array(),
-                CoffeeMaker::BREW_SHARED
-            )
-        );
-        // LEGACY classes that are NOT compatible with PSR-4 autoloading, and so must specify a filepath
-        // add a wildcard recipe for loading legacy core interfaces
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EEI_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_LOAD_ONLY,
-                array(
-                    EE_INTERFACES . '*.php',
-                    EE_INTERFACES . '*.interfaces.php',
-                )
-            )
-        );
-        // add a wildcard recipe for loading models
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EEM_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_SHARED,
-                EE_MODELS . '*.model.php'
-            )
-        );
-        // add a wildcard recipe for loading core classes
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EE_*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_SHARED,
-                array(
-                    EE_CORE . '*.core.php',
-                    EE_ADMIN . '*.core.php',
-                    EE_CPTS . '*.core.php',
-                    EE_CORE . 'data_migration_scripts/*.core.php',
-                )
-            )
-        );
-        // load admin page parent class
-        $this->CoffeeShop->addRecipe(
-            new Recipe(
-                'EE_Admin_Page*',
-                '',
-                array(),
-                array(),
-                CoffeeMaker::BREW_LOAD_ONLY,
-                array(EE_ADMIN . '*.core.php')
-            )
-        );
-        // add a wildcard recipe for loading core classes
-        // $this->CoffeeShop->addRecipe(
-        //     new Recipe(
-        //         '*_Admin_Page',
-        //         '',
-        //         array(),
-        //         array(),
-        //         CoffeeMaker::BREW_SHARED,
-        //         array(
-        //             EE_ADMIN_PAGES . 'transactions/*.core.php',
-        //         )
-        //     )
-        // );
-    }
+	/**
+	 * Recipes define how to load legacy classes
+	 *
+	 * @throws InvalidIdentifierException
+	 */
+	public function addRecipes()
+	{
+		// add default recipe, which should handle loading for most PSR-4 compatible classes
+		// as long as they are not type hinting for interfaces
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				Recipe::DEFAULT_ID
+			)
+		);
+		// PSR-4 compatible class with aliases
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'CommandHandlerManager',
+				'EventEspresso\core\services\commands\CommandHandlerManager',
+				array(
+					'CommandHandlerManagerInterface',
+					'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
+				),
+				array(),
+				CoffeeMaker::BREW_SHARED
+			)
+		);
+		// PSR-4 compatible class with aliases, which dependency on CommandHandlerManager
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'CommandBus',
+				'EventEspresso\core\services\commands\CommandBus',
+				array(
+					'CommandBusInterface',
+					'EventEspresso\core\services\commands\CommandBusInterface',
+				),
+				array(),
+				CoffeeMaker::BREW_SHARED
+			)
+		);
+		// LEGACY classes that are NOT compatible with PSR-4 autoloading, and so must specify a filepath
+		// add a wildcard recipe for loading legacy core interfaces
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EEI_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_LOAD_ONLY,
+				array(
+					EE_INTERFACES . '*.php',
+					EE_INTERFACES . '*.interfaces.php',
+				)
+			)
+		);
+		// add a wildcard recipe for loading models
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EEM_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_SHARED,
+				EE_MODELS . '*.model.php'
+			)
+		);
+		// add a wildcard recipe for loading core classes
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EE_*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_SHARED,
+				array(
+					EE_CORE . '*.core.php',
+					EE_ADMIN . '*.core.php',
+					EE_CPTS . '*.core.php',
+					EE_CORE . 'data_migration_scripts/*.core.php',
+				)
+			)
+		);
+		// load admin page parent class
+		$this->CoffeeShop->addRecipe(
+			new Recipe(
+				'EE_Admin_Page*',
+				'',
+				array(),
+				array(),
+				CoffeeMaker::BREW_LOAD_ONLY,
+				array(EE_ADMIN . '*.core.php')
+			)
+		);
+		// add a wildcard recipe for loading core classes
+		// $this->CoffeeShop->addRecipe(
+		//     new Recipe(
+		//         '*_Admin_Page',
+		//         '',
+		//         array(),
+		//         array(),
+		//         CoffeeMaker::BREW_SHARED,
+		//         array(
+		//             EE_ADMIN_PAGES . 'transactions/*.core.php',
+		//         )
+		//     )
+		// );
+	}
 
 
-    /**
-     * bootstrap EE and the request stack
-     *
-     * @throws ServiceNotFoundException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidIdentifierException
-     * @throws exceptions\ServiceExistsException
-     * @throws OutOfBoundsException
-     * @throws exceptions\InstantiationException
-     */
-    public function firstBrew()
-    {
-        $this->CoffeeShop->brew(
-            'EventEspresso\core\services\request\Request',
-            array($_GET, $_POST, $_COOKIE, $_SERVER)
-        );
-        $this->CoffeeShop->brew('EventEspresso\core\services\request\Response');
-        $this->CoffeeShop->brew('EE_Bootstrap');
-    }
+	/**
+	 * bootstrap EE and the request stack
+	 *
+	 * @throws ServiceNotFoundException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidIdentifierException
+	 * @throws exceptions\ServiceExistsException
+	 * @throws OutOfBoundsException
+	 * @throws exceptions\InstantiationException
+	 */
+	public function firstBrew()
+	{
+		$this->CoffeeShop->brew(
+			'EventEspresso\core\services\request\Request',
+			array($_GET, $_POST, $_COOKIE, $_SERVER)
+		);
+		$this->CoffeeShop->brew('EventEspresso\core\services\request\Response');
+		$this->CoffeeShop->brew('EE_Bootstrap');
+	}
 }

core/services/progress_steps/display_strategies/number_bubbles/NumberBubblesProgressStepsDisplay.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
         // core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.css
         wp_enqueue_style(
             'ee_progress_steps_display_number_bubbles',
-            plugin_dir_url(__FILE__) . 'number_bubbles.css'
+            plugin_dir_url(__FILE__).'number_bubbles.css'
         );
     }
 
@@ -39,6 +39,6 @@ 
     public function getTemplate()
     {
         // return plugin_dir_path( __FILE__ ) . 'number_bubbles.template.php';
-        return __DIR__ . '/number_bubbles.template.php';
+        return __DIR__.'/number_bubbles.template.php';
     }
 }

Indentation +23 added lines, -23 removed lines

@@ -14,29 +14,29 @@
  */
 class NumberBubblesProgressStepsDisplay implements ProgressStepsDisplayInterface
 {
-    /**
-     * used for setting up css and js required for the display strategy
-     *
-     * @return void
-     */
-    public function enqueueStylesAndScripts()
-    {
-        // core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.css
-        wp_enqueue_style(
-            'ee_progress_steps_display_number_bubbles',
-            plugin_dir_url(__FILE__) . 'number_bubbles.css'
-        );
-    }
+	/**
+	 * used for setting up css and js required for the display strategy
+	 *
+	 * @return void
+	 */
+	public function enqueueStylesAndScripts()
+	{
+		// core/services/progress_steps/display_strategies/number_bubbles/number_bubbles.css
+		wp_enqueue_style(
+			'ee_progress_steps_display_number_bubbles',
+			plugin_dir_url(__FILE__) . 'number_bubbles.css'
+		);
+	}
 
 
-    /**
-     * loads and returns a full server path to the template used for the display strategy
-     *
-     * @return string
-     */
-    public function getTemplate()
-    {
-        // return plugin_dir_path( __FILE__ ) . 'number_bubbles.template.php';
-        return __DIR__ . '/number_bubbles.template.php';
-    }
+	/**
+	 * loads and returns a full server path to the template used for the display strategy
+	 *
+	 * @return string
+	 */
+	public function getTemplate()
+	{
+		// return plugin_dir_path( __FILE__ ) . 'number_bubbles.template.php';
+		return __DIR__ . '/number_bubbles.template.php';
+	}
 }

modules/venue_single/EED_Venue_Single.module.php

Spacing +5 added lines, -5 removed lines

@@ -162,7 +162,7 @@ 
      */
     public function venue_location($content)
     {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+        return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
     }
 
 
@@ -177,16 +177,16 @@ 
         // get some style
         if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
             // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
+            if (is_readable(get_stylesheet_directory().$this->theme.'/style.css')) {
                 wp_register_style(
                     $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . '/style.css',
+                    get_stylesheet_directory_uri().$this->theme.'/style.css',
                     array('dashicons', 'espresso_default')
                 );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
+            } elseif (is_readable(EE_TEMPLATES.$this->theme.'/style.css')) {
                 wp_register_style(
                     $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . '/style.css',
+                    EE_TEMPLATES_URL.$this->theme.'/style.css',
                     array('dashicons', 'espresso_default')
                 );
             }

Indentation +169 added lines, -169 removed lines

@@ -29,173 +29,173 @@
  */
 class EED_Venue_Single extends EED_Module
 {
-    /**
-     * @return EED_Venue_Single
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_hooks()
-    {
-        /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
-        $custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-        $custom_post_types = $custom_post_type_definitions->getDefinitions();
-        EE_Config::register_route(
-            $custom_post_types[EspressoPostType::VENUES]['singular_slug'],
-            'Venue_Single',
-            'run'
-        );
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     * run - initial module setup
-     *
-     * @access    public
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-        // check what template is loaded
-        add_filter('template_include', array($this, 'template_include'), 999, 1);
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-    }
-
-
-    /**
-     * template_include
-     *
-     * @access public
-     * @param  string $template
-     * @return string
-     */
-    public function template_include($template)
-    {
-        // not a custom template?
-        if (
-            EE_Registry::instance()
-                       ->load_core('Front_Controller', array(), false, true)
-                       ->get_selected_template() != 'single-espresso_venues.php'
-        ) {
-            EEH_Template::load_espresso_theme_functions();
-            // then add extra event data via hooks
-            add_filter('the_title', array($this, 'the_title'), 100, 1);
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // don't display entry meta because the existing theme will take car of that
-            add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
-        }
-        return $template;
-    }
-
-
-    /**
-     * the_title
-     *
-     * @access public
-     * @param  string $title
-     * @return string
-     */
-    public function the_title($title = '')
-    {
-        return $title;
-    }
-
-
-    /**
-     *    venue_details
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_details($content)
-    {
-        global $post;
-        if (
-            $post->post_type == EspressoPostType::VENUES
-            && ! post_password_required()
-        ) {
-            // since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
-            // it uses the_content() for displaying the $post->post_content
-            // so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
-            // we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-            remove_filter('the_content', array($this, 'venue_details'), 100);
-            // add filters we want
-            add_filter('the_content', array($this, 'venue_location'), 110);
-            // now load our template
-            $template = EEH_Template::locate_template('content-espresso_venues-details.php');
-            // remove other filters we added so they won't get applied to the next post
-            remove_filter('the_content', array($this, 'venue_location'), 110);
-        }
-        // we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-        return ! empty($template) ? $template : $content;
-    }
-
-
-    /**
-     * venue_location
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_location($content)
-    {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
-    }
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access public
-     * @return void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
-            // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . '/style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . '/style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            wp_enqueue_style($this->theme);
-            if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
-                add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
-            }
-        }
-    }
+	/**
+	 * @return EED_Venue_Single
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_hooks()
+	{
+		/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
+		$custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+		$custom_post_types = $custom_post_type_definitions->getDefinitions();
+		EE_Config::register_route(
+			$custom_post_types[EspressoPostType::VENUES]['singular_slug'],
+			'Venue_Single',
+			'run'
+		);
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 * run - initial module setup
+	 *
+	 * @access    public
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+		// check what template is loaded
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+	}
+
+
+	/**
+	 * template_include
+	 *
+	 * @access public
+	 * @param  string $template
+	 * @return string
+	 */
+	public function template_include($template)
+	{
+		// not a custom template?
+		if (
+			EE_Registry::instance()
+					   ->load_core('Front_Controller', array(), false, true)
+					   ->get_selected_template() != 'single-espresso_venues.php'
+		) {
+			EEH_Template::load_espresso_theme_functions();
+			// then add extra event data via hooks
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// don't display entry meta because the existing theme will take car of that
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
+		}
+		return $template;
+	}
+
+
+	/**
+	 * the_title
+	 *
+	 * @access public
+	 * @param  string $title
+	 * @return string
+	 */
+	public function the_title($title = '')
+	{
+		return $title;
+	}
+
+
+	/**
+	 *    venue_details
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_details($content)
+	{
+		global $post;
+		if (
+			$post->post_type == EspressoPostType::VENUES
+			&& ! post_password_required()
+		) {
+			// since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
+			// it uses the_content() for displaying the $post->post_content
+			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
+			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
+			remove_filter('the_content', array($this, 'venue_details'), 100);
+			// add filters we want
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			// now load our template
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
+			// remove other filters we added so they won't get applied to the next post
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+		}
+		// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
+		return ! empty($template) ? $template : $content;
+	}
+
+
+	/**
+	 * venue_location
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_location($content)
+	{
+		return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+	}
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', true) && is_single()) {
+			// first check theme folder
+			if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
+				wp_register_style(
+					$this->theme,
+					get_stylesheet_directory_uri() . $this->theme . '/style.css',
+					array('dashicons', 'espresso_default')
+				);
+			} elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
+				wp_register_style(
+					$this->theme,
+					EE_TEMPLATES_URL . $this->theme . '/style.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			wp_enqueue_style($this->theme);
+			if (EE_Registry::instance()->CFG->map_settings->use_google_maps) {
+				add_action('wp_enqueue_scripts', array('EEH_Maps', 'espresso_google_map_js'), 11);
+			}
+		}
+	}
 }

modules/venues_archive/EED_Venues_Archive.module.php

Spacing +5 added lines, -5 removed lines

@@ -170,7 +170,7 @@ 
      */
     public function venue_location($content)
     {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+        return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
     }
 
 
@@ -185,16 +185,16 @@ 
         // get some style
         if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
             // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
+            if (is_readable(get_stylesheet_directory().$this->theme.'/style.css')) {
                 wp_register_style(
                     $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . '/style.css',
+                    get_stylesheet_directory_uri().$this->theme.'/style.css',
                     array('dashicons', 'espresso_default')
                 );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
+            } elseif (is_readable(EE_TEMPLATES.$this->theme.'/style.css')) {
                 wp_register_style(
                     $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . '/style.css',
+                    EE_TEMPLATES_URL.$this->theme.'/style.css',
                     array('dashicons', 'espresso_default')
                 );
             }

Indentation +174 added lines, -174 removed lines

@@ -29,178 +29,178 @@
  */
 class EED_Venues_Archive extends EED_Module
 {
-    /**
-     * @return EED_Venues_Archive
-     */
-    public static function instance()
-    {
-        return parent::get_instance(__CLASS__);
-    }
-
-
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     *
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_hooks()
-    {
-        /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
-        $custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-        );
-        $custom_post_types = $custom_post_type_definitions->getDefinitions();
-        EE_Config::register_route(
-            $custom_post_types[EspressoPostType::VENUES]['plural_slug'],
-            'Venues_Archive',
-            'run'
-        );
-    }
-
-    /**
-     *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     *
-     * @access    public
-     * @return    void
-     */
-    public static function set_hooks_admin()
-    {
-    }
-
-
-    /**
-     * run - initial module setup
-     *
-     * @access    public
-     * @param \WP $WP
-     */
-    public function run($WP)
-    {
-        // check what template is loaded
-        add_filter('template_include', array($this, 'template_include'), 999, 1);
-        add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
-    }
-
-
-    /**
-     * template_include
-     *
-     * @access public
-     * @param  string $template
-     * @return string
-     */
-    public function template_include($template)
-    {
-        // not a custom template?
-        if (
-            EE_Registry::instance()->load_core('Front_Controller', array(), false, true)
-                                   ->get_selected_template() != 'archive-espresso_venues.php'
-        ) {
-            EEH_Template::load_espresso_theme_functions();
-            // then add extra event data via hooks
-            add_filter('the_title', array($this, 'the_title'), 100, 1);
-            // don't know if theme uses the_excerpt
-            add_filter('the_excerpt', array($this, 'venue_details'), 100);
-            // or the_content
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // don't display entry meta because the existing theme will take care of that
-            add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
-        }
-        return $template;
-    }
-
-
-    /**
-     * the_title
-     *
-     * @access public
-     * @param  string $title
-     * @return string
-     */
-    public function the_title($title = '')
-    {
-        return $title;
-    }
-
-
-    /**
-     *    venue_details
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_details($content)
-    {
-        global $post;
-        if (
-            $post->post_type == EspressoPostType::VENUES
-            && ! post_password_required()
-        ) {
-            // since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
-            // it uses the_content() for displaying the $post->post_content
-            // so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
-            // we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
-            remove_filter('the_excerpt', array($this, 'venue_details'), 100);
-            remove_filter('the_content', array($this, 'venue_details'), 100);
-            // add filters we want
-            add_filter('the_content', array($this, 'venue_location'), 110);
-            add_filter('the_excerpt', array($this, 'venue_location'), 110);
-            // now load our template
-            $template = EEH_Template::locate_template('content-espresso_venues-details.php');
-            // now add our filter back in, plus some others
-            add_filter('the_excerpt', array($this, 'venue_details'), 100);
-            add_filter('the_content', array($this, 'venue_details'), 100);
-            // remove other filters we added so they won't get applied to the next post
-            remove_filter('the_content', array($this, 'venue_location'), 110);
-            remove_filter('the_excerpt', array($this, 'venue_location'), 110);
-            // we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
-        }
-        return ! empty($template) ? $template : $content;
-    }
-
-
-    /**
-     * venue_location
-     *
-     * @access public
-     * @param  string $content
-     * @return string
-     */
-    public function venue_location($content)
-    {
-        return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
-    }
-
-
-    /**
-     *    wp_enqueue_scripts
-     *
-     * @access    public
-     * @return    void
-     */
-    public function wp_enqueue_scripts()
-    {
-        // get some style
-        if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
-            // first check theme folder
-            if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    get_stylesheet_directory_uri() . $this->theme . '/style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            } elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
-                wp_register_style(
-                    $this->theme,
-                    EE_TEMPLATES_URL . $this->theme . '/style.css',
-                    array('dashicons', 'espresso_default')
-                );
-            }
-            wp_enqueue_style($this->theme);
-        }
-    }
+	/**
+	 * @return EED_Venues_Archive
+	 */
+	public static function instance()
+	{
+		return parent::get_instance(__CLASS__);
+	}
+
+
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 *
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_hooks()
+	{
+		/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_type_definitions */
+		$custom_post_type_definitions = LoaderFactory::getLoader()->getShared(
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+		);
+		$custom_post_types = $custom_post_type_definitions->getDefinitions();
+		EE_Config::register_route(
+			$custom_post_types[EspressoPostType::VENUES]['plural_slug'],
+			'Venues_Archive',
+			'run'
+		);
+	}
+
+	/**
+	 *    set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public static function set_hooks_admin()
+	{
+	}
+
+
+	/**
+	 * run - initial module setup
+	 *
+	 * @access    public
+	 * @param \WP $WP
+	 */
+	public function run($WP)
+	{
+		// check what template is loaded
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
+	}
+
+
+	/**
+	 * template_include
+	 *
+	 * @access public
+	 * @param  string $template
+	 * @return string
+	 */
+	public function template_include($template)
+	{
+		// not a custom template?
+		if (
+			EE_Registry::instance()->load_core('Front_Controller', array(), false, true)
+								   ->get_selected_template() != 'archive-espresso_venues.php'
+		) {
+			EEH_Template::load_espresso_theme_functions();
+			// then add extra event data via hooks
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
+			// don't know if theme uses the_excerpt
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			// or the_content
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// don't display entry meta because the existing theme will take care of that
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
+		}
+		return $template;
+	}
+
+
+	/**
+	 * the_title
+	 *
+	 * @access public
+	 * @param  string $title
+	 * @return string
+	 */
+	public function the_title($title = '')
+	{
+		return $title;
+	}
+
+
+	/**
+	 *    venue_details
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_details($content)
+	{
+		global $post;
+		if (
+			$post->post_type == EspressoPostType::VENUES
+			&& ! post_password_required()
+		) {
+			// since the 'content-espresso_venues-details.php' template might be used directly from within a theme,
+			// it uses the_content() for displaying the $post->post_content
+			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
+			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
+			remove_filter('the_content', array($this, 'venue_details'), 100);
+			// add filters we want
+			add_filter('the_content', array($this, 'venue_location'), 110);
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
+			// now load our template
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
+			// now add our filter back in, plus some others
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
+			add_filter('the_content', array($this, 'venue_details'), 100);
+			// remove other filters we added so they won't get applied to the next post
+			remove_filter('the_content', array($this, 'venue_location'), 110);
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
+			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
+		}
+		return ! empty($template) ? $template : $content;
+	}
+
+
+	/**
+	 * venue_location
+	 *
+	 * @access public
+	 * @param  string $content
+	 * @return string
+	 */
+	public function venue_location($content)
+	{
+		return $content . EEH_Template::locate_template('content-espresso_venues-location.php');
+	}
+
+
+	/**
+	 *    wp_enqueue_scripts
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	public function wp_enqueue_scripts()
+	{
+		// get some style
+		if (apply_filters('FHEE_enable_default_espresso_css', true) && is_archive()) {
+			// first check theme folder
+			if (is_readable(get_stylesheet_directory() . $this->theme . '/style.css')) {
+				wp_register_style(
+					$this->theme,
+					get_stylesheet_directory_uri() . $this->theme . '/style.css',
+					array('dashicons', 'espresso_default')
+				);
+			} elseif (is_readable(EE_TEMPLATES . $this->theme . '/style.css')) {
+				wp_register_style(
+					$this->theme,
+					EE_TEMPLATES_URL . $this->theme . '/style.css',
+					array('dashicons', 'espresso_default')
+				);
+			}
+			wp_enqueue_style($this->theme);
+		}
+	}
 }

core/libraries/shortcodes/EE_Recipient_List_Shortcodes.lib.php

Spacing +26 added lines, -26 removed lines

@@ -79,7 +79,7 @@ 
     {
         // first get registrations just for this attendee.
         $att = $data->att_obj;
-        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
+        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[$att->ID()]['reg_objs'] : array();
         $registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
             ? array($data->reg_obj) : $registrations_on_attendee;
         $tkts = array();
@@ -101,12 +101,12 @@ 
             // tickets will be tickets for all registrations on this attendee.
             foreach ($registrations_on_attendee as $reg) {
                 if ($reg instanceof EE_Registration) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
+                    $ticket = isset($data->registrations[$reg->ID()]) && is_array(
+                        $data->registrations[$reg->ID()]
+                    ) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID(
+                    )]['tkt_obj'] : null;
                     if ($ticket instanceof EE_Ticket) {
-                        $tkts[ $ticket->ID() ] = $ticket;
+                        $tkts[$ticket->ID()] = $ticket;
                     }
                 }
             }
@@ -123,12 +123,12 @@ 
             // data will be tickets for this event for this recipient.
             foreach ($registrations_on_attendee as $reg) {
                 if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
+                    $ticket = isset($data->registrations[$reg->ID()]) && is_array(
+                        $data->registrations[$reg->ID()]
+                    ) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID(
+                    )]['tkt_obj'] : null;
                     if ($ticket instanceof EE_Ticket) {
-                        $tkts[ $ticket->ID() ] = $ticket;
+                        $tkts[$ticket->ID()] = $ticket;
                     }
                 }
             }
@@ -170,7 +170,7 @@ 
     {
         // first get registrations just for this attendee.
         $att = $data->att_obj;
-        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
+        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[$att->ID()]['reg_objs'] : array();
         $registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
             ? array($data->reg_obj)
             : $registrations_on_attendee;
@@ -185,14 +185,14 @@ 
             // dtts will be datetimes for all registrations on this attendee
             foreach ($registrations_on_attendee as $reg) {
                 if ($reg instanceof EE_Registration) {
-                    $dtt_objs = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['dtt_objs']) ? $data->registrations[ $reg->ID(
-                    ) ]['dtt_objs'] : array();
+                    $dtt_objs = isset($data->registrations[$reg->ID()]) && is_array(
+                        $data->registrations[$reg->ID()]
+                    ) && isset($data->registrations[$reg->ID()]['dtt_objs']) ? $data->registrations[$reg->ID(
+                    )]['dtt_objs'] : array();
                     $dtt_objs = (array) $dtt_objs;
                     foreach ($dtt_objs as $dtt_obj) {
                         if ($dtt_obj instanceof EE_Datetime) {
-                            $dtts[ $dtt_obj->ID() ] = $dtt_obj;
+                            $dtts[$dtt_obj->ID()] = $dtt_obj;
                         }
                     }
                 }
@@ -208,19 +208,19 @@ 
             // data will be datetimes for this event for this recipient
             foreach ($registrations_on_attendee as $reg) {
                 if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
+                    $ticket = isset($data->registrations[$reg->ID()]) && is_array(
+                        $data->registrations[$reg->ID()]
+                    ) && isset($data->registrations[$reg->ID()]['tkt_obj']) ? $data->registrations[$reg->ID(
+                    )]['tkt_obj'] : null;
                     if ($ticket instanceof EE_Ticket) {
-                        $dtt_objs = isset($data->tickets[ $ticket->ID() ]) && is_array(
-                            $data->tickets[ $ticket->ID() ]
-                        ) && isset($data->tickets[ $ticket->ID() ]['dtt_objs']) ? $data->tickets[ $ticket->ID(
-                        ) ]['dtt_objs'] : array();
+                        $dtt_objs = isset($data->tickets[$ticket->ID()]) && is_array(
+                            $data->tickets[$ticket->ID()]
+                        ) && isset($data->tickets[$ticket->ID()]['dtt_objs']) ? $data->tickets[$ticket->ID(
+                        )]['dtt_objs'] : array();
                         $dtt_objs = (array) $dtt_objs;
                         foreach ($dtt_objs as $dtt_obj) {
                             if ($dtt_obj instanceof EE_Datetime) {
-                                $dtts[ $dtt_obj->ID() ] = $dtt_obj;
+                                $dtts[$dtt_obj->ID()] = $dtt_obj;
                             }
                         }
                     }

Indentation +221 added lines, -221 removed lines

@@ -18,225 +18,225 @@
  */
 class EE_Recipient_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label = esc_html__('Recipient List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to registrant recipients list type data.', 'event_espresso');
-        $this->_shortcodes = array(
-            '[RECIPIENT_TICKET_LIST]' => esc_html__(
-                'Will output a list of tickets for the recipient of the email. Note, if the recipient is the Event Author, then this is blank.',
-                'event_espresso'
-            ),
-            '[RECIPIENT_DATETIME_LIST]' => esc_html__(
-                'Will output a list of datetimes that the person receiving this message has been registered for.',
-                'event_espresso'
-            ),
-        );
-    }
-
-
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[RECIPIENT_TICKET_LIST]':
-                return $this->_get_recipient_ticket_list();
-                break;
-
-            case '[RECIPIENT_DATETIME_LIST]':
-                return $this->_get_recipient_datetime_list();
-                break;
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value
-     *
-     * @return string
-     */
-    private function _get_recipient_ticket_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_recipient_ticket_list_parsed($this->_data['data']);
-        } elseif ($this->_extra_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data']);
-        } else {
-            return '';
-        }
-    }
-
-
-    private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data)
-    {
-        // first get registrations just for this attendee.
-        $att = $data->att_obj;
-        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
-        $registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
-            ? array($data->reg_obj) : $registrations_on_attendee;
-        $tkts = array();
-
-        // if we're coming in from the main content then $this->_data['data'] is instanceof EE_Messages_Addressee.
-        // which means we want to get tickets for all events this addressee is a part of.
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            $valid_shortcodes = array(
-                'ticket',
-                'event_list',
-                'attendee_list',
-                'datetime_list',
-                'registration_details',
-                'attendee',
-                'recipient_details',
-            );
-            $template = $this->_data['template'];
-
-            // tickets will be tickets for all registrations on this attendee.
-            foreach ($registrations_on_attendee as $reg) {
-                if ($reg instanceof EE_Registration) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
-                    if ($ticket instanceof EE_Ticket) {
-                        $tkts[ $ticket->ID() ] = $ticket;
-                    }
-                }
-            }
-        }
-
-        // if coming from the context of the event list parser, then let's return just the tickets for that event.
-        $event = $this->_data['data'];
-        if ($event instanceof EE_Event) {
-            $valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'recipient_details');
-            $template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
-                ? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
-            // let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
-            $template = str_replace('[EVENT_LIST]', '', $template);
-            // data will be tickets for this event for this recipient.
-            foreach ($registrations_on_attendee as $reg) {
-                if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
-                    if ($ticket instanceof EE_Ticket) {
-                        $tkts[ $ticket->ID() ] = $ticket;
-                    }
-                }
-            }
-        }
-
-        $tkt_parsed = '';
-        foreach ($tkts as $ticket) {
-            $tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-        return $tkt_parsed;
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value
-     *
-     * @return string
-     */
-    private function _get_recipient_datetime_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_recipient_datetime_list_parsed($this->_data['data']);
-        } elseif ($this->_extra_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data']);
-        } else {
-            return '';
-        }
-    }
-
-
-    private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data)
-    {
-        // first get registrations just for this attendee.
-        $att = $data->att_obj;
-        $registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
-        $registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
-            ? array($data->reg_obj)
-            : $registrations_on_attendee;
-        $valid_shortcodes = array('datetime', 'attendee', 'recipient_details');
-        $template = '';
-        $dtts = array();
-
-        // setup valid shortcodes depending on what the status of the $this->_data property is
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            $template = $this->_data['template'];
-
-            // dtts will be datetimes for all registrations on this attendee
-            foreach ($registrations_on_attendee as $reg) {
-                if ($reg instanceof EE_Registration) {
-                    $dtt_objs = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['dtt_objs']) ? $data->registrations[ $reg->ID(
-                    ) ]['dtt_objs'] : array();
-                    $dtt_objs = (array) $dtt_objs;
-                    foreach ($dtt_objs as $dtt_obj) {
-                        if ($dtt_obj instanceof EE_Datetime) {
-                            $dtts[ $dtt_obj->ID() ] = $dtt_obj;
-                        }
-                    }
-                }
-            }
-        }
-
-        // if coming from the context of the event list parser, then let's just return the datetimes for the specific event.
-        $event = $this->_data['data'];
-        if ($event instanceof EE_Event) {
-            $template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
-                ? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
-
-            // data will be datetimes for this event for this recipient
-            foreach ($registrations_on_attendee as $reg) {
-                if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
-                    $ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
-                        $data->registrations[ $reg->ID() ]
-                    ) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
-                    ) ]['tkt_obj'] : null;
-                    if ($ticket instanceof EE_Ticket) {
-                        $dtt_objs = isset($data->tickets[ $ticket->ID() ]) && is_array(
-                            $data->tickets[ $ticket->ID() ]
-                        ) && isset($data->tickets[ $ticket->ID() ]['dtt_objs']) ? $data->tickets[ $ticket->ID(
-                        ) ]['dtt_objs'] : array();
-                        $dtt_objs = (array) $dtt_objs;
-                        foreach ($dtt_objs as $dtt_obj) {
-                            if ($dtt_obj instanceof EE_Datetime) {
-                                $dtts[ $dtt_obj->ID() ] = $dtt_obj;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        $dtt_parsed = '';
-        foreach ($dtts as $datetime) {
-            $dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
-                $template,
-                $datetime,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-        return $dtt_parsed;
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label = esc_html__('Recipient List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to registrant recipients list type data.', 'event_espresso');
+		$this->_shortcodes = array(
+			'[RECIPIENT_TICKET_LIST]' => esc_html__(
+				'Will output a list of tickets for the recipient of the email. Note, if the recipient is the Event Author, then this is blank.',
+				'event_espresso'
+			),
+			'[RECIPIENT_DATETIME_LIST]' => esc_html__(
+				'Will output a list of datetimes that the person receiving this message has been registered for.',
+				'event_espresso'
+			),
+		);
+	}
+
+
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[RECIPIENT_TICKET_LIST]':
+				return $this->_get_recipient_ticket_list();
+				break;
+
+			case '[RECIPIENT_DATETIME_LIST]':
+				return $this->_get_recipient_datetime_list();
+				break;
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value
+	 *
+	 * @return string
+	 */
+	private function _get_recipient_ticket_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_ticket_list_parsed($this->_data['data']);
+		} elseif ($this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_ticket_list_parsed($this->_extra_data['data']);
+		} else {
+			return '';
+		}
+	}
+
+
+	private function _get_recipient_ticket_list_parsed(EE_Messages_Addressee $data)
+	{
+		// first get registrations just for this attendee.
+		$att = $data->att_obj;
+		$registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
+		$registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
+			? array($data->reg_obj) : $registrations_on_attendee;
+		$tkts = array();
+
+		// if we're coming in from the main content then $this->_data['data'] is instanceof EE_Messages_Addressee.
+		// which means we want to get tickets for all events this addressee is a part of.
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$valid_shortcodes = array(
+				'ticket',
+				'event_list',
+				'attendee_list',
+				'datetime_list',
+				'registration_details',
+				'attendee',
+				'recipient_details',
+			);
+			$template = $this->_data['template'];
+
+			// tickets will be tickets for all registrations on this attendee.
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration) {
+					$ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
+						$data->registrations[ $reg->ID() ]
+					) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
+					) ]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
+						$tkts[ $ticket->ID() ] = $ticket;
+					}
+				}
+			}
+		}
+
+		// if coming from the context of the event list parser, then let's return just the tickets for that event.
+		$event = $this->_data['data'];
+		if ($event instanceof EE_Event) {
+			$valid_shortcodes = array('ticket', 'attendee_list', 'datetime_list', 'attendee', 'recipient_details');
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['ticket_list'])
+				? $this->_data['template']['ticket_list'] : $this->_extra_data['template']['ticket_list'];
+			// let's remove any existing [EVENT_LIST] shortcode from the ticket list template so that we don't get recursion.
+			$template = str_replace('[EVENT_LIST]', '', $template);
+			// data will be tickets for this event for this recipient.
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+					$ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
+						$data->registrations[ $reg->ID() ]
+					) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
+					) ]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
+						$tkts[ $ticket->ID() ] = $ticket;
+					}
+				}
+			}
+		}
+
+		$tkt_parsed = '';
+		foreach ($tkts as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+		return $tkt_parsed;
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value
+	 *
+	 * @return string
+	 */
+	private function _get_recipient_datetime_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_datetime_list_parsed($this->_data['data']);
+		} elseif ($this->_extra_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_recipient_datetime_list_parsed($this->_extra_data['data']);
+		} else {
+			return '';
+		}
+	}
+
+
+	private function _get_recipient_datetime_list_parsed(EE_Messages_Addressee $data)
+	{
+		// first get registrations just for this attendee.
+		$att = $data->att_obj;
+		$registrations_on_attendee = $att instanceof EE_Attendee ? $data->attendees[ $att->ID() ]['reg_objs'] : array();
+		$registrations_on_attendee = empty($registrations_on_attendee) && $data->reg_obj instanceof EE_Registration
+			? array($data->reg_obj)
+			: $registrations_on_attendee;
+		$valid_shortcodes = array('datetime', 'attendee', 'recipient_details');
+		$template = '';
+		$dtts = array();
+
+		// setup valid shortcodes depending on what the status of the $this->_data property is
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			$template = $this->_data['template'];
+
+			// dtts will be datetimes for all registrations on this attendee
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration) {
+					$dtt_objs = isset($data->registrations[ $reg->ID() ]) && is_array(
+						$data->registrations[ $reg->ID() ]
+					) && isset($data->registrations[ $reg->ID() ]['dtt_objs']) ? $data->registrations[ $reg->ID(
+					) ]['dtt_objs'] : array();
+					$dtt_objs = (array) $dtt_objs;
+					foreach ($dtt_objs as $dtt_obj) {
+						if ($dtt_obj instanceof EE_Datetime) {
+							$dtts[ $dtt_obj->ID() ] = $dtt_obj;
+						}
+					}
+				}
+			}
+		}
+
+		// if coming from the context of the event list parser, then let's just return the datetimes for the specific event.
+		$event = $this->_data['data'];
+		if ($event instanceof EE_Event) {
+			$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
+				? $this->_data['template']['datetime_list'] : $this->_extra_data['template']['datetime_list'];
+
+			// data will be datetimes for this event for this recipient
+			foreach ($registrations_on_attendee as $reg) {
+				if ($reg instanceof EE_Registration && $reg->event_ID() == $event->ID()) {
+					$ticket = isset($data->registrations[ $reg->ID() ]) && is_array(
+						$data->registrations[ $reg->ID() ]
+					) && isset($data->registrations[ $reg->ID() ]['tkt_obj']) ? $data->registrations[ $reg->ID(
+					) ]['tkt_obj'] : null;
+					if ($ticket instanceof EE_Ticket) {
+						$dtt_objs = isset($data->tickets[ $ticket->ID() ]) && is_array(
+							$data->tickets[ $ticket->ID() ]
+						) && isset($data->tickets[ $ticket->ID() ]['dtt_objs']) ? $data->tickets[ $ticket->ID(
+						) ]['dtt_objs'] : array();
+						$dtt_objs = (array) $dtt_objs;
+						foreach ($dtt_objs as $dtt_obj) {
+							if ($dtt_obj instanceof EE_Datetime) {
+								$dtts[ $dtt_obj->ID() ] = $dtt_obj;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		$dtt_parsed = '';
+		foreach ($dtts as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
+				$template,
+				$datetime,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+		return $dtt_parsed;
+	}
 }

core/domain/services/converters/json/DatetimeToJson.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         $jsonDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
+                $jsonDates[$datetime->ID()] = $this->convertAndEncode($datetime);
             }
         }
         return $jsonDates;
@@ -75,7 +75,7 @@ 
         $arrayOfDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
+                $arrayOfDates[$datetime->ID()] = $this->convert($datetime);
             }
         }
         return $arrayOfDates;
@@ -127,7 +127,7 @@ 
         $jsonDates = [];
         foreach ($datetimes as $datetime) {
             if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->encode($datetime);
+                $jsonDates[$datetime->ID()] = $this->encode($datetime);
             }
         }
         return $jsonDates;

Indentation +111 added lines, -111 removed lines

@@ -21,125 +21,125 @@
  */
 class DatetimeToJson implements ModelObjectToJsonConverterInterface
 {
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function convertAndEncodeArrayOf(array $datetimes)
-    {
-        $jsonDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
-            }
-        }
-        return $jsonDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function convertAndEncodeArrayOf(array $datetimes)
+	{
+		$jsonDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$jsonDates[ $datetime->ID() ] = $this->convertAndEncode($datetime);
+			}
+		}
+		return $jsonDates;
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @return false|string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function convertAndEncode($datetime)
-    {
-        return $datetime instanceof EE_Datetime ? $this->encode($this->convert($datetime)) : false;
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @return false|string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function convertAndEncode($datetime)
+	{
+		return $datetime instanceof EE_Datetime ? $this->encode($this->convert($datetime)) : false;
+	}
 
 
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function convertArrayOf(array $datetimes)
-    {
-        $arrayOfDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
-            }
-        }
-        return $arrayOfDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function convertArrayOf(array $datetimes)
+	{
+		$arrayOfDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$arrayOfDates[ $datetime->ID() ] = $this->convert($datetime);
+			}
+		}
+		return $arrayOfDates;
+	}
 
 
-    /**
-     * @param EE_Datetime $datetime
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function convert($datetime)
-    {
-        return $datetime instanceof EE_Datetime ? [
-            'DTT_ID'          => $datetime->ID(),
-            'EVT_ID'          => $datetime->event() instanceof EE_Event ? $datetime->event()->ID() : 0,
-            'DTT_name'        => $datetime->name(),
-            'DTT_description' => $datetime->description(),
-            'DTT_EVT_start'   => $datetime->start_date(DATE_ATOM),
-            'DTT_EVT_end'     => $datetime->end_date(DATE_ATOM),
-            'DTT_sold'        => $datetime->sold(),
-            'DTT_reserved'    => $datetime->reserved(),
-            'DTT_reg_limit'   => $datetime->reg_limit() === INF ? -1 : $datetime->reg_limit(),
-            'DTT_is_primary'  => $datetime->get_active_status(),
-            'DTT_order'       => $datetime->order(),
-            'DTT_parent'      => $datetime->parent(),
-            'DTT_deleted'     => $datetime->get('DTT_deleted'),
-        ] : [];
-    }
+	/**
+	 * @param EE_Datetime $datetime
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function convert($datetime)
+	{
+		return $datetime instanceof EE_Datetime ? [
+			'DTT_ID'          => $datetime->ID(),
+			'EVT_ID'          => $datetime->event() instanceof EE_Event ? $datetime->event()->ID() : 0,
+			'DTT_name'        => $datetime->name(),
+			'DTT_description' => $datetime->description(),
+			'DTT_EVT_start'   => $datetime->start_date(DATE_ATOM),
+			'DTT_EVT_end'     => $datetime->end_date(DATE_ATOM),
+			'DTT_sold'        => $datetime->sold(),
+			'DTT_reserved'    => $datetime->reserved(),
+			'DTT_reg_limit'   => $datetime->reg_limit() === INF ? -1 : $datetime->reg_limit(),
+			'DTT_is_primary'  => $datetime->get_active_status(),
+			'DTT_order'       => $datetime->order(),
+			'DTT_parent'      => $datetime->parent(),
+			'DTT_deleted'     => $datetime->get('DTT_deleted'),
+		] : [];
+	}
 
 
-    /**
-     * @param EE_Datetime[] $datetimes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function encodeArrayOf(array $datetimes)
-    {
-        $jsonDates = [];
-        foreach ($datetimes as $datetime) {
-            if ($datetime instanceof EE_Datetime) {
-                $jsonDates[ $datetime->ID() ] = $this->encode($datetime);
-            }
-        }
-        return $jsonDates;
-    }
+	/**
+	 * @param EE_Datetime[] $datetimes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function encodeArrayOf(array $datetimes)
+	{
+		$jsonDates = [];
+		foreach ($datetimes as $datetime) {
+			if ($datetime instanceof EE_Datetime) {
+				$jsonDates[ $datetime->ID() ] = $this->encode($datetime);
+			}
+		}
+		return $jsonDates;
+	}
 
 
-    /**
-     * @param array $datetime_array
-     * @return false|string
-     * @since 5.0.0.p
-     */
-    public function encode(array $datetime_array)
-    {
-        return wp_json_encode($datetime_array);
-    }
+	/**
+	 * @param array $datetime_array
+	 * @return false|string
+	 * @since 5.0.0.p
+	 */
+	public function encode(array $datetime_array)
+	{
+		return wp_json_encode($datetime_array);
+	}
 }