eventespresso / event-espresso-core

core/domain/DomainBase.php

Spacing +9 added lines, -9 removed lines

@@ -89,7 +89,7 @@ 
      */
     public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->initialized) {
+        if ( ! $this->initialized) {
             $this->plugin_basename = plugin_basename($this->pluginFile());
             $this->plugin_path     = plugin_dir_path($this->pluginFile());
             $this->plugin_url      = plugin_dir_url($this->pluginFile());
@@ -106,7 +106,7 @@ 
      */
     public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
     {
-        if (! $this->asset_namespace) {
+        if ( ! $this->asset_namespace) {
             $this->asset_namespace = sanitize_key(
                 // convert directory separators to dashes and remove file extension
                 str_replace(['/', '.php'], ['-', ''], $asset_namespace)
@@ -122,8 +122,8 @@ 
     private function setDistributionAssetsPath()
     {
         $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.DomainBase::ASSETS_FOLDER,
+            $this->plugin_path.'src/'.DomainBase::ASSETS_FOLDER,
         ];
         foreach ($assets_folder_paths as $assets_folder_path) {
             if (is_readable($assets_folder_path)) {
@@ -169,7 +169,7 @@ 
     public function pluginPath($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
+            ? $this->plugin_path.$additional_path
             : $this->plugin_path;
     }
 
@@ -181,7 +181,7 @@ 
     public function pluginUrl($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
+            ? $this->plugin_url.$additional_path
             : $this->plugin_url;
     }
 
@@ -220,7 +220,7 @@ 
     public function distributionAssetsPath($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
+            ? $this->assets_path.$additional_path
             : $this->assets_path;
     }
 
@@ -232,8 +232,8 @@ 
     public function distributionAssetsUrl($additional_path = ''): string
     {
         return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
+            ? $this->plugin_url.DomainBase::ASSETS_FOLDER.$additional_path
+            : $this->plugin_url.DomainBase::ASSETS_FOLDER;
     }
 
 

Indentation +227 added lines, -227 removed lines

@@ -16,231 +16,231 @@
  */
 abstract class DomainBase implements DomainInterface
 {
-    const ASSETS_FOLDER = 'assets/';
-
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
-
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-    /**
-     * @var string $asset_namespace
-     */
-    private $asset_namespace;
-
-    /**
-     * @var string $assets_path
-     */
-    private $assets_path;
-
-    /**
-     * @var bool
-     */
-    protected $initialized = false;
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @param string $asset_namespace
-     */
-    public function __construct(
-        FilePath $plugin_file,
-        Version $version,
-        string $asset_namespace = Domain::ASSET_NAMESPACE
-    ) {
-        $this->plugin_file = $plugin_file;
-        $this->version     = $version;
-        $this->initialize($asset_namespace);
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     * @since 5.0.0.p
-     */
-    public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->initialized) {
-            $this->plugin_basename = plugin_basename($this->pluginFile());
-            $this->plugin_path     = plugin_dir_path($this->pluginFile());
-            $this->plugin_url      = plugin_dir_url($this->pluginFile());
-            $this->setAssetNamespace($asset_namespace);
-            $this->setDistributionAssetsPath();
-            $this->initialized = true;
-        }
-    }
-
-
-    /**
-     * @param string $asset_namespace
-     * @return void
-     */
-    public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
-    {
-        if (! $this->asset_namespace) {
-            $this->asset_namespace = sanitize_key(
-                // convert directory separators to dashes and remove file extension
-                str_replace(['/', '.php'], ['-', ''], $asset_namespace)
-            );
-        }
-    }
-
-
-    /**
-     * @throws DomainException
-     * @since 5.0.0.p
-     */
-    private function setDistributionAssetsPath()
-    {
-        $assets_folder_paths = [
-            $this->plugin_path . DomainBase::ASSETS_FOLDER,
-            $this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
-        ];
-        foreach ($assets_folder_paths as $assets_folder_path) {
-            if (is_readable($assets_folder_path)) {
-                $this->assets_path = trailingslashit($assets_folder_path);
-                // once we find a valid path, just break out of loop
-                break;
-            }
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile(): string
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-    /**
-     * @return FilePath
-     */
-    public function pluginFileObject(): FilePath
-    {
-        return $this->plugin_file;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename(): string
-    {
-        return $this->plugin_basename;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginPath($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_path . $additional_path
-            : $this->plugin_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function pluginUrl($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . $additional_path
-            : $this->plugin_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version(): string
-    {
-        return (string) $this->version;
-    }
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function distributionAssetsFolder(): string
-    {
-        return DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsPath($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->assets_path . $additional_path
-            : $this->assets_path;
-    }
-
-
-    /**
-     * @param string $additional_path
-     * @return string
-     */
-    public function distributionAssetsUrl($additional_path = ''): string
-    {
-        return is_string($additional_path) && $additional_path !== ''
-            ? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
-            : $this->plugin_url . DomainBase::ASSETS_FOLDER;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function assetNamespace(): string
-    {
-        return $this->asset_namespace;
-    }
+	const ASSETS_FOLDER = 'assets/';
+
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
+
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+	/**
+	 * @var string $asset_namespace
+	 */
+	private $asset_namespace;
+
+	/**
+	 * @var string $assets_path
+	 */
+	private $assets_path;
+
+	/**
+	 * @var bool
+	 */
+	protected $initialized = false;
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @param string $asset_namespace
+	 */
+	public function __construct(
+		FilePath $plugin_file,
+		Version $version,
+		string $asset_namespace = Domain::ASSET_NAMESPACE
+	) {
+		$this->plugin_file = $plugin_file;
+		$this->version     = $version;
+		$this->initialize($asset_namespace);
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 * @since 5.0.0.p
+	 */
+	public function initialize($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->initialized) {
+			$this->plugin_basename = plugin_basename($this->pluginFile());
+			$this->plugin_path     = plugin_dir_path($this->pluginFile());
+			$this->plugin_url      = plugin_dir_url($this->pluginFile());
+			$this->setAssetNamespace($asset_namespace);
+			$this->setDistributionAssetsPath();
+			$this->initialized = true;
+		}
+	}
+
+
+	/**
+	 * @param string $asset_namespace
+	 * @return void
+	 */
+	public function setAssetNamespace($asset_namespace = Domain::ASSET_NAMESPACE)
+	{
+		if (! $this->asset_namespace) {
+			$this->asset_namespace = sanitize_key(
+				// convert directory separators to dashes and remove file extension
+				str_replace(['/', '.php'], ['-', ''], $asset_namespace)
+			);
+		}
+	}
+
+
+	/**
+	 * @throws DomainException
+	 * @since 5.0.0.p
+	 */
+	private function setDistributionAssetsPath()
+	{
+		$assets_folder_paths = [
+			$this->plugin_path . DomainBase::ASSETS_FOLDER,
+			$this->plugin_path . 'src/' . DomainBase::ASSETS_FOLDER,
+		];
+		foreach ($assets_folder_paths as $assets_folder_path) {
+			if (is_readable($assets_folder_path)) {
+				$this->assets_path = trailingslashit($assets_folder_path);
+				// once we find a valid path, just break out of loop
+				break;
+			}
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile(): string
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+	/**
+	 * @return FilePath
+	 */
+	public function pluginFileObject(): FilePath
+	{
+		return $this->plugin_file;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename(): string
+	{
+		return $this->plugin_basename;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginPath($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_path . $additional_path
+			: $this->plugin_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function pluginUrl($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . $additional_path
+			: $this->plugin_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version(): string
+	{
+		return (string) $this->version;
+	}
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function distributionAssetsFolder(): string
+	{
+		return DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsPath($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->assets_path . $additional_path
+			: $this->assets_path;
+	}
+
+
+	/**
+	 * @param string $additional_path
+	 * @return string
+	 */
+	public function distributionAssetsUrl($additional_path = ''): string
+	{
+		return is_string($additional_path) && $additional_path !== ''
+			? $this->plugin_url . DomainBase::ASSETS_FOLDER . $additional_path
+			: $this->plugin_url . DomainBase::ASSETS_FOLDER;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function assetNamespace(): string
+	{
+		return $this->asset_namespace;
+	}
 }

admin_pages/messages/help_tabs/messages_templates.help_tab.php

Indentation +15 added lines, -15 removed lines

@@ -3,25 +3,25 @@
 </p>
 <p>
     <?php
-    printf(
-        esc_html__(
-            'Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.',
-            'event_espresso'
-        ),
-        '<em>',
-        '</em>'
-    );
-    ?>
+	printf(
+		esc_html__(
+			'Message Templates are the %1$sformat%2$s of the messages going out. Think of them as a “form letter”. Templates tell the Messages system how to style your messages and the content (information) they will have when they are delivered.',
+			'event_espresso'
+		),
+		'<em>',
+		'</em>'
+	);
+	?>
 </p>
 <p>
     <?php esc_html_e(
-        'There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).',
-        'event_espresso'
-    ); ?>
+		'There is a template created for each Messenger / Message Type and context combination. For example, messages that are sent for Payment Confirmation have a template for Event Administrator and a different one for Primary Registrant.  Whereas, messages that are sent for the Registration confirmation have 3 templates: one for Event Administrator, one for the Primary Registrant, and another for each additional Registrant(s).',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").',
-        'event_espresso'
-    ); ?>
+		'With the Event Espresso Messages system, every Messenger, Message Type, and context will have a global template created with some default content on creation. You have the ability to edit the global template that will be used for all events you create. Additionally, you have the ability to create custom templates for each event on the edit event page for the event (in a metabox labelled "Notifications").',
+		'event_espresso'
+	); ?>
 </p>

core/libraries/shortcodes/EE_Datetime_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
     private function _get_datetimes_from_event(EE_Event $event)
     {
         return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
+            ? $this->_extra_data['data']->events[$event->ID()]['dtt_objs']
             : [];
     }
 
@@ -182,7 +182,7 @@ 
     private function _get_datetimes_from_ticket(EE_Ticket $ticket)
     {
         return isset($this->_extra_data['data']->tickets)
-            ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
+            ? $this->_extra_data['data']->tickets[$ticket->ID()]['dtt_objs']
             : [];
     }
 }

Indentation +165 added lines, -165 removed lines

@@ -18,169 +18,169 @@
  */
 class EE_Datetime_List_Shortcodes extends EE_Shortcodes
 {
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Datetime List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to datetime lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[DATETIME_LIST]' => esc_html__(
-                'Will output a list of datetimes according to the layout specified in the datetime list field.',
-                'event_espresso'
-            ),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[DATETIME_LIST]':
-                return $this->_get_datetime_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetime_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Ticket) {
-            return $this->_get_datetime_list_for_ticket();
-        }
-        if ($this->_data['data'] instanceof EE_Event) {
-            return $this->_get_datetime_list_for_event();
-        }
-        if (
-            $this->_data['data'] instanceof EE_Messages_Addressee
-            && $this->_data['data']->reg_obj instanceof EE_Registration
-        ) {
-            return $this->_get_datetime_list_for_registration();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * return parsed list of datetimes for an event
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetime_list_for_event()
-    {
-        $event            = $this->_data['data'];
-        $valid_shortcodes = ['datetime', 'attendee'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
-            ? $this->_data['template']['datetime_list']
-            : $this->_extra_data['template']['datetime_list'];
-
-        // here we're setting up the datetimes for the datetime list template for THIS event.
-        $dtt_parsed = '';
-        $datetimes  = $this->_get_datetimes_from_event($event);
-
-        // each datetime in this case should be an datetime object.
-        foreach ($datetimes as $datetime) {
-            $dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
-                $template,
-                $datetime,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $dtt_parsed;
-    }
-
-
-    /**
-     * return parsed list of datetimes for an ticket
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    private function _get_datetime_list_for_ticket()
-    {
-        $valid_shortcodes = ['datetime', 'attendee'];
-
-        $template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
-            ? $this->_data['template']['datetime_list']
-            : $this->_extra_data['template']['datetime_list'];
-        $ticket   = $this->_data['data'];
-
-        // here we're setting up the datetimes for the datetime list template for THIS ticket.
-        $dtt_parsed = '';
-        $datetimes  = $this->_get_datetimes_from_ticket($ticket);
-
-        // each datetime in this case should be an datetime object.
-        foreach ($datetimes as $datetime) {
-            $dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
-                $template,
-                $datetime,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $dtt_parsed;
-    }
-
-
-    /**
-     * return parsed list of datetimes from a given registration.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws EE_Error
-     */
-    private function _get_datetime_list_for_registration()
-    {
-        $registration = $this->_data['data']->reg_obj;
-
-        // now let's just get the ticket, set $this->_data['data'] to the ticket and then call _get_datetime_list_for__ticket();
-        $this->_data['data'] = $registration->ticket();
-        return $this->_get_datetime_list_for_ticket();
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return array|mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_datetimes_from_event(EE_Event $event)
-    {
-        return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
-            : [];
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return array|mixed
-     * @throws EE_Error
-     */
-    private function _get_datetimes_from_ticket(EE_Ticket $ticket)
-    {
-        return isset($this->_extra_data['data']->tickets)
-            ? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
-            : [];
-    }
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Datetime List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to datetime lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[DATETIME_LIST]' => esc_html__(
+				'Will output a list of datetimes according to the layout specified in the datetime list field.',
+				'event_espresso'
+			),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[DATETIME_LIST]':
+				return $this->_get_datetime_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetime_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Ticket) {
+			return $this->_get_datetime_list_for_ticket();
+		}
+		if ($this->_data['data'] instanceof EE_Event) {
+			return $this->_get_datetime_list_for_event();
+		}
+		if (
+			$this->_data['data'] instanceof EE_Messages_Addressee
+			&& $this->_data['data']->reg_obj instanceof EE_Registration
+		) {
+			return $this->_get_datetime_list_for_registration();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * return parsed list of datetimes for an event
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetime_list_for_event()
+	{
+		$event            = $this->_data['data'];
+		$valid_shortcodes = ['datetime', 'attendee'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
+			? $this->_data['template']['datetime_list']
+			: $this->_extra_data['template']['datetime_list'];
+
+		// here we're setting up the datetimes for the datetime list template for THIS event.
+		$dtt_parsed = '';
+		$datetimes  = $this->_get_datetimes_from_event($event);
+
+		// each datetime in this case should be an datetime object.
+		foreach ($datetimes as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
+				$template,
+				$datetime,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $dtt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of datetimes for an ticket
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	private function _get_datetime_list_for_ticket()
+	{
+		$valid_shortcodes = ['datetime', 'attendee'];
+
+		$template = is_array($this->_data['template']) && isset($this->_data['template']['datetime_list'])
+			? $this->_data['template']['datetime_list']
+			: $this->_extra_data['template']['datetime_list'];
+		$ticket   = $this->_data['data'];
+
+		// here we're setting up the datetimes for the datetime list template for THIS ticket.
+		$dtt_parsed = '';
+		$datetimes  = $this->_get_datetimes_from_ticket($ticket);
+
+		// each datetime in this case should be an datetime object.
+		foreach ($datetimes as $datetime) {
+			$dtt_parsed .= $this->_shortcode_helper->parse_datetime_list_template(
+				$template,
+				$datetime,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $dtt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of datetimes from a given registration.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 */
+	private function _get_datetime_list_for_registration()
+	{
+		$registration = $this->_data['data']->reg_obj;
+
+		// now let's just get the ticket, set $this->_data['data'] to the ticket and then call _get_datetime_list_for__ticket();
+		$this->_data['data'] = $registration->ticket();
+		return $this->_get_datetime_list_for_ticket();
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return array|mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_datetimes_from_event(EE_Event $event)
+	{
+		return isset($this->_extra_data['data']->events)
+			? $this->_extra_data['data']->events[ $event->ID() ]['dtt_objs']
+			: [];
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return array|mixed
+	 * @throws EE_Error
+	 */
+	private function _get_datetimes_from_ticket(EE_Ticket $ticket)
+	{
+		return isset($this->_extra_data['data']->tickets)
+			? $this->_extra_data['data']->tickets[ $ticket->ID() ]['dtt_objs']
+			: [];
+	}
 }

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

@@ -202,7 +202,7 @@ 
     private function _get_tickets_from_event(EE_Event $event)
     {
         return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
+            ? $this->_extra_data['data']->events[$event->ID()]['tkt_objs']
             : [];
     }
 
@@ -216,7 +216,7 @@ 
     private function _get_ticket_list_from_registration(EE_Registration $registration)
     {
         return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
+            ? [$this->_extra_data['data']->registrations[$registration->ID()]['tkt_obj']]
             : [];
     }
 }

Indentation +200 added lines, -200 removed lines

@@ -18,204 +18,204 @@
  */
 class EE_Ticket_List_Shortcodes extends EE_Shortcodes
 {
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Ticket List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to ticket lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[TICKET_LIST]' => esc_html__('Will output a list of tickets', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[TICKET_LIST]':
-                return $this->_get_ticket_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_ticket_list_for_main();
-        }
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_ticket_list_for_attendee();
-        }
-        if ($this->_data['data'] instanceof EE_Event) {
-            return $this->_get_ticket_list_for_event();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * This returns the parsed ticket list for main template;
-     */
-    private function _get_ticket_list_for_main()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'event_list',
-            'attendee_list',
-            'datetime_list',
-            'attendee',
-            'line_item_list',
-            'primary_registration_details',
-            'recipient_details',
-        ];
-        $template         = $this->_data['template'];
-        $data             = $this->_data['data'];
-        $ticket_list      = '';
-
-
-        // now we need to loop through the ticket list and send data to the EE_Parser helper.
-        foreach ($data->tickets as $ticket) {
-            $ticket_list .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket['ticket'],
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $ticket_list;
-    }
-
-
-    /**
-     * return parsed list of tickets for an event
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_for_event()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'attendee_list',
-            'datetime_list',
-            'attendee',
-            'venue',
-            'line_item_list',
-            'primary_registration_details',
-            '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'];
-        $event            = $this->_data['data'];
-
-        // let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
-        $template = str_replace('[EVENT_LIST]', '', $template);
-
-        // here we're setting up the tickets for the ticket list template for THIS event.
-        $tkt_parsed = '';
-        $tickets    = $this->_get_tickets_from_event($event);
-
-        // each ticket in this case should be an ticket object.
-        foreach ($tickets as $ticket) {
-            $tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $tkt_parsed;
-    }
-
-
-    /**
-     * return parsed list of tickets for an attendee
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_for_attendee()
-    {
-        $valid_shortcodes = [
-            'ticket',
-            'event_list',
-            'datetime_list',
-            'attendee',
-            'primary_registration_details',
-            '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'];
-        $registration = $this->_data['data'];
-
-        // let's remove any existing [ATTENDEE_LIST] shortcode from the ticket list template so that we don't get recursion.
-        $template = str_replace('[ATTENDEE_LIST]', '', $template);
-
-        // here we're setting up the tickets for the ticket list template for THIS attendee.
-        $tkt_parsed = '';
-        $tickets    = $this->_get_ticket_list_from_registration($registration);
-
-        // each ticket in this case should be an ticket object.
-        foreach ($tickets as $ticket) {
-            $tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
-                $template,
-                $ticket,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $tkt_parsed;
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return array|mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_tickets_from_event(EE_Event $event)
-    {
-        return isset($this->_extra_data['data']->events)
-            ? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
-            : [];
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_ticket_list_from_registration(EE_Registration $registration)
-    {
-        return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
-            : [];
-    }
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Ticket List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to ticket lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[TICKET_LIST]' => esc_html__('Will output a list of tickets', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[TICKET_LIST]':
+				return $this->_get_ticket_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_ticket_list_for_main();
+		}
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_ticket_list_for_attendee();
+		}
+		if ($this->_data['data'] instanceof EE_Event) {
+			return $this->_get_ticket_list_for_event();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * This returns the parsed ticket list for main template;
+	 */
+	private function _get_ticket_list_for_main()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'event_list',
+			'attendee_list',
+			'datetime_list',
+			'attendee',
+			'line_item_list',
+			'primary_registration_details',
+			'recipient_details',
+		];
+		$template         = $this->_data['template'];
+		$data             = $this->_data['data'];
+		$ticket_list      = '';
+
+
+		// now we need to loop through the ticket list and send data to the EE_Parser helper.
+		foreach ($data->tickets as $ticket) {
+			$ticket_list .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket['ticket'],
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $ticket_list;
+	}
+
+
+	/**
+	 * return parsed list of tickets for an event
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_for_event()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'attendee_list',
+			'datetime_list',
+			'attendee',
+			'venue',
+			'line_item_list',
+			'primary_registration_details',
+			'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'];
+		$event            = $this->_data['data'];
+
+		// let's remove any existing [EVENT_LIST] shortcodes from the ticket list template so that we don't get recursion.
+		$template = str_replace('[EVENT_LIST]', '', $template);
+
+		// here we're setting up the tickets for the ticket list template for THIS event.
+		$tkt_parsed = '';
+		$tickets    = $this->_get_tickets_from_event($event);
+
+		// each ticket in this case should be an ticket object.
+		foreach ($tickets as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $tkt_parsed;
+	}
+
+
+	/**
+	 * return parsed list of tickets for an attendee
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_for_attendee()
+	{
+		$valid_shortcodes = [
+			'ticket',
+			'event_list',
+			'datetime_list',
+			'attendee',
+			'primary_registration_details',
+			'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'];
+		$registration = $this->_data['data'];
+
+		// let's remove any existing [ATTENDEE_LIST] shortcode from the ticket list template so that we don't get recursion.
+		$template = str_replace('[ATTENDEE_LIST]', '', $template);
+
+		// here we're setting up the tickets for the ticket list template for THIS attendee.
+		$tkt_parsed = '';
+		$tickets    = $this->_get_ticket_list_from_registration($registration);
+
+		// each ticket in this case should be an ticket object.
+		foreach ($tickets as $ticket) {
+			$tkt_parsed .= $this->_shortcode_helper->parse_ticket_list_template(
+				$template,
+				$ticket,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $tkt_parsed;
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return array|mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_tickets_from_event(EE_Event $event)
+	{
+		return isset($this->_extra_data['data']->events)
+			? $this->_extra_data['data']->events[ $event->ID() ]['tkt_objs']
+			: [];
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_ticket_list_from_registration(EE_Registration $registration)
+	{
+		return isset($this->_extra_data['data']->registrations)
+			? [$this->_extra_data['data']->registrations[ $registration->ID() ]['tkt_obj']]
+			: [];
+	}
 }

core/libraries/shortcodes/EE_Event_List_Shortcodes.lib.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
     private function _get_events_from_registration(EE_Registration $registration)
     {
         return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
+            ? [$this->_extra_data['data']->registrations[$registration->ID()]['evt_obj']]
             : [];
     }
 }

Indentation +152 added lines, -152 removed lines

@@ -18,156 +18,156 @@
  */
 class EE_Event_List_Shortcodes extends EE_Shortcodes
 {
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    protected function _init_props()
-    {
-        $this->label       = esc_html__('Event List Shortcodes', 'event_espresso');
-        $this->description = esc_html__('All shortcodes specific to event lists', 'event_espresso');
-        $this->_shortcodes = [
-            '[EVENT_LIST]' => esc_html__('Will output a list of events', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * @param string $shortcode
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _parser($shortcode)
-    {
-        switch ($shortcode) {
-            case '[EVENT_LIST]':
-                return $this->_get_event_list();
-        }
-        return '';
-    }
-
-
-    /**
-     * figure out what the incoming data is and then return the appropriate parsed value.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_event_list()
-    {
-        $this->_validate_list_requirements();
-
-        if ($this->_data['data'] instanceof EE_Messages_Addressee) {
-            return $this->_get_event_list_for_main();
-        }
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_event_list_for_registration();
-        }
-        // prevent recursive loop
-        return '';
-    }
-
-
-    /**
-     * This returns the parsed event list for main template
-     *
-     * @return string
-     */
-    private function _get_event_list_for_main()
-    {
-
-        $valid_shortcodes = [
-            'event',
-            'attendee_list',
-            'ticket_list',
-            'datetime_list',
-            'venue',
-            'attendee',
-            'recipient_list',
-            'recipient_details',
-            'primary_registration_list',
-            'primary_registration_details',
-            'event_author',
-            'organization',
-        ];
-        $template         = $this->_data['template'];
-        $data             = $this->_data['data'];
-        $events           = '';
-
-        // now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
-        foreach ($data->events as $event) {
-            $events .= $this->_shortcode_helper->parse_event_list_template(
-                $template,
-                $event['event'],
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-        return $events;
-    }
-
-
-    /**
-     * This returns the parsed event list for an attendee
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_event_list_for_registration()
-    {
-        $valid_shortcodes = [
-            'event',
-            'ticket_list',
-            'datetime_list',
-            'attendee',
-            'event_author',
-            'recipient_details',
-            'recipient_list',
-            'venue',
-            'organization',
-        ];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['event_list'])
-            ? $this->_data['template']['event_list']
-            : $this->_extra_data['template']['event_list'];
-        $registration     = $this->_data['data'];
-
-        // let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
-        $template = str_replace('[ATTENDEE_LIST]', '', $template);
-
-        // here we're setting up the events for the event_list template for THIS registration.
-        $all_events = $this->_get_events_from_registration($registration);
-
-        // we're NOT going to prepare a list of attendees this time around
-        $events = '';
-
-        foreach ($all_events as $event) {
-            $events .= $this->_shortcode_helper->parse_event_list_template(
-                $template,
-                $event,
-                $valid_shortcodes,
-                $this->_extra_data
-            );
-        }
-
-        return $events;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_events_from_registration(EE_Registration $registration)
-    {
-        return isset($this->_extra_data['data']->registrations)
-            ? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
-            : [];
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+
+	protected function _init_props()
+	{
+		$this->label       = esc_html__('Event List Shortcodes', 'event_espresso');
+		$this->description = esc_html__('All shortcodes specific to event lists', 'event_espresso');
+		$this->_shortcodes = [
+			'[EVENT_LIST]' => esc_html__('Will output a list of events', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * @param string $shortcode
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _parser($shortcode)
+	{
+		switch ($shortcode) {
+			case '[EVENT_LIST]':
+				return $this->_get_event_list();
+		}
+		return '';
+	}
+
+
+	/**
+	 * figure out what the incoming data is and then return the appropriate parsed value.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_event_list()
+	{
+		$this->_validate_list_requirements();
+
+		if ($this->_data['data'] instanceof EE_Messages_Addressee) {
+			return $this->_get_event_list_for_main();
+		}
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_event_list_for_registration();
+		}
+		// prevent recursive loop
+		return '';
+	}
+
+
+	/**
+	 * This returns the parsed event list for main template
+	 *
+	 * @return string
+	 */
+	private function _get_event_list_for_main()
+	{
+
+		$valid_shortcodes = [
+			'event',
+			'attendee_list',
+			'ticket_list',
+			'datetime_list',
+			'venue',
+			'attendee',
+			'recipient_list',
+			'recipient_details',
+			'primary_registration_list',
+			'primary_registration_details',
+			'event_author',
+			'organization',
+		];
+		$template         = $this->_data['template'];
+		$data             = $this->_data['data'];
+		$events           = '';
+
+		// now we need to loop through the events array in EE_Messages_Addressee and send data to the EE_Parser helper.
+		foreach ($data->events as $event) {
+			$events .= $this->_shortcode_helper->parse_event_list_template(
+				$template,
+				$event['event'],
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+		return $events;
+	}
+
+
+	/**
+	 * This returns the parsed event list for an attendee
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_event_list_for_registration()
+	{
+		$valid_shortcodes = [
+			'event',
+			'ticket_list',
+			'datetime_list',
+			'attendee',
+			'event_author',
+			'recipient_details',
+			'recipient_list',
+			'venue',
+			'organization',
+		];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['event_list'])
+			? $this->_data['template']['event_list']
+			: $this->_extra_data['template']['event_list'];
+		$registration     = $this->_data['data'];
+
+		// let's remove any existing [ATTENDEE_LIST] shortcode from the event list template so that we don't get recursion.
+		$template = str_replace('[ATTENDEE_LIST]', '', $template);
+
+		// here we're setting up the events for the event_list template for THIS registration.
+		$all_events = $this->_get_events_from_registration($registration);
+
+		// we're NOT going to prepare a list of attendees this time around
+		$events = '';
+
+		foreach ($all_events as $event) {
+			$events .= $this->_shortcode_helper->parse_event_list_template(
+				$template,
+				$event,
+				$valid_shortcodes,
+				$this->_extra_data
+			);
+		}
+
+		return $events;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_events_from_registration(EE_Registration $registration)
+	{
+		return isset($this->_extra_data['data']->registrations)
+			? [$this->_extra_data['data']->registrations[ $registration->ID() ]['evt_obj']]
+			: [];
+	}
 }

core/admin/templates/admin_general_metabox_contents_espresso_sponsors.template.php

Indentation +18 added lines, -18 removed lines

@@ -1,17 +1,17 @@ 
 <div class="padding">
     <p>
         <?php
-        printf(
-            esc_html__(
-                'Upgrade to an %1$sEvent Espresso 4 support license%2$s to get access to dedicated support staff and premium features, such as a calendar, printable tickets and check-in capabilities, MailChimp integration, and more!',
-                'event_espresso'
-            ),
-            '<a
+		printf(
+			esc_html__(
+				'Upgrade to an %1$sEvent Espresso 4 support license%2$s to get access to dedicated support staff and premium features, such as a calendar, printable tickets and check-in capabilities, MailChimp integration, and more!',
+				'event_espresso'
+			),
+			'<a
             href="https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=event_espresso_highlights_widget&utm_content=link"
             target="_blank">',
-            '</a>'
-        );
-        ?>
+			'</a>'
+		);
+		?>
     </p>
     <p>
         <a href='https://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=event_espresso_highlights_widget&utm_content=banner'
@@ -23,16 +23,16 @@ 
     </p>
     <p>
         <?php
-        printf(
-            esc_html__(
-                'Visit %1$sEvent Espresso%2$s for more details.',
-                'event_espresso'
-            ),
-            '<a
+		printf(
+			esc_html__(
+				'Visit %1$sEvent Espresso%2$s for more details.',
+				'event_espresso'
+			),
+			'<a
             href="https://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=event_espresso_highlights_widget&utm_content=link"
             target="_blank">',
-            '</a>'
-        );
-        ?>
+			'</a>'
+		);
+		?>
         </p>
 </div>

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
         <a href='https://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=event_espresso_highlights_widget&utm_content=banner'
            target='_blank'>
             <img alt="<?php esc_html_e('manage events faster', 'event_espresso'); ?>"
-                 src="<?php echo esc_url_raw(EE_GLOBAL_ASSETS_URL . 'images/manage-events-faster-240x240.jpg'); ?>"
+                 src="<?php echo esc_url_raw(EE_GLOBAL_ASSETS_URL.'images/manage-events-faster-240x240.jpg'); ?>"
             />
         </a>
     </p>

core/libraries/rest_api/controllers/model/Meta.php

Spacing +5 added lines, -5 removed lines

@@ -83,13 +83,13 @@ 
                     'table_alias'         => $field_obj->get_table_alias(),
                     'table_column'        => $field_obj->get_table_column(),
                 );
-                $fields_json[ $field_json['name'] ] = $field_json;
+                $fields_json[$field_json['name']] = $field_json;
             }
             $fields_json = array_merge(
                 $fields_json,
                 $this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
             );
-            $response[ $model_name ]['fields'] = apply_filters(
+            $response[$model_name]['fields'] = apply_filters(
                 'FHEE__Meta__handle_request_models_meta__fields',
                 $fields_json,
                 $model
@@ -101,9 +101,9 @@ 
                     'type'   => str_replace('EE_', '', get_class($relation_obj)),
                     'single' => $relation_obj instanceof EE_Belongs_To_Relation,
                 );
-                $relations_json[ $relation_name ] = $relation_json;
+                $relations_json[$relation_name] = $relation_json;
             }
-            $response[ $model_name ]['relations'] = apply_filters(
+            $response[$model_name]['relations'] = apply_filters(
                 'FHEE__Meta__handle_request_models_meta__relations',
                 $relations_json,
                 $model
@@ -128,7 +128,7 @@ 
                 'name'    => $addon->name(),
                 'version' => $addon->version(),
             );
-            $addons[ $addon_json['name'] ] = $addon_json;
+            $addons[$addon_json['name']] = $addon_json;
         }
         $response_data['ee'] = array(
             'version'              => EEM_System_Status::instance()->get_ee_version(),

Indentation +109 added lines, -109 removed lines

@@ -24,122 +24,122 @@
  */
 class Meta extends Base
 {
-    /**
-     * @param WP_REST_Request $request
-     * @param string           $version
-     * @return array|WP_REST_Response
-     */
-    public static function handleRequestModelsMeta(WP_REST_Request $request, $version)
-    {
-        $controller = new Meta();
-        try {
-            $controller->setRequestedVersion($version);
-            return $controller->sendResponse($controller->getModelsMetadataEntity());
-        } catch (Exception $e) {
-            return $controller->sendResponse($e);
-        }
-    }
+	/**
+	 * @param WP_REST_Request $request
+	 * @param string           $version
+	 * @return array|WP_REST_Response
+	 */
+	public static function handleRequestModelsMeta(WP_REST_Request $request, $version)
+	{
+		$controller = new Meta();
+		try {
+			$controller->setRequestedVersion($version);
+			return $controller->sendResponse($controller->getModelsMetadataEntity());
+		} catch (Exception $e) {
+			return $controller->sendResponse($e);
+		}
+	}
 
 
-    /*
+	/*
      * Gets the model metadata resource entity
      * @return array for JSON response, describing all the models available in teh requested version
      */
-    protected function getModelsMetadataEntity()
-    {
-        $response = array();
-        foreach ($this->getModelVersionInfo()->modelsForRequestedVersion() as $model_name => $model_classname) {
-            $model = $this->getModelVersionInfo()->loadModel($model_name);
-            $fields_json = array();
-            foreach ($this->getModelVersionInfo()->fieldsOnModelInThisVersion($model) as $field_name => $field_obj) {
-                if ($this->getModelVersionInfo()->fieldIsIgnored($field_obj)) {
-                    continue;
-                }
-                if ($field_obj instanceof EE_Boolean_Field) {
-                    $datatype = 'Boolean';
-                } elseif ($field_obj->get_wpdb_data_type() == '%d') {
-                    $datatype = 'Number';
-                } elseif ($field_name instanceof EE_Serialized_Text_Field) {
-                    $datatype = 'Object';
-                } else {
-                    $datatype = 'String';
-                }
-                $default_value = ModelDataTranslator::prepareFieldValueForJson(
-                    $field_obj,
-                    $field_obj->get_default_value(),
-                    $this->getModelVersionInfo()->requestedVersion()
-                );
-                $field_json = array(
-                    'name'                => $field_name,
-                    'nicename'            => wp_specialchars_decode($field_obj->get_nicename(), ENT_QUOTES),
-                    'has_rendered_format' => $this->getModelVersionInfo()->fieldHasRenderedFormat($field_obj),
-                    'has_pretty_format'   => $this->getModelVersionInfo()->fieldHasPrettyFormat($field_obj),
-                    'type'                => str_replace('EE_', '', get_class($field_obj)),
-                    'datatype'            => $datatype,
-                    'nullable'            => $field_obj->is_nullable(),
-                    'default'             => $default_value,
-                    'table_alias'         => $field_obj->get_table_alias(),
-                    'table_column'        => $field_obj->get_table_column(),
-                );
-                $fields_json[ $field_json['name'] ] = $field_json;
-            }
-            $fields_json = array_merge(
-                $fields_json,
-                $this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
-            );
-            $response[ $model_name ]['fields'] = apply_filters(
-                'FHEE__Meta__handle_request_models_meta__fields',
-                $fields_json,
-                $model
-            );
-            $relations_json = array();
-            foreach ($model->relation_settings() as $relation_name => $relation_obj) {
-                $relation_json = array(
-                    'name'   => $relation_name,
-                    'type'   => str_replace('EE_', '', get_class($relation_obj)),
-                    'single' => $relation_obj instanceof EE_Belongs_To_Relation,
-                );
-                $relations_json[ $relation_name ] = $relation_json;
-            }
-            $response[ $model_name ]['relations'] = apply_filters(
-                'FHEE__Meta__handle_request_models_meta__relations',
-                $relations_json,
-                $model
-            );
-        }
-        return $response;
-    }
+	protected function getModelsMetadataEntity()
+	{
+		$response = array();
+		foreach ($this->getModelVersionInfo()->modelsForRequestedVersion() as $model_name => $model_classname) {
+			$model = $this->getModelVersionInfo()->loadModel($model_name);
+			$fields_json = array();
+			foreach ($this->getModelVersionInfo()->fieldsOnModelInThisVersion($model) as $field_name => $field_obj) {
+				if ($this->getModelVersionInfo()->fieldIsIgnored($field_obj)) {
+					continue;
+				}
+				if ($field_obj instanceof EE_Boolean_Field) {
+					$datatype = 'Boolean';
+				} elseif ($field_obj->get_wpdb_data_type() == '%d') {
+					$datatype = 'Number';
+				} elseif ($field_name instanceof EE_Serialized_Text_Field) {
+					$datatype = 'Object';
+				} else {
+					$datatype = 'String';
+				}
+				$default_value = ModelDataTranslator::prepareFieldValueForJson(
+					$field_obj,
+					$field_obj->get_default_value(),
+					$this->getModelVersionInfo()->requestedVersion()
+				);
+				$field_json = array(
+					'name'                => $field_name,
+					'nicename'            => wp_specialchars_decode($field_obj->get_nicename(), ENT_QUOTES),
+					'has_rendered_format' => $this->getModelVersionInfo()->fieldHasRenderedFormat($field_obj),
+					'has_pretty_format'   => $this->getModelVersionInfo()->fieldHasPrettyFormat($field_obj),
+					'type'                => str_replace('EE_', '', get_class($field_obj)),
+					'datatype'            => $datatype,
+					'nullable'            => $field_obj->is_nullable(),
+					'default'             => $default_value,
+					'table_alias'         => $field_obj->get_table_alias(),
+					'table_column'        => $field_obj->get_table_column(),
+				);
+				$fields_json[ $field_json['name'] ] = $field_json;
+			}
+			$fields_json = array_merge(
+				$fields_json,
+				$this->getModelVersionInfo()->extraResourcePropertiesForModel($model)
+			);
+			$response[ $model_name ]['fields'] = apply_filters(
+				'FHEE__Meta__handle_request_models_meta__fields',
+				$fields_json,
+				$model
+			);
+			$relations_json = array();
+			foreach ($model->relation_settings() as $relation_name => $relation_obj) {
+				$relation_json = array(
+					'name'   => $relation_name,
+					'type'   => str_replace('EE_', '', get_class($relation_obj)),
+					'single' => $relation_obj instanceof EE_Belongs_To_Relation,
+				);
+				$relations_json[ $relation_name ] = $relation_json;
+			}
+			$response[ $model_name ]['relations'] = apply_filters(
+				'FHEE__Meta__handle_request_models_meta__relations',
+				$relations_json,
+				$model
+			);
+		}
+		return $response;
+	}
 
 
-    /**
-     * Adds EE metadata to the index
-     *
-     * @param WP_REST_Response $rest_response_obj
-     * @return WP_REST_Response
-     */
-    public static function filterEeMetadataIntoIndex(WP_REST_Response $rest_response_obj)
-    {
-        $response_data = $rest_response_obj->get_data();
-        $addons = array();
-        foreach (EE_Registry::instance()->addons as $addon) {
-            $addon_json = array(
-                'name'    => $addon->name(),
-                'version' => $addon->version(),
-            );
-            $addons[ $addon_json['name'] ] = $addon_json;
-        }
-        $response_data['ee'] = array(
-            'version'              => EEM_System_Status::instance()->get_ee_version(),
-            // @codingStandardsIgnoreStart
-            'documentation_url'    => 'https://github.com/eventespresso/event-espresso-core/tree/master/docs/C--REST-API',
-            // @codingStandardsIgnoreEnd
-            'addons'               => $addons,
-            'maintenance_mode'     => EE_Maintenance_Mode::instance()->real_level(),
-            'served_core_versions' => array_keys(EED_Core_Rest_Api::versions_served()),
-        );
-        $rest_response_obj->set_data($response_data);
-        return $rest_response_obj;
-    }
+	/**
+	 * Adds EE metadata to the index
+	 *
+	 * @param WP_REST_Response $rest_response_obj
+	 * @return WP_REST_Response
+	 */
+	public static function filterEeMetadataIntoIndex(WP_REST_Response $rest_response_obj)
+	{
+		$response_data = $rest_response_obj->get_data();
+		$addons = array();
+		foreach (EE_Registry::instance()->addons as $addon) {
+			$addon_json = array(
+				'name'    => $addon->name(),
+				'version' => $addon->version(),
+			);
+			$addons[ $addon_json['name'] ] = $addon_json;
+		}
+		$response_data['ee'] = array(
+			'version'              => EEM_System_Status::instance()->get_ee_version(),
+			// @codingStandardsIgnoreStart
+			'documentation_url'    => 'https://github.com/eventespresso/event-espresso-core/tree/master/docs/C--REST-API',
+			// @codingStandardsIgnoreEnd
+			'addons'               => $addons,
+			'maintenance_mode'     => EE_Maintenance_Mode::instance()->real_level(),
+			'served_core_versions' => array_keys(EED_Core_Rest_Api::versions_served()),
+		);
+		$rest_response_obj->set_data($response_data);
+		return $rest_response_obj;
+	}
 }
 
 

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

Spacing +11 added lines, -11 removed lines

@@ -80,24 +80,24 @@ 
          * Collect the input_fields and sanitize them to prepare them for sending to the Query
          */
         $input_fields = [];
-        if (! empty($this->args['where'])) {
+        if ( ! empty($this->args['where'])) {
             $input_fields = $this->sanitizeInputFields($this->args['where']);
 
             // Use the proper operator.
-            if (! empty($input_fields['PRC_ID']) && is_array($input_fields['PRC_ID'])) {
+            if ( ! empty($input_fields['PRC_ID']) && is_array($input_fields['PRC_ID'])) {
                 $input_fields['PRC_ID'] = ['in', $input_fields['PRC_ID']];
             }
-            if (! empty($input_fields['Ticket.TKT_ID']) && is_array($input_fields['Ticket.TKT_ID'])) {
+            if ( ! empty($input_fields['Ticket.TKT_ID']) && is_array($input_fields['Ticket.TKT_ID'])) {
                 $input_fields['Ticket.TKT_ID'] = ['in', $input_fields['Ticket.TKT_ID']];
             }
-            if (! empty($input_fields['Price_Type.PBT_ID']) && is_array($input_fields['Price_Type.PBT_ID'])) {
+            if ( ! empty($input_fields['Price_Type.PBT_ID']) && is_array($input_fields['Price_Type.PBT_ID'])) {
                 $input_fields['Price_Type.PBT_ID'] = ['in', $input_fields['Price_Type.PBT_ID']];
             }
-            if (! empty($input_fields['Price_Type.PRT_ID']) && is_array($input_fields['Price_Type.PRT_ID'])) {
+            if ( ! empty($input_fields['Price_Type.PRT_ID']) && is_array($input_fields['Price_Type.PRT_ID'])) {
                 $input_fields['Price_Type.PRT_ID'] = ['in', $input_fields['Price_Type.PRT_ID']];
             }
             // if event ID is passed but not a ticket ID
-            if (! isset($input_fields['Ticket.TKT_ID']) && isset($input_fields['Event.EVT_ID'])) {
+            if ( ! isset($input_fields['Ticket.TKT_ID']) && isset($input_fields['Event.EVT_ID'])) {
                 $event_id = $input_fields['Event.EVT_ID'];
                 // Ensure that this doesn't go to the query.
                 // After all there is no DB relation between event and price
@@ -132,7 +132,7 @@ 
         /**
          * Merge the input_fields with the default query_args
          */
-        if (! empty($input_fields)) {
+        if ( ! empty($input_fields)) {
             $where_params = array_merge($where_params, $input_fields);
         }
 
@@ -141,7 +141,7 @@ 
         $default_prices_params = [];
 
         // If default ticket prices should be included.
-        if (! empty($this->args['where']['includeDefaultTicketsPrices'])) {
+        if ( ! empty($this->args['where']['includeDefaultTicketsPrices'])) {
             $default_ticket_ids = EEM_Ticket::instance()->get_col([
                 [
                     'TKT_is_default' => 1,
@@ -150,7 +150,7 @@ 
             ]);
 
             // if we have default tickets
-            if (! empty($default_ticket_ids)) {
+            if ( ! empty($default_ticket_ids)) {
                 $default_prices_params['OR'] = [
                     'Ticket.TKT_ID' => ['IN', $default_ticket_ids],
                 ];
@@ -158,14 +158,14 @@ 
         }
 
         // If default prices should be included.
-        if (! empty($this->args['where']['includeDefaultPrices'])) {
+        if ( ! empty($this->args['where']['includeDefaultPrices'])) {
             $default_prices_params['AND'] = [
                 'PRC_deleted'    => 0,
                 'PRC_is_default' => 1,
             ];
         }
 
-        if (! empty($default_prices_params)) {
+        if ( ! empty($default_prices_params)) {
             if (empty($where_params)) {
                 $where_params['OR'] = $default_prices_params;
             } else {

Indentation +215 added lines, -215 removed lines

@@ -17,219 +17,219 @@
  */
 class PriceConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_price';
-    }
-
-    /**
-     * @return EEM_Price
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_Price
-    {
-        return EEM_Price::instance();
-    }
-
-
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
-
-        return ! empty($results) ? $results : [];
-    }
-
-
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = [];
-        $query_args   = [];
-
-        $query_args['limit'] = $this->getLimit();
-
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'PRC_ID';
-
-        $query_args['default_where_conditions'] = 'minimum';
-
-        /**
-         * Collect the input_fields and sanitize them to prepare them for sending to the Query
-         */
-        $input_fields = [];
-        if (! empty($this->args['where'])) {
-            $input_fields = $this->sanitizeInputFields($this->args['where']);
-
-            // Use the proper operator.
-            if (! empty($input_fields['PRC_ID']) && is_array($input_fields['PRC_ID'])) {
-                $input_fields['PRC_ID'] = ['in', $input_fields['PRC_ID']];
-            }
-            if (! empty($input_fields['Ticket.TKT_ID']) && is_array($input_fields['Ticket.TKT_ID'])) {
-                $input_fields['Ticket.TKT_ID'] = ['in', $input_fields['Ticket.TKT_ID']];
-            }
-            if (! empty($input_fields['Price_Type.PBT_ID']) && is_array($input_fields['Price_Type.PBT_ID'])) {
-                $input_fields['Price_Type.PBT_ID'] = ['in', $input_fields['Price_Type.PBT_ID']];
-            }
-            if (! empty($input_fields['Price_Type.PRT_ID']) && is_array($input_fields['Price_Type.PRT_ID'])) {
-                $input_fields['Price_Type.PRT_ID'] = ['in', $input_fields['Price_Type.PRT_ID']];
-            }
-            // if event ID is passed but not a ticket ID
-            if (! isset($input_fields['Ticket.TKT_ID']) && isset($input_fields['Event.EVT_ID'])) {
-                $event_id = $input_fields['Event.EVT_ID'];
-                // Ensure that this doesn't go to the query.
-                // After all there is no DB relation between event and price
-                unset($input_fields['Event.EVT_ID']);
-                // get all the datetimeIds of the event
-                $event_datetime_ids = EEM_Datetime::instance()->get_col([
-                    [
-                        'EVT_ID'      => $event_id,
-                    ],
-                    'default_where_conditions' => 'minimum'
-                ]);
-                // get all the related ticket Ids
-                $ticket_ids = EEM_Ticket::instance()->get_col([
-                    [
-                        'Datetime.DTT_ID' => ['IN', $event_datetime_ids],
-                    ],
-                    'default_where_conditions' => 'minimum'
-                ]);
-
-                // add tickets relation to the query
-                $input_fields['Ticket.TKT_ID'] = ['IN', $ticket_ids];
-            }
-        }
-
-        /**
-         * Determine where we're at in the Graph and adjust the query context appropriately.
-         */
-        if ($this->source instanceof EE_Ticket) {
-            $where_params['Ticket.TKT_ID'] = $this->source->ID();
-        }
-
-        /**
-         * Merge the input_fields with the default query_args
-         */
-        if (! empty($input_fields)) {
-            $where_params = array_merge($where_params, $input_fields);
-        }
-
-        [$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'PRC_ID');
-
-        $default_prices_params = [];
-
-        // If default ticket prices should be included.
-        if (! empty($this->args['where']['includeDefaultTicketsPrices'])) {
-            $default_ticket_ids = EEM_Ticket::instance()->get_col([
-                [
-                    'TKT_is_default' => 1,
-                ],
-                'default_where_conditions' => 'minimum'
-            ]);
-
-            // if we have default tickets
-            if (! empty($default_ticket_ids)) {
-                $default_prices_params['OR'] = [
-                    'Ticket.TKT_ID' => ['IN', $default_ticket_ids],
-                ];
-            }
-        }
-
-        // If default prices should be included.
-        if (! empty($this->args['where']['includeDefaultPrices'])) {
-            $default_prices_params['AND'] = [
-                'PRC_deleted'    => 0,
-                'PRC_is_default' => 1,
-            ];
-        }
-
-        if (! empty($default_prices_params)) {
-            if (empty($where_params)) {
-                $where_params['OR'] = $default_prices_params;
-            } else {
-                $where_params = [
-                    'OR' => [
-                        'OR'  => $default_prices_params,
-                        'AND' => $where_params,
-                    ],
-                ];
-            }
-        }
-
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__price_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
-
-        $query_args[] = $where_params;
-
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__price_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @return array
-     */
-    public function sanitizeInputFields(array $where_args): array
-    {
-        $arg_mapping = [
-            'in'              => 'PRC_ID',
-            'idIn'            => 'PRC_ID',
-            'isDefault'       => 'PRC_is_default',
-            'event'           => 'Event.EVT_ID',
-            'eventId'         => 'Event.EVT_ID', // priority.
-            'ticket'          => 'Ticket.TKT_ID',
-            'ticketIn'        => 'Ticket.TKT_ID',
-            'ticketIdIn'      => 'Ticket.TKT_ID',
-            'ticketId'        => 'Ticket.TKT_ID', // priority.
-            'priceType'       => 'Price_Type.PRT_ID',
-            'priceTypeIn'     => 'Price_Type.PRT_ID',
-            'priceTypeIdIn'   => 'Price_Type.PRT_ID',
-            'priceTypeId'     => 'Price_Type.PRT_ID', // priority.
-            'priceBaseType'   => 'Price_Type.PBT_ID',
-            'priceBaseTypeIn' => 'Price_Type.PBT_ID',
-        ];
-        return $this->sanitizeWhereArgsForInputFields(
-            $where_args,
-            $arg_mapping,
-            ['in', 'event', 'ticket', 'ticketIn', 'priceType', 'priceTypeIn']
-        );
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_price';
+	}
+
+	/**
+	 * @return EEM_Price
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_Price
+	{
+		return EEM_Price::instance();
+	}
+
+
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
+
+		return ! empty($results) ? $results : [];
+	}
+
+
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = [];
+		$query_args   = [];
+
+		$query_args['limit'] = $this->getLimit();
+
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'PRC_ID';
+
+		$query_args['default_where_conditions'] = 'minimum';
+
+		/**
+		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
+		 */
+		$input_fields = [];
+		if (! empty($this->args['where'])) {
+			$input_fields = $this->sanitizeInputFields($this->args['where']);
+
+			// Use the proper operator.
+			if (! empty($input_fields['PRC_ID']) && is_array($input_fields['PRC_ID'])) {
+				$input_fields['PRC_ID'] = ['in', $input_fields['PRC_ID']];
+			}
+			if (! empty($input_fields['Ticket.TKT_ID']) && is_array($input_fields['Ticket.TKT_ID'])) {
+				$input_fields['Ticket.TKT_ID'] = ['in', $input_fields['Ticket.TKT_ID']];
+			}
+			if (! empty($input_fields['Price_Type.PBT_ID']) && is_array($input_fields['Price_Type.PBT_ID'])) {
+				$input_fields['Price_Type.PBT_ID'] = ['in', $input_fields['Price_Type.PBT_ID']];
+			}
+			if (! empty($input_fields['Price_Type.PRT_ID']) && is_array($input_fields['Price_Type.PRT_ID'])) {
+				$input_fields['Price_Type.PRT_ID'] = ['in', $input_fields['Price_Type.PRT_ID']];
+			}
+			// if event ID is passed but not a ticket ID
+			if (! isset($input_fields['Ticket.TKT_ID']) && isset($input_fields['Event.EVT_ID'])) {
+				$event_id = $input_fields['Event.EVT_ID'];
+				// Ensure that this doesn't go to the query.
+				// After all there is no DB relation between event and price
+				unset($input_fields['Event.EVT_ID']);
+				// get all the datetimeIds of the event
+				$event_datetime_ids = EEM_Datetime::instance()->get_col([
+					[
+						'EVT_ID'      => $event_id,
+					],
+					'default_where_conditions' => 'minimum'
+				]);
+				// get all the related ticket Ids
+				$ticket_ids = EEM_Ticket::instance()->get_col([
+					[
+						'Datetime.DTT_ID' => ['IN', $event_datetime_ids],
+					],
+					'default_where_conditions' => 'minimum'
+				]);
+
+				// add tickets relation to the query
+				$input_fields['Ticket.TKT_ID'] = ['IN', $ticket_ids];
+			}
+		}
+
+		/**
+		 * Determine where we're at in the Graph and adjust the query context appropriately.
+		 */
+		if ($this->source instanceof EE_Ticket) {
+			$where_params['Ticket.TKT_ID'] = $this->source->ID();
+		}
+
+		/**
+		 * Merge the input_fields with the default query_args
+		 */
+		if (! empty($input_fields)) {
+			$where_params = array_merge($where_params, $input_fields);
+		}
+
+		[$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'PRC_ID');
+
+		$default_prices_params = [];
+
+		// If default ticket prices should be included.
+		if (! empty($this->args['where']['includeDefaultTicketsPrices'])) {
+			$default_ticket_ids = EEM_Ticket::instance()->get_col([
+				[
+					'TKT_is_default' => 1,
+				],
+				'default_where_conditions' => 'minimum'
+			]);
+
+			// if we have default tickets
+			if (! empty($default_ticket_ids)) {
+				$default_prices_params['OR'] = [
+					'Ticket.TKT_ID' => ['IN', $default_ticket_ids],
+				];
+			}
+		}
+
+		// If default prices should be included.
+		if (! empty($this->args['where']['includeDefaultPrices'])) {
+			$default_prices_params['AND'] = [
+				'PRC_deleted'    => 0,
+				'PRC_is_default' => 1,
+			];
+		}
+
+		if (! empty($default_prices_params)) {
+			if (empty($where_params)) {
+				$where_params['OR'] = $default_prices_params;
+			} else {
+				$where_params = [
+					'OR' => [
+						'OR'  => $default_prices_params,
+						'AND' => $where_params,
+					],
+				];
+			}
+		}
+
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__price_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
+
+		$query_args[] = $where_params;
+
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__price_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @return array
+	 */
+	public function sanitizeInputFields(array $where_args): array
+	{
+		$arg_mapping = [
+			'in'              => 'PRC_ID',
+			'idIn'            => 'PRC_ID',
+			'isDefault'       => 'PRC_is_default',
+			'event'           => 'Event.EVT_ID',
+			'eventId'         => 'Event.EVT_ID', // priority.
+			'ticket'          => 'Ticket.TKT_ID',
+			'ticketIn'        => 'Ticket.TKT_ID',
+			'ticketIdIn'      => 'Ticket.TKT_ID',
+			'ticketId'        => 'Ticket.TKT_ID', // priority.
+			'priceType'       => 'Price_Type.PRT_ID',
+			'priceTypeIn'     => 'Price_Type.PRT_ID',
+			'priceTypeIdIn'   => 'Price_Type.PRT_ID',
+			'priceTypeId'     => 'Price_Type.PRT_ID', // priority.
+			'priceBaseType'   => 'Price_Type.PBT_ID',
+			'priceBaseTypeIn' => 'Price_Type.PBT_ID',
+		];
+		return $this->sanitizeWhereArgsForInputFields(
+			$where_args,
+			$arg_mapping,
+			['in', 'event', 'ticket', 'ticketIn', 'priceType', 'priceTypeIn']
+		);
+	}
 }

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

Spacing +8 added lines, -8 removed lines

@@ -78,14 +78,14 @@ 
          * Collect the input_fields and sanitize them to prepare them for sending to the Query
          */
         $input_fields = [];
-        if (! empty($this->args['where'])) {
+        if ( ! empty($this->args['where'])) {
             $input_fields = $this->sanitizeInputFields($this->args['where']);
 
             // Use the proper operator.
-            if (! empty($input_fields['Datetime.DTT_ID']) && is_array($input_fields['Datetime.DTT_ID'])) {
+            if ( ! empty($input_fields['Datetime.DTT_ID']) && is_array($input_fields['Datetime.DTT_ID'])) {
                 $input_fields['Datetime.DTT_ID'] = ['IN', $input_fields['Datetime.DTT_ID']];
             }
-            if (! empty($input_fields['Datetime.EVT_ID']) && is_array($input_fields['Datetime.EVT_ID'])) {
+            if ( ! empty($input_fields['Datetime.EVT_ID']) && is_array($input_fields['Datetime.EVT_ID'])) {
                 $input_fields['Datetime.EVT_ID'] = ['IN', $input_fields['Datetime.EVT_ID']];
             }
         }
@@ -100,7 +100,7 @@ 
         /**
          * Merge the input_fields with the default query_args
          */
-        if (! empty($input_fields)) {
+        if ( ! empty($input_fields)) {
             $where_params = array_merge($where_params, $input_fields);
         }
 
@@ -108,16 +108,16 @@ 
 
         $search = isset($this->args['where']) ? $this->getSearchKeywords($this->args['where']) : '';
 
-        if (! empty($search)) {
+        if ( ! empty($search)) {
             // use OR operator to search in any of the fields
             $where_params['OR'] = array(
-                'TKT_name'        => array('LIKE', '%' . $search . '%'),
-                'TKT_description' => array('LIKE', '%' . $search . '%'),
+                'TKT_name'        => array('LIKE', '%'.$search.'%'),
+                'TKT_description' => array('LIKE', '%'.$search.'%'),
             );
         }
 
         // If default tickets should be included.
-        if (! empty($this->args['where']['includeDefaultTickets'])) {
+        if ( ! empty($this->args['where']['includeDefaultTickets'])) {
             /**
              * We need to get each ticket that
              * - satisfies $where_params above

Indentation +174 added lines, -174 removed lines

@@ -15,178 +15,178 @@
  */
 class TicketConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_ticket';
-    }
-
-    /**
-     * @return EEM_Ticket
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_Ticket
-    {
-        return EEM_Ticket::instance();
-    }
-
-
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
-
-        return ! empty($results) ? $results : [];
-    }
-
-
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = ['TKT_deleted' => ['IN', [true, false]]];
-        $query_args   = [];
-
-        $query_args['limit'] = $this->getLimit();
-
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'TKT_ID';
-
-        $query_args['default_where_conditions'] = 'minimum';
-
-        /**
-         * Collect the input_fields and sanitize them to prepare them for sending to the Query
-         */
-        $input_fields = [];
-        if (! empty($this->args['where'])) {
-            $input_fields = $this->sanitizeInputFields($this->args['where']);
-
-            // Use the proper operator.
-            if (! empty($input_fields['Datetime.DTT_ID']) && is_array($input_fields['Datetime.DTT_ID'])) {
-                $input_fields['Datetime.DTT_ID'] = ['IN', $input_fields['Datetime.DTT_ID']];
-            }
-            if (! empty($input_fields['Datetime.EVT_ID']) && is_array($input_fields['Datetime.EVT_ID'])) {
-                $input_fields['Datetime.EVT_ID'] = ['IN', $input_fields['Datetime.EVT_ID']];
-            }
-        }
-
-        /**
-         * Determine where we're at in the Graph and adjust the query context appropriately.
-         */
-        if ($this->source instanceof EE_Datetime) {
-            $where_params['Datetime.DTT_ID'] = $this->source->ID();
-        }
-
-        /**
-         * Merge the input_fields with the default query_args
-         */
-        if (! empty($input_fields)) {
-            $where_params = array_merge($where_params, $input_fields);
-        }
-
-        [$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'TKT_ID');
-
-        $search = isset($this->args['where']) ? $this->getSearchKeywords($this->args['where']) : '';
-
-        if (! empty($search)) {
-            // use OR operator to search in any of the fields
-            $where_params['OR'] = array(
-                'TKT_name'        => array('LIKE', '%' . $search . '%'),
-                'TKT_description' => array('LIKE', '%' . $search . '%'),
-            );
-        }
-
-        // If default tickets should be included.
-        if (! empty($this->args['where']['includeDefaultTickets'])) {
-            /**
-             * We need to get each ticket that
-             * - satisfies $where_params above
-             * OR
-             * - it's a default ticket
-             */
-            $where_params = [
-                'OR' => [
-                    // use extra OR instead of AND to avoid it getting overridden
-                    'OR' => [
-                        'AND' => [
-                            'TKT_deleted'    => ['IN', [true, false]],
-                            'TKT_is_default' => 1,
-                        ]
-                    ],
-                    'AND' => $where_params,
-                ],
-            ];
-        }
-
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__ticket_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
-
-        $query_args[] = $where_params;
-
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__ticket_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @return array
-     */
-    public function sanitizeInputFields(array $where_args): array
-    {
-        $arg_mapping = [
-            'event'        => 'Datetime.EVT_ID',
-            'eventIn'      => 'Datetime.EVT_ID',
-            'eventIdIn'    => 'Datetime.EVT_ID',
-            'eventId'      => 'Datetime.EVT_ID', // priority.
-            'datetime'     => 'Datetime.DTT_ID',
-            'datetimeIn'   => 'Datetime.DTT_ID',
-            'datetimeIdIn' => 'Datetime.DTT_ID',
-            'datetimeId'   => 'Datetime.DTT_ID', // priority.
-            'isDefault'    => 'TKT_is_default',
-            'isRequired'   => 'TKT_required',
-            'isTaxable'    => 'TKT_taxable',
-            'isTrashed'    => 'TKT_deleted',
-        ];
-        return $this->sanitizeWhereArgsForInputFields(
-            $where_args,
-            $arg_mapping,
-            ['datetime', 'datetimeIn', 'event', 'eventIn']
-        );
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_ticket';
+	}
+
+	/**
+	 * @return EEM_Ticket
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_Ticket
+	{
+		return EEM_Ticket::instance();
+	}
+
+
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
+
+		return ! empty($results) ? $results : [];
+	}
+
+
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = ['TKT_deleted' => ['IN', [true, false]]];
+		$query_args   = [];
+
+		$query_args['limit'] = $this->getLimit();
+
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'TKT_ID';
+
+		$query_args['default_where_conditions'] = 'minimum';
+
+		/**
+		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
+		 */
+		$input_fields = [];
+		if (! empty($this->args['where'])) {
+			$input_fields = $this->sanitizeInputFields($this->args['where']);
+
+			// Use the proper operator.
+			if (! empty($input_fields['Datetime.DTT_ID']) && is_array($input_fields['Datetime.DTT_ID'])) {
+				$input_fields['Datetime.DTT_ID'] = ['IN', $input_fields['Datetime.DTT_ID']];
+			}
+			if (! empty($input_fields['Datetime.EVT_ID']) && is_array($input_fields['Datetime.EVT_ID'])) {
+				$input_fields['Datetime.EVT_ID'] = ['IN', $input_fields['Datetime.EVT_ID']];
+			}
+		}
+
+		/**
+		 * Determine where we're at in the Graph and adjust the query context appropriately.
+		 */
+		if ($this->source instanceof EE_Datetime) {
+			$where_params['Datetime.DTT_ID'] = $this->source->ID();
+		}
+
+		/**
+		 * Merge the input_fields with the default query_args
+		 */
+		if (! empty($input_fields)) {
+			$where_params = array_merge($where_params, $input_fields);
+		}
+
+		[$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'TKT_ID');
+
+		$search = isset($this->args['where']) ? $this->getSearchKeywords($this->args['where']) : '';
+
+		if (! empty($search)) {
+			// use OR operator to search in any of the fields
+			$where_params['OR'] = array(
+				'TKT_name'        => array('LIKE', '%' . $search . '%'),
+				'TKT_description' => array('LIKE', '%' . $search . '%'),
+			);
+		}
+
+		// If default tickets should be included.
+		if (! empty($this->args['where']['includeDefaultTickets'])) {
+			/**
+			 * We need to get each ticket that
+			 * - satisfies $where_params above
+			 * OR
+			 * - it's a default ticket
+			 */
+			$where_params = [
+				'OR' => [
+					// use extra OR instead of AND to avoid it getting overridden
+					'OR' => [
+						'AND' => [
+							'TKT_deleted'    => ['IN', [true, false]],
+							'TKT_is_default' => 1,
+						]
+					],
+					'AND' => $where_params,
+				],
+			];
+		}
+
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__ticket_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
+
+		$query_args[] = $where_params;
+
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__ticket_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @return array
+	 */
+	public function sanitizeInputFields(array $where_args): array
+	{
+		$arg_mapping = [
+			'event'        => 'Datetime.EVT_ID',
+			'eventIn'      => 'Datetime.EVT_ID',
+			'eventIdIn'    => 'Datetime.EVT_ID',
+			'eventId'      => 'Datetime.EVT_ID', // priority.
+			'datetime'     => 'Datetime.DTT_ID',
+			'datetimeIn'   => 'Datetime.DTT_ID',
+			'datetimeIdIn' => 'Datetime.DTT_ID',
+			'datetimeId'   => 'Datetime.DTT_ID', // priority.
+			'isDefault'    => 'TKT_is_default',
+			'isRequired'   => 'TKT_required',
+			'isTaxable'    => 'TKT_taxable',
+			'isTrashed'    => 'TKT_deleted',
+		];
+		return $this->sanitizeWhereArgsForInputFields(
+			$where_args,
+			$arg_mapping,
+			['datetime', 'datetimeIn', 'event', 'eventIn']
+		);
+	}
 }