eventespresso / event-espresso-core

core/libraries/shortcodes/EE_Ticket_List_Shortcodes.lib.php

Spacing +2 added lines, -2 removed lines

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

Indentation +200 added lines, -200 removed lines

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

core/libraries/shortcodes/EE_Event_List_Shortcodes.lib.php

Spacing +1 added lines, -1 removed lines

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

Indentation +152 added lines, -152 removed lines

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

core/admin/templates/admin_general_metabox_contents_espresso_sponsors.template.php

Indentation +18 added lines, -18 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

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

Indentation +109 added lines, -109 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

Indentation +215 added lines, -215 removed lines

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

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

Spacing +8 added lines, -8 removed lines

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

Indentation +174 added lines, -174 removed lines

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

core/domain/services/admin/entities/DefaultPrices.php

Spacing +10 added lines, -10 removed lines

@@ -67,7 +67,7 @@ 
      */
     public function create(EE_Base_Class $entity): array
     {
-        if (! $entity instanceof EE_Ticket) {
+        if ( ! $entity instanceof EE_Ticket) {
             throw new InvalidEntityException($entity, 'EE_Ticket');
         }
         $is_free                   = true;
@@ -91,9 +91,9 @@ 
             $has_base_price,
             $is_free
         );
-        if (! $has_base_price) {
+        if ( ! $has_base_price) {
             $new_base_price                            = $this->createNewBasePrice($entity);
-            $this->new_prices[ $new_base_price->ID() ] = $new_base_price;
+            $this->new_prices[$new_base_price->ID()] = $new_base_price;
         }
         $this->applyTaxes($entity, $is_free);
         $ticket_total = $entity->get_ticket_total_with_taxes(true);
@@ -113,7 +113,7 @@ 
      */
     private function applyTaxes(EE_Ticket $ticket, bool $is_free)
     {
-        if (! $is_free && $ticket->taxable() && ! empty($this->taxes)) {
+        if ( ! $is_free && $ticket->taxable() && ! empty($this->taxes)) {
             foreach ($this->taxes as $tax) {
                 // assign taxes but don't duplicate them because they operate globally
                 $ticket->set_taxable(true);
@@ -162,12 +162,12 @@ 
             $is_base_price = $default_price_clone->is_base_price();
             // add this price to ticket if it is a regular price modifier, ie: NOT a base price,
             // OR if it IS a base price but this ticket does NOT already have a base price
-            if (! $is_base_price || ! $has_base_price) {
+            if ( ! $is_base_price || ! $has_base_price) {
                 $default_price_clone->set('PRC_ID', null);
                 $default_price_clone->set('PRC_is_default', false);
                 $default_price_clone->save();
                 $default_price_clone->_add_relation_to($ticket, 'Ticket');
-                $this->new_prices[ $default_price_clone->ID() ] = $default_price_clone;
+                $this->new_prices[$default_price_clone->ID()] = $default_price_clone;
                 // then recheck that a base price has been set so that we don't add another one
                 $has_base_price = $is_base_price ? true : $has_base_price;
             }
@@ -192,7 +192,7 @@ 
                 ],
             ]
         );
-        if (! $base_price_type instanceof EE_Price_Type) {
+        if ( ! $base_price_type instanceof EE_Price_Type) {
             throw new RuntimeException(
                 esc_html__(
                     'A valid base price type could not be retrieved from the database.',
@@ -219,15 +219,15 @@ 
         $default_prices = [];
         if (is_array($prices)) {
             foreach ($prices as $key => $price) {
-                if (! $price instanceof EE_Price) {
+                if ( ! $price instanceof EE_Price) {
                     throw new InvalidEntityException($price, 'EE_Price');
                 }
                 // grab any taxes but don't do anything just yet
                 if ($price->is_tax()) {
-                    $this->taxes[ $price->ID() ] = $price;
+                    $this->taxes[$price->ID()] = $price;
                     continue;
                 }
-                $default_prices[ $price->ID() ] = $price;
+                $default_prices[$price->ID()] = $price;
             }
         }
         return $default_prices;

Indentation +219 added lines, -219 removed lines

@@ -24,223 +24,223 @@
  */
 class DefaultPrices implements DefaultEntityGeneratorInterface
 {
-    /**
-     * @var EEM_Price
-     */
-    protected $price_model;
-
-    /**
-     * @var EEM_Price_Type
-     */
-    protected $price_type_model;
-
-    /**
-     * @var EE_Price[]
-     */
-    protected $new_prices = [];
-
-    /**
-     * @var EE_Price[]
-     */
-    protected $taxes = [];
-
-
-    /**
-     * @param EEM_Price      $price_model
-     * @param EEM_Price_Type $price_type_model
-     */
-    public function __construct(EEM_Price $price_model, EEM_Price_Type $price_type_model)
-    {
-        $this->price_model      = $price_model;
-        $this->price_type_model = $price_type_model;
-    }
-
-
-    /**
-     * @param EE_Ticket|EE_Base_Class $entity
-     * @return EE_Price[]
-     * @throws EE_Error
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function create(EE_Base_Class $entity): array
-    {
-        if (! $entity instanceof EE_Ticket) {
-            throw new InvalidEntityException($entity, 'EE_Ticket');
-        }
-        $is_free                   = true;
-        $has_base_price            = false;
-        $remove_existing_relations = true;
-        // first, let's get all of the default taxes for the site
-        $this->taxes = $this->price_model->getAllDefaultTaxes();
-        // then separate taxes from the other prices for the existing default ticket prices
-        $default_prices = $this->separateTaxesFromOtherPrices($entity->prices());
-        // but if that's empty, then let's get the default global prices
-        if (empty($default_prices)) {
-            $default_global_prices     = $this->price_model->get_all_default_prices();
-            $default_prices            = $this->separateTaxesFromOtherPrices($default_global_prices);
-            $remove_existing_relations = false;
-        }
-        // then clone and apply all of the default prices
-        [$has_base_price, $is_free] = $this->cloneDefaultPrices(
-            $entity,
-            $default_prices,
-            $remove_existing_relations,
-            $has_base_price,
-            $is_free
-        );
-        if (! $has_base_price) {
-            $new_base_price                            = $this->createNewBasePrice($entity);
-            $this->new_prices[ $new_base_price->ID() ] = $new_base_price;
-        }
-        $this->applyTaxes($entity, $is_free);
-        $ticket_total = $entity->get_ticket_total_with_taxes(true);
-        if ($ticket_total !== $entity->ticket_price()) {
-            $entity->set_price($ticket_total);
-            $entity->save();
-        }
-        return $this->new_prices;
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @param bool      $is_free
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function applyTaxes(EE_Ticket $ticket, bool $is_free)
-    {
-        if (! $is_free && $ticket->taxable() && ! empty($this->taxes)) {
-            foreach ($this->taxes as $tax) {
-                // assign taxes but don't duplicate them because they operate globally
-                $ticket->set_taxable(true);
-                $tax->_add_relation_to($ticket, 'Ticket');
-            }
-        }
-    }
-
-
-    /**
-     * @param EE_Ticket  $ticket
-     * @param EE_Price[] $default_prices
-     * @param bool       $remove_existing_relations
-     * @param bool       $has_base_price
-     * @param bool       $is_free
-     * @return bool[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function cloneDefaultPrices(
-        EE_Ticket $ticket,
-        array $default_prices,
-        bool $remove_existing_relations,
-        bool $has_base_price,
-        bool $is_free
-    ): array {
-        foreach ($default_prices as $default_price) {
-            // duplicate the default price so that it does not get mutated
-            $default_price_clone = clone $default_price;
-            if ($remove_existing_relations) {
-                $ticket->_remove_relation_to($default_price, 'Price');
-            }
-            if (
-                (
-                    // has non-zero base price
-                    $default_price_clone->is_base_price()
-                    && $default_price_clone->amount() > 0
-                )
-                || (
-                    // or has fixed amount surcharge
-                    $default_price_clone->is_surcharge()
-                    && ! $default_price_clone->is_percent()
-                )
-            ) {
-                $is_free = false;
-            }
-            $is_base_price = $default_price_clone->is_base_price();
-            // add this price to ticket if it is a regular price modifier, ie: NOT a base price,
-            // OR if it IS a base price but this ticket does NOT already have a base price
-            if (! $is_base_price || ! $has_base_price) {
-                $default_price_clone->set('PRC_ID', null);
-                $default_price_clone->set('PRC_is_default', false);
-
-                $order = $default_price_clone->get('PRC_order');
-
-                // enforce base price order to be 1 and 5 if the order is not set for a modifier
-                $order = $is_base_price ? 1 : $order;
-                $order = $order ?? 5;
-
-                $default_price_clone->set('PRC_order', $order);
-
-                $default_price_clone->save();
-                $default_price_clone->_add_relation_to($ticket, 'Ticket');
-                $this->new_prices[ $default_price_clone->ID() ] = $default_price_clone;
-                // then recheck that a base price has been set so that we don't add another one
-                $has_base_price = $is_base_price ? true : $has_base_price;
-            }
-        }
-        return [$has_base_price, $is_free];
-    }
-
-
-    /**
-     * @param EE_Ticket $ticket
-     * @return EE_Price
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function createNewBasePrice(EE_Ticket $ticket): EE_Price
-    {
-        $new_base_price  = $this->price_model->get_new_price();
-        $base_price_type = $this->price_type_model->get_one(
-            [
-                [
-                    'PBT_ID' => EEM_Price_Type::base_type_base_price,
-                ],
-            ]
-        );
-        if (! $base_price_type instanceof EE_Price_Type) {
-            throw new RuntimeException(
-                esc_html__(
-                    'A valid base price type could not be retrieved from the database.',
-                    'event_espresso'
-                )
-            );
-        }
-        $new_base_price->set('PRT_ID', $base_price_type->ID());
-        // set base price order to 1
-        $new_base_price->set('PRC_order', 1);
-        $new_base_price->set('PRC_is_default', false);
-        $new_base_price->save();
-        $new_base_price->_add_relation_to($ticket, 'Ticket');
-        return $new_base_price;
-    }
-
-
-    /**
-     * @param array $prices
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function separateTaxesFromOtherPrices(array $prices = []): array
-    {
-        $default_prices = [];
-        if (is_array($prices)) {
-            foreach ($prices as $key => $price) {
-                if (! $price instanceof EE_Price) {
-                    throw new InvalidEntityException($price, 'EE_Price');
-                }
-                // grab any taxes but don't do anything just yet
-                if ($price->is_tax()) {
-                    $this->taxes[ $price->ID() ] = $price;
-                    continue;
-                }
-                $default_prices[ $price->ID() ] = $price;
-            }
-        }
-        return $default_prices;
-    }
+	/**
+	 * @var EEM_Price
+	 */
+	protected $price_model;
+
+	/**
+	 * @var EEM_Price_Type
+	 */
+	protected $price_type_model;
+
+	/**
+	 * @var EE_Price[]
+	 */
+	protected $new_prices = [];
+
+	/**
+	 * @var EE_Price[]
+	 */
+	protected $taxes = [];
+
+
+	/**
+	 * @param EEM_Price      $price_model
+	 * @param EEM_Price_Type $price_type_model
+	 */
+	public function __construct(EEM_Price $price_model, EEM_Price_Type $price_type_model)
+	{
+		$this->price_model      = $price_model;
+		$this->price_type_model = $price_type_model;
+	}
+
+
+	/**
+	 * @param EE_Ticket|EE_Base_Class $entity
+	 * @return EE_Price[]
+	 * @throws EE_Error
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function create(EE_Base_Class $entity): array
+	{
+		if (! $entity instanceof EE_Ticket) {
+			throw new InvalidEntityException($entity, 'EE_Ticket');
+		}
+		$is_free                   = true;
+		$has_base_price            = false;
+		$remove_existing_relations = true;
+		// first, let's get all of the default taxes for the site
+		$this->taxes = $this->price_model->getAllDefaultTaxes();
+		// then separate taxes from the other prices for the existing default ticket prices
+		$default_prices = $this->separateTaxesFromOtherPrices($entity->prices());
+		// but if that's empty, then let's get the default global prices
+		if (empty($default_prices)) {
+			$default_global_prices     = $this->price_model->get_all_default_prices();
+			$default_prices            = $this->separateTaxesFromOtherPrices($default_global_prices);
+			$remove_existing_relations = false;
+		}
+		// then clone and apply all of the default prices
+		[$has_base_price, $is_free] = $this->cloneDefaultPrices(
+			$entity,
+			$default_prices,
+			$remove_existing_relations,
+			$has_base_price,
+			$is_free
+		);
+		if (! $has_base_price) {
+			$new_base_price                            = $this->createNewBasePrice($entity);
+			$this->new_prices[ $new_base_price->ID() ] = $new_base_price;
+		}
+		$this->applyTaxes($entity, $is_free);
+		$ticket_total = $entity->get_ticket_total_with_taxes(true);
+		if ($ticket_total !== $entity->ticket_price()) {
+			$entity->set_price($ticket_total);
+			$entity->save();
+		}
+		return $this->new_prices;
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @param bool      $is_free
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function applyTaxes(EE_Ticket $ticket, bool $is_free)
+	{
+		if (! $is_free && $ticket->taxable() && ! empty($this->taxes)) {
+			foreach ($this->taxes as $tax) {
+				// assign taxes but don't duplicate them because they operate globally
+				$ticket->set_taxable(true);
+				$tax->_add_relation_to($ticket, 'Ticket');
+			}
+		}
+	}
+
+
+	/**
+	 * @param EE_Ticket  $ticket
+	 * @param EE_Price[] $default_prices
+	 * @param bool       $remove_existing_relations
+	 * @param bool       $has_base_price
+	 * @param bool       $is_free
+	 * @return bool[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function cloneDefaultPrices(
+		EE_Ticket $ticket,
+		array $default_prices,
+		bool $remove_existing_relations,
+		bool $has_base_price,
+		bool $is_free
+	): array {
+		foreach ($default_prices as $default_price) {
+			// duplicate the default price so that it does not get mutated
+			$default_price_clone = clone $default_price;
+			if ($remove_existing_relations) {
+				$ticket->_remove_relation_to($default_price, 'Price');
+			}
+			if (
+				(
+					// has non-zero base price
+					$default_price_clone->is_base_price()
+					&& $default_price_clone->amount() > 0
+				)
+				|| (
+					// or has fixed amount surcharge
+					$default_price_clone->is_surcharge()
+					&& ! $default_price_clone->is_percent()
+				)
+			) {
+				$is_free = false;
+			}
+			$is_base_price = $default_price_clone->is_base_price();
+			// add this price to ticket if it is a regular price modifier, ie: NOT a base price,
+			// OR if it IS a base price but this ticket does NOT already have a base price
+			if (! $is_base_price || ! $has_base_price) {
+				$default_price_clone->set('PRC_ID', null);
+				$default_price_clone->set('PRC_is_default', false);
+
+				$order = $default_price_clone->get('PRC_order');
+
+				// enforce base price order to be 1 and 5 if the order is not set for a modifier
+				$order = $is_base_price ? 1 : $order;
+				$order = $order ?? 5;
+
+				$default_price_clone->set('PRC_order', $order);
+
+				$default_price_clone->save();
+				$default_price_clone->_add_relation_to($ticket, 'Ticket');
+				$this->new_prices[ $default_price_clone->ID() ] = $default_price_clone;
+				// then recheck that a base price has been set so that we don't add another one
+				$has_base_price = $is_base_price ? true : $has_base_price;
+			}
+		}
+		return [$has_base_price, $is_free];
+	}
+
+
+	/**
+	 * @param EE_Ticket $ticket
+	 * @return EE_Price
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function createNewBasePrice(EE_Ticket $ticket): EE_Price
+	{
+		$new_base_price  = $this->price_model->get_new_price();
+		$base_price_type = $this->price_type_model->get_one(
+			[
+				[
+					'PBT_ID' => EEM_Price_Type::base_type_base_price,
+				],
+			]
+		);
+		if (! $base_price_type instanceof EE_Price_Type) {
+			throw new RuntimeException(
+				esc_html__(
+					'A valid base price type could not be retrieved from the database.',
+					'event_espresso'
+				)
+			);
+		}
+		$new_base_price->set('PRT_ID', $base_price_type->ID());
+		// set base price order to 1
+		$new_base_price->set('PRC_order', 1);
+		$new_base_price->set('PRC_is_default', false);
+		$new_base_price->save();
+		$new_base_price->_add_relation_to($ticket, 'Ticket');
+		return $new_base_price;
+	}
+
+
+	/**
+	 * @param array $prices
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function separateTaxesFromOtherPrices(array $prices = []): array
+	{
+		$default_prices = [];
+		if (is_array($prices)) {
+			foreach ($prices as $key => $price) {
+				if (! $price instanceof EE_Price) {
+					throw new InvalidEntityException($price, 'EE_Price');
+				}
+				// grab any taxes but don't do anything just yet
+				if ($price->is_tax()) {
+					$this->taxes[ $price->ID() ] = $price;
+					continue;
+				}
+				$default_prices[ $price->ID() ] = $price;
+			}
+		}
+		return $default_prices;
+	}
 }

core/db_models/EEM_Question_Group.model.php

Spacing +4 added lines, -4 removed lines

@@ -110,13 +110,13 @@
             'WP_User'              => new EE_Belongs_To_Relation(),
         ];
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
+        $this->_cap_restriction_generators[EEM_Base::caps_read]       =
             new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] =
             new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]       =
             new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
+        $this->_cap_restriction_generators[EEM_Base::caps_delete]     =
             new EE_Restriction_Generator_Reg_Form('QSG_system');
 
         parent::__construct($timezone);

Indentation +124 added lines, -124 removed lines

@@ -9,136 +9,136 @@
  */
 class EEM_Question_Group extends EEM_Soft_Delete_Base
 {
-    const system_personal = 1;
+	const system_personal = 1;
 
-    const system_address = 2;
+	const system_address = 2;
 
-    /**
-     * private instance of the EEM_Question_Group object
-     *
-     * @var EEM_Question_Group
-     */
-    protected static $_instance = null;
+	/**
+	 * private instance of the EEM_Question_Group object
+	 *
+	 * @var EEM_Question_Group
+	 */
+	protected static $_instance = null;
 
 
-    /**
-     * EEM_Question_Group constructor.
-     *
-     * @param string|null $timezone
-     */
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Question Group', 'event_espresso');
-        $this->plural_item   = esc_html__('Question Groups', 'event_espresso');
+	/**
+	 * EEM_Question_Group constructor.
+	 *
+	 * @param string|null $timezone
+	 */
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Question Group', 'event_espresso');
+		$this->plural_item   = esc_html__('Question Groups', 'event_espresso');
 
-        $this->_tables          = [
-            'Question_Group' => new EE_Primary_Table('esp_question_group', 'QSG_ID'),
-        ];
-        $this->_fields          = [
-            'Question_Group' => [
-                'QSG_ID'              => new EE_Primary_Key_Int_Field(
-                    'QSG_ID',
-                    esc_html__('Question Group ID', 'event_espresso')
-                ),
-                'QSG_deleted'         => new EE_Trashed_Flag_Field(
-                    'QSG_deleted',
-                    esc_html__('Flag indicating this question group was deleted', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'QSG_desc'            => new EE_Post_Content_Field(
-                    'QSG_desc',
-                    esc_html__('Description of Question Group', 'event_espresso'),
-                    true,
-                    ''
-                ),
-                'QSG_identifier'      => new EE_Plain_Text_Field(
-                    'QSG_identifier',
-                    esc_html__('Text ID for question Group', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'QSG_name'            => new EE_Plain_Text_Field(
-                    'QSG_name',
-                    esc_html__('Question Group Name', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'QSG_order'           => new EE_Integer_Field(
-                    'QSG_order',
-                    esc_html__('Order in which to show the question group', 'event_espresso'),
-                    true,
-                    0
-                ),
-                'QSG_show_group_desc' => new EE_Boolean_Field(
-                    'QSG_show_group_desc',
-                    esc_html__(
-                        'Flag indicating whether to show the group\s description on the registration page',
-                        'event_espresso'
-                    ),
-                    false,
-                    false
-                ),
-                'QSG_show_group_name' => new EE_Boolean_Field(
-                    'QSG_show_group_name',
-                    esc_html__(
-                        'Flag indicating whether to show the group\'s name on the registration page',
-                        'event_espresso'
-                    ),
-                    false,
-                    true
-                ),
-                'QSG_system'          => new EE_Integer_Field(
-                    'QSG_system',
-                    esc_html__(
-                        'Indicate IF this is a system group and if it is what system group it corresponds to.',
-                        'event_espresso'
-                    ),
-                    false,
-                    0
-                ),
-                'QSG_wp_user'         => new EE_WP_User_Field(
-                    'QSG_wp_user',
-                    esc_html__('Question Group Creator ID', 'event_espresso'),
-                    false
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Event'                => new EE_HABTM_Relation('Event_Question_Group'),
-            'Event_Question_Group' => new EE_Has_Many_Relation(),
-            'Question'             => new EE_HABTM_Relation('Question_Group_Question'),
-            'WP_User'              => new EE_Belongs_To_Relation(),
-        ];
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
-            new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
-            new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_tables          = [
+			'Question_Group' => new EE_Primary_Table('esp_question_group', 'QSG_ID'),
+		];
+		$this->_fields          = [
+			'Question_Group' => [
+				'QSG_ID'              => new EE_Primary_Key_Int_Field(
+					'QSG_ID',
+					esc_html__('Question Group ID', 'event_espresso')
+				),
+				'QSG_deleted'         => new EE_Trashed_Flag_Field(
+					'QSG_deleted',
+					esc_html__('Flag indicating this question group was deleted', 'event_espresso'),
+					false,
+					false
+				),
+				'QSG_desc'            => new EE_Post_Content_Field(
+					'QSG_desc',
+					esc_html__('Description of Question Group', 'event_espresso'),
+					true,
+					''
+				),
+				'QSG_identifier'      => new EE_Plain_Text_Field(
+					'QSG_identifier',
+					esc_html__('Text ID for question Group', 'event_espresso'),
+					false,
+					''
+				),
+				'QSG_name'            => new EE_Plain_Text_Field(
+					'QSG_name',
+					esc_html__('Question Group Name', 'event_espresso'),
+					false,
+					''
+				),
+				'QSG_order'           => new EE_Integer_Field(
+					'QSG_order',
+					esc_html__('Order in which to show the question group', 'event_espresso'),
+					true,
+					0
+				),
+				'QSG_show_group_desc' => new EE_Boolean_Field(
+					'QSG_show_group_desc',
+					esc_html__(
+						'Flag indicating whether to show the group\s description on the registration page',
+						'event_espresso'
+					),
+					false,
+					false
+				),
+				'QSG_show_group_name' => new EE_Boolean_Field(
+					'QSG_show_group_name',
+					esc_html__(
+						'Flag indicating whether to show the group\'s name on the registration page',
+						'event_espresso'
+					),
+					false,
+					true
+				),
+				'QSG_system'          => new EE_Integer_Field(
+					'QSG_system',
+					esc_html__(
+						'Indicate IF this is a system group and if it is what system group it corresponds to.',
+						'event_espresso'
+					),
+					false,
+					0
+				),
+				'QSG_wp_user'         => new EE_WP_User_Field(
+					'QSG_wp_user',
+					esc_html__('Question Group Creator ID', 'event_espresso'),
+					false
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Event'                => new EE_HABTM_Relation('Event_Question_Group'),
+			'Event_Question_Group' => new EE_Has_Many_Relation(),
+			'Question'             => new EE_HABTM_Relation('Question_Group_Question'),
+			'WP_User'              => new EE_Belongs_To_Relation(),
+		];
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
+			new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
+			new EE_Restriction_Generator_Reg_Form('QSG_system');
 
-        parent::__construct($timezone);
-    }
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * searches the db for the question group with the latest question order and returns that value.
-     *
-     * @return int
-     * @throws EE_Error
-     */
-    public function get_latest_question_group_order(): int
-    {
-        $max = $this->_get_all_wpdb_results(
-            [],
-            ARRAY_A,
-            [
-                'max_order' => ["MAX(QSG_order)", "%d"],
-            ]
-        );
-        return $max[0]['max_order'];
-    }
+	/**
+	 * searches the db for the question group with the latest question order and returns that value.
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function get_latest_question_group_order(): int
+	{
+		$max = $this->_get_all_wpdb_results(
+			[],
+			ARRAY_A,
+			[
+				'max_order' => ["MAX(QSG_order)", "%d"],
+			]
+		);
+		return $max[0]['max_order'];
+	}
 }

core/db_models/EEM_Question_Option.model.php

Spacing +4 added lines, -4 removed lines

@@ -74,13 +74,13 @@
         $this->_model_chain_to_wp_user = 'Question';
 
         // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
+        $this->_cap_restriction_generators[EEM_Base::caps_read]       =
             new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
+        $this->_cap_restriction_generators[EEM_Base::caps_read_admin] =
             new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
+        $this->_cap_restriction_generators[EEM_Base::caps_edit]       =
             new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
+        $this->_cap_restriction_generators[EEM_Base::caps_delete]     =
             new EE_Restriction_Generator_Reg_Form('QSO_system');
 
         parent::__construct($timezone);

Indentation +70 added lines, -70 removed lines

@@ -9,80 +9,80 @@
  */
 class EEM_Question_Option extends EEM_Soft_Delete_Base
 {
-    // private instance of the Attendee object
-    protected static $_instance = null;
+	// private instance of the Attendee object
+	protected static $_instance = null;
 
 
-    protected function __construct($timezone = null)
-    {
-        $this->singular_item = esc_html__('Question Option', 'event_espresso');
-        $this->plural_item   = esc_html__('Question Options', 'event_espresso');
+	protected function __construct($timezone = null)
+	{
+		$this->singular_item = esc_html__('Question Option', 'event_espresso');
+		$this->plural_item   = esc_html__('Question Options', 'event_espresso');
 
-        $this->_tables          = [
-            'Question_Option' => new EE_Primary_Table('esp_question_option', 'QSO_ID'),
-        ];
-        $this->_fields          = [
-            'Question_Option' => [
-                'QSO_ID'      => new EE_Primary_Key_Int_Field(
-                    'QSO_ID',
-                    esc_html__('Question Option ID', 'event_espresso')
-                ),
-                'QST_ID'      => new EE_Foreign_Key_Int_Field(
-                    'QST_ID',
-                    esc_html__('Question ID', 'event_espresso'),
-                    false,
-                    0,
-                    'Question'
-                ),
-                'QSO_deleted' => new EE_Trashed_Flag_Field(
-                    'QSO_deleted',
-                    esc_html__('Flag indicating Option was trashed', 'event_espresso'),
-                    false,
-                    false
-                ),
-                'QSO_desc'    => new EE_Post_Content_Field(
-                    'QSO_desc',
-                    esc_html__('Question Option Description', 'event_espresso'),
-                    false,
-                    ''
-                ),
-                'QSO_order'   => new EE_Integer_Field(
-                    'QSO_order',
-                    esc_html__('Question Option Order', 'event_espresso'),
-                    false,
-                    0
-                ),
-                'QSO_system'  => new EE_Plain_Text_Field(
-                    'QSO_system',
-                    esc_html__('Internal string ID for question option', 'event_espresso'),
-                    true,
-                    null
-                ),
-                'QSO_value'   => new EE_Plain_Text_Field(
-                    'QSO_value',
-                    esc_html__("Question Option Value", "event_espresso"),
-                    false,
-                    ''
-                ),
-            ],
-        ];
-        $this->_model_relations = [
-            'Question' => new EE_Belongs_To_Relation(),
-        ];
+		$this->_tables          = [
+			'Question_Option' => new EE_Primary_Table('esp_question_option', 'QSO_ID'),
+		];
+		$this->_fields          = [
+			'Question_Option' => [
+				'QSO_ID'      => new EE_Primary_Key_Int_Field(
+					'QSO_ID',
+					esc_html__('Question Option ID', 'event_espresso')
+				),
+				'QST_ID'      => new EE_Foreign_Key_Int_Field(
+					'QST_ID',
+					esc_html__('Question ID', 'event_espresso'),
+					false,
+					0,
+					'Question'
+				),
+				'QSO_deleted' => new EE_Trashed_Flag_Field(
+					'QSO_deleted',
+					esc_html__('Flag indicating Option was trashed', 'event_espresso'),
+					false,
+					false
+				),
+				'QSO_desc'    => new EE_Post_Content_Field(
+					'QSO_desc',
+					esc_html__('Question Option Description', 'event_espresso'),
+					false,
+					''
+				),
+				'QSO_order'   => new EE_Integer_Field(
+					'QSO_order',
+					esc_html__('Question Option Order', 'event_espresso'),
+					false,
+					0
+				),
+				'QSO_system'  => new EE_Plain_Text_Field(
+					'QSO_system',
+					esc_html__('Internal string ID for question option', 'event_espresso'),
+					true,
+					null
+				),
+				'QSO_value'   => new EE_Plain_Text_Field(
+					'QSO_value',
+					esc_html__("Question Option Value", "event_espresso"),
+					false,
+					''
+				),
+			],
+		];
+		$this->_model_relations = [
+			'Question' => new EE_Belongs_To_Relation(),
+		];
 
-        $this->_caps_slug              = 'questions';
-        $this->_model_chain_to_wp_user = 'Question';
+		$this->_caps_slug              = 'questions';
+		$this->_model_chain_to_wp_user = 'Question';
 
-        // this model is generally available for reading
-        $this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
-            new EE_Restriction_Generator_Public();
-        $this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
-            new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
-            new EE_Restriction_Generator_Reg_Form('QSO_system');
-        $this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
-            new EE_Restriction_Generator_Reg_Form('QSO_system');
+		// this model is generally available for reading
+		$this->_cap_restriction_generators[ EEM_Base::caps_read ]       =
+			new EE_Restriction_Generator_Public();
+		$this->_cap_restriction_generators[ EEM_Base::caps_read_admin ] =
+			new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_edit ]       =
+			new EE_Restriction_Generator_Reg_Form('QSO_system');
+		$this->_cap_restriction_generators[ EEM_Base::caps_delete ]     =
+			new EE_Restriction_Generator_Reg_Form('QSO_system');
 
-        parent::__construct($timezone);
-    }
+		parent::__construct($timezone);
+	}
 }