eventespresso / event-espresso-core

core/domain/services/graphql/data/loaders/StateLoader.php

Indentation +22 added lines, -22 removed lines

@@ -15,28 +15,28 @@
  */
 class StateLoader extends AbstractLoader
 {
-    /**
-     * @return EEM_Base|EEM_State
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function getQuery(): EEM_Base
-    {
-        return EEM_State::instance();
-    }
+	/**
+	 * @return EEM_Base|EEM_State
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function getQuery(): EEM_Base
+	{
+		return EEM_State::instance();
+	}
 
 
-    /**
-     * @param array $keys
-     * @return array
-     */
-    protected function getWhereParams(array $keys): array
-    {
-        return [
-            'STA_ID' => ['IN', $keys],
-        ];
-    }
+	/**
+	 * @param array $keys
+	 * @return array
+	 */
+	protected function getWhereParams(array $keys): array
+	{
+		return [
+			'STA_ID' => ['IN', $keys],
+		];
+	}
 }

core/domain/services/graphql/data/domains/EspressoEditor.php

Indentation +22 added lines, -22 removed lines

@@ -17,27 +17,27 @@
 class EspressoEditor implements GQLDataDomainInterface
 {
 
-    /**
-     * @param array      $loaders The loaders accessible in the AppContext
-     * @param AppContext $context The AppContext
-     * @return array
-     * @return array
-     */
-    public function registerLoaders(array $loaders, AppContext $context): array
-    {
-        $newLoaders = [
-            'espresso_attendee'    => new Loaders\AttendeeLoader($context),
-            'espresso_country'     => new Loaders\CountryLoader($context),
-            'espresso_datetime'    => new Loaders\DatetimeLoader($context),
-            'espresso_price'       => new Loaders\PriceLoader($context),
-            'espresso_priceType'   => new Loaders\PriceTypeLoader($context),
-            'espresso_formSection' => new Loaders\FormSectionLoader($context),
-            'espresso_formElement' => new Loaders\FormElementLoader($context),
-            'espresso_state'       => new Loaders\StateLoader($context),
-            'espresso_ticket'      => new Loaders\TicketLoader($context),
-            'espresso_venue'       => new Loaders\VenueLoader($context),
-        ];
+	/**
+	 * @param array      $loaders The loaders accessible in the AppContext
+	 * @param AppContext $context The AppContext
+	 * @return array
+	 * @return array
+	 */
+	public function registerLoaders(array $loaders, AppContext $context): array
+	{
+		$newLoaders = [
+			'espresso_attendee'    => new Loaders\AttendeeLoader($context),
+			'espresso_country'     => new Loaders\CountryLoader($context),
+			'espresso_datetime'    => new Loaders\DatetimeLoader($context),
+			'espresso_price'       => new Loaders\PriceLoader($context),
+			'espresso_priceType'   => new Loaders\PriceTypeLoader($context),
+			'espresso_formSection' => new Loaders\FormSectionLoader($context),
+			'espresso_formElement' => new Loaders\FormElementLoader($context),
+			'espresso_state'       => new Loaders\StateLoader($context),
+			'espresso_ticket'      => new Loaders\TicketLoader($context),
+			'espresso_venue'       => new Loaders\VenueLoader($context),
+		];
 
-        return array_merge($loaders, $newLoaders);
-    }
+		return array_merge($loaders, $newLoaders);
+	}
 }

core/domain/services/graphql/enums/CountriesConnectionOrderbyEnum.php

Indentation +29 added lines, -29 removed lines

@@ -15,35 +15,35 @@
 class CountriesConnectionOrderbyEnum extends EnumBase
 {
 
-    /**
-     * CountriesConnectionOrderbyEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
-        $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * CountriesConnectionOrderbyEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
+		$this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'NAME'     => [
-                'value'       => 'CNT_name',
-                'description' => esc_html__('Order by country name', 'event_espresso'),
-            ],
-            'ISO'     => [
-                'value'       => 'CNT_ISO',
-                'description' => esc_html__('Order by country ISO', 'event_espresso'),
-            ],
-            'CNT_ISO3'     => [
-                'value'       => 'CNT_ISO3',
-                'description' => esc_html__('Order by country ISO3', 'event_espresso'),
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'NAME'     => [
+				'value'       => 'CNT_name',
+				'description' => esc_html__('Order by country name', 'event_espresso'),
+			],
+			'ISO'     => [
+				'value'       => 'CNT_ISO',
+				'description' => esc_html__('Order by country ISO', 'event_espresso'),
+			],
+			'CNT_ISO3'     => [
+				'value'       => 'CNT_ISO3',
+				'description' => esc_html__('Order by country ISO3', 'event_espresso'),
+			],
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'CountriesConnectionOrderbyEnum');
+        $this->setName($this->namespace.'CountriesConnectionOrderbyEnum');
         $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
         parent::__construct();
     }

core/domain/services/graphql/enums/StatesConnectionOrderbyEnum.php

Indentation +25 added lines, -25 removed lines

@@ -15,31 +15,31 @@
 class StatesConnectionOrderbyEnum extends EnumBase
 {
 
-    /**
-     * StatesConnectionOrderbyEnum constructor.
-     */
-    public function __construct()
-    {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
-        $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
-        parent::__construct();
-    }
+	/**
+	 * StatesConnectionOrderbyEnum constructor.
+	 */
+	public function __construct()
+	{
+		$this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
+		$this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
+		parent::__construct();
+	}
 
 
-    /**
-     * @return array
-     */
-    protected function getValues(): array
-    {
-        return [
-            'NAME'     => [
-                'value'       => 'CNT_name',
-                'description' => esc_html__('Order by state name', 'event_espresso'),
-            ],
-            'COUNTRY_ISO'     => [
-                'value'       => 'CNT_ISO',
-                'description' => esc_html__('Order by country ISO', 'event_espresso'),
-            ],
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function getValues(): array
+	{
+		return [
+			'NAME'     => [
+				'value'       => 'CNT_name',
+				'description' => esc_html__('Order by state name', 'event_espresso'),
+			],
+			'COUNTRY_ISO'     => [
+				'value'       => 'CNT_ISO',
+				'description' => esc_html__('Order by country ISO', 'event_espresso'),
+			],
+		];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      */
     public function __construct()
     {
-        $this->setName($this->namespace . 'StatesConnectionOrderbyEnum');
+        $this->setName($this->namespace.'StatesConnectionOrderbyEnum');
         $this->setDescription(esc_html__('Field to order the connection by', 'event_espresso'));
         parent::__construct();
     }

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

Indentation +148 added lines, -148 removed lines

@@ -14,152 +14,152 @@
  */
 class StateConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_state';
-    }
-
-    /**
-     * @return EEM_State
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_State
-    {
-        return EEM_State::instance();
-    }
-
-
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
-
-        return ! empty($results) ? $results : [];
-    }
-
-
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = [];
-        $query_args   = [];
-
-        $query_args['limit'] = $this->getLimit();
-
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'STA_ID';
-
-        $query_args['default_where_conditions'] = 'minimum';
-
-        /**
-         * Collect the input_fields and sanitize them to prepare them for sending to the Query
-         */
-        $input_fields = [];
-        if (! empty($this->args['where'])) {
-            $input_fields = $this->sanitizeInputFields($this->args['where']);
-
-            // Since we do not have any falsy values in query params
-            // Lets get rid of empty values
-            $input_fields = array_filter($input_fields);
-
-            // Use the proper operator.
-            if (! empty($input_fields['STA_ID']) && is_array($input_fields['STA_ID'])) {
-                $input_fields['STA_ID'] = ['IN', $input_fields['STA_ID']];
-            }
-            if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
-                $input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
-            }
-        }
-
-        /**
-         * Merge the input_fields with the default query_args
-         */
-        if (! empty($input_fields)) {
-            $where_params = array_merge($where_params, $input_fields);
-        }
-
-        // limit to active countries by default.
-        if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
-            $where_params['STA_active'] = true;
-        }
-
-        [$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'STA_ID');
-
-        if (empty($query_args['order_by'])) {
-            // set order_by to 'name' by default
-            $query_args['order_by'] = [
-                'STA_name' => 'ASC',
-            ];
-        }
-
-        $search = $this->getSearchKeywords($this->args['where']);
-
-        if (! empty($search)) {
-            // use OR operator to search in any of the fields
-            $where_params['OR'] = array(
-                'STA_name' => array('LIKE', '%' . $search . '%'),
-            );
-        }
-
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__state_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
-
-        $query_args[] = $where_params;
-
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__state_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @return array
-     */
-    public function sanitizeInputFields(array $where_args): array
-    {
-        $arg_mapping = [
-            'in'           => 'STA_ID',
-            'countryIsoIn' => 'CNT_ISO',
-        ];
-        return $this->sanitizeWhereArgsForInputFields(
-            $where_args,
-            $arg_mapping,
-            ['in']
-        );
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_state';
+	}
+
+	/**
+	 * @return EEM_State
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_State
+	{
+		return EEM_State::instance();
+	}
+
+
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
+
+		return ! empty($results) ? $results : [];
+	}
+
+
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = [];
+		$query_args   = [];
+
+		$query_args['limit'] = $this->getLimit();
+
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'STA_ID';
+
+		$query_args['default_where_conditions'] = 'minimum';
+
+		/**
+		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
+		 */
+		$input_fields = [];
+		if (! empty($this->args['where'])) {
+			$input_fields = $this->sanitizeInputFields($this->args['where']);
+
+			// Since we do not have any falsy values in query params
+			// Lets get rid of empty values
+			$input_fields = array_filter($input_fields);
+
+			// Use the proper operator.
+			if (! empty($input_fields['STA_ID']) && is_array($input_fields['STA_ID'])) {
+				$input_fields['STA_ID'] = ['IN', $input_fields['STA_ID']];
+			}
+			if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
+				$input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
+			}
+		}
+
+		/**
+		 * Merge the input_fields with the default query_args
+		 */
+		if (! empty($input_fields)) {
+			$where_params = array_merge($where_params, $input_fields);
+		}
+
+		// limit to active countries by default.
+		if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
+			$where_params['STA_active'] = true;
+		}
+
+		[$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'STA_ID');
+
+		if (empty($query_args['order_by'])) {
+			// set order_by to 'name' by default
+			$query_args['order_by'] = [
+				'STA_name' => 'ASC',
+			];
+		}
+
+		$search = $this->getSearchKeywords($this->args['where']);
+
+		if (! empty($search)) {
+			// use OR operator to search in any of the fields
+			$where_params['OR'] = array(
+				'STA_name' => array('LIKE', '%' . $search . '%'),
+			);
+		}
+
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__state_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
+
+		$query_args[] = $where_params;
+
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__state_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @return array
+	 */
+	public function sanitizeInputFields(array $where_args): array
+	{
+		$arg_mapping = [
+			'in'           => 'STA_ID',
+			'countryIsoIn' => 'CNT_ISO',
+		];
+		return $this->sanitizeWhereArgsForInputFields(
+			$where_args,
+			$arg_mapping,
+			['in']
+		);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
          * Collect the input_fields and sanitize them to prepare them for sending to the Query
          */
         $input_fields = [];
-        if (! empty($this->args['where'])) {
+        if ( ! empty($this->args['where'])) {
             $input_fields = $this->sanitizeInputFields($this->args['where']);
 
             // Since we do not have any falsy values in query params
@@ -84,10 +84,10 @@ 
             $input_fields = array_filter($input_fields);
 
             // Use the proper operator.
-            if (! empty($input_fields['STA_ID']) && is_array($input_fields['STA_ID'])) {
+            if ( ! empty($input_fields['STA_ID']) && is_array($input_fields['STA_ID'])) {
                 $input_fields['STA_ID'] = ['IN', $input_fields['STA_ID']];
             }
-            if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
+            if ( ! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
                 $input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
             }
         }
@@ -95,12 +95,12 @@ 
         /**
          * Merge the input_fields with the default query_args
          */
-        if (! empty($input_fields)) {
+        if ( ! empty($input_fields)) {
             $where_params = array_merge($where_params, $input_fields);
         }
 
         // limit to active countries by default.
-        if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
+        if ( ! isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
             $where_params['STA_active'] = true;
         }
 
@@ -115,10 +115,10 @@ 
 
         $search = $this->getSearchKeywords($this->args['where']);
 
-        if (! empty($search)) {
+        if ( ! empty($search)) {
             // use OR operator to search in any of the fields
             $where_params['OR'] = array(
-                'STA_name' => array('LIKE', '%' . $search . '%'),
+                'STA_name' => array('LIKE', '%'.$search.'%'),
             );
         }
 

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

Indentation +166 added lines, -166 removed lines

@@ -16,170 +16,170 @@
  */
 class CountryConnectionResolver extends AbstractConnectionResolver
 {
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_loader_name(): string
-    {
-        return 'espresso_country';
-    }
-
-    /**
-     * @return EEM_Country
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query(): EEM_Country
-    {
-        return EEM_Country::instance();
-    }
-
-
-    /**
-     * Return an array of item IDs from the query
-     *
-     * @return array
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_ids(): array
-    {
-        $results = $this->query->get_col($this->query_args);
-
-        return ! empty($results) ? $results : [];
-    }
-
-    /**
-     * Get_query_amount
-     *
-     * Returns the max between what was requested and what is defined as the $max_query_amount to
-     * ensure that queries don't exceed unwanted limits when querying data.
-     *
-     * @return int
-     * @throws Exception
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_amount()
-    {
-        // Override the default limit (100) for countries
-        return 300;
-    }
-
-
-    /**
-     * Here, we map the args from the input, then we make sure that we're only querying
-     * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
-     * handle batch resolution of the posts.
-     *
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    public function get_query_args(): array
-    {
-        $where_params = [];
-        $query_args   = [];
-
-        $query_args['limit'] = $this->getLimit();
-
-        // Avoid multiple entries by join.
-        $query_args['group_by'] = 'CNT_ISO';
-
-        $query_args['default_where_conditions'] = 'minimum';
-
-        /**
-         * Collect the input_fields and sanitize them to prepare them for sending to the Query
-         */
-        $input_fields = [];
-        if (! empty($this->args['where'])) {
-            $input_fields = $this->sanitizeInputFields($this->args['where']);
-
-            // Since we do not have any falsy values in query params
-            // Lets get rid of empty values
-            $input_fields = array_filter($input_fields);
-
-            // Use the proper operator.
-            if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
-                $input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
-            }
-            if (! empty($input_fields['CNT_ISO3']) && is_array($input_fields['CNT_ISO3'])) {
-                $input_fields['CNT_ISO3'] = ['IN', $input_fields['CNT_ISO3']];
-            }
-        }
-
-        /**
-         * Merge the input_fields with the default query_args
-         */
-        if (! empty($input_fields)) {
-            $where_params = array_merge($where_params, $input_fields);
-        }
-
-        // limit to active countries by default.
-        if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
-            $where_params['CNT_active'] = true;
-        }
-
-        [$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'CNT_ISO');
-
-        if (empty($query_args['order_by'])) {
-            // set order_by to 'name' by default
-            $query_args['order_by'] = [
-                'CNT_name' => 'ASC',
-            ];
-        }
-
-        $search = $this->getSearchKeywords($this->args['where']);
-
-        if (! empty($search)) {
-            // use OR operator to search in any of the fields
-            $where_params['OR'] = array(
-                'CNT_name' => array('LIKE', '%' . $search . '%'),
-                'CNT_ISO'  => array('LIKE', '%' . $search . '%'),
-            );
-        }
-
-        $where_params = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__country_where_params',
-            $where_params,
-            $this->source,
-            $this->args
-        );
-
-        $query_args[] = $where_params;
-
-        /**
-         * Return the $query_args
-         */
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__country_query_args',
-            $query_args,
-            $this->source,
-            $this->args
-        );
-    }
-
-
-    /**
-     * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
-     * friendly keys.
-     *
-     * @param array $where_args
-     * @return array
-     */
-    public function sanitizeInputFields(array $where_args): array
-    {
-        $arg_mapping = [
-            'isoIn'  => 'CNT_ISO',
-            'in'     => 'CNT_ISO',
-            'iso3In' => 'CNT_ISO3',
-        ];
-        return $this->sanitizeWhereArgsForInputFields(
-            $where_args,
-            $arg_mapping,
-            ['in']
-        );
-    }
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_loader_name(): string
+	{
+		return 'espresso_country';
+	}
+
+	/**
+	 * @return EEM_Country
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query(): EEM_Country
+	{
+		return EEM_Country::instance();
+	}
+
+
+	/**
+	 * Return an array of item IDs from the query
+	 *
+	 * @return array
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_ids(): array
+	{
+		$results = $this->query->get_col($this->query_args);
+
+		return ! empty($results) ? $results : [];
+	}
+
+	/**
+	 * Get_query_amount
+	 *
+	 * Returns the max between what was requested and what is defined as the $max_query_amount to
+	 * ensure that queries don't exceed unwanted limits when querying data.
+	 *
+	 * @return int
+	 * @throws Exception
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_amount()
+	{
+		// Override the default limit (100) for countries
+		return 300;
+	}
+
+
+	/**
+	 * Here, we map the args from the input, then we make sure that we're only querying
+	 * for IDs. The IDs are then passed down the resolve tree, and deferred resolvers
+	 * handle batch resolution of the posts.
+	 *
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	public function get_query_args(): array
+	{
+		$where_params = [];
+		$query_args   = [];
+
+		$query_args['limit'] = $this->getLimit();
+
+		// Avoid multiple entries by join.
+		$query_args['group_by'] = 'CNT_ISO';
+
+		$query_args['default_where_conditions'] = 'minimum';
+
+		/**
+		 * Collect the input_fields and sanitize them to prepare them for sending to the Query
+		 */
+		$input_fields = [];
+		if (! empty($this->args['where'])) {
+			$input_fields = $this->sanitizeInputFields($this->args['where']);
+
+			// Since we do not have any falsy values in query params
+			// Lets get rid of empty values
+			$input_fields = array_filter($input_fields);
+
+			// Use the proper operator.
+			if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
+				$input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
+			}
+			if (! empty($input_fields['CNT_ISO3']) && is_array($input_fields['CNT_ISO3'])) {
+				$input_fields['CNT_ISO3'] = ['IN', $input_fields['CNT_ISO3']];
+			}
+		}
+
+		/**
+		 * Merge the input_fields with the default query_args
+		 */
+		if (! empty($input_fields)) {
+			$where_params = array_merge($where_params, $input_fields);
+		}
+
+		// limit to active countries by default.
+		if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
+			$where_params['CNT_active'] = true;
+		}
+
+		[$query_args, $where_params] = $this->mapOrderbyInputArgs($query_args, $where_params, 'CNT_ISO');
+
+		if (empty($query_args['order_by'])) {
+			// set order_by to 'name' by default
+			$query_args['order_by'] = [
+				'CNT_name' => 'ASC',
+			];
+		}
+
+		$search = $this->getSearchKeywords($this->args['where']);
+
+		if (! empty($search)) {
+			// use OR operator to search in any of the fields
+			$where_params['OR'] = array(
+				'CNT_name' => array('LIKE', '%' . $search . '%'),
+				'CNT_ISO'  => array('LIKE', '%' . $search . '%'),
+			);
+		}
+
+		$where_params = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__country_where_params',
+			$where_params,
+			$this->source,
+			$this->args
+		);
+
+		$query_args[] = $where_params;
+
+		/**
+		 * Return the $query_args
+		 */
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_connection_resolvers__country_query_args',
+			$query_args,
+			$this->source,
+			$this->args
+		);
+	}
+
+
+	/**
+	 * This sets up the "allowed" args, and translates the GraphQL-friendly keys to model
+	 * friendly keys.
+	 *
+	 * @param array $where_args
+	 * @return array
+	 */
+	public function sanitizeInputFields(array $where_args): array
+	{
+		$arg_mapping = [
+			'isoIn'  => 'CNT_ISO',
+			'in'     => 'CNT_ISO',
+			'iso3In' => 'CNT_ISO3',
+		];
+		return $this->sanitizeWhereArgsForInputFields(
+			$where_args,
+			$arg_mapping,
+			['in']
+		);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -94,7 +94,7 @@ 
          * Collect the input_fields and sanitize them to prepare them for sending to the Query
          */
         $input_fields = [];
-        if (! empty($this->args['where'])) {
+        if ( ! empty($this->args['where'])) {
             $input_fields = $this->sanitizeInputFields($this->args['where']);
 
             // Since we do not have any falsy values in query params
@@ -102,10 +102,10 @@ 
             $input_fields = array_filter($input_fields);
 
             // Use the proper operator.
-            if (! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
+            if ( ! empty($input_fields['CNT_ISO']) && is_array($input_fields['CNT_ISO'])) {
                 $input_fields['CNT_ISO'] = ['IN', $input_fields['CNT_ISO']];
             }
-            if (! empty($input_fields['CNT_ISO3']) && is_array($input_fields['CNT_ISO3'])) {
+            if ( ! empty($input_fields['CNT_ISO3']) && is_array($input_fields['CNT_ISO3'])) {
                 $input_fields['CNT_ISO3'] = ['IN', $input_fields['CNT_ISO3']];
             }
         }
@@ -113,12 +113,12 @@ 
         /**
          * Merge the input_fields with the default query_args
          */
-        if (! empty($input_fields)) {
+        if ( ! empty($input_fields)) {
             $where_params = array_merge($where_params, $input_fields);
         }
 
         // limit to active countries by default.
-        if (!isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
+        if ( ! isset($this->args['where']['activeOnly']) || $this->args['where']['activeOnly']) {
             $where_params['CNT_active'] = true;
         }
 
@@ -133,11 +133,11 @@ 
 
         $search = $this->getSearchKeywords($this->args['where']);
 
-        if (! empty($search)) {
+        if ( ! empty($search)) {
             // use OR operator to search in any of the fields
             $where_params['OR'] = array(
-                'CNT_name' => array('LIKE', '%' . $search . '%'),
-                'CNT_ISO'  => array('LIKE', '%' . $search . '%'),
+                'CNT_name' => array('LIKE', '%'.$search.'%'),
+                'CNT_ISO'  => array('LIKE', '%'.$search.'%'),
             );
         }
 

core/domain/entities/routing/handlers/shared/GQLRequests.php

Indentation +219 added lines, -219 removed lines

@@ -19,231 +19,231 @@
  */
 class GQLRequests extends Route
 {
-    /**
-     * @var AssetManifestFactory
-     */
-    private $manifest_factory;
+	/**
+	 * @var AssetManifestFactory
+	 */
+	private $manifest_factory;
 
 
-    /**
-     * AssetRequests constructor.
-     *
-     * @param EE_Dependency_Map    $dependency_map
-     * @param LoaderInterface      $loader
-     * @param RequestInterface     $request
-     * @param AssetManifestFactory $manifest_factory
-     */
-    public function __construct(
-        EE_Dependency_Map $dependency_map,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        AssetManifestFactory $manifest_factory
-    ) {
-        $this->manifest_factory = $manifest_factory;
-        parent::__construct($dependency_map, $loader, $request);
-    }
+	/**
+	 * AssetRequests constructor.
+	 *
+	 * @param EE_Dependency_Map    $dependency_map
+	 * @param LoaderInterface      $loader
+	 * @param RequestInterface     $request
+	 * @param AssetManifestFactory $manifest_factory
+	 */
+	public function __construct(
+		EE_Dependency_Map $dependency_map,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		AssetManifestFactory $manifest_factory
+	) {
+		$this->manifest_factory = $manifest_factory;
+		parent::__construct($dependency_map, $loader, $request);
+	}
 
 
-    /**
-     * returns true if the current request matches this route
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    public function matchesCurrentRequest(): bool
-    {
-        global $pagenow;
-        return (
-                   $this->request->isGQL()
-                   || $this->request->isUnitTesting()
-                   || (
-                       $this->request->isAdmin()
-                       && $this->request->getRequestParam('page') === 'espresso_events'
-                       && (
-                           $this->request->getRequestParam('action') === 'create_new'
-                           || $this->request->getRequestParam('action') === 'edit'
-                       )
-                   )
-                   || (
-                       $pagenow
-                       && (
-                           $pagenow === 'post-new.php'
-                           || (
-                               $pagenow === 'post.php'
-                               && $this->request->getRequestParam('action') === 'edit'
-                           )
-                       )
-                   )
-               );
-    }
+	/**
+	 * returns true if the current request matches this route
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	public function matchesCurrentRequest(): bool
+	{
+		global $pagenow;
+		return (
+				   $this->request->isGQL()
+				   || $this->request->isUnitTesting()
+				   || (
+					   $this->request->isAdmin()
+					   && $this->request->getRequestParam('page') === 'espresso_events'
+					   && (
+						   $this->request->getRequestParam('action') === 'create_new'
+						   || $this->request->getRequestParam('action') === 'edit'
+					   )
+				   )
+				   || (
+					   $pagenow
+					   && (
+						   $pagenow === 'post-new.php'
+						   || (
+							   $pagenow === 'post.php'
+							   && $this->request->getRequestParam('action') === 'edit'
+						   )
+					   )
+				   )
+			   );
+	}
 
 
-    /**
-     * @since $VID:$
-     */
-    protected function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\GraphQLManager',
-            [
-                'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\TypesManager',
-            [
-                'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\InputsManager',
-            [
-                'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\EnumsManager',
-            [
-                'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\ConnectionsManager',
-            [
-                'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\services\graphql\DataLoaderManager',
-            [
-                'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Datetime',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Attendee',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Event',
-            ['EEM_Event' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormElement',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\FormSection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Ticket',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Price',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\PriceType',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Venue',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\State',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\types\Country',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
-            ['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryCountriesConnection',
-            ['EEM_Country' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
-            ['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
-            ['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
-            ['EEM_State' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
-            ['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
-            ['EEM_Price' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
-            ['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
-            ['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
-            ['EEM_Venue' => EE_Dependency_Map::load_from_cache]
-        );
-    }
+	/**
+	 * @since $VID:$
+	 */
+	protected function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\GraphQLManager',
+			[
+				'EventEspresso\core\services\graphql\ConnectionsManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\DataLoaderManager'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\EnumsManager'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\InputsManager'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\graphql\TypesManager'       => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\TypesManager',
+			[
+				'EventEspresso\core\services\graphql\types\TypeCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\InputsManager',
+			[
+				'EventEspresso\core\services\graphql\inputs\InputCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\EnumsManager',
+			[
+				'EventEspresso\core\services\graphql\enums\EnumCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\ConnectionsManager',
+			[
+				'EventEspresso\core\services\graphql\connections\ConnectionCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\services\graphql\DataLoaderManager',
+			[
+				'EventEspresso\core\services\graphql\loaders\DataLoaderCollection' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Datetime',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Attendee',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Event',
+			['EEM_Event' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormElement',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\FormSection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Ticket',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Price',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\PriceType',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Venue',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\State',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\types\Country',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryAttendeesConnection',
+			['EEM_Attendee' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryCountriesConnection',
+			['EEM_Country' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormElementsConnection',
+			['EEM_Form_Element' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryFormSectionsConnection',
+			['EEM_Form_Section' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryStatesConnection',
+			['EEM_State' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\DatetimeTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryTicketsConnection',
+			['EEM_Ticket' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPricesConnection',
+			['EEM_Price' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\RootQueryPriceTypesConnection',
+			['EEM_Price_Type' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\TicketDatetimesConnection',
+			['EEM_Datetime' => EE_Dependency_Map::load_from_cache]
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\graphql\connections\EventVenuesConnection',
+			['EEM_Venue' => EE_Dependency_Map::load_from_cache]
+		);
+	}
 
 
-    /**
-     * implements logic required to run during request
-     *
-     * @return bool
-     * @since   $VID:$
-     */
-    protected function requestHandler(): bool
-    {
-        if (! class_exists('WPGraphQL')) {
-            require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
-        }
-        // load handler for EE GraphQL requests
-        $graphQL_manager = $this->loader->getShared(
-            'EventEspresso\core\services\graphql\GraphQLManager'
-        );
-        $graphQL_manager->init();
-        $manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
-        $manifest->initialize();
-        return true;
-    }
+	/**
+	 * implements logic required to run during request
+	 *
+	 * @return bool
+	 * @since   $VID:$
+	 */
+	protected function requestHandler(): bool
+	{
+		if (! class_exists('WPGraphQL')) {
+			require_once EE_THIRD_PARTY . 'wp-graphql/wp-graphql.php';
+		}
+		// load handler for EE GraphQL requests
+		$graphQL_manager = $this->loader->getShared(
+			'EventEspresso\core\services\graphql\GraphQLManager'
+		);
+		$graphQL_manager->init();
+		$manifest = $this->manifest_factory->createFromDomainObject(DomainFactory::getEventEspressoCoreDomain());
+		$manifest->initialize();
+		return true;
+	}
 }

public/template_tags.php

Indentation +48 added lines, -48 removed lines

@@ -206,7 +206,7 @@ 
 	function espresso_ticket_selector( $event = NULL ) {
 		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
 			espresso_load_ticket_selector();
-            \EED_Ticket_Selector::set_definitions();
+			\EED_Ticket_Selector::set_definitions();
 			echo EED_Ticket_Selector::display_ticket_selector( $event );
 		}
 	}
@@ -460,12 +460,12 @@ 
 	 * @return string
 	 */
 	function espresso_list_of_event_dates( $EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL ) {
-	    $arguments = apply_filters(
-            'FHEE__espresso_list_of_event_dates__arguments',
-            [ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit ]
-        );
-        [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit] = $arguments;
-	    $datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit );
+		$arguments = apply_filters(
+			'FHEE__espresso_list_of_event_dates__arguments',
+			[ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit ]
+		);
+		[$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit] = $arguments;
+		$datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit );
 		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
 		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
 		$date_format = apply_filters( 'FHEE__espresso_list_of_event_dates__date_format', $date_format );
@@ -481,51 +481,51 @@ 
 			$html = '<ul id="ee-event-datetimes-ul-' . $post->ID . '" class="'. $ul_class.'">';
 			foreach ( $datetimes as $datetime ) {
 				if ( $datetime instanceof EE_Datetime ) {
-                    $datetime_name = $datetime->name();
-                    $datetime_description = $datetime->description();
-                    $html .= '<li id="ee-event-datetimes-li-' . $datetime->ID();
-                    $html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">';
-                    $inner_html = '';
-                    if (! empty( $datetime_name )) {
-                        $inner_html .= '<strong>' . $datetime_name . '</strong>';
-                        $inner_html .= $add_breaks ? '<br />' : '';
-                    }
-                    // add date
-                    $inner_html .= '<span class="ee-event-datetimes-li-daterange">';
-                    $inner_html .= '<span class="dashicons dashicons-calendar"></span>&nbsp;';
-                    $inner_html .= $datetime->date_range( $date_format ) . '</span><br/>';
-                    // add time
-                    $inner_html .= '<span class="ee-event-datetimes-li-timerange">';
-                    $inner_html .= '<span class="dashicons dashicons-clock"></span>&nbsp;';
-                    $inner_html .= $datetime->time_range( $time_format ) . '</span>';
-
-                    $venue = $datetime->venue();
-                    if ($venue instanceof EE_Venue) {
-                        $inner_html .= '<br /><span class="ee-event-datetimes-li-venue">';
-                        $inner_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
-                        $inner_html .= '<a href="'. $venue->get_permalink() .'" ';
-                        $inner_html .= 'alt="'. $venue->name() .'" target="_blank">';
-                        $inner_html .= $venue->name() . '</a></span>';
-                    }
-                    if (! empty( $datetime_description )) {
-                        $inner_html .= $add_breaks ? '<br />' : '';
-                        $inner_html .= $datetime_description;
-                    }
-                    $inner_html = apply_filters(
-                        'FHEE__espresso_list_of_event_dates__datetime_html',
-                        $inner_html,
-                        $datetime,
-                        $arguments
-                    );
-                    $html .= $inner_html . '</li>';
+					$datetime_name = $datetime->name();
+					$datetime_description = $datetime->description();
+					$html .= '<li id="ee-event-datetimes-li-' . $datetime->ID();
+					$html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">';
+					$inner_html = '';
+					if (! empty( $datetime_name )) {
+						$inner_html .= '<strong>' . $datetime_name . '</strong>';
+						$inner_html .= $add_breaks ? '<br />' : '';
+					}
+					// add date
+					$inner_html .= '<span class="ee-event-datetimes-li-daterange">';
+					$inner_html .= '<span class="dashicons dashicons-calendar"></span>&nbsp;';
+					$inner_html .= $datetime->date_range( $date_format ) . '</span><br/>';
+					// add time
+					$inner_html .= '<span class="ee-event-datetimes-li-timerange">';
+					$inner_html .= '<span class="dashicons dashicons-clock"></span>&nbsp;';
+					$inner_html .= $datetime->time_range( $time_format ) . '</span>';
+
+					$venue = $datetime->venue();
+					if ($venue instanceof EE_Venue) {
+						$inner_html .= '<br /><span class="ee-event-datetimes-li-venue">';
+						$inner_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
+						$inner_html .= '<a href="'. $venue->get_permalink() .'" ';
+						$inner_html .= 'alt="'. $venue->name() .'" target="_blank">';
+						$inner_html .= $venue->name() . '</a></span>';
+					}
+					if (! empty( $datetime_description )) {
+						$inner_html .= $add_breaks ? '<br />' : '';
+						$inner_html .= $datetime_description;
+					}
+					$inner_html = apply_filters(
+						'FHEE__espresso_list_of_event_dates__datetime_html',
+						$inner_html,
+						$datetime,
+						$arguments
+					);
+					$html .= $inner_html . '</li>';
 				}
 			}
 			$html .= '</ul>';
-            $html = apply_filters('FHEE__espresso_list_of_event_dates__html', $html, $arguments, $datetime);
+			$html = apply_filters('FHEE__espresso_list_of_event_dates__html', $html, $arguments, $datetime);
 		} else {
-            $html = '<p><span class="dashicons dashicons-marker pink-text"></span>';
-            $html .= esc_html__( 'There are no upcoming dates for this event.', 'event_espresso' );
-            $html .= '</p><br/>';
+			$html = '<p><span class="dashicons dashicons-marker pink-text"></span>';
+			$html .= esc_html__( 'There are no upcoming dates for this event.', 'event_espresso' );
+			$html .= '</p><br/>';
 		}
 		if ( $echo ) {
 			echo $html;

Spacing +294 added lines, -294 removed lines

@@ -14,12 +14,12 @@ 
  * @param int | \EE_Event $event
  * @return bool
  */
-function is_espresso_event( $event = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_event($event = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// extract EE_Event object from passed param regardless of what it is (within reason of course)
-		$event = EEH_Event_View::get_event( $event );
+		$event = EEH_Event_View::get_event($event);
 		// do we have a valid event ?
-		return $event instanceof EE_Event  ? TRUE : FALSE;
+		return $event instanceof EE_Event ? TRUE : FALSE;
 	}
 	return FALSE;
 }
@@ -31,7 +31,7 @@ 
  * @return bool
  */
 function is_espresso_event_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		// return conditionals set by CPTs
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : FALSE;
@@ -46,7 +46,7 @@ 
  * @return bool
  */
 function is_espresso_event_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : FALSE;
 	}
@@ -60,7 +60,7 @@ 
  * @return bool
  */
 function is_espresso_event_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : FALSE;
 	}
@@ -74,10 +74,10 @@ 
  * @param int | \EE_Venue $venue
  * @return bool
  */
-function is_espresso_venue( $venue = NULL ) {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+function is_espresso_venue($venue = NULL) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
-		$venue = EEH_Venue_View::get_venue( $venue, FALSE );
+		$venue = EEH_Venue_View::get_venue($venue, FALSE);
 		// do we have a valid event ?
 		return $venue instanceof EE_Venue ? TRUE : FALSE;
 	}
@@ -91,7 +91,7 @@ 
  * @return bool
  */
 function is_espresso_venue_single() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : FALSE;
 	}
@@ -105,7 +105,7 @@ 
  * @return bool
  */
 function is_espresso_venue_archive() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : FALSE;
 	}
@@ -119,7 +119,7 @@ 
  * @return bool
  */
 function is_espresso_venue_taxonomy() {
-	if ( can_use_espresso_conditionals( __FUNCTION__ )) {
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
 		global $wp_query;
 		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : FALSE;
 	}
@@ -133,12 +133,12 @@ 
  * @param $conditional_tag
  * @return bool
  */
-function can_use_espresso_conditionals( $conditional_tag ) {
-	if ( ! did_action( 'AHEE__EE_System__initialize' )) {
+function can_use_espresso_conditionals($conditional_tag) {
+	if ( ! did_action('AHEE__EE_System__initialize')) {
 		EE_Error::doing_it_wrong(
 			__FUNCTION__,
 			sprintf(
-				esc_html__( 'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.','event_espresso'),
+				esc_html__('The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.', 'event_espresso'),
 				$conditional_tag
 			),
 			'4.4.0'
@@ -153,13 +153,13 @@ 
 
 /*************************** Event Queries ***************************/
 
-if ( ! function_exists( 'espresso_get_events' )) {
+if ( ! function_exists('espresso_get_events')) {
 	/**
 	 * 	espresso_get_events
 	 * @param array $params
 	 * @return array
 	 */
-	function espresso_get_events( $params = array() ) {
+	function espresso_get_events($params = array()) {
 		//set default params
 		$default_espresso_events_params = array(
 			'limit' => 10,
@@ -170,18 +170,18 @@ 
 			'sort' => 'ASC'
 		);
 		// allow the defaults to be filtered
-		$default_espresso_events_params = apply_filters( 'espresso_get_events__default_espresso_events_params', $default_espresso_events_params );
+		$default_espresso_events_params = apply_filters('espresso_get_events__default_espresso_events_params', $default_espresso_events_params);
 		// grab params and merge with defaults, then extract
-		$params = array_merge( $default_espresso_events_params, $params );
+		$params = array_merge($default_espresso_events_params, $params);
 		// run the query
-		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery( $params );
+		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
 		// assign results to a variable so we can return it
 		$events = $events_query->have_posts() ? $events_query->posts : array();
 		// but first reset the query and postdata
 		wp_reset_query();
 		wp_reset_postdata();
 		EED_Events_Archive::remove_all_events_archive_filters();
-		unset( $events_query );
+		unset($events_query);
 		return $events;
 	}
 }
@@ -195,33 +195,33 @@ 
  * espresso_load_ticket_selector
  */
 function espresso_load_ticket_selector() {
-	EE_Registry::instance()->load_file( EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module' );
+	EE_Registry::instance()->load_file(EE_MODULES.'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
-if ( ! function_exists( 'espresso_ticket_selector' )) {
+if ( ! function_exists('espresso_ticket_selector')) {
 	/**
 	 * espresso_ticket_selector
 	 * @param null $event
 	 */
-	function espresso_ticket_selector( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_ticket_selector', FALSE ) ) {
+	function espresso_ticket_selector($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_ticket_selector', FALSE)) {
 			espresso_load_ticket_selector();
             \EED_Ticket_Selector::set_definitions();
-			echo EED_Ticket_Selector::display_ticket_selector( $event );
+			echo EED_Ticket_Selector::display_ticket_selector($event);
 		}
 	}
 }
 
 
-	if ( ! function_exists( 'espresso_view_details_btn' )) {
+	if ( ! function_exists('espresso_view_details_btn')) {
 	/**
 	 * espresso_view_details_btn
 	 * @param null $event
 	 */
-	function espresso_view_details_btn( $event = NULL ) {
-		if (  ! apply_filters( 'FHEE_disable_espresso_view_details_btn', FALSE ) ) {
+	function espresso_view_details_btn($event = NULL) {
+		if ( ! apply_filters('FHEE_disable_espresso_view_details_btn', FALSE)) {
 			espresso_load_ticket_selector();
-			echo EED_Ticket_Selector::display_ticket_selector( $event, TRUE );
+			echo EED_Ticket_Selector::display_ticket_selector($event, TRUE);
 		}
 	}
 }
@@ -231,7 +231,7 @@ 
 
 /*************************** EEH_Event_View ***************************/
 
-if ( ! function_exists( 'espresso_load_event_list_assets' )) {
+if ( ! function_exists('espresso_load_event_list_assets')) {
 	/**
 	 * espresso_load_event_list_assets
 	 * ensures that event list styles and scripts are loaded
@@ -240,13 +240,13 @@ 
 	 */
 	function espresso_load_event_list_assets() {
 		$event_list = EED_Events_Archive::instance();
-		add_action( 'AHEE__EE_System__initialize_last', array( $event_list, 'load_event_list_assets' ), 10 );
-		add_filter( 'FHEE_enable_default_espresso_css', '__return_true' );
+		add_action('AHEE__EE_System__initialize_last', array($event_list, 'load_event_list_assets'), 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_reg_button' )) {
+if ( ! function_exists('espresso_event_reg_button')) {
 	/**
 	 * espresso_event_reg_button
 	 * returns the "Register Now" button if event is active,
@@ -258,13 +258,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_reg_button( $btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE ) {
-		$event = EEH_Event_View::get_event( $EVT_ID );
-		if ( ! $event instanceof EE_Event ) {
+	function espresso_event_reg_button($btn_text_if_active = NULL, $btn_text_if_inactive = FALSE, $EVT_ID = FALSE) {
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if ( ! $event instanceof EE_Event) {
 			return;
 		}
 		$event_status = $event->get_active_status();
-		switch ( $event_status ) {
+		switch ($event_status) {
 			case EE_Datetime::sold_out :
 				$btn_text = esc_html__('Sold Out', 'event_espresso');
 				$class = 'ee-pink';
@@ -284,15 +284,15 @@ 
 			case EE_Datetime::upcoming :
 			case EE_Datetime::active :
 			default :
-				$btn_text =! empty( $btn_text_if_active ) ? $btn_text_if_active : esc_html__( 'Register Now', 'event_espresso' );
+				$btn_text = ! empty($btn_text_if_active) ? $btn_text_if_active : esc_html__('Register Now', 'event_espresso');
 				$class = 'ee-green';
 		}
-		if ( $event_status < 1 && ! empty( $btn_text_if_inactive )) {
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
 			$btn_text = $btn_text_if_inactive;
 			$class = 'ee-grey';
 		}
 		?>
-		<a class="ee-button ee-register-button <?php echo $class; ?>" href="<?php espresso_event_link_url( $EVT_ID ); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
+		<a class="ee-button ee-register-button <?php echo $class; ?>" href="<?php espresso_event_link_url($EVT_ID); ?>"<?php echo \EED_Events_Archive::link_target(); ?>>
 			<?php echo $btn_text; ?>
 		</a>
 	<?php
@@ -301,7 +301,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_display_ticket_selector' )) {
+if ( ! function_exists('espresso_display_ticket_selector')) {
 	/**
 	 * espresso_display_ticket_selector
 	 * whether or not to display the Ticket Selector for an event
@@ -309,14 +309,14 @@ 
 	 * @param bool $EVT_ID
 	 * @return boolean
 	 */
-	function espresso_display_ticket_selector( $EVT_ID = FALSE ) {
-		return EEH_Event_View::display_ticket_selector( $EVT_ID );
+	function espresso_display_ticket_selector($EVT_ID = FALSE) {
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_status_banner' )) {
+if ( ! function_exists('espresso_event_status_banner')) {
 	/**
 	 * espresso_event_status
 	 * returns a banner showing the event status if it is sold out, expired, or inactive
@@ -324,13 +324,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_status_banner( $EVT_ID = FALSE ) {
-		return EEH_Event_View::event_status( $EVT_ID );
+	function espresso_event_status_banner($EVT_ID = FALSE) {
+		return EEH_Event_View::event_status($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_status' )) {
+if ( ! function_exists('espresso_event_status')) {
 	/**
 	 * espresso_event_status
 	 * returns the event status if it is sold out, expired, or inactive
@@ -339,13 +339,13 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_status( $EVT_ID = 0, $echo = TRUE ) {
-		return EEH_Event_View::event_active_status( $EVT_ID, $echo );
+	function espresso_event_status($EVT_ID = 0, $echo = TRUE) {
+		return EEH_Event_View::event_active_status($EVT_ID, $echo);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_categories' )) {
+if ( ! function_exists('espresso_event_categories')) {
 	/**
 	 * espresso_event_categories
 	 * returns the terms associated with an event
@@ -355,17 +355,17 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_categories( $EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Event_View::event_categories( $EVT_ID, $hide_uncategorized );
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_tickets_available' )) {
+if ( ! function_exists('espresso_event_tickets_available')) {
 	/**
 	 * espresso_event_tickets_available
 	 * returns the ticket types available for purchase for an event
@@ -375,26 +375,26 @@ 
 	 * @param bool $format
 	 * @return string
 	 */
-	function espresso_event_tickets_available( $EVT_ID = 0, $echo = TRUE, $format = TRUE ) {
-		$tickets = EEH_Event_View::event_tickets_available( $EVT_ID );
-		if ( is_array( $tickets ) && ! empty( $tickets )) {
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = TRUE, $format = TRUE) {
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
 			// if formatting then $html will be a string, else it will be an array of ticket objects
-			$html = $format ? '<ul id="ee-event-tickets-ul-' . $EVT_ID . '" class="ee-event-tickets-ul">' : array();
-			foreach ( $tickets as $ticket ) {
-				if ( $ticket instanceof EE_Ticket ) {
-					if ( $format ) {
-						$html .= '<li id="ee-event-tickets-li-' . $ticket->ID() . '" class="ee-event-tickets-li">';
-						$html .= $ticket->name() . ' ' . EEH_Template::format_currency( $ticket->get_ticket_total_with_taxes() );
+			$html = $format ? '<ul id="ee-event-tickets-ul-'.$EVT_ID.'" class="ee-event-tickets-ul">' : array();
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'.$ticket->ID().'" class="ee-event-tickets-li">';
+						$html .= $ticket->name().' '.EEH_Template::format_currency($ticket->get_ticket_total_with_taxes());
 						$html .= '</li>';
 					} else {
 						$html[] = $ticket;
 					}
 				}
 			}
-			if ( $format ) {
+			if ($format) {
 				$html .= '</ul>';
 			}
-			if ( $echo && $format ) {
+			if ($echo && $format) {
 				echo $html;
 				return '';
 			}
@@ -404,7 +404,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_obj' )) {
+if ( ! function_exists('espresso_event_date_obj')) {
 	/**
 	 * espresso_event_date_obj
 	 * returns the primary date object for an event
@@ -412,13 +412,13 @@ 
 	 * @param bool $EVT_ID
 	 * @return object
 	 */
-	function espresso_event_date_obj( $EVT_ID = FALSE ) {
-		return EEH_Event_View::get_primary_date_obj( $EVT_ID );
+	function espresso_event_date_obj($EVT_ID = FALSE) {
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_event_date' )) {
+if ( ! function_exists('espresso_event_date')) {
 	/**
 	 * espresso_event_date
 	 * returns the primary date for an event
@@ -429,22 +429,22 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_date__time_format', $time_format );
-		if($echo){
-			echo EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
 
 	}
 }
 
 
-if ( ! function_exists( 'espresso_list_of_event_dates' )) {
+if ( ! function_exists('espresso_list_of_event_dates')) {
 	/**
 	 * espresso_list_of_event_dates
 	 * returns a unordered list of dates for an event
@@ -459,55 +459,55 @@ 
 	 * @param null   $limit
 	 * @return string
 	 */
-	function espresso_list_of_event_dates( $EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL ) {
+	function espresso_list_of_event_dates($EVT_ID = 0, $date_format = '', $time_format = '', $echo = TRUE, $show_expired = NULL, $format = TRUE, $add_breaks = TRUE, $limit = NULL) {
 	    $arguments = apply_filters(
             'FHEE__espresso_list_of_event_dates__arguments',
-            [ $EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit ]
+            [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit]
         );
         [$EVT_ID, $date_format, $time_format, $echo, $show_expired, $format, $add_breaks, $limit] = $arguments;
-	    $datetimes = EEH_Event_View::get_all_date_obj( $EVT_ID, $show_expired, FALSE, $limit );
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_list_of_event_dates__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_list_of_event_dates__time_format', $time_format );
-		if ( ! $format ) {
-			return apply_filters( 'FHEE__espresso_list_of_event_dates__datetimes', $datetimes );
+	    $datetimes = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, FALSE, $limit);
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		if ( ! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
 		}
-		if ( is_array( $datetimes ) && ! empty( $datetimes )) {
+		if (is_array($datetimes) && ! empty($datetimes)) {
 			global $post;
 			$cols = count($datetimes);
 			$cols = $cols >= 3 ? 'big' : 'small';
 			$ul_class = "ee-event-datetimes-ul ee-event-datetimes-ul--{$cols}";
-			$html = '<ul id="ee-event-datetimes-ul-' . $post->ID . '" class="'. $ul_class.'">';
-			foreach ( $datetimes as $datetime ) {
-				if ( $datetime instanceof EE_Datetime ) {
+			$html = '<ul id="ee-event-datetimes-ul-'.$post->ID.'" class="'.$ul_class.'">';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
                     $datetime_name = $datetime->name();
                     $datetime_description = $datetime->description();
-                    $html .= '<li id="ee-event-datetimes-li-' . $datetime->ID();
-                    $html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-' . $datetime->get_active_status() . '">';
+                    $html .= '<li id="ee-event-datetimes-li-'.$datetime->ID();
+                    $html .= '" class="ee-event-datetimes-li ee-event-datetimes-li-'.$datetime->get_active_status().'">';
                     $inner_html = '';
-                    if (! empty( $datetime_name )) {
-                        $inner_html .= '<strong>' . $datetime_name . '</strong>';
+                    if ( ! empty($datetime_name)) {
+                        $inner_html .= '<strong>'.$datetime_name.'</strong>';
                         $inner_html .= $add_breaks ? '<br />' : '';
                     }
                     // add date
                     $inner_html .= '<span class="ee-event-datetimes-li-daterange">';
                     $inner_html .= '<span class="dashicons dashicons-calendar"></span>&nbsp;';
-                    $inner_html .= $datetime->date_range( $date_format ) . '</span><br/>';
+                    $inner_html .= $datetime->date_range($date_format).'</span><br/>';
                     // add time
                     $inner_html .= '<span class="ee-event-datetimes-li-timerange">';
                     $inner_html .= '<span class="dashicons dashicons-clock"></span>&nbsp;';
-                    $inner_html .= $datetime->time_range( $time_format ) . '</span>';
+                    $inner_html .= $datetime->time_range($time_format).'</span>';
 
                     $venue = $datetime->venue();
                     if ($venue instanceof EE_Venue) {
                         $inner_html .= '<br /><span class="ee-event-datetimes-li-venue">';
                         $inner_html .= '<span class="dashicons dashicons-admin-home"></span>&nbsp;';
-                        $inner_html .= '<a href="'. $venue->get_permalink() .'" ';
-                        $inner_html .= 'alt="'. $venue->name() .'" target="_blank">';
-                        $inner_html .= $venue->name() . '</a></span>';
+                        $inner_html .= '<a href="'.$venue->get_permalink().'" ';
+                        $inner_html .= 'alt="'.$venue->name().'" target="_blank">';
+                        $inner_html .= $venue->name().'</a></span>';
                     }
-                    if (! empty( $datetime_description )) {
+                    if ( ! empty($datetime_description)) {
                         $inner_html .= $add_breaks ? '<br />' : '';
                         $inner_html .= $datetime_description;
                     }
@@ -517,17 +517,17 @@ 
                         $datetime,
                         $arguments
                     );
-                    $html .= $inner_html . '</li>';
+                    $html .= $inner_html.'</li>';
 				}
 			}
 			$html .= '</ul>';
             $html = apply_filters('FHEE__espresso_list_of_event_dates__html', $html, $arguments, $datetime);
 		} else {
             $html = '<p><span class="dashicons dashicons-marker pink-text"></span>';
-            $html .= esc_html__( 'There are no upcoming dates for this event.', 'event_espresso' );
+            $html .= esc_html__('There are no upcoming dates for this event.', 'event_espresso');
             $html .= '</p><br/>';
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -536,7 +536,7 @@ 
 }
 
 
-if ( ! function_exists( 'espresso_event_end_date' )) {
+if ( ! function_exists('espresso_event_end_date')) {
 	/**
 	 * espresso_event_end_date
 	 * returns the last date for an event
@@ -547,20 +547,20 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_event_end_date( $date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_end_date__date_format', $date_format );
-		$time_format = apply_filters( 'FHEE__espresso_event_end_date__time_format', $time_format );
-		if($echo){
-			echo EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::the_event_end_date( $date_format, $time_format, $EVT_ID );
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_range' )) {
+if ( ! function_exists('espresso_event_date_range')) {
 	/**
 	 * espresso_event_date_range
 	 * returns the first and last chronologically ordered dates for an event (if different)
@@ -573,32 +573,32 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_event_date_range( $date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE ) {
+	function espresso_event_date_range($date_format = '', $time_format = '', $single_date_format = '', $single_time_format = '', $EVT_ID = FALSE, $echo = TRUE) {
 		// set and filter date and time formats when a range is returned
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$date_format = apply_filters( 'FHEE__espresso_event_date_range__date_format', $date_format );
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
 		// get the start and end date with NO time portion
-		$the_event_date = EEH_Event_View::the_earliest_event_date( $date_format, '', $EVT_ID );
-		$the_event_end_date = EEH_Event_View::the_latest_event_date( $date_format, '', $EVT_ID );
+		$the_event_date = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
 		// now we can determine if date range spans more than one day
-		if ( $the_event_date != $the_event_end_date ) {
-			$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-			$time_format = apply_filters( 'FHEE__espresso_event_date_range__time_format', $time_format );
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
 			$html = sprintf(
 				/* translators: 1: first event date, 2: last event date */
-				esc_html__( '%1$s - %2$s', 'event_espresso' ),
-				EEH_Event_View::the_earliest_event_date( $date_format, $time_format, $EVT_ID ),
-				EEH_Event_View::the_latest_event_date( $date_format, $time_format, $EVT_ID )
+				esc_html__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
 			);
 		} else {
 			// set and filter date and time formats when only a single datetime is returned
-			$single_date_format = ! empty( $single_date_format ) ? $single_date_format : get_option( 'date_format' );
-			$single_time_format = ! empty( $single_time_format ) ? $single_time_format : get_option( 'time_format' );
-			$single_date_format = apply_filters( 'FHEE__espresso_event_date_range__single_date_format', $single_date_format );
-			$single_time_format = apply_filters( 'FHEE__espresso_event_date_range__single_time_format', $single_time_format );
-			$html = EEH_Event_View::the_earliest_event_date( $single_date_format, $single_time_format, $EVT_ID );
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format = apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format = apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html = EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
 		}
-		if ( $echo ) {
+		if ($echo) {
 			echo $html;
 			return '';
 		}
@@ -606,7 +606,7 @@ 
 	}
 }
 
-if ( ! function_exists( 'espresso_next_upcoming_datetime_obj' )) {
+if ( ! function_exists('espresso_next_upcoming_datetime_obj')) {
 	/**
 	 * espresso_next_upcoming_datetime_obj
 	 * returns the next upcoming datetime object for an event
@@ -614,12 +614,12 @@ 
 	 * @param int $EVT_ID
 	 * @return EE_Datetime|null
 	 */
-	function espresso_next_upcoming_datetime_obj( $EVT_ID = 0 ) {
-		return EEH_Event_View::get_next_upcoming_date_obj( $EVT_ID );
+	function espresso_next_upcoming_datetime_obj($EVT_ID = 0) {
+		return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
 	}
 }
 
-if ( ! function_exists( 'espresso_next_upcoming_datetime' ) ) {
+if ( ! function_exists('espresso_next_upcoming_datetime')) {
 	/**
 	 * espresso_next_upcoming_datetime
 	 * returns the start date and time for the next upcoming event.
@@ -630,30 +630,30 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_next_upcoming_datetime( $date_format = '', $time_format = '', $EVT_ID = 0, $echo = true ) {
+	function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true) {
 
-		$date_format = ! empty( $date_format ) ? $date_format : get_option( 'date_format' );
-		$date_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__date_format', $date_format );
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
 
-		$time_format = ! empty( $time_format ) ? $time_format : get_option( 'time_format' );
-		$time_format = apply_filters( 'FHEE__espresso_next_upcoming_datetime__time_format', $time_format );
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
 
-		$datetime_format = trim( $date_format . ' ' . $time_format);
+		$datetime_format = trim($date_format.' '.$time_format);
 
-		$datetime = espresso_next_upcoming_datetime_obj( $EVT_ID );
+		$datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
 
-		if( ! $datetime instanceof EE_Datetime ) {
+		if ( ! $datetime instanceof EE_Datetime) {
 			return '';
 		}
-		if ( $echo ){
-			echo $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format );
+		if ($echo) {
+			echo $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
 			return '';
 		}
-		return $datetime->get_i18n_datetime( 'DTT_EVT_start', $datetime_format );
+		return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
 	}
 }
 
-if ( ! function_exists( 'espresso_event_date_as_calendar_page' )) {
+if ( ! function_exists('espresso_event_date_as_calendar_page')) {
 	/**
 	 * espresso_event_date_as_calendar_page
 	 * returns the primary date for an event, stylized to appear as the page of a calendar
@@ -661,15 +661,15 @@ 
 	 * @param bool $EVT_ID
 	 * @return string
 	 */
-	function espresso_event_date_as_calendar_page( $EVT_ID = FALSE ) {
-		EEH_Event_View::event_date_as_calendar_page( $EVT_ID );
+	function espresso_event_date_as_calendar_page($EVT_ID = FALSE) {
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_link_url' )) {
+if ( ! function_exists('espresso_event_link_url')) {
 	/**
 	 * espresso_event_link_url
 	 *
@@ -677,18 +677,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_link_url( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_link_url( $EVT_ID );
+	function espresso_event_link_url($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_link_url($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_link_url( $EVT_ID );
+		return EEH_Event_View::event_link_url($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_has_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_has_content_or_excerpt')) {
 	/**
 	 *    espresso_event_has_content_or_excerpt
 	 *
@@ -696,15 +696,15 @@ 
 	 * @param bool $EVT_ID
 	 * @return    boolean
 	 */
-	function espresso_event_has_content_or_excerpt( $EVT_ID = FALSE ) {
-		return EEH_Event_View::event_has_content_or_excerpt( $EVT_ID );
+	function espresso_event_has_content_or_excerpt($EVT_ID = FALSE) {
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_event_content_or_excerpt' )) {
+if ( ! function_exists('espresso_event_content_or_excerpt')) {
 	/**
 	 * espresso_event_content_or_excerpt
 	 *
@@ -713,18 +713,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_content_or_excerpt( $num_words = 55, $more = NULL, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+	function espresso_event_content_or_excerpt($num_words = 55, $more = NULL, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_content_or_excerpt($num_words, $more);
 			return '';
 		}
-		return EEH_Event_View::event_content_or_excerpt( $num_words, $more );
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_event_phone' )) {
+if ( ! function_exists('espresso_event_phone')) {
 	/**
 	 * espresso_event_phone
 	 *
@@ -732,18 +732,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_event_phone( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::event_phone( $EVT_ID );
+	function espresso_event_phone($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::event_phone($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::event_phone( $EVT_ID );
+		return EEH_Event_View::event_phone($EVT_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_event_link' )) {
+if ( ! function_exists('espresso_edit_event_link')) {
 	/**
 	 * espresso_edit_event_link
 	 * returns a link to edit an event
@@ -752,39 +752,39 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_event_link( $EVT_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Event_View::edit_event_link( $EVT_ID );
+	function espresso_edit_event_link($EVT_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Event_View::edit_event_link($EVT_ID);
 			return '';
 		}
-		return EEH_Event_View::edit_event_link( $EVT_ID );
+		return EEH_Event_View::edit_event_link($EVT_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_organization_name' )) {
+if ( ! function_exists('espresso_organization_name')) {
 	/**
 	 * espresso_organization_name
 	 * @param bool $echo
 	 * @return string
 	 */
 	function espresso_organization_name($echo = TRUE) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('name');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'name' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_address' )) {
+if ( ! function_exists('espresso_organization_address')) {
 	/**
 	 * espresso_organization_address
 	 * @param string $type
 	 * @return string
 	 */
-	function espresso_organization_address( $type = 'inline' ) {
-		if ( EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config ) {
+	function espresso_organization_address($type = 'inline') {
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
 			$address = new EventEspresso\core\domain\entities\GenericAddress(
 				EE_Registry::instance()->CFG->organization->address_1,
 				EE_Registry::instance()->CFG->organization->address_2,
@@ -793,129 +793,129 @@ 
 				EE_Registry::instance()->CFG->organization->zip,
 				EE_Registry::instance()->CFG->organization->CNT_ISO
 			);
-			return EEH_Address::format( $address, $type );
+			return EEH_Address::format($address, $type);
 		}
 		return '';
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_email' )) {
+if ( ! function_exists('espresso_organization_email')) {
 	/**
 	 * espresso_organization_email
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_email( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+	function espresso_organization_email($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('email');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'email' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_logo_url' )) {
+if ( ! function_exists('espresso_organization_logo_url')) {
 	/**
 	 * espresso_organization_logo_url
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_logo_url( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+	function espresso_organization_logo_url($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'logo_url' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_facebook' )) {
+if ( ! function_exists('espresso_organization_facebook')) {
 	/**
 	 * espresso_organization_facebook
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_facebook( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+	function espresso_organization_facebook($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'facebook' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_twitter' )) {
+if ( ! function_exists('espresso_organization_twitter')) {
 	/**
 	 * espresso_organization_twitter
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_twitter( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+	function espresso_organization_twitter($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'twitter' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_linkedin' )) {
+if ( ! function_exists('espresso_organization_linkedin')) {
 	/**
 	 * espresso_organization_linkedin
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_linkedin( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+	function espresso_organization_linkedin($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'linkedin' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_pinterest' )) {
+if ( ! function_exists('espresso_organization_pinterest')) {
 	/**
 	 * espresso_organization_pinterest
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_pinterest( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+	function espresso_organization_pinterest($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'pinterest' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_google' )) {
+if ( ! function_exists('espresso_organization_google')) {
 	/**
 	 * espresso_organization_google
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_google( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+	function espresso_organization_google($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('google');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'google' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
 	}
 }
 
-if ( ! function_exists( 'espresso_organization_instagram' )) {
+if ( ! function_exists('espresso_organization_instagram')) {
 	/**
 	 * espresso_organization_instagram
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_organization_instagram( $echo = TRUE ) {
-		if($echo){
-			echo EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+	function espresso_organization_instagram($echo = TRUE) {
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 			return '';
 		}
-		return EE_Registry::instance()->CFG->organization->get_pretty( 'instagram' );
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
 	}
 }
 
@@ -925,7 +925,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_event_venues' )) {
+if ( ! function_exists('espresso_event_venues')) {
 	/**
 	 * espresso_event_venues
 	 *
@@ -939,7 +939,7 @@ 
 
 
 
-if ( ! function_exists( 'espresso_venue_id' )) {
+if ( ! function_exists('espresso_venue_id')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -947,15 +947,15 @@ 
 	 * @param     int $EVT_ID
 	 * @return    string
 	 */
-	function espresso_venue_id( $EVT_ID = 0 ) {
-		$venue = EEH_Venue_View::get_venue( $EVT_ID );
+	function espresso_venue_id($EVT_ID = 0) {
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
 		return $venue instanceof EE_Venue ? $venue->ID() : 0;
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_is_venue_private' ) ) {
+if ( ! function_exists('espresso_is_venue_private')) {
 	/**
 	 * Return whether a venue is private or not.
 	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
@@ -964,45 +964,45 @@ 
 	 *
 	 * @return bool | null
 	 */
-	function espresso_is_venue_private( $VNU_ID = 0 ) {
-		return EEH_Venue_View::is_venue_private( $VNU_ID );
+	function espresso_is_venue_private($VNU_ID = 0) {
+		return EEH_Venue_View::is_venue_private($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_is_password_protected' ) ) {
+if ( ! function_exists('espresso_venue_is_password_protected')) {
 	/**
 	 * returns true or false if a venue is password protected or not
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 * @return string
 	 */
-	function espresso_venue_is_password_protected( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::is_venue_password_protected( $VNU_ID );
+	function espresso_venue_is_password_protected($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_password_protected($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_password_protected_venue_form' ) ) {
+if ( ! function_exists('espresso_password_protected_venue_form')) {
 	/**
 	 * Returns a password form if venue is password protected.
 	 *
 	 * @param int     $VNU_ID optional, the venue id to check.
 	 * @return string
 	 */
-	function espresso_password_protected_venue_form( $VNU_ID = 0 ) {
-		EE_Registry::instance()->load_helper( 'Venue_View' );
-		return EEH_Venue_View::password_protected_venue_form( $VNU_ID );
+	function espresso_password_protected_venue_form($VNU_ID = 0) {
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::password_protected_venue_form($VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_name' )) {
+if ( ! function_exists('espresso_venue_name')) {
 	/**
 	 *    espresso_venue_name
 	 *
@@ -1012,19 +1012,19 @@ 
 	 * @param bool   $echo
 	 * @return    string
 	 */
-	function espresso_venue_name( $VNU_ID = 0, $link_to = 'details', $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_name($link_to, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_name( $link_to, $VNU_ID );
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
 	}
 }
 
 
 
 
-if ( ! function_exists( 'espresso_venue_link' )) {
+if ( ! function_exists('espresso_venue_link')) {
 	/**
 	 * 	espresso_venue_link
 	 *
@@ -1033,14 +1033,14 @@ 
 	 *  @param 	string 	$text
 	 *  @return 	string
 	 */
-	function espresso_venue_link( $VNU_ID = 0, $text = '' ) {
-		return EEH_Venue_View::venue_details_link( $VNU_ID, $text );
+	function espresso_venue_link($VNU_ID = 0, $text = '') {
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_description' )) {
+if ( ! function_exists('espresso_venue_description')) {
 	/**
 	 *    espresso_venue_description
 	 *
@@ -1049,17 +1049,17 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_description( $VNU_ID = FALSE, $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::venue_description( $VNU_ID );
+	function espresso_venue_description($VNU_ID = FALSE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_description($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_description( $VNU_ID );
+		return EEH_Venue_View::venue_description($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_excerpt' )) {
+if ( ! function_exists('espresso_venue_excerpt')) {
 	/**
 	 *    espresso_venue_excerpt
 	 *
@@ -1068,18 +1068,18 @@ 
 	 * @param bool $echo
 	 * @return    string
 	 */
-	function espresso_venue_excerpt( $VNU_ID = 0,  $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_excerpt( $VNU_ID );
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_excerpt($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_excerpt( $VNU_ID );
+		return EEH_Venue_View::venue_excerpt($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_categories' )) {
+if ( ! function_exists('espresso_venue_categories')) {
 	/**
 	 * espresso_venue_categories
 	 * returns the terms associated with a venue
@@ -1089,17 +1089,17 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_categories( $VNU_ID = 0, $hide_uncategorized = TRUE,  $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = TRUE, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 			return '';
 		}
-		return EEH_Venue_View::venue_categories( $VNU_ID, $hide_uncategorized );
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_address' )) {
+if ( ! function_exists('espresso_venue_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns a formatted block of html  for displaying a venue's address
@@ -1109,17 +1109,17 @@ 
 	 * @param bool   $echo
 	 * @return string
 	 */
-	function espresso_venue_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID );
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID );
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_raw_address' )) {
+if ( ! function_exists('espresso_venue_raw_address')) {
 	/**
 	 * espresso_venue_address
 	 * returns an UN-formatted string containing a venue's address
@@ -1129,17 +1129,17 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_raw_address( $type = 'multiline', $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 			return '';
 		}
-		return EEH_Venue_View::venue_address( $type, $VNU_ID, FALSE, FALSE );
+		return EEH_Venue_View::venue_address($type, $VNU_ID, FALSE, FALSE);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_has_address' )) {
+if ( ! function_exists('espresso_venue_has_address')) {
 	/**
 	 * espresso_venue_has_address
 	 * returns TRUE or FALSE if a Venue has address information
@@ -1147,13 +1147,13 @@ 
 	 * @param int $VNU_ID
 	 * @return bool
 	 */
-	function espresso_venue_has_address( $VNU_ID = 0 ) {
-		return EEH_Venue_View::venue_has_address( $VNU_ID );
+	function espresso_venue_has_address($VNU_ID = 0) {
+		return EEH_Venue_View::venue_has_address($VNU_ID);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_gmap' )) {
+if ( ! function_exists('espresso_venue_gmap')) {
 	/**
 	 * espresso_venue_gmap
 	 * returns a google map for the venue address
@@ -1164,17 +1164,17 @@ 
 	 * @param bool     $echo
 	 * @return string
 	 */
-	function espresso_venue_gmap( $VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE  ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = FALSE, $gmap = array(), $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 			return '';
 		}
-		return EEH_Venue_View::venue_gmap( $VNU_ID, $map_ID, $gmap );
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
 	}
 }
 
 
-if ( ! function_exists( 'espresso_venue_phone' )) {
+if ( ! function_exists('espresso_venue_phone')) {
 	/**
 	 * espresso_venue_phone
 	 *
@@ -1182,18 +1182,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_phone( $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_phone( $VNU_ID );
+	function espresso_venue_phone($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_phone($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_phone( $VNU_ID );
+		return EEH_Venue_View::venue_phone($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_venue_website' )) {
+if ( ! function_exists('espresso_venue_website')) {
 	/**
 	 * espresso_venue_website
 	 *
@@ -1201,18 +1201,18 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_venue_website( $VNU_ID = 0, $echo = TRUE ) {
-		if ( $echo ) {
-			echo EEH_Venue_View::venue_website_link( $VNU_ID );
+	function espresso_venue_website($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::venue_website_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::venue_website_link( $VNU_ID );
+		return EEH_Venue_View::venue_website_link($VNU_ID);
 	}
 }
 
 
 
-if ( ! function_exists( 'espresso_edit_venue_link' )) {
+if ( ! function_exists('espresso_edit_venue_link')) {
 	/**
 	 * espresso_edit_venue_link
 	 *
@@ -1220,12 +1220,12 @@ 
 	 * @param bool $echo
 	 * @return string
 	 */
-	function espresso_edit_venue_link( $VNU_ID = 0, $echo = TRUE ) {
-		if($echo){
-			echo EEH_Venue_View::edit_venue_link( $VNU_ID );
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = TRUE) {
+		if ($echo) {
+			echo EEH_Venue_View::edit_venue_link($VNU_ID);
 			return '';
 		}
-		return EEH_Venue_View::edit_venue_link( $VNU_ID );
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
 	}
 }
 

core/domain/services/graphql/types/Datetime.php

Indentation +407 added lines, -407 removed lines

@@ -38,423 +38,423 @@
 class Datetime extends TypeBase
 {
 
-    /**
-     * EventDate constructor.
-     *
-     * @param EEM_Datetime $datetime_model
-     */
-    public function __construct(EEM_Datetime $datetime_model)
-    {
-        $this->setName($this->namespace . 'Datetime');
-        $this->setDescription(__('An event date', 'event_espresso'));
-        $this->setIsCustomPostType(false);
-        parent::__construct($datetime_model);
-    }
+	/**
+	 * EventDate constructor.
+	 *
+	 * @param EEM_Datetime $datetime_model
+	 */
+	public function __construct(EEM_Datetime $datetime_model)
+	{
+		$this->setName($this->namespace . 'Datetime');
+		$this->setDescription(__('An event date', 'event_espresso'));
+		$this->setIsCustomPostType(false);
+		parent::__construct($datetime_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields(): array
-    {
-        $fields = [
-            new GraphQLField(
-                'id',
-                ['non_null' => 'ID'],
-                null,
-                esc_html__('The globally unique ID for the object.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'dbId',
-                ['non_null' => 'Int'],
-                'ID',
-                esc_html__('The datetime ID.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'cacheId',
-                ['non_null' => 'String'],
-                null,
-                esc_html__('The cache ID of the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'capacity',
-                'Int',
-                'reg_limit',
-                esc_html__('Registration Limit for this time', 'event_espresso'),
-                [$this, 'parseInfiniteValue']
-            ),
-            new GraphQLField(
-                'description',
-                'String',
-                'description',
-                esc_html__('Description for Datetime', 'event_espresso')
-            ),
-            new GraphQLField(
-                'endDate',
-                'String',
-                'end_date_and_time',
-                esc_html__('End date and time of the Event', 'event_espresso'),
-                [$this, 'formatDatetime']
-            ),
-            new GraphQLOutputField(
-                'event',
-                $this->namespace . 'Event',
-                null,
-                esc_html__('Event of the datetime.', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'event',
-                'ID',
-                null,
-                esc_html__('Globally unique event ID of the datetime.', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'eventId',
-                'Int',
-                null,
-                esc_html__('Event ID of the datetime.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isActive',
-                'Boolean',
-                'is_active',
-                esc_html__('Flag indicating datetime is active', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isExpired',
-                'Boolean',
-                'is_expired',
-                esc_html__('Flag indicating datetime is expired or not', 'event_espresso')
-            ),
-            new GraphQLField(
-                'isPrimary',
-                'Boolean',
-                'is_primary',
-                esc_html__('Flag indicating datetime is primary one for event', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isSoldOut',
-                'Boolean',
-                'sold_out',
-                esc_html__(
-                    'Flag indicating whether the tickets sold for this datetime, met or exceed the registration limit',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLField(
-                'isTrashed',
-                'Boolean',
-                null,
-                esc_html__('Flag indicating datetime has been trashed.', 'event_espresso'),
-                null,
-                [$this, 'getIsTrashed']
-            ),
-            new GraphQLOutputField(
-                'isUpcoming',
-                'Boolean',
-                'is_upcoming',
-                esc_html__('Whether the date is upcoming', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'length',
-                'Int',
-                'length',
-                esc_html__('The length of the event (start to end time) in seconds', 'event_espresso')
-            ),
-            new GraphQLField(
-                'name',
-                'String',
-                'name',
-                esc_html__('Datetime Name', 'event_espresso')
-            ),
-            new GraphQLField(
-                'order',
-                'Int',
-                'order',
-                esc_html__('The order in which the Datetime is displayed', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'parent',
-                $this->name(),
-                null,
-                esc_html__('The parent datetime of the current datetime', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'parent',
-                'ID',
-                null,
-                esc_html__('The parent datetime ID', 'event_espresso')
-            ),
-            new GraphQLField(
-                'reserved',
-                'Int',
-                'reserved',
-                esc_html__('Quantity of tickets reserved, but not yet fully purchased', 'event_espresso')
-            ),
-            new GraphQLField(
-                'startDate',
-                'String',
-                'start_date_and_time',
-                esc_html__('Start date and time of the Event', 'event_espresso'),
-                [$this, 'formatDatetime']
-            ),
-            new GraphQLField(
-                'sold',
-                'Int',
-                'sold',
-                esc_html__('How many sales for this Datetime that have occurred', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'status',
-                $this->namespace . 'DatetimeStatusEnum',
-                'get_active_status',
-                esc_html__('Datetime status', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'tickets',
-                ['list_of' => 'ID'],
-                null,
-                sprintf(
-                    '%1$s %2$s',
-                    esc_html__('Globally unique IDs of the tickets related to the datetime.', 'event_espresso'),
-                    esc_html__('Ignored if empty.', 'event_espresso')
-                )
-            ),
-            new GraphQLField(
-                'venue',
-                'String',
-                null,
-                esc_html__('Datetime venue ID', 'event_espresso'),
-                null,
-                function (EE_Datetime $source) {
-                    $venue_ID = $source->venue_ID();
-                    return $venue_ID
-                        // Since venue is a CPT, $type will be 'post'
-                        ? Relay::toGlobalId('post', $venue_ID)
-                        : null;
-                }
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields(): array
+	{
+		$fields = [
+			new GraphQLField(
+				'id',
+				['non_null' => 'ID'],
+				null,
+				esc_html__('The globally unique ID for the object.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'dbId',
+				['non_null' => 'Int'],
+				'ID',
+				esc_html__('The datetime ID.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'cacheId',
+				['non_null' => 'String'],
+				null,
+				esc_html__('The cache ID of the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'capacity',
+				'Int',
+				'reg_limit',
+				esc_html__('Registration Limit for this time', 'event_espresso'),
+				[$this, 'parseInfiniteValue']
+			),
+			new GraphQLField(
+				'description',
+				'String',
+				'description',
+				esc_html__('Description for Datetime', 'event_espresso')
+			),
+			new GraphQLField(
+				'endDate',
+				'String',
+				'end_date_and_time',
+				esc_html__('End date and time of the Event', 'event_espresso'),
+				[$this, 'formatDatetime']
+			),
+			new GraphQLOutputField(
+				'event',
+				$this->namespace . 'Event',
+				null,
+				esc_html__('Event of the datetime.', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'event',
+				'ID',
+				null,
+				esc_html__('Globally unique event ID of the datetime.', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'eventId',
+				'Int',
+				null,
+				esc_html__('Event ID of the datetime.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isActive',
+				'Boolean',
+				'is_active',
+				esc_html__('Flag indicating datetime is active', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isExpired',
+				'Boolean',
+				'is_expired',
+				esc_html__('Flag indicating datetime is expired or not', 'event_espresso')
+			),
+			new GraphQLField(
+				'isPrimary',
+				'Boolean',
+				'is_primary',
+				esc_html__('Flag indicating datetime is primary one for event', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isSoldOut',
+				'Boolean',
+				'sold_out',
+				esc_html__(
+					'Flag indicating whether the tickets sold for this datetime, met or exceed the registration limit',
+					'event_espresso'
+				)
+			),
+			new GraphQLField(
+				'isTrashed',
+				'Boolean',
+				null,
+				esc_html__('Flag indicating datetime has been trashed.', 'event_espresso'),
+				null,
+				[$this, 'getIsTrashed']
+			),
+			new GraphQLOutputField(
+				'isUpcoming',
+				'Boolean',
+				'is_upcoming',
+				esc_html__('Whether the date is upcoming', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'length',
+				'Int',
+				'length',
+				esc_html__('The length of the event (start to end time) in seconds', 'event_espresso')
+			),
+			new GraphQLField(
+				'name',
+				'String',
+				'name',
+				esc_html__('Datetime Name', 'event_espresso')
+			),
+			new GraphQLField(
+				'order',
+				'Int',
+				'order',
+				esc_html__('The order in which the Datetime is displayed', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'parent',
+				$this->name(),
+				null,
+				esc_html__('The parent datetime of the current datetime', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'parent',
+				'ID',
+				null,
+				esc_html__('The parent datetime ID', 'event_espresso')
+			),
+			new GraphQLField(
+				'reserved',
+				'Int',
+				'reserved',
+				esc_html__('Quantity of tickets reserved, but not yet fully purchased', 'event_espresso')
+			),
+			new GraphQLField(
+				'startDate',
+				'String',
+				'start_date_and_time',
+				esc_html__('Start date and time of the Event', 'event_espresso'),
+				[$this, 'formatDatetime']
+			),
+			new GraphQLField(
+				'sold',
+				'Int',
+				'sold',
+				esc_html__('How many sales for this Datetime that have occurred', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'status',
+				$this->namespace . 'DatetimeStatusEnum',
+				'get_active_status',
+				esc_html__('Datetime status', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'tickets',
+				['list_of' => 'ID'],
+				null,
+				sprintf(
+					'%1$s %2$s',
+					esc_html__('Globally unique IDs of the tickets related to the datetime.', 'event_espresso'),
+					esc_html__('Ignored if empty.', 'event_espresso')
+				)
+			),
+			new GraphQLField(
+				'venue',
+				'String',
+				null,
+				esc_html__('Datetime venue ID', 'event_espresso'),
+				null,
+				function (EE_Datetime $source) {
+					$venue_ID = $source->venue_ID();
+					return $venue_ID
+						// Since venue is a CPT, $type will be 'post'
+						? Relay::toGlobalId('post', $venue_ID)
+						: null;
+				}
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__datetime_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__datetime_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * @param EE_Datetime   $source  The source that's passed down the GraphQL queries
-     * @param array       $args    The inputArgs on the field
-     * @param AppContext  $context The AppContext passed down the GraphQL tree
-     * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
-     * @return bool
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UserError
-     * @throws UnexpectedEntityException
-     */
-    public function getIsTrashed(EE_Datetime $source, array $args, AppContext $context, ResolveInfo $info): bool
-    {
-        return (bool) $source->get('DTT_deleted');
-    }
+	/**
+	 * @param EE_Datetime   $source  The source that's passed down the GraphQL queries
+	 * @param array       $args    The inputArgs on the field
+	 * @param AppContext  $context The AppContext passed down the GraphQL tree
+	 * @param ResolveInfo $info    The ResolveInfo passed down the GraphQL tree
+	 * @return bool
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UserError
+	 * @throws UnexpectedEntityException
+	 */
+	public function getIsTrashed(EE_Datetime $source, array $args, AppContext $context, ResolveInfo $info): bool
+	{
+		return (bool) $source->get('DTT_deleted');
+	}
 
-    /**
-     * Return the base mutation config for bulk update.
-     *
-     * @param string $base_input
-     * @return array
-     */
-    public static function bulkUpdateBaseConfig(string $base_input): array
-    {
-        return [
-            'inputFields'     => [
-                /**
-                 * represents the input that is unique for each entity
-                 * e.g. dates may be unique for datetimes and tickets
-                 */
-                'uniqueInputs' => [
-                    'type'        => [
-                        'non_null' => ['list_of' => $base_input],
-                    ],
-                    'description' => esc_html__(
-                        'List of unique inputs for each entity in bulk update',
-                        'event_espresso'
-                    ),
-                ],
-                /**
-                 * represents the common input for all entities
-                 * e.g. capacity or quantity may be same for all dates/tickets
-                 */
-                'sharedInput' => [
-                    'type'        => $base_input,
-                    'description' => esc_html__(
-                        'Shared input for all entities in bulk update',
-                        'event_espresso'
-                    ),
-                ],
-            ],
-            'outputFields'        => [
-                'updated' => [
-                    'type' => ['list_of' => 'ID'],
-                ],
-                'failed' => [
-                    'type' => ['list_of' => 'ID'],
-                ],
-            ],
-        ];
-    }
+	/**
+	 * Return the base mutation config for bulk update.
+	 *
+	 * @param string $base_input
+	 * @return array
+	 */
+	public static function bulkUpdateBaseConfig(string $base_input): array
+	{
+		return [
+			'inputFields'     => [
+				/**
+				 * represents the input that is unique for each entity
+				 * e.g. dates may be unique for datetimes and tickets
+				 */
+				'uniqueInputs' => [
+					'type'        => [
+						'non_null' => ['list_of' => $base_input],
+					],
+					'description' => esc_html__(
+						'List of unique inputs for each entity in bulk update',
+						'event_espresso'
+					),
+				],
+				/**
+				 * represents the common input for all entities
+				 * e.g. capacity or quantity may be same for all dates/tickets
+				 */
+				'sharedInput' => [
+					'type'        => $base_input,
+					'description' => esc_html__(
+						'Shared input for all entities in bulk update',
+						'event_espresso'
+					),
+				],
+			],
+			'outputFields'        => [
+				'updated' => [
+					'type' => ['list_of' => 'ID'],
+				],
+				'failed' => [
+					'type' => ['list_of' => 'ID'],
+				],
+			],
+		];
+	}
 
 
-    /**
-     * @param array $inputFields The mutation input fields.
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws Exception
-     */
-    public function registerMutations(array $inputFields)
-    {
-        register_graphql_input_type(
-            'Update' .  $this->name() . 'BaseInput',
-            [
-                'fields' => $inputFields,
-            ]
-        );
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'update' . $this->name(),
-            [
-                'inputFields'         => $inputFields,
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'    => $this->name(),
-                        'resolve' => [$this, 'resolveFromPayload'],
-                    ],
-                ],
-                'mutateAndGetPayload' => DatetimeUpdate::mutateAndGetPayload($this->model, $this),
-            ]
-        );
-        $base_input = 'Update' .  $this->name() . 'BaseInput';
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'bulkUpdate' . $this->name(),
-            array_merge(
-                Datetime::bulkUpdateBaseConfig($base_input),
-                [
-                    'mutateAndGetPayload' => DatetimeBulkUpdate::mutateAndGetPayload($this->model, $this),
-                ]
-            )
-        );
+	/**
+	 * @param array $inputFields The mutation input fields.
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 */
+	public function registerMutations(array $inputFields)
+	{
+		register_graphql_input_type(
+			'Update' .  $this->name() . 'BaseInput',
+			[
+				'fields' => $inputFields,
+			]
+		);
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'update' . $this->name(),
+			[
+				'inputFields'         => $inputFields,
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'    => $this->name(),
+						'resolve' => [$this, 'resolveFromPayload'],
+					],
+				],
+				'mutateAndGetPayload' => DatetimeUpdate::mutateAndGetPayload($this->model, $this),
+			]
+		);
+		$base_input = 'Update' .  $this->name() . 'BaseInput';
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'bulkUpdate' . $this->name(),
+			array_merge(
+				Datetime::bulkUpdateBaseConfig($base_input),
+				[
+					'mutateAndGetPayload' => DatetimeBulkUpdate::mutateAndGetPayload($this->model, $this),
+				]
+			)
+		);
 
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'bulkDelete' . $this->namespace . 'Entities',
-            [
-                'inputFields'         => [
-                    'entityIds'  => [
-                        'type'        => [
-                            'non_null' => ['list_of' => 'ID'],
-                        ],
-                        'description' => esc_html__('The list of GUIDs of the entities to be deleted.', 'event_espresso'),
-                    ],
-                    'entityType' => [
-                        'type'        => [
-                            'non_null' => $this->namespace . 'ModelNameEnum',
-                        ],
-                        'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
-                    ],
-                    'deletePermanently' => [
-                        'type'        => 'Boolean',
-                        'description' => esc_html__('Whether to delete the entities permanently.', 'event_espresso'),
-                    ],
-                ],
-                'outputFields'        => [
-                    'deleted' => [
-                        'type' => ['list_of' => 'ID'],
-                    ],
-                    'failed' => [
-                        'type' => ['list_of' => 'ID'],
-                    ],
-                ],
-                'mutateAndGetPayload' => BulkEntityDelete::mutateAndGetPayload(),
-            ]
-        );
-        // Register mutation to delete an entity.
-        register_graphql_mutation(
-            'delete' . $this->name(),
-            [
-                'inputFields'         => [
-                    'id'                => $inputFields['id'],
-                    'deletePermanently' => [
-                        'type'        => 'Boolean',
-                        'description' => esc_html__('Whether to delete the entity permanently.', 'event_espresso'),
-                    ],
-                ],
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'        => $this->name(),
-                        'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
-                            $deleted = (object) $payload['deleted'];
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'bulkDelete' . $this->namespace . 'Entities',
+			[
+				'inputFields'         => [
+					'entityIds'  => [
+						'type'        => [
+							'non_null' => ['list_of' => 'ID'],
+						],
+						'description' => esc_html__('The list of GUIDs of the entities to be deleted.', 'event_espresso'),
+					],
+					'entityType' => [
+						'type'        => [
+							'non_null' => $this->namespace . 'ModelNameEnum',
+						],
+						'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
+					],
+					'deletePermanently' => [
+						'type'        => 'Boolean',
+						'description' => esc_html__('Whether to delete the entities permanently.', 'event_espresso'),
+					],
+				],
+				'outputFields'        => [
+					'deleted' => [
+						'type' => ['list_of' => 'ID'],
+					],
+					'failed' => [
+						'type' => ['list_of' => 'ID'],
+					],
+				],
+				'mutateAndGetPayload' => BulkEntityDelete::mutateAndGetPayload(),
+			]
+		);
+		// Register mutation to delete an entity.
+		register_graphql_mutation(
+			'delete' . $this->name(),
+			[
+				'inputFields'         => [
+					'id'                => $inputFields['id'],
+					'deletePermanently' => [
+						'type'        => 'Boolean',
+						'description' => esc_html__('Whether to delete the entity permanently.', 'event_espresso'),
+					],
+				],
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'        => $this->name(),
+						'description' => esc_html__('The object before it was deleted', 'event_espresso'),
+						'resolve'     => static function ($payload) {
+							$deleted = (object) $payload['deleted'];
 
-                            return ! empty($deleted) ? $deleted : null;
-                        },
-                    ],
-                ],
-                'mutateAndGetPayload' => DatetimeDelete::mutateAndGetPayload($this->model, $this),
-            ]
-        );
+							return ! empty($deleted) ? $deleted : null;
+						},
+					],
+				],
+				'mutateAndGetPayload' => DatetimeDelete::mutateAndGetPayload($this->model, $this),
+			]
+		);
 
-        // remove primary key from input.
-        unset($inputFields['id']);
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'create' . $this->name(),
-            [
-                'inputFields'         => $inputFields,
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'    => $this->name(),
-                        'resolve' => [$this, 'resolveFromPayload'],
-                    ],
-                ],
-                'mutateAndGetPayload' => DatetimeCreate::mutateAndGetPayload($this->model, $this),
-            ]
-        );
+		// remove primary key from input.
+		unset($inputFields['id']);
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'create' . $this->name(),
+			[
+				'inputFields'         => $inputFields,
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'    => $this->name(),
+						'resolve' => [$this, 'resolveFromPayload'],
+					],
+				],
+				'mutateAndGetPayload' => DatetimeCreate::mutateAndGetPayload($this->model, $this),
+			]
+		);
 
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'reorder' . $this->namespace . 'Entities',
-            [
-                'inputFields'         => [
-                    'entityIds'  => [
-                        'type'        => [
-                            'non_null' => ['list_of' => 'ID'],
-                        ],
-                        'description' => esc_html__('The reordered list of entity GUIDs.', 'event_espresso'),
-                    ],
-                    'entityType' => [
-                        'type'        => [
-                            'non_null' => $this->namespace . 'ModelNameEnum',
-                        ],
-                        'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
-                    ],
-                ],
-                'outputFields'        => [
-                    'ok' => [
-                        'type'    => 'Boolean',
-                        'resolve' => function ($payload) {
-                            return (bool) $payload['ok'];
-                        },
-                    ],
-                ],
-                'mutateAndGetPayload' => EntityReorder::mutateAndGetPayload(),
-            ]
-        );
-    }
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'reorder' . $this->namespace . 'Entities',
+			[
+				'inputFields'         => [
+					'entityIds'  => [
+						'type'        => [
+							'non_null' => ['list_of' => 'ID'],
+						],
+						'description' => esc_html__('The reordered list of entity GUIDs.', 'event_espresso'),
+					],
+					'entityType' => [
+						'type'        => [
+							'non_null' => $this->namespace . 'ModelNameEnum',
+						],
+						'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
+					],
+				],
+				'outputFields'        => [
+					'ok' => [
+						'type'    => 'Boolean',
+						'resolve' => function ($payload) {
+							return (bool) $payload['ok'];
+						},
+					],
+				],
+				'mutateAndGetPayload' => EntityReorder::mutateAndGetPayload(),
+			]
+		);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
      */
     public function __construct(EEM_Datetime $datetime_model)
     {
-        $this->setName($this->namespace . 'Datetime');
+        $this->setName($this->namespace.'Datetime');
         $this->setDescription(__('An event date', 'event_espresso'));
         $this->setIsCustomPostType(false);
         parent::__construct($datetime_model);
@@ -98,7 +98,7 @@ 
             ),
             new GraphQLOutputField(
                 'event',
-                $this->namespace . 'Event',
+                $this->namespace.'Event',
                 null,
                 esc_html__('Event of the datetime.', 'event_espresso')
             ),
@@ -206,7 +206,7 @@ 
             ),
             new GraphQLOutputField(
                 'status',
-                $this->namespace . 'DatetimeStatusEnum',
+                $this->namespace.'DatetimeStatusEnum',
                 'get_active_status',
                 esc_html__('Datetime status', 'event_espresso')
             ),
@@ -226,7 +226,7 @@ 
                 null,
                 esc_html__('Datetime venue ID', 'event_espresso'),
                 null,
-                function (EE_Datetime $source) {
+                function(EE_Datetime $source) {
                     $venue_ID = $source->venue_ID();
                     return $venue_ID
                         // Since venue is a CPT, $type will be 'post'
@@ -320,14 +320,14 @@ 
     public function registerMutations(array $inputFields)
     {
         register_graphql_input_type(
-            'Update' .  $this->name() . 'BaseInput',
+            'Update'.$this->name().'BaseInput',
             [
                 'fields' => $inputFields,
             ]
         );
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'update' . $this->name(),
+            'update'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [
@@ -339,10 +339,10 @@ 
                 'mutateAndGetPayload' => DatetimeUpdate::mutateAndGetPayload($this->model, $this),
             ]
         );
-        $base_input = 'Update' .  $this->name() . 'BaseInput';
+        $base_input = 'Update'.$this->name().'BaseInput';
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'bulkUpdate' . $this->name(),
+            'bulkUpdate'.$this->name(),
             array_merge(
                 Datetime::bulkUpdateBaseConfig($base_input),
                 [
@@ -353,7 +353,7 @@ 
 
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'bulkDelete' . $this->namespace . 'Entities',
+            'bulkDelete'.$this->namespace.'Entities',
             [
                 'inputFields'         => [
                     'entityIds'  => [
@@ -364,7 +364,7 @@ 
                     ],
                     'entityType' => [
                         'type'        => [
-                            'non_null' => $this->namespace . 'ModelNameEnum',
+                            'non_null' => $this->namespace.'ModelNameEnum',
                         ],
                         'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
                     ],
@@ -386,7 +386,7 @@ 
         );
         // Register mutation to delete an entity.
         register_graphql_mutation(
-            'delete' . $this->name(),
+            'delete'.$this->name(),
             [
                 'inputFields'         => [
                     'id'                => $inputFields['id'],
@@ -399,7 +399,7 @@ 
                     lcfirst($this->name()) => [
                         'type'        => $this->name(),
                         'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
+                        'resolve'     => static function($payload) {
                             $deleted = (object) $payload['deleted'];
 
                             return ! empty($deleted) ? $deleted : null;
@@ -414,7 +414,7 @@ 
         unset($inputFields['id']);
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'create' . $this->name(),
+            'create'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [
@@ -429,7 +429,7 @@ 
 
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'reorder' . $this->namespace . 'Entities',
+            'reorder'.$this->namespace.'Entities',
             [
                 'inputFields'         => [
                     'entityIds'  => [
@@ -440,7 +440,7 @@ 
                     ],
                     'entityType' => [
                         'type'        => [
-                            'non_null' => $this->namespace . 'ModelNameEnum',
+                            'non_null' => $this->namespace.'ModelNameEnum',
                         ],
                         'description' => esc_html__('The entity type for the IDs', 'event_espresso'),
                     ],
@@ -448,7 +448,7 @@ 
                 'outputFields'        => [
                     'ok' => [
                         'type'    => 'Boolean',
-                        'resolve' => function ($payload) {
+                        'resolve' => function($payload) {
                             return (bool) $payload['ok'];
                         },
                     ],