eventespresso / event-espresso-core

core/services/assets/BaristaFactory.php

Spacing +3 added lines, -3 removed lines

@@ -72,13 +72,13 @@
     private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
     {
         $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+        if ( ! isset(BaristaFactory::$baristas[$domain_fqcn])) {
             $barista = new Barista($asset_manifest);
             // we still need to share this with the core loader to facilitate automatic dependency injection
             $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+            BaristaFactory::$baristas[$domain_fqcn] = $barista;
         }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
+        return BaristaFactory::$baristas[$domain_fqcn];
     }
 
 

Indentation +109 added lines, -109 removed lines

@@ -11,114 +11,114 @@
 
 class BaristaFactory implements FactoryInterface
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
-
-    /**
-     * @var BaristaInterface[]
-     */
-    private static $baristas = [];
-
-    /**
-     * @var LoaderInterface $loader
-     */
-    protected $loader;
-
-
-    /**
-     * BaristaFactory constructor.
-     *
-     * @param AssetManifestFactory $manifest_factory
-     * @param LoaderInterface      $loader
-     */
-    public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
-    {
-        $this->manifest_factory = $manifest_factory;
-        $this->loader           = $loader;
-    }
-
-
-    /**
-     * @param string $domain_fqcn
-     * @return BaristaInterface
-     */
-    public function createFromDomainClass($domain_fqcn)
-    {
-        /** @var DomainInterface $domain */
-        $domain = $this->loader->getShared($domain_fqcn);
-        return $this->createFromDomainObject($domain);
-    }
-
-
-    /**
-     * @param DomainInterface $domain
-     * @return BaristaInterface
-     */
-    public function createFromDomainObject(DomainInterface $domain)
-    {
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
-
-
-    /**
-     * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $domain_arguments arguments required by the applicable DomainInterface class
-     * @return BaristaInterface
-     */
-    public function create($domain_fqcn = '', array $domain_arguments = [])
-    {
-        $domain         = $this->getDomain($domain_fqcn, $domain_arguments);
-        $asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
-        return $this->getBaristaForDomain($asset_manifest, $domain);
-    }
-
-
-    /**
-     * @param AssetManifestInterface $asset_manifest
-     * @param DomainInterface        $domain
-     * @return BaristaInterface
-     */
-    private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
-    {
-        $domain_fqcn = get_class($domain);
-        if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
-            $barista = new Barista($asset_manifest);
-            // we still need to share this with the core loader to facilitate automatic dependency injection
-            $this->loader->share(Barista::class, $barista, [$asset_manifest]);
-            BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
-        }
-        return BaristaFactory::$baristas[ $domain_fqcn ];
-    }
-
-
-    /**
-     * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
-     * @param array  $arguments
-     * @return DomainInterface
-     */
-    private function getDomain($domain_fqcn, array $arguments = [])
-    {
-        // if no FQCN is supplied for the domain, then we are loading the defaults for core
-        // add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
-        $domain = empty($domain_fqcn)
-            ? DomainFactory::getEventEspressoCoreDomain()
-            : DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
-        if ($domain instanceof DomainInterface) {
-            return $domain;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__(
-                    'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
+
+	/**
+	 * @var BaristaInterface[]
+	 */
+	private static $baristas = [];
+
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	protected $loader;
+
+
+	/**
+	 * BaristaFactory constructor.
+	 *
+	 * @param AssetManifestFactory $manifest_factory
+	 * @param LoaderInterface      $loader
+	 */
+	public function __construct(AssetManifestFactory $manifest_factory, LoaderInterface $loader)
+	{
+		$this->manifest_factory = $manifest_factory;
+		$this->loader           = $loader;
+	}
+
+
+	/**
+	 * @param string $domain_fqcn
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainClass($domain_fqcn)
+	{
+		/** @var DomainInterface $domain */
+		$domain = $this->loader->getShared($domain_fqcn);
+		return $this->createFromDomainObject($domain);
+	}
+
+
+	/**
+	 * @param DomainInterface $domain
+	 * @return BaristaInterface
+	 */
+	public function createFromDomainObject(DomainInterface $domain)
+	{
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
+
+
+	/**
+	 * @param string $domain_fqcn      Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $domain_arguments arguments required by the applicable DomainInterface class
+	 * @return BaristaInterface
+	 */
+	public function create($domain_fqcn = '', array $domain_arguments = [])
+	{
+		$domain         = $this->getDomain($domain_fqcn, $domain_arguments);
+		$asset_manifest = $this->manifest_factory->createFromDomainObject($domain);
+		return $this->getBaristaForDomain($asset_manifest, $domain);
+	}
+
+
+	/**
+	 * @param AssetManifestInterface $asset_manifest
+	 * @param DomainInterface        $domain
+	 * @return BaristaInterface
+	 */
+	private function getBaristaForDomain(AssetManifestInterface $asset_manifest, DomainInterface $domain)
+	{
+		$domain_fqcn = get_class($domain);
+		if (! isset(BaristaFactory::$baristas[ $domain_fqcn ])) {
+			$barista = new Barista($asset_manifest);
+			// we still need to share this with the core loader to facilitate automatic dependency injection
+			$this->loader->share(Barista::class, $barista, [$asset_manifest]);
+			BaristaFactory::$baristas[ $domain_fqcn ] = $barista;
+		}
+		return BaristaFactory::$baristas[ $domain_fqcn ];
+	}
+
+
+	/**
+	 * @param string $domain_fqcn Fully Qualified Class Name for the applicable DomainInterface class
+	 * @param array  $arguments
+	 * @return DomainInterface
+	 */
+	private function getDomain($domain_fqcn, array $arguments = [])
+	{
+		// if no FQCN is supplied for the domain, then we are loading the defaults for core
+		// add-ons will always have to supply their domain FQCN and arguments to retrieve their manifest
+		$domain = empty($domain_fqcn)
+			? DomainFactory::getEventEspressoCoreDomain()
+			: DomainFactory::getShared(new FullyQualifiedName($domain_fqcn), $arguments);
+		if ($domain instanceof DomainInterface) {
+			return $domain;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__(
+					'BaristaFactory::create() requires a fully qualified class name (FQCN) for the currently applicable Domain object.
                     %1$sThe supplied FQCN ("%2$s") is either invalid or the class is missing.',
-                    'event_espresso'
-                ),
-                '<br />',
-                $domain_fqcn
-            )
-        );
-    }
+					'event_espresso'
+				),
+				'<br />',
+				$domain_fqcn
+			)
+		);
+	}
 }

core/helpers/EEH_Event_Query.helper.php

Indentation +672 added lines, -672 removed lines

@@ -15,676 +15,676 @@
 class EEH_Event_Query
 {
 
-    /**
-     * Start Date
-     *
-     * @var $_event_query_month
-     */
-    protected static $_event_query_month;
-
-    /**
-     * Category
-     *
-     * @var $_event_query_category
-     */
-    protected static $_event_query_category;
-
-    /**
-     * whether to display expired events in the event list
-     *
-     * @var bool $_show_expired
-     */
-    protected static $_event_query_show_expired = false;
-
-    /**
-     * list of params for controlling how the query results are ordered
-     *
-     * @var array $_event_query_orderby
-     */
-    protected static $_event_query_orderby = array();
-
-    /**
-     * direction list is sorted
-     *
-     * @var string $_event_query_sort
-     */
-    protected static $_event_query_sort;
-
-    /**
-     * list of params used to build the query's various clauses
-     *
-     * @var $_query_params
-     */
-    protected static $_query_params = array();
-
-
-
-    /**
-     * @return void
-     */
-    public static function add_query_filters()
-    {
-        // add query filters
-        add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
-    }
-
-
-
-    /**
-     * @param WP_Query $WP_Query
-     * @return bool
-     */
-    public static function apply_query_filters(WP_Query $WP_Query)
-    {
-        return (
-                   isset($WP_Query->query['post_type'])
-                   && $WP_Query->query['post_type'] === 'espresso_events'
-               )
-               || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
-    }
-
-
-    /**
-     * @param WP_Query $WP_Query
-     */
-    public static function filter_query_parts(WP_Query $WP_Query)
-    {
-        // ONLY add our filters if this isn't the main wp_query,
-        // because if this is the main wp_query we already have
-        // our cpt strategies take care of adding things in.
-        if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
-            // build event list query
-            add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
-            add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
-            add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
-            add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
-            add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
-        }
-    }
-
-
-
-    /**
-     * @param string $month
-     * @param string $category
-     * @param bool   $show_expired
-     * @param string $orderby
-     * @param string $sort
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function set_query_params(
-        $month = '',
-        $category = '',
-        $show_expired = false,
-        $orderby = 'start_date',
-        $sort = 'ASC'
-    ) {
-        self::$_query_params                        = array();
-        EEH_Event_Query::$_event_query_month        = EEH_Event_Query::_display_month($month);
-        EEH_Event_Query::$_event_query_category     = EEH_Event_Query::_event_category_slug($category);
-        EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
-        EEH_Event_Query::$_event_query_orderby      = EEH_Event_Query::_orderby($orderby);
-        EEH_Event_Query::$_event_query_sort         = EEH_Event_Query::_sort($sort);
-    }
-
-
-
-    /**
-     * what month should the event list display events for?
-     *
-     * @param string $month
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _display_month($month = '')
-    {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
-    }
-
-
-
-    /**
-     * @param string $category
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _event_category_slug($category = '')
-    {
-        return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category', $category));
-    }
-
-
-
-    /**
-     * @param bool $show_expired
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _show_expired($show_expired = false)
-    {
-        // override default expired option if set via filter
-        return filter_var(
-            EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
-            FILTER_VALIDATE_BOOLEAN
-        );
-    }
-
-
-
-    /**
-     * @param    string $orderby
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _orderby($orderby = 'start_date')
-    {
-        $event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
-        $event_query_orderby = is_array($event_query_orderby)
-            ? $event_query_orderby
-            : explode(',', $event_query_orderby);
-        $event_query_orderby = array_map('trim', $event_query_orderby);
-        $event_query_orderby = array_map('sanitize_text_field', $event_query_orderby);
-        return $event_query_orderby;
-    }
-
-
-
-    /**
-     * @param string $sort
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function _sort($sort = 'ASC')
-    {
-        $sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
-        return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
-    }
-
-
-
-    /**
-     * Filters the clauses for the WP_Query object
-     *
-     * @param array    $clauses array of clauses
-     * @param WP_Query $wp_query
-     * @return array   array of clauses
-     */
-    public static function posts_clauses($clauses, WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            global $wpdb;
-            $clauses['groupby'] = $wpdb->posts . '.ID ';
-        }
-        return $clauses;
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_fields($SQL, WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
-            $SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param array $orderby_params
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_fields_sql_for_orderby(array $orderby_params = array())
-    {
-        $SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
-                    break;
-                case 'ticket_end':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
-                    break;
-                case 'venue_title':
-                    $SQL .= ', Venue.post_title AS venue_title';
-                    break;
-                case 'city':
-                    $SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
-                    break;
-                case 'state':
-                    $SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // Category
-            $SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
-            $SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
-            $SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string  $SQL
-     * @param boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
-    {
-        if (! $show_expired) {
-            $join = EEM_Event::instance()->table() . '.ID = ';
-            $join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-            // don't add if this is already in the SQL
-            if (strpos($SQL, $join) === false) {
-                $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param string $join_terms    pass TRUE or term string, doesn't really matter since this value doesn't really get
-     *                              used for anything yet
-     * @return string
-     */
-    public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
-    {
-        if (! empty($join_terms)) {
-            global $wpdb;
-            $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
-            $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
-            $SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
-     *
-     * @param    string $SQL
-     * @param    array  $orderby_params
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_join_for_orderby($SQL = '', array $orderby_params = array())
-    {
-        foreach ($orderby_params as $orderby) {
-            switch ($orderby) {
-                case 'ticket_start':
-                case 'ticket_end':
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime(
-                        $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
-                    );
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
-                    $SQL .= ' ON (';
-                    $SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
-                    $SQL .= ' = ';
-                    $SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
-                    $SQL .= ' )';
-                    break;
-                case 'venue_title':
-                case 'city':
-                    $SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
-                    break;
-                case 'state':
-                    $SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
-                    $SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
-                    break;
-                case 'start_date':
-                default:
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
-                    break;
-            }
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param string $join
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _posts_join_for_datetime($SQL = '', $join = '')
-    {
-        if (! empty($join)) {
-            $join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
-            if (strpos($SQL, $join) === false) {
-                return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
-            }
-        }
-        return '';
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _posts_join_for_event_venue($SQL = '')
-    {
-        // Event Venue table name
-        $event_venue_table = EEM_Event_Venue::instance()->table();
-        // generate conditions for:  Event <=> Event Venue  JOIN clause
-        $event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ';
-        $event_to_event_venue_join .= $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
-        // don't add joins if they have already been added
-        if (strpos($SQL, $event_to_event_venue_join) === false) {
-            // Venue table name
-            $venue_table = EEM_Venue::instance()->table();
-            // Venue table pk
-            $venue_table_pk = EEM_Venue::instance()->primary_key_name();
-            // Venue Meta table name
-            $venue_meta_table = EEM_Venue::instance()->second_table();
-            // generate JOIN clause for: Event <=> Event Venue
-            $venue_SQL = " LEFT JOIN $event_venue_table ON ( $event_to_event_venue_join )";
-            // generate JOIN clause for: Event Venue <=> Venue
-            $venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
-            // generate JOIN clause for: Venue <=> Venue Meta
-            $venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
-            unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
-            return $venue_SQL;
-        }
-        unset($event_venue_table, $event_to_event_venue_join);
-        return '';
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected static function _posts_join_for_venue_state($SQL = '')
-    {
-        // Venue Meta table name
-        $venue_meta_table = EEM_Venue::instance()->second_table();
-        // State table name
-        $state_table = EEM_State::instance()->table();
-        // State table pk
-        $state_table_pk = EEM_State::instance()->primary_key_name();
-        // verify vars
-        if ($venue_meta_table && $state_table && $state_table_pk) {
-            // like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
-            $join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
-            // don't add join if it has already been added
-            if (strpos($SQL, $join) === false) {
-                unset($state_table_pk, $venue_meta_table, $venue_table_pk);
-                return " LEFT JOIN $state_table ON ( $join )";
-            }
-        }
-        unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
-        return '';
-    }
-
-
-
-    /**
-     * @param string   $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            // Show Expired ?
-            $SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
-            // Category
-            $SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
-            // Start Date
-            $SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param    boolean $show_expired if TRUE, then displayed past events
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where_sql_for_show_expired($show_expired = false)
-    {
-        return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
-            : '';
-    }
-
-
-
-    /**
-     * @param boolean $event_category_slug
-     * @return string
-     */
-    public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
-    {
-        global $wpdb;
-        if (! empty($event_category_slug)) {
-            $event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
-            $event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
-            return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
-        }
-        return '';
-    }
-
-
-
-    /**
-     * @param boolean $month
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_where_sql_for_event_list_month($month = null)
-    {
-        $SQL = '';
-        if (! empty($month)) {
-            $datetime_table = EEM_Datetime::instance()->table();
-            // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
-            $SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
-            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
-            // event end date is GREATER than the start of the month ( so nothing that ended before this month )
-            $SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
-            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     * @param string $SQL
-     * @param WP_Query $wp_query
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_orderby($SQL = '', WP_Query $wp_query)
-    {
-        if (EEH_Event_Query::apply_query_filters($wp_query)) {
-            $SQL = EEH_Event_Query::posts_orderby_sql(
-                EEH_Event_Query::$_event_query_orderby,
-                EEH_Event_Query::$_event_query_sort
-            );
-        }
-        return $SQL;
-    }
-
-
-
-    /**
-     *    posts_orderby_sql
-     *    possible parameters:
-     *    ID
-     *    start_date
-     *    end_date
-     *    event_name
-     *    category_slug
-     *    ticket_start
-     *    ticket_end
-     *    venue_title
-     *    city
-     *    state
-     *    **IMPORTANT**
-     *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
-     *    or else some of the table references below will result in MySQL errors
-     *
-     * @param array  $orderby_params
-     * @param string $sort
-     * @return string
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function posts_orderby_sql(array $orderby_params = array(), $sort = 'ASC')
-    {
-        global $wpdb;
-        $SQL     = '';
-        $counter = 0;
-        $sort    = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
-            ? strtoupper($sort)
-            : 'ASC';
-        // make sure 'orderby' is set in query params
-        if (! isset(self::$_query_params['orderby'])) {
-            self::$_query_params['orderby'] = array();
-        }
-        // loop thru $orderby_params (type cast as array)
-        foreach ($orderby_params as $orderby) {
-            // check if we have already added this param
-            if (isset(self::$_query_params['orderby'][ $orderby ])) {
-                // if so then remove from the $orderby_params so that the count() method below is accurate
-                unset($orderby_params[ $orderby ]);
-                // then bump ahead to the next param
-                continue;
-            }
-            // this will ad a comma depending on whether this is the first or last param
-            $glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
-            // ok what's we dealing with?
-            switch ($orderby) {
-                case 'id':
-                case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
-                    break;
-                case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
-                    break;
-                case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
-                    break;
-                case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
-                    break;
-                case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
-                    break;
-                case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
-                    break;
-                case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
-                    break;
-                case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
-                    break;
-                case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
-                    break;
-                case 'start_date':
-                default:
-                    $SQL .= $glue . ' event_start_date ' . $sort;
-                    break;
-            }
-            // add to array of orderby params that have been added
-            self::$_query_params['orderby'][ $orderby ] = true;
-            $counter++;
-        }
-        return $SQL;
-    }
+	/**
+	 * Start Date
+	 *
+	 * @var $_event_query_month
+	 */
+	protected static $_event_query_month;
+
+	/**
+	 * Category
+	 *
+	 * @var $_event_query_category
+	 */
+	protected static $_event_query_category;
+
+	/**
+	 * whether to display expired events in the event list
+	 *
+	 * @var bool $_show_expired
+	 */
+	protected static $_event_query_show_expired = false;
+
+	/**
+	 * list of params for controlling how the query results are ordered
+	 *
+	 * @var array $_event_query_orderby
+	 */
+	protected static $_event_query_orderby = array();
+
+	/**
+	 * direction list is sorted
+	 *
+	 * @var string $_event_query_sort
+	 */
+	protected static $_event_query_sort;
+
+	/**
+	 * list of params used to build the query's various clauses
+	 *
+	 * @var $_query_params
+	 */
+	protected static $_query_params = array();
+
+
+
+	/**
+	 * @return void
+	 */
+	public static function add_query_filters()
+	{
+		// add query filters
+		add_action('pre_get_posts', array('EEH_Event_Query', 'filter_query_parts'), 10, 1);
+	}
+
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 * @return bool
+	 */
+	public static function apply_query_filters(WP_Query $WP_Query)
+	{
+		return (
+				   isset($WP_Query->query['post_type'])
+				   && $WP_Query->query['post_type'] === 'espresso_events'
+			   )
+			   || apply_filters('FHEE__EEH_Event_Query__apply_query_filters', false);
+	}
+
+
+	/**
+	 * @param WP_Query $WP_Query
+	 */
+	public static function filter_query_parts(WP_Query $WP_Query)
+	{
+		// ONLY add our filters if this isn't the main wp_query,
+		// because if this is the main wp_query we already have
+		// our cpt strategies take care of adding things in.
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_main_query()) {
+			// build event list query
+			add_filter('posts_fields', array('EEH_Event_Query', 'posts_fields'), 10, 2);
+			add_filter('posts_join', array('EEH_Event_Query', 'posts_join'), 10, 2);
+			add_filter('posts_where', array('EEH_Event_Query', 'posts_where'), 10, 2);
+			add_filter('posts_orderby', array('EEH_Event_Query', 'posts_orderby'), 10, 2);
+			add_filter('posts_clauses_request', array('EEH_Event_Query', 'posts_clauses'), 10, 2);
+		}
+	}
+
+
+
+	/**
+	 * @param string $month
+	 * @param string $category
+	 * @param bool   $show_expired
+	 * @param string $orderby
+	 * @param string $sort
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function set_query_params(
+		$month = '',
+		$category = '',
+		$show_expired = false,
+		$orderby = 'start_date',
+		$sort = 'ASC'
+	) {
+		self::$_query_params                        = array();
+		EEH_Event_Query::$_event_query_month        = EEH_Event_Query::_display_month($month);
+		EEH_Event_Query::$_event_query_category     = EEH_Event_Query::_event_category_slug($category);
+		EEH_Event_Query::$_event_query_show_expired = EEH_Event_Query::_show_expired($show_expired);
+		EEH_Event_Query::$_event_query_orderby      = EEH_Event_Query::_orderby($orderby);
+		EEH_Event_Query::$_event_query_sort         = EEH_Event_Query::_sort($sort);
+	}
+
+
+
+	/**
+	 * what month should the event list display events for?
+	 *
+	 * @param string $month
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _display_month($month = '')
+	{
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_month', $month));
+	}
+
+
+
+	/**
+	 * @param string $category
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _event_category_slug($category = '')
+	{
+		return sanitize_text_field(EE_Registry::instance()->REQ->get('event_query_category', $category));
+	}
+
+
+
+	/**
+	 * @param bool $show_expired
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _show_expired($show_expired = false)
+	{
+		// override default expired option if set via filter
+		return filter_var(
+			EE_Registry::instance()->REQ->get('event_query_show_expired', $show_expired),
+			FILTER_VALIDATE_BOOLEAN
+		);
+	}
+
+
+
+	/**
+	 * @param    string $orderby
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _orderby($orderby = 'start_date')
+	{
+		$event_query_orderby = EE_Registry::instance()->REQ->get('event_query_orderby', $orderby);
+		$event_query_orderby = is_array($event_query_orderby)
+			? $event_query_orderby
+			: explode(',', $event_query_orderby);
+		$event_query_orderby = array_map('trim', $event_query_orderby);
+		$event_query_orderby = array_map('sanitize_text_field', $event_query_orderby);
+		return $event_query_orderby;
+	}
+
+
+
+	/**
+	 * @param string $sort
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function _sort($sort = 'ASC')
+	{
+		$sort = EE_Registry::instance()->REQ->get('event_query_sort', $sort);
+		return in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+			? strtoupper($sort)
+			: 'ASC';
+	}
+
+
+
+	/**
+	 * Filters the clauses for the WP_Query object
+	 *
+	 * @param array    $clauses array of clauses
+	 * @param WP_Query $wp_query
+	 * @return array   array of clauses
+	 */
+	public static function posts_clauses($clauses, WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			global $wpdb;
+			$clauses['groupby'] = $wpdb->posts . '.ID ';
+		}
+		return $clauses;
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_fields($SQL, WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// adds something like ", wp_esp_datetime.* " to WP Query SELECT statement
+			$SQL .= EEH_Event_Query::posts_fields_sql_for_orderby(EEH_Event_Query::$_event_query_orderby);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param array $orderby_params
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_fields_sql_for_orderby(array $orderby_params = array())
+	{
+		$SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
+					break;
+				case 'ticket_end':
+					$SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
+					break;
+				case 'venue_title':
+					$SQL .= ', Venue.post_title AS venue_title';
+					break;
+				case 'city':
+					$SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
+					break;
+				case 'state':
+					$SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// Category
+			$SQL = EEH_Event_Query::posts_join_sql_for_show_expired($SQL, EEH_Event_Query::$_event_query_show_expired);
+			$SQL = EEH_Event_Query::posts_join_sql_for_terms($SQL, EEH_Event_Query::$_event_query_category);
+			$SQL = EEH_Event_Query::posts_join_for_orderby($SQL, EEH_Event_Query::$_event_query_orderby);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string  $SQL
+	 * @param boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
+	{
+		if (! $show_expired) {
+			$join = EEM_Event::instance()->table() . '.ID = ';
+			$join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+			// don't add if this is already in the SQL
+			if (strpos($SQL, $join) === false) {
+				$SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param string $join_terms    pass TRUE or term string, doesn't really matter since this value doesn't really get
+	 *                              used for anything yet
+	 * @return string
+	 */
+	public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
+	{
+		if (! empty($join_terms)) {
+			global $wpdb;
+			$SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
+			$SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
+			$SQL .= " LEFT JOIN $wpdb->terms ON ($wpdb->terms.term_id = $wpdb->term_taxonomy.term_id) ";
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * usage:  $SQL .= EEH_Event_Query::posts_join_for_orderby( $orderby_params );
+	 *
+	 * @param    string $SQL
+	 * @param    array  $orderby_params
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_join_for_orderby($SQL = '', array $orderby_params = array())
+	{
+		foreach ($orderby_params as $orderby) {
+			switch ($orderby) {
+				case 'ticket_start':
+				case 'ticket_end':
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime(
+						$SQL,
+						EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+					);
+					$SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
+					$SQL .= ' ON (';
+					$SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+					$SQL .= ' = ';
+					$SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+					$SQL .= ' )';
+					break;
+				case 'venue_title':
+				case 'city':
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					break;
+				case 'state':
+					$SQL .= EEH_Event_Query::_posts_join_for_event_venue($SQL);
+					$SQL .= EEH_Event_Query::_posts_join_for_venue_state($SQL);
+					break;
+				case 'start_date':
+				default:
+					$SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
+					break;
+			}
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param string $join
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _posts_join_for_datetime($SQL = '', $join = '')
+	{
+		if (! empty($join)) {
+			$join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+			if (strpos($SQL, $join) === false) {
+				return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+			}
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _posts_join_for_event_venue($SQL = '')
+	{
+		// Event Venue table name
+		$event_venue_table = EEM_Event_Venue::instance()->table();
+		// generate conditions for:  Event <=> Event Venue  JOIN clause
+		$event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ';
+		$event_to_event_venue_join .= $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+		// don't add joins if they have already been added
+		if (strpos($SQL, $event_to_event_venue_join) === false) {
+			// Venue table name
+			$venue_table = EEM_Venue::instance()->table();
+			// Venue table pk
+			$venue_table_pk = EEM_Venue::instance()->primary_key_name();
+			// Venue Meta table name
+			$venue_meta_table = EEM_Venue::instance()->second_table();
+			// generate JOIN clause for: Event <=> Event Venue
+			$venue_SQL = " LEFT JOIN $event_venue_table ON ( $event_to_event_venue_join )";
+			// generate JOIN clause for: Event Venue <=> Venue
+			$venue_SQL .= " LEFT JOIN $venue_table as Venue ON ( $event_venue_table.$venue_table_pk = Venue.ID )";
+			// generate JOIN clause for: Venue <=> Venue Meta
+			$venue_SQL .= " LEFT JOIN $venue_meta_table ON ( Venue.ID = $venue_meta_table.$venue_table_pk )";
+			unset($event_venue_table, $event_to_event_venue_join, $venue_table, $venue_table_pk, $venue_meta_table);
+			return $venue_SQL;
+		}
+		unset($event_venue_table, $event_to_event_venue_join);
+		return '';
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected static function _posts_join_for_venue_state($SQL = '')
+	{
+		// Venue Meta table name
+		$venue_meta_table = EEM_Venue::instance()->second_table();
+		// State table name
+		$state_table = EEM_State::instance()->table();
+		// State table pk
+		$state_table_pk = EEM_State::instance()->primary_key_name();
+		// verify vars
+		if ($venue_meta_table && $state_table && $state_table_pk) {
+			// like: wp_esp_venue_meta.STA_ID = wp_esp_state.STA_ID
+			$join = "$venue_meta_table.$state_table_pk = $state_table.$state_table_pk";
+			// don't add join if it has already been added
+			if (strpos($SQL, $join) === false) {
+				unset($state_table_pk, $venue_meta_table, $venue_table_pk);
+				return " LEFT JOIN $state_table ON ( $join )";
+			}
+		}
+		unset($join, $state_table, $state_table_pk, $venue_meta_table, $venue_table_pk);
+		return '';
+	}
+
+
+
+	/**
+	 * @param string   $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			// Show Expired ?
+			$SQL .= EEH_Event_Query::posts_where_sql_for_show_expired(EEH_Event_Query::$_event_query_show_expired);
+			// Category
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_category_slug(EEH_Event_Query::$_event_query_category);
+			// Start Date
+			$SQL .= EEH_Event_Query::posts_where_sql_for_event_list_month(EEH_Event_Query::$_event_query_month);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param    boolean $show_expired if TRUE, then displayed past events
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where_sql_for_show_expired($show_expired = false)
+	{
+		return ! $show_expired
+			? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
+			: '';
+	}
+
+
+
+	/**
+	 * @param boolean $event_category_slug
+	 * @return string
+	 */
+	public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
+	{
+		global $wpdb;
+		if (! empty($event_category_slug)) {
+			$event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
+			$event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
+			return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
+		}
+		return '';
+	}
+
+
+
+	/**
+	 * @param boolean $month
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_where_sql_for_event_list_month($month = null)
+	{
+		$SQL = '';
+		if (! empty($month)) {
+			$datetime_table = EEM_Datetime::instance()->table();
+			// event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
+			$SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
+			$SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
+			// event end date is GREATER than the start of the month ( so nothing that ended before this month )
+			$SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
+			$SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 * @param string $SQL
+	 * @param WP_Query $wp_query
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_orderby($SQL = '', WP_Query $wp_query)
+	{
+		if (EEH_Event_Query::apply_query_filters($wp_query)) {
+			$SQL = EEH_Event_Query::posts_orderby_sql(
+				EEH_Event_Query::$_event_query_orderby,
+				EEH_Event_Query::$_event_query_sort
+			);
+		}
+		return $SQL;
+	}
+
+
+
+	/**
+	 *    posts_orderby_sql
+	 *    possible parameters:
+	 *    ID
+	 *    start_date
+	 *    end_date
+	 *    event_name
+	 *    category_slug
+	 *    ticket_start
+	 *    ticket_end
+	 *    venue_title
+	 *    city
+	 *    state
+	 *    **IMPORTANT**
+	 *    make sure to also send the $orderby_params array to the posts_join_for_orderby() method
+	 *    or else some of the table references below will result in MySQL errors
+	 *
+	 * @param array  $orderby_params
+	 * @param string $sort
+	 * @return string
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function posts_orderby_sql(array $orderby_params = array(), $sort = 'ASC')
+	{
+		global $wpdb;
+		$SQL     = '';
+		$counter = 0;
+		$sort    = in_array($sort, array('ASC', 'asc', 'DESC', 'desc'), true)
+			? strtoupper($sort)
+			: 'ASC';
+		// make sure 'orderby' is set in query params
+		if (! isset(self::$_query_params['orderby'])) {
+			self::$_query_params['orderby'] = array();
+		}
+		// loop thru $orderby_params (type cast as array)
+		foreach ($orderby_params as $orderby) {
+			// check if we have already added this param
+			if (isset(self::$_query_params['orderby'][ $orderby ])) {
+				// if so then remove from the $orderby_params so that the count() method below is accurate
+				unset($orderby_params[ $orderby ]);
+				// then bump ahead to the next param
+				continue;
+			}
+			// this will ad a comma depending on whether this is the first or last param
+			$glue = $counter === 0 || $counter === count($orderby_params) ? ' ' : ', ';
+			// ok what's we dealing with?
+			switch ($orderby) {
+				case 'id':
+				case 'ID':
+					$SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+					break;
+				case 'end_date':
+					$SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+					break;
+				case 'event_name':
+					$SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+					break;
+				case 'category_slug':
+					$SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+					break;
+				case 'ticket_start':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+					break;
+				case 'ticket_end':
+					$SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+					break;
+				case 'venue_title':
+					$SQL .= $glue . 'venue_title ' . $sort;
+					break;
+				case 'city':
+					$SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+					break;
+				case 'state':
+					$SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+					break;
+				case 'start_date':
+				default:
+					$SQL .= $glue . ' event_start_date ' . $sort;
+					break;
+			}
+			// add to array of orderby params that have been added
+			self::$_query_params['orderby'][ $orderby ] = true;
+			$counter++;
+		}
+		return $SQL;
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -227,7 +227,7 @@ 
     {
         if (EEH_Event_Query::apply_query_filters($wp_query)) {
             global $wpdb;
-            $clauses['groupby'] = $wpdb->posts . '.ID ';
+            $clauses['groupby'] = $wpdb->posts.'.ID ';
         }
         return $clauses;
     }
@@ -264,23 +264,23 @@ 
      */
     public static function posts_fields_sql_for_orderby(array $orderby_params = array())
     {
-        $SQL = ', MIN( ' . EEM_Datetime::instance()->table() . '.DTT_EVT_start ) as event_start_date ';
+        $SQL = ', MIN( '.EEM_Datetime::instance()->table().'.DTT_EVT_start ) as event_start_date ';
         foreach ($orderby_params as $orderby) {
             switch ($orderby) {
                 case 'ticket_start':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_start_date';
+                    $SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_start_date';
                     break;
                 case 'ticket_end':
-                    $SQL .= ', ' . EEM_Ticket::instance()->table() . '.TKT_end_date';
+                    $SQL .= ', '.EEM_Ticket::instance()->table().'.TKT_end_date';
                     break;
                 case 'venue_title':
                     $SQL .= ', Venue.post_title AS venue_title';
                     break;
                 case 'city':
-                    $SQL .= ', ' . EEM_Venue::instance()->second_table() . '.VNU_city';
+                    $SQL .= ', '.EEM_Venue::instance()->second_table().'.VNU_city';
                     break;
                 case 'state':
-                    $SQL .= ', ' . EEM_State::instance()->table() . '.STA_name';
+                    $SQL .= ', '.EEM_State::instance()->table().'.STA_name';
                     break;
             }
         }
@@ -322,12 +322,12 @@ 
      */
     public static function posts_join_sql_for_show_expired($SQL = '', $show_expired = false)
     {
-        if (! $show_expired) {
-            $join = EEM_Event::instance()->table() . '.ID = ';
-            $join .= EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+        if ( ! $show_expired) {
+            $join = EEM_Event::instance()->table().'.ID = ';
+            $join .= EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
             // don't add if this is already in the SQL
             if (strpos($SQL, $join) === false) {
-                $SQL .= ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' ) ';
+                $SQL .= ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' ) ';
             }
         }
         return $SQL;
@@ -343,7 +343,7 @@ 
      */
     public static function posts_join_sql_for_terms($SQL = '', $join_terms = '')
     {
-        if (! empty($join_terms)) {
+        if ( ! empty($join_terms)) {
             global $wpdb;
             $SQL .= " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id)";
             $SQL .= " LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id)";
@@ -373,13 +373,13 @@ 
                 case 'ticket_end':
                     $SQL .= EEH_Event_Query::_posts_join_for_datetime(
                         $SQL,
-                        EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Datetime::instance()->primary_key_name()
+                        EEM_Datetime_Ticket::instance()->table().'.'.EEM_Datetime::instance()->primary_key_name()
                     );
-                    $SQL .= ' LEFT JOIN ' . EEM_Ticket::instance()->table();
+                    $SQL .= ' LEFT JOIN '.EEM_Ticket::instance()->table();
                     $SQL .= ' ON (';
-                    $SQL .= EEM_Datetime_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+                    $SQL .= EEM_Datetime_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
                     $SQL .= ' = ';
-                    $SQL .= EEM_Ticket::instance()->table() . '.' . EEM_Ticket::instance()->primary_key_name();
+                    $SQL .= EEM_Ticket::instance()->table().'.'.EEM_Ticket::instance()->primary_key_name();
                     $SQL .= ' )';
                     break;
                 case 'venue_title':
@@ -392,7 +392,7 @@ 
                     break;
                 case 'start_date':
                 default:
-                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table() . '.ID');
+                    $SQL .= EEH_Event_Query::_posts_join_for_datetime($SQL, EEM_Event::instance()->table().'.ID');
                     break;
             }
         }
@@ -412,10 +412,10 @@ 
      */
     protected static function _posts_join_for_datetime($SQL = '', $join = '')
     {
-        if (! empty($join)) {
-            $join .= ' = ' . EEM_Datetime::instance()->table() . '.' . EEM_Event::instance()->primary_key_name();
+        if ( ! empty($join)) {
+            $join .= ' = '.EEM_Datetime::instance()->table().'.'.EEM_Event::instance()->primary_key_name();
             if (strpos($SQL, $join) === false) {
-                return ' INNER JOIN ' . EEM_Datetime::instance()->table() . ' ON ( ' . $join . ' )';
+                return ' INNER JOIN '.EEM_Datetime::instance()->table().' ON ( '.$join.' )';
             }
         }
         return '';
@@ -436,8 +436,8 @@ 
         // Event Venue table name
         $event_venue_table = EEM_Event_Venue::instance()->table();
         // generate conditions for:  Event <=> Event Venue  JOIN clause
-        $event_to_event_venue_join = EEM_Event::instance()->table() . '.ID = ';
-        $event_to_event_venue_join .= $event_venue_table . '.' . EEM_Event::instance()->primary_key_name();
+        $event_to_event_venue_join = EEM_Event::instance()->table().'.ID = ';
+        $event_to_event_venue_join .= $event_venue_table.'.'.EEM_Event::instance()->primary_key_name();
         // don't add joins if they have already been added
         if (strpos($SQL, $event_to_event_venue_join) === false) {
             // Venue table name
@@ -528,7 +528,7 @@ 
     public static function posts_where_sql_for_show_expired($show_expired = false)
     {
         return ! $show_expired
-            ? ' AND ' . EEM_Datetime::instance()->table() . '.DTT_EVT_end > \'' . current_time('mysql', true) . '\' '
+            ? ' AND '.EEM_Datetime::instance()->table().'.DTT_EVT_end > \''.current_time('mysql', true).'\' '
             : '';
     }
 
@@ -541,7 +541,7 @@ 
     public static function posts_where_sql_for_event_category_slug($event_category_slug = null)
     {
         global $wpdb;
-        if (! empty($event_category_slug)) {
+        if ( ! empty($event_category_slug)) {
             $event_category_slugs_array = array_map('trim', explode(',', $event_category_slug));
             $event_category_slugs_prepare = implode(', ', array_fill(0, count($event_category_slugs_array), '%s'));
             return $wpdb->prepare(" AND {$wpdb->terms}.slug IN ({$event_category_slugs_prepare}) ", $event_category_slugs_array);
@@ -562,14 +562,14 @@ 
     public static function posts_where_sql_for_event_list_month($month = null)
     {
         $SQL = '';
-        if (! empty($month)) {
+        if ( ! empty($month)) {
             $datetime_table = EEM_Datetime::instance()->table();
             // event start date is LESS than the end of the month ( so nothing that doesn't start until next month )
             $SQL = " AND {$datetime_table}.DTT_EVT_start <= '";
-            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "'";
+            $SQL .= date('Y-m-t 23:59:59', \EEH_DTT_Helper::first_of_month_timestamp($month))."'";
             // event end date is GREATER than the start of the month ( so nothing that ended before this month )
             $SQL .= " AND {$datetime_table}.DTT_EVT_end >= '";
-            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month)) . "' ";
+            $SQL .= date('Y-m-01 0:0:00', \EEH_DTT_Helper::first_of_month_timestamp($month))."' ";
         }
         return $SQL;
     }
@@ -632,15 +632,15 @@ 
             ? strtoupper($sort)
             : 'ASC';
         // make sure 'orderby' is set in query params
-        if (! isset(self::$_query_params['orderby'])) {
+        if ( ! isset(self::$_query_params['orderby'])) {
             self::$_query_params['orderby'] = array();
         }
         // loop thru $orderby_params (type cast as array)
         foreach ($orderby_params as $orderby) {
             // check if we have already added this param
-            if (isset(self::$_query_params['orderby'][ $orderby ])) {
+            if (isset(self::$_query_params['orderby'][$orderby])) {
                 // if so then remove from the $orderby_params so that the count() method below is accurate
-                unset($orderby_params[ $orderby ]);
+                unset($orderby_params[$orderby]);
                 // then bump ahead to the next param
                 continue;
             }
@@ -650,39 +650,39 @@ 
             switch ($orderby) {
                 case 'id':
                 case 'ID':
-                    $SQL .= $glue . $wpdb->posts . '.ID ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.ID '.$sort;
                     break;
                 case 'end_date':
-                    $SQL .= $glue . EEM_Datetime::instance()->table() . '.DTT_EVT_end ' . $sort;
+                    $SQL .= $glue.EEM_Datetime::instance()->table().'.DTT_EVT_end '.$sort;
                     break;
                 case 'event_name':
-                    $SQL .= $glue . $wpdb->posts . '.post_title ' . $sort;
+                    $SQL .= $glue.$wpdb->posts.'.post_title '.$sort;
                     break;
                 case 'category_slug':
-                    $SQL .= $glue . $wpdb->terms . '.slug ' . $sort;
+                    $SQL .= $glue.$wpdb->terms.'.slug '.$sort;
                     break;
                 case 'ticket_start':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_start_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_start_date '.$sort;
                     break;
                 case 'ticket_end':
-                    $SQL .= $glue . EEM_Ticket::instance()->table() . '.TKT_end_date ' . $sort;
+                    $SQL .= $glue.EEM_Ticket::instance()->table().'.TKT_end_date '.$sort;
                     break;
                 case 'venue_title':
-                    $SQL .= $glue . 'venue_title ' . $sort;
+                    $SQL .= $glue.'venue_title '.$sort;
                     break;
                 case 'city':
-                    $SQL .= $glue . EEM_Venue::instance()->second_table() . '.VNU_city ' . $sort;
+                    $SQL .= $glue.EEM_Venue::instance()->second_table().'.VNU_city '.$sort;
                     break;
                 case 'state':
-                    $SQL .= $glue . EEM_State::instance()->table() . '.STA_name ' . $sort;
+                    $SQL .= $glue.EEM_State::instance()->table().'.STA_name '.$sort;
                     break;
                 case 'start_date':
                 default:
-                    $SQL .= $glue . ' event_start_date ' . $sort;
+                    $SQL .= $glue.' event_start_date '.$sort;
                     break;
             }
             // add to array of orderby params that have been added
-            self::$_query_params['orderby'][ $orderby ] = true;
+            self::$_query_params['orderby'][$orderby] = true;
             $counter++;
         }
         return $SQL;

core/domain/services/graphql/data/mutations/DatetimeMutation.php

Spacing +9 added lines, -9 removed lines

@@ -40,15 +40,15 @@ 
             $args['DTT_description'] = wp_kses_post($input['description']);
         }
 
-        if (! empty($input['endDate'])) {
+        if ( ! empty($input['endDate'])) {
             $args['DTT_EVT_end'] = new DateTime(sanitize_text_field($input['endDate']));
         }
 
-        if (! empty($input['eventId'])) {
+        if ( ! empty($input['eventId'])) {
             $args['EVT_ID'] = absint($input['eventId']);
-        } elseif (! empty($input['event'])) {
+        } elseif ( ! empty($input['event'])) {
             $parts = Relay::fromGlobalId(sanitize_text_field($input['event']));
-            $args['EVT_ID'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
+            $args['EVT_ID'] = ( ! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
         }
 
         if (array_key_exists('isPrimary', $input)) {
@@ -67,9 +67,9 @@ 
             $args['DTT_order'] = (int) $input['order'];
         }
 
-        if (! empty($input['parent'])) {
+        if ( ! empty($input['parent'])) {
             $parts = Relay::fromGlobalId(sanitize_text_field($input['parent']));
-            $args['DTT_parent'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
+            $args['DTT_parent'] = ( ! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
         }
 
         if (array_key_exists('reserved', $input)) {
@@ -80,11 +80,11 @@ 
             $args['DTT_sold'] = (int) $input['sold'];
         }
 
-        if (! empty($input['startDate'])) {
+        if ( ! empty($input['startDate'])) {
             $args['DTT_EVT_start'] = new DateTime(sanitize_text_field($input['startDate']));
         }
 
-        if (! empty($input['tickets'])) {
+        if ( ! empty($input['tickets'])) {
             $args['tickets'] = array_map('sanitize_text_field', (array) $input['tickets']);
         }
 
@@ -115,7 +115,7 @@ 
 
         foreach ($tickets as $ID) {
             $parts = Relay::fromGlobalId($ID);
-            if (! empty($parts['id']) && absint($parts['id'])) {
+            if ( ! empty($parts['id']) && absint($parts['id'])) {
                 $entity->_add_relation_to(
                     $parts['id'],
                     $relationName

Indentation +102 added lines, -102 removed lines

@@ -21,106 +21,106 @@
 class DatetimeMutation
 {
 
-    /**
-     * Maps the GraphQL input to a format that the model functions can use
-     *
-     * @param array $input Data coming from the GraphQL mutation query input
-     * @return array
-     * @throws Exception
-     */
-    public static function prepareFields(array $input): array
-    {
-        $args = [];
-
-        if (array_key_exists('capacity', $input)) {
-            $args['DTT_reg_limit'] = (int) $input['capacity'];
-        }
-
-        if (isset($input['description'])) {
-            $args['DTT_description'] = wp_kses_post($input['description']);
-        }
-
-        if (! empty($input['endDate'])) {
-            $args['DTT_EVT_end'] = new DateTime(sanitize_text_field($input['endDate']));
-        }
-
-        if (! empty($input['eventId'])) {
-            $args['EVT_ID'] = absint($input['eventId']);
-        } elseif (! empty($input['event'])) {
-            $parts = Relay::fromGlobalId(sanitize_text_field($input['event']));
-            $args['EVT_ID'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
-        }
-
-        if (array_key_exists('isPrimary', $input)) {
-            $args['DTT_is_primary'] = (bool) $input['isPrimary'];
-        }
-
-        if (array_key_exists('isTrashed', $input)) {
-            $args['DTT_deleted'] = (bool) $input['isTrashed'];
-        }
-
-        if (isset($input['name'])) {
-            $args['DTT_name'] = sanitize_text_field($input['name']);
-        }
-
-        if (array_key_exists('order', $input)) {
-            $args['DTT_order'] = (int) $input['order'];
-        }
-
-        if (! empty($input['parent'])) {
-            $parts = Relay::fromGlobalId(sanitize_text_field($input['parent']));
-            $args['DTT_parent'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
-        }
-
-        if (array_key_exists('reserved', $input)) {
-            $args['DTT_reserved'] = (int) $input['reserved'];
-        }
-
-        if (array_key_exists('sold', $input)) {
-            $args['DTT_sold'] = (int) $input['sold'];
-        }
-
-        if (! empty($input['startDate'])) {
-            $args['DTT_EVT_start'] = new DateTime(sanitize_text_field($input['startDate']));
-        }
-
-        if (! empty($input['tickets'])) {
-            $args['tickets'] = array_map('sanitize_text_field', (array) $input['tickets']);
-        }
-
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_data_mutations__datetime_args',
-            $args,
-            $input
-        );
-    }
-
-
-    /**
-     * Sets the related tickets for the given datetime.
-     *
-     * @param EE_Datetime $entity  The datetime instance.
-     * @param array       $tickets Array of ticket IDs to relate.
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public static function setRelatedTickets(EE_Datetime $entity, array $tickets)
-    {
-        $relationName = 'Ticket';
-        // Remove all the existing related tickets
-        $entity->_remove_relations($relationName);
-
-        foreach ($tickets as $ID) {
-            $parts = Relay::fromGlobalId($ID);
-            if (! empty($parts['id']) && absint($parts['id'])) {
-                $entity->_add_relation_to(
-                    $parts['id'],
-                    $relationName
-                );
-            }
-        }
-    }
+	/**
+	 * Maps the GraphQL input to a format that the model functions can use
+	 *
+	 * @param array $input Data coming from the GraphQL mutation query input
+	 * @return array
+	 * @throws Exception
+	 */
+	public static function prepareFields(array $input): array
+	{
+		$args = [];
+
+		if (array_key_exists('capacity', $input)) {
+			$args['DTT_reg_limit'] = (int) $input['capacity'];
+		}
+
+		if (isset($input['description'])) {
+			$args['DTT_description'] = wp_kses_post($input['description']);
+		}
+
+		if (! empty($input['endDate'])) {
+			$args['DTT_EVT_end'] = new DateTime(sanitize_text_field($input['endDate']));
+		}
+
+		if (! empty($input['eventId'])) {
+			$args['EVT_ID'] = absint($input['eventId']);
+		} elseif (! empty($input['event'])) {
+			$parts = Relay::fromGlobalId(sanitize_text_field($input['event']));
+			$args['EVT_ID'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
+		}
+
+		if (array_key_exists('isPrimary', $input)) {
+			$args['DTT_is_primary'] = (bool) $input['isPrimary'];
+		}
+
+		if (array_key_exists('isTrashed', $input)) {
+			$args['DTT_deleted'] = (bool) $input['isTrashed'];
+		}
+
+		if (isset($input['name'])) {
+			$args['DTT_name'] = sanitize_text_field($input['name']);
+		}
+
+		if (array_key_exists('order', $input)) {
+			$args['DTT_order'] = (int) $input['order'];
+		}
+
+		if (! empty($input['parent'])) {
+			$parts = Relay::fromGlobalId(sanitize_text_field($input['parent']));
+			$args['DTT_parent'] = (! empty($parts['id']) && is_int($parts['id'])) ? $parts['id'] : null;
+		}
+
+		if (array_key_exists('reserved', $input)) {
+			$args['DTT_reserved'] = (int) $input['reserved'];
+		}
+
+		if (array_key_exists('sold', $input)) {
+			$args['DTT_sold'] = (int) $input['sold'];
+		}
+
+		if (! empty($input['startDate'])) {
+			$args['DTT_EVT_start'] = new DateTime(sanitize_text_field($input['startDate']));
+		}
+
+		if (! empty($input['tickets'])) {
+			$args['tickets'] = array_map('sanitize_text_field', (array) $input['tickets']);
+		}
+
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_data_mutations__datetime_args',
+			$args,
+			$input
+		);
+	}
+
+
+	/**
+	 * Sets the related tickets for the given datetime.
+	 *
+	 * @param EE_Datetime $entity  The datetime instance.
+	 * @param array       $tickets Array of ticket IDs to relate.
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public static function setRelatedTickets(EE_Datetime $entity, array $tickets)
+	{
+		$relationName = 'Ticket';
+		// Remove all the existing related tickets
+		$entity->_remove_relations($relationName);
+
+		foreach ($tickets as $ID) {
+			$parts = Relay::fromGlobalId($ID);
+			if (! empty($parts['id']) && absint($parts['id'])) {
+				$entity->_add_relation_to(
+					$parts['id'],
+					$relationName
+				);
+			}
+		}
+	}
 }

core/services/json/JsonDataNodeHandler.php

Spacing +6 added lines, -6 removed lines

@@ -82,10 +82,10 @@ 
                 }
                 if ($child_node instanceof JsonDataNode) {
                     // feed data node back into this function
-                    $data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
+                    $data[$child_node_name] = $this->initializeDataNodes($child_node, $depth);
                 } else {
                     // or assign data directly
-                    $data[ $child_node_name ] = $child_node;
+                    $data[$child_node_name] = $child_node;
                 }
             }
         }
@@ -99,15 +99,15 @@ 
      */
     public function printDataNode()
     {
-        if (!$this->primary_data_node instanceof PrimaryJsonDataNode) {
+        if ( ! $this->primary_data_node instanceof PrimaryJsonDataNode) {
             return;
         }
         // validate that the domain, node name, and target script are set
         $domain = $this->primary_data_node->domain();
         $node_name = $this->primary_data_node->nodeName();
-        $data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
+        $data_valid = $this->validator->validateCriticalProperty($domain, 'domain route', false)
                        && $this->validator->validateCriticalProperty($node_name, 'node name', false);
-        if (! $data_valid) {
+        if ( ! $data_valid) {
             return;
         }
         // initialize and parse data from primary data node
@@ -137,7 +137,7 @@ 
             $this->setPrimaryDataNode($data_node);
         }
         // and don't allow other nodes to be set until a primary is set
-        if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
+        if ( ! $this->primary_data_node instanceof PrimaryJsonDataNode) {
             throw new DomainException(
                 esc_html__(
                     'A PrimaryJsonDataNode needs to be set before data nodes can be added.',

Indentation +126 added lines, -126 removed lines

@@ -18,130 +18,130 @@
 class JsonDataNodeHandler
 {
 
-    /**
-     * @var PrimaryJsonDataNode $primary_data_node
-     */
-    private $primary_data_node;
-
-    /**
-     * @var JsonDataNodeValidator $validator
-     */
-    private $validator;
-
-
-    /**
-     * @param JsonDataNodeValidator $validator
-     */
-    public function __construct(JsonDataNodeValidator $validator)
-    {
-        $this->validator = $validator;
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    public function addDataNode(JsonDataNode $data_node)
-    {
-        if ($data_node->isNotInitialized()) {
-            $this->validatePrimaryDataNode($data_node);
-            $this->primary_data_node->addDataNode($data_node);
-        }
-    }
-
-
-    /**
-     * @param PrimaryJsonDataNode $primary_data_node
-     */
-    public function setPrimaryDataNode(PrimaryJsonDataNode $primary_data_node)
-    {
-        $this->primary_data_node = $primary_data_node;
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @param int                $depth
-     * @return array
-     */
-    private function initializeDataNodes(JsonDataNode $data_node, $depth = 0): array
-    {
-        $depth++;
-        $data = [];
-        // initialize the data node if not done already
-        if ($data_node->isNotInitialized()) {
-            $data_node->initialize();
-            // grab the data node's data array
-            $data_node_data = $data_node->data();
-            foreach ($data_node_data as $child_node_name => $child_node) {
-                // don't parse node if it's the primary, OR if depth has exceeded wp_json_encode() limit
-                if ($child_node instanceof PrimaryJsonDataNode || $depth > 512) {
-                    continue;
-                }
-                if ($child_node instanceof JsonDataNode) {
-                    // feed data node back into this function
-                    $data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
-                } else {
-                    // or assign data directly
-                    $data[ $child_node_name ] = $child_node;
-                }
-            }
-        }
-        return $data;
-    }
-
-
-    /**
-     * @throws DomainException
-     */
-    public function printDataNode()
-    {
-        if (!$this->primary_data_node instanceof PrimaryJsonDataNode) {
-            return;
-        }
-        // validate that the domain, node name, and target script are set
-        $domain = $this->primary_data_node->domain();
-        $node_name = $this->primary_data_node->nodeName();
-        $data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
-                       && $this->validator->validateCriticalProperty($node_name, 'node name', false);
-        if (! $data_valid) {
-            return;
-        }
-        // initialize and parse data from primary data node
-        $data = $this->initializeDataNodes($this->primary_data_node);
-        // this prepends the current domain "use case" to the front of the array
-        $data = ['domain' => $domain] + $data;
-        // add legacy i18n strings
-        $data['eei18n'] = EE_Registry::$i18n_js_strings;
-        // and finally, print the JSON encoded data to the DOM
-        printf(
-            "<script type='text/javascript' id='%s'>\nvar %s = %s\n</script>\n",
-            $node_name,
-            $node_name,
-            json_encode($data)
-        );
-    }
-
-
-    /**
-     * @param JsonDataNode $data_node
-     * @throws DomainException
-     */
-    private function validatePrimaryDataNode(JsonDataNode $data_node)
-    {
-        // set primary data node if that's what the incoming node is
-        if ($data_node instanceof PrimaryJsonDataNode) {
-            $this->setPrimaryDataNode($data_node);
-        }
-        // and don't allow other nodes to be set until a primary is set
-        if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
-            throw new DomainException(
-                esc_html__(
-                    'A PrimaryJsonDataNode needs to be set before data nodes can be added.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
+	/**
+	 * @var PrimaryJsonDataNode $primary_data_node
+	 */
+	private $primary_data_node;
+
+	/**
+	 * @var JsonDataNodeValidator $validator
+	 */
+	private $validator;
+
+
+	/**
+	 * @param JsonDataNodeValidator $validator
+	 */
+	public function __construct(JsonDataNodeValidator $validator)
+	{
+		$this->validator = $validator;
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	public function addDataNode(JsonDataNode $data_node)
+	{
+		if ($data_node->isNotInitialized()) {
+			$this->validatePrimaryDataNode($data_node);
+			$this->primary_data_node->addDataNode($data_node);
+		}
+	}
+
+
+	/**
+	 * @param PrimaryJsonDataNode $primary_data_node
+	 */
+	public function setPrimaryDataNode(PrimaryJsonDataNode $primary_data_node)
+	{
+		$this->primary_data_node = $primary_data_node;
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @param int                $depth
+	 * @return array
+	 */
+	private function initializeDataNodes(JsonDataNode $data_node, $depth = 0): array
+	{
+		$depth++;
+		$data = [];
+		// initialize the data node if not done already
+		if ($data_node->isNotInitialized()) {
+			$data_node->initialize();
+			// grab the data node's data array
+			$data_node_data = $data_node->data();
+			foreach ($data_node_data as $child_node_name => $child_node) {
+				// don't parse node if it's the primary, OR if depth has exceeded wp_json_encode() limit
+				if ($child_node instanceof PrimaryJsonDataNode || $depth > 512) {
+					continue;
+				}
+				if ($child_node instanceof JsonDataNode) {
+					// feed data node back into this function
+					$data[ $child_node_name ] = $this->initializeDataNodes($child_node, $depth);
+				} else {
+					// or assign data directly
+					$data[ $child_node_name ] = $child_node;
+				}
+			}
+		}
+		return $data;
+	}
+
+
+	/**
+	 * @throws DomainException
+	 */
+	public function printDataNode()
+	{
+		if (!$this->primary_data_node instanceof PrimaryJsonDataNode) {
+			return;
+		}
+		// validate that the domain, node name, and target script are set
+		$domain = $this->primary_data_node->domain();
+		$node_name = $this->primary_data_node->nodeName();
+		$data_valid =  $this->validator->validateCriticalProperty($domain, 'domain route', false)
+					   && $this->validator->validateCriticalProperty($node_name, 'node name', false);
+		if (! $data_valid) {
+			return;
+		}
+		// initialize and parse data from primary data node
+		$data = $this->initializeDataNodes($this->primary_data_node);
+		// this prepends the current domain "use case" to the front of the array
+		$data = ['domain' => $domain] + $data;
+		// add legacy i18n strings
+		$data['eei18n'] = EE_Registry::$i18n_js_strings;
+		// and finally, print the JSON encoded data to the DOM
+		printf(
+			"<script type='text/javascript' id='%s'>\nvar %s = %s\n</script>\n",
+			$node_name,
+			$node_name,
+			json_encode($data)
+		);
+	}
+
+
+	/**
+	 * @param JsonDataNode $data_node
+	 * @throws DomainException
+	 */
+	private function validatePrimaryDataNode(JsonDataNode $data_node)
+	{
+		// set primary data node if that's what the incoming node is
+		if ($data_node instanceof PrimaryJsonDataNode) {
+			$this->setPrimaryDataNode($data_node);
+		}
+		// and don't allow other nodes to be set until a primary is set
+		if (! $this->primary_data_node instanceof PrimaryJsonDataNode) {
+			throw new DomainException(
+				esc_html__(
+					'A PrimaryJsonDataNode needs to be set before data nodes can be added.',
+					'event_espresso'
+				)
+			);
+		}
+	}
 }

core/services/assets/JedLocaleData.php

Indentation +30 added lines, -30 removed lines

@@ -15,35 +15,35 @@
 class JedLocaleData
 {
 
-    /**
-     * @var array $locales
-     */
-    protected $locales = [];
+	/**
+	 * @var array $locales
+	 */
+	protected $locales = [];
 
-    /**
-     * Returns Jed-formatted localization data.
-     *
-     * @param string $domain Translation domain.
-     * @return array
-     */
-    public function getData($domain = Domain::TEXT_DOMAIN)
-    {
-        if (! isset($locales[ $domain ])) {
-            $translations = get_translations_for_domain($domain);
-            $locale = [
-                '' => [
-                    'domain' => $domain,
-                    'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
-                ],
-            ];
-            if (! empty($translations->headers['Plural-Forms'])) {
-                $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
-            }
-            foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
-            }
-            $locales[ $domain ] = $locale;
-        }
-        return $locales[ $domain ];
-    }
+	/**
+	 * Returns Jed-formatted localization data.
+	 *
+	 * @param string $domain Translation domain.
+	 * @return array
+	 */
+	public function getData($domain = Domain::TEXT_DOMAIN)
+	{
+		if (! isset($locales[ $domain ])) {
+			$translations = get_translations_for_domain($domain);
+			$locale = [
+				'' => [
+					'domain' => $domain,
+					'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
+				],
+			];
+			if (! empty($translations->headers['Plural-Forms'])) {
+				$locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
+			}
+			foreach ($translations->entries as $id => $entry) {
+				$locale[ $id ] = $entry->translations;
+			}
+			$locales[ $domain ] = $locale;
+		}
+		return $locales[ $domain ];
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function getData($domain = Domain::TEXT_DOMAIN)
     {
-        if (! isset($locales[ $domain ])) {
+        if ( ! isset($locales[$domain])) {
             $translations = get_translations_for_domain($domain);
             $locale = [
                 '' => [
@@ -36,14 +36,14 @@ 
                     'lang'   => is_admin() ? EEH_DTT_Helper::get_user_locale() : get_locale()
                 ],
             ];
-            if (! empty($translations->headers['Plural-Forms'])) {
+            if ( ! empty($translations->headers['Plural-Forms'])) {
                 $locale['']['plural_forms'] = $translations->headers['Plural-Forms'];
             }
             foreach ($translations->entries as $id => $entry) {
-                $locale[ $id ] = $entry->translations;
+                $locale[$id] = $entry->translations;
             }
-            $locales[ $domain ] = $locale;
+            $locales[$domain] = $locale;
         }
-        return $locales[ $domain ];
+        return $locales[$domain];
     }
 }
\ No newline at end of file

core/services/assets/I18nRegistry.php

Indentation +38 added lines, -38 removed lines

@@ -13,46 +13,46 @@
  */
 class I18nRegistry
 {
-    /**
-     * @var DomainInterface
-     */
-    private $domain;
+	/**
+	 * @var DomainInterface
+	 */
+	private $domain;
 
-    /**
-     * @var JedLocaleData $jed_locale
-     */
-    private $jed_locale;
+	/**
+	 * @var JedLocaleData $jed_locale
+	 */
+	private $jed_locale;
 
-    /**
-     * I18nRegistry constructor.
-     *
-     * @param DomainInterface $domain
-     * @param JedLocaleData $jed_locale
-     * @param array() $i18n_map
-     * @deprecated $VID:$
-     */
-    public function __construct(DomainInterface $domain, JedLocaleData $jed_locale, array $i18n_map = [])
-    {
-        $this->domain = $domain;
-        $this->jed_locale = $jed_locale;
-    }
+	/**
+	 * I18nRegistry constructor.
+	 *
+	 * @param DomainInterface $domain
+	 * @param JedLocaleData $jed_locale
+	 * @param array() $i18n_map
+	 * @deprecated $VID:$
+	 */
+	public function __construct(DomainInterface $domain, JedLocaleData $jed_locale, array $i18n_map = [])
+	{
+		$this->domain = $domain;
+		$this->jed_locale = $jed_locale;
+	}
 
-    /**
-     * @param string $handle The script handle reference.
-     * @param string $domain The i18n domain for the strings.
-     * @deprecated $VID:$
-     */
-    public function registerScriptI18n($handle, $domain = Domain::TEXT_DOMAIN)
-    {
-    }
+	/**
+	 * @param string $handle The script handle reference.
+	 * @param string $domain The i18n domain for the strings.
+	 * @deprecated $VID:$
+	 */
+	public function registerScriptI18n($handle, $domain = Domain::TEXT_DOMAIN)
+	{
+	}
 
-    /**
-     * @param array $handles Array of registered script handles.
-     * @return array
-     * @deprecated $VID:$
-     */
-    public function queueI18n(array $handles)
-    {
-        return $handles;
-    }
+	/**
+	 * @param array $handles Array of registered script handles.
+	 * @return array
+	 * @deprecated $VID:$
+	 */
+	public function queueI18n(array $handles)
+	{
+		return $handles;
+	}
 }

core/domain/entities/editor/CoreBlocksAssetManager.php

Indentation +26 added lines, -26 removed lines

@@ -16,30 +16,30 @@
  */
 class CoreBlocksAssetManager extends BlockAssetManager
 {
-    const DOMAIN = 'blocks';
-
-    const ASSET_HANDLE_CORE_BLOCKS = Domain::ASSET_NAMESPACE . '-' . CoreBlocksAssetManager::DOMAIN;
-
-
-    /**
-     * @since  $VID:$
-     * @throws DomainException
-     */
-    public function enqueueEventEditor()
-    {
-        if ($this->verifyAssetIsRegistered(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS)) {
-            wp_enqueue_script(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
-            wp_enqueue_style(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
-        }
-    }
-
-
-    /**
-     * @since 4.9.71.p
-     */
-    public function setAssetHandles()
-    {
-        $this->setEditorScriptHandle(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
-        $this->setScriptHandle(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
-    }
+	const DOMAIN = 'blocks';
+
+	const ASSET_HANDLE_CORE_BLOCKS = Domain::ASSET_NAMESPACE . '-' . CoreBlocksAssetManager::DOMAIN;
+
+
+	/**
+	 * @since  $VID:$
+	 * @throws DomainException
+	 */
+	public function enqueueEventEditor()
+	{
+		if ($this->verifyAssetIsRegistered(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS)) {
+			wp_enqueue_script(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
+			wp_enqueue_style(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
+		}
+	}
+
+
+	/**
+	 * @since 4.9.71.p
+	 */
+	public function setAssetHandles()
+	{
+		$this->setEditorScriptHandle(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
+		$this->setScriptHandle(CoreBlocksAssetManager::ASSET_HANDLE_CORE_BLOCKS);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 {
     const DOMAIN = 'blocks';
 
-    const ASSET_HANDLE_CORE_BLOCKS = Domain::ASSET_NAMESPACE . '-' . CoreBlocksAssetManager::DOMAIN;
+    const ASSET_HANDLE_CORE_BLOCKS = Domain::ASSET_NAMESPACE.'-'.CoreBlocksAssetManager::DOMAIN;
 
 
     /**

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

Indentation +38 added lines, -38 removed lines

@@ -21,49 +21,49 @@
 class EventEspressoData extends PrimaryJsonDataNode
 {
 
-    const NODE_NAME = 'eventEspressoData';
+	const NODE_NAME = 'eventEspressoData';
 
-    /**
-     * @var Api $api
-     */
-    private $api;
+	/**
+	 * @var Api $api
+	 */
+	private $api;
 
-    /**
-     * @var Config $config
-     */
-    private $config;
+	/**
+	 * @var Config $config
+	 */
+	private $config;
 
-    /**
-     * @var JedLocaleData $jed_locale
-     */
-    private $jed_locale;
+	/**
+	 * @var JedLocaleData $jed_locale
+	 */
+	private $jed_locale;
 
 
-    /**
-     * @param Api $api
-     * @param Config $config
-     * @param JedLocaleData         $jed_locale
-     * @param JsonDataNodeValidator $validator
-     */
-    public function __construct(Api $api, Config $config, JedLocaleData $jed_locale, JsonDataNodeValidator $validator)
-    {
-        parent::__construct($validator);
-        $this->api = $api;
-        $this->config = $config;
-        $this->jed_locale = $jed_locale;
-        $this->setNodeName(EventEspressoData::NODE_NAME);
-    }
+	/**
+	 * @param Api $api
+	 * @param Config $config
+	 * @param JedLocaleData         $jed_locale
+	 * @param JsonDataNodeValidator $validator
+	 */
+	public function __construct(Api $api, Config $config, JedLocaleData $jed_locale, JsonDataNodeValidator $validator)
+	{
+		parent::__construct($validator);
+		$this->api = $api;
+		$this->config = $config;
+		$this->jed_locale = $jed_locale;
+		$this->setNodeName(EventEspressoData::NODE_NAME);
+	}
 
 
-    /**
-     * @throws DomainException
-     * @since $VID:$
-     */
-    public function initialize()
-    {
-        $this->addDataNode($this->api);
-        $this->addDataNode($this->config);
-        $this->addData('i18n', $this->jed_locale->getData(Domain::TEXT_DOMAIN));
-        $this->setInitialized(true);
-    }
+	/**
+	 * @throws DomainException
+	 * @since $VID:$
+	 */
+	public function initialize()
+	{
+		$this->addDataNode($this->api);
+		$this->addDataNode($this->config);
+		$this->addData('i18n', $this->jed_locale->getData(Domain::TEXT_DOMAIN));
+		$this->setInitialized(true);
+	}
 }

core/domain/values/assets/JavascriptAsset.php

Indentation +168 added lines, -168 removed lines

@@ -18,172 +18,172 @@
 class JavascriptAsset extends BrowserAsset
 {
 
-    /**
-     * @var boolean $load_in_footer
-     */
-    private $load_in_footer = false;
-
-    /**
-     * @var boolean $requires_translation
-     */
-    private $requires_translation = false;
-
-    /**
-     * @var boolean $has_inline_data
-     */
-    private $has_inline_data = false;
-
-    /**
-     * @var Closure $inline_data_callback
-     */
-    private $inline_data_callback;
-
-
-    /**
-     * Asset constructor.
-     *
-     * @param string          $handle
-     * @param string          $source
-     * @param array           $dependencies
-     * @param bool            $load_in_footer
-     * @param DomainInterface $domain
-     * @param string          $version
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    public function __construct(
-        $handle,
-        $source,
-        array $dependencies,
-        $load_in_footer,
-        DomainInterface $domain,
-        $version = ''
-    ) {
-        parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
-        $this->setLoadInFooter($load_in_footer);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function loadInFooter()
-    {
-        return $this->load_in_footer;
-    }
-
-
-    /**
-     * @param bool $load_in_footer
-     */
-    private function setLoadInFooter($load_in_footer = true)
-    {
-        $this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function requiresTranslation()
-    {
-        return $this->requires_translation;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineData()
-    {
-        return $this->has_inline_data;
-    }
-
-
-    /**
-     * @param bool $has_inline_data
-     * @return JavascriptAsset
-     */
-    public function setHasInlineData($has_inline_data = true)
-    {
-        $this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
-
-
-    /**
-     * @return Closure
-     */
-    public function inlineDataCallback()
-    {
-        return $this->inline_data_callback;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasInlineDataCallback()
-    {
-        return $this->inline_data_callback instanceof Closure;
-    }
-
-
-    /**
-     * @param Closure $inline_data_callback
-     * @return JavascriptAsset
-     */
-    public function setInlineDataCallback(Closure $inline_data_callback)
-    {
-        $this->inline_data_callback = $inline_data_callback;
-        $this->setHasInlineData();
-        return $this;
-    }
-
-
-    /**
-     * @since 4.9.62.p
-     */
-    public function enqueueAsset()
-    {
-        if ($this->source() === '') {
-            return;
-        }
-        $attributes = $this->getAttributes();
-        if (!empty($attributes)) {
-            add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
-        }
-        wp_enqueue_script($this->handle());
-    }
-
-
-    public function addAttributeTagsToScript($tag, $handle)
-    {
-        if ($handle === $this->handle()) {
-            $attributes = $this->getAttributes();
-            $attributes_string = '';
-            foreach ($attributes as $key => $value) {
-                if (is_int($key)) {
-                    $attributes_string .= " {$value}";
-                } else {
-                    $attributes_string .= " {$key}='{$value}'";
-                }
-            }
-            $tag = str_replace('></script>', $attributes_string . '></script>', $tag);
-        }
-
-        return $tag;
-    }
-
-
-    /**
-     * @deprecated $VID:$
-     * @param bool $requires_translation
-     * @return JavascriptAsset
-     */
-    public function setRequiresTranslation($requires_translation = true)
-    {
-        $this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
-        return $this;
-    }
+	/**
+	 * @var boolean $load_in_footer
+	 */
+	private $load_in_footer = false;
+
+	/**
+	 * @var boolean $requires_translation
+	 */
+	private $requires_translation = false;
+
+	/**
+	 * @var boolean $has_inline_data
+	 */
+	private $has_inline_data = false;
+
+	/**
+	 * @var Closure $inline_data_callback
+	 */
+	private $inline_data_callback;
+
+
+	/**
+	 * Asset constructor.
+	 *
+	 * @param string          $handle
+	 * @param string          $source
+	 * @param array           $dependencies
+	 * @param bool            $load_in_footer
+	 * @param DomainInterface $domain
+	 * @param string          $version
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	public function __construct(
+		$handle,
+		$source,
+		array $dependencies,
+		$load_in_footer,
+		DomainInterface $domain,
+		$version = ''
+	) {
+		parent::__construct(Asset::TYPE_JS, $handle, $source, $dependencies, $domain, $version);
+		$this->setLoadInFooter($load_in_footer);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function loadInFooter()
+	{
+		return $this->load_in_footer;
+	}
+
+
+	/**
+	 * @param bool $load_in_footer
+	 */
+	private function setLoadInFooter($load_in_footer = true)
+	{
+		$this->load_in_footer = filter_var($load_in_footer, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function requiresTranslation()
+	{
+		return $this->requires_translation;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineData()
+	{
+		return $this->has_inline_data;
+	}
+
+
+	/**
+	 * @param bool $has_inline_data
+	 * @return JavascriptAsset
+	 */
+	public function setHasInlineData($has_inline_data = true)
+	{
+		$this->has_inline_data = filter_var($has_inline_data, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
+
+
+	/**
+	 * @return Closure
+	 */
+	public function inlineDataCallback()
+	{
+		return $this->inline_data_callback;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasInlineDataCallback()
+	{
+		return $this->inline_data_callback instanceof Closure;
+	}
+
+
+	/**
+	 * @param Closure $inline_data_callback
+	 * @return JavascriptAsset
+	 */
+	public function setInlineDataCallback(Closure $inline_data_callback)
+	{
+		$this->inline_data_callback = $inline_data_callback;
+		$this->setHasInlineData();
+		return $this;
+	}
+
+
+	/**
+	 * @since 4.9.62.p
+	 */
+	public function enqueueAsset()
+	{
+		if ($this->source() === '') {
+			return;
+		}
+		$attributes = $this->getAttributes();
+		if (!empty($attributes)) {
+			add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
+		}
+		wp_enqueue_script($this->handle());
+	}
+
+
+	public function addAttributeTagsToScript($tag, $handle)
+	{
+		if ($handle === $this->handle()) {
+			$attributes = $this->getAttributes();
+			$attributes_string = '';
+			foreach ($attributes as $key => $value) {
+				if (is_int($key)) {
+					$attributes_string .= " {$value}";
+				} else {
+					$attributes_string .= " {$key}='{$value}'";
+				}
+			}
+			$tag = str_replace('></script>', $attributes_string . '></script>', $tag);
+		}
+
+		return $tag;
+	}
+
+
+	/**
+	 * @deprecated $VID:$
+	 * @param bool $requires_translation
+	 * @return JavascriptAsset
+	 */
+	public function setRequiresTranslation($requires_translation = true)
+	{
+		$this->requires_translation = filter_var($requires_translation, FILTER_VALIDATE_BOOLEAN);
+		return $this;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
             return;
         }
         $attributes = $this->getAttributes();
-        if (!empty($attributes)) {
+        if ( ! empty($attributes)) {
             add_filter('script_loader_tag', [$this, 'addAttributeTagsToScript'], 10, 2);
         }
         wp_enqueue_script($this->handle());
@@ -169,7 +169,7 @@ 
                     $attributes_string .= " {$key}='{$value}'";
                 }
             }
-            $tag = str_replace('></script>', $attributes_string . '></script>', $tag);
+            $tag = str_replace('></script>', $attributes_string.'></script>', $tag);
         }
 
         return $tag;