eventespresso / event-espresso-core

languages/event_espresso-translations-js.php

Spacing +713 added lines, -713 removed lines

@@ -2,137 +2,137 @@ 
 /* THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY. */
 $generated_i18n_strings = array(
 	// Reference: packages/ui-components/src/Pagination/constants.ts:6
-	__( '2', 'event_espresso' ),
+	__('2', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:7
-	__( '6', 'event_espresso' ),
+	__('6', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:8
-	__( '12', 'event_espresso' ),
+	__('12', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:9
-	__( '24', 'event_espresso' ),
+	__('24', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
-	__( '48', 'event_espresso' ),
+	__('48', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/AvatarImage.tsx:27
-	__( 'contact avatar', 'event_espresso' ),
+	__('contact avatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/OrderByControl.tsx:12
-	__( 'Order by', 'event_espresso' ),
+	__('Order by', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/RegStatusControl.tsx:17
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectStatus.tsx:13
-	__( 'Select Registration Status', 'event_espresso' ),
+	__('Select Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:14
-	__( 'Ascending', 'event_espresso' ),
+	__('Ascending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:18
-	__( 'Descending', 'event_espresso' ),
+	__('Descending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:24
-	__( 'Sort order:', 'event_espresso' ),
+	__('Sort order:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:41
-	__( 'There was some error fetching attendees list', 'event_espresso' ),
+	__('There was some error fetching attendees list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:47
-	__( 'To get started, select what event you want to show attendees from in the block settings.', 'event_espresso' ),
+	__('To get started, select what event you want to show attendees from in the block settings.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:53
-	__( 'There are no attendees for selected options.', 'event_espresso' ),
+	__('There are no attendees for selected options.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:12
-	__( 'Display on Archives', 'event_espresso' ),
+	__('Display on Archives', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:17
-	__( 'Attendees are shown whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are shown whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:18
-	__( 'Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:29
-	__( 'Number of Attendees to Display:', 'event_espresso' ),
+	__('Number of Attendees to Display:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:34
 	/* translators: %d attendees count */
-	_n_noop( 'Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso' ),
+	_n_noop('Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:27
-	__( 'Display Gravatar', 'event_espresso' ),
+	__('Display Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:32
-	__( 'Gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('Gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:33
-	__( 'No gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('No gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:38
-	__( 'Size of Gravatar', 'event_espresso' ),
+	__('Size of Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectDatetime.tsx:22
-	__( 'Select Datetime', 'event_espresso' ),
+	__('Select Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectEvent.tsx:22
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectEvent.tsx:22
-	__( 'Select Event', 'event_espresso' ),
+	__('Select Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:11
-	__( 'Attendee id', 'event_espresso' ),
+	__('Attendee id', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:15
-	__( 'Last name only', 'event_espresso' ),
+	__('Last name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:19
-	__( 'First name only', 'event_espresso' ),
+	__('First name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:23
-	__( 'First, then Last name', 'event_espresso' ),
+	__('First, then Last name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:27
-	__( 'Last, then First name', 'event_espresso' ),
+	__('Last, then First name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:41
-	__( 'Order Attendees by:', 'event_espresso' ),
+	__('Order Attendees by:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectTicket.tsx:22
-	__( 'Select Ticket', 'event_espresso' ),
+	__('Select Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:21
-	__( 'Filter By Settings', 'event_espresso' ),
+	__('Filter By Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:36
-	__( 'Gravatar Setttings', 'event_espresso' ),
+	__('Gravatar Setttings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:39
-	__( 'Archive Settings', 'event_espresso' ),
+	__('Archive Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:10
-	__( 'Event Attendees', 'event_espresso' ),
+	__('Event Attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:11
-	__( 'Displays a list of people that have registered for the specified event', 'event_espresso' ),
+	__('Displays a list of people that have registered for the specified event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
 	// Reference: packages/edtr-services/src/constants.ts:25
-	__( 'event', 'event_espresso' ),
+	__('event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'attendees', 'event_espresso' ),
+	__('attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'list', 'event_espresso' ),
+	__('list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/DisplayField.tsx:41
-	__( 'An unknown error occurred while fetching event details.', 'event_espresso' ),
+	__('An unknown error occurred while fetching event details.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:10
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:24
 	// Reference: packages/utils/src/list/index.ts:14
-	__( 'Select…', 'event_espresso' ),
+	__('Select…', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:75
@@ -141,7 +141,7 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:198
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:48
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:40
-	__( 'Name', 'event_espresso' ),
+	__('Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:19
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:80
@@ -149,407 +149,407 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:203
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:54
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:47
-	__( 'Description', 'event_espresso' ),
+	__('Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:23
-	__( 'Short description', 'event_espresso' ),
+	__('Short description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:35
-	__( 'Select Field', 'event_espresso' ),
+	__('Select Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:27
-	__( 'Text Color', 'event_espresso' ),
+	__('Text Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:32
-	__( 'Background Color', 'event_espresso' ),
+	__('Background Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:41
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:22
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:21
-	__( 'Settings', 'event_espresso' ),
+	__('Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:45
-	__( 'Typography', 'event_espresso' ),
+	__('Typography', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:48
-	__( 'Color', 'event_espresso' ),
+	__('Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
-	__( 'field', 'event_espresso' ),
+	__('field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:8
-	__( 'Event Field', 'event_espresso' ),
+	__('Event Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:9
-	__( 'Displays the selected field of an event', 'event_espresso' ),
+	__('Displays the selected field of an event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:17
-	__( 'Error', 'event_espresso' ),
+	__('Error', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:9
-	__( 'Loading…', 'event_espresso' ),
+	__('Loading…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventDescription.tsx:33
-	__( 'Event Description', 'event_espresso' ),
+	__('Event Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/ActiveStatus.tsx:28
-	__( 'Active status', 'event_espresso' ),
+	__('Active status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/AltRegPage.tsx:12
-	__( 'Alternative Registration Page', 'event_espresso' ),
+	__('Alternative Registration Page', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/DefaultRegistrationStatus.tsx:25
-	__( 'Default Registration Status', 'event_espresso' ),
+	__('Default Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Enabled', 'event_espresso' ),
+	__('Donations Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Disabled', 'event_espresso' ),
+	__('Donations Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventManager.tsx:16
-	__( 'Event Manager', 'event_espresso' ),
+	__('Event Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventPhoneNumber.tsx:15
-	__( 'Event Phone Number', 'event_espresso' ),
+	__('Event Phone Number', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/MaxRegistrations.tsx:13
-	__( 'Max Registrations per Transaction', 'event_espresso' ),
+	__('Max Registrations per Transaction', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Enabled', 'event_espresso' ),
+	__('Ticket Selector Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Disabled', 'event_espresso' ),
+	__('Ticket Selector Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:41
-	__( 'Event Details', 'event_espresso' ),
+	__('Event Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:47
-	__( 'Registration Options', 'event_espresso' ),
+	__('Registration Options', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'primary information about the date', 'event_espresso' ),
+	__('primary information about the date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'Date Details', 'event_espresso' ),
+	__('Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'relations between tickets and dates', 'event_espresso' ),
+	__('relations between tickets and dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
-	__( 'Assign Tickets', 'event_espresso' ),
+	__('Assign Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/FooterButtons.tsx:22
-	__( 'Save and assign tickets', 'event_espresso' ),
+	__('Save and assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:30
 	/* translators: %d database id */
-	__( 'Edit datetime %s', 'event_espresso' ),
+	__('Edit datetime %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:33
-	__( 'New Datetime', 'event_espresso' ),
+	__('New Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:43
-	__( 'modal for datetime', 'event_espresso' ),
+	__('modal for datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:110
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:107
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:233
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:106
-	__( 'Details', 'event_espresso' ),
+	__('Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:111
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:81
-	__( 'Capacity', 'event_espresso' ),
+	__('Capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:119
-	__( 'The maximum number of registrants that can attend the event at this particular date.', 'event_espresso' ),
+	__('The maximum number of registrants that can attend the event at this particular date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:123
-	__( 'Set to 0 to close registration or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to close registration or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:129
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:171
-	__( 'Trash', 'event_espresso' ),
+	__('Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:71
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:194
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:44
-	__( 'Basics', 'event_espresso' ),
+	__('Basics', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:88
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:62
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:62
-	__( 'Dates', 'event_espresso' ),
+	__('Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:92
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:51
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:215
-	__( 'Start Date', 'event_espresso' ),
+	__('Start Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:99
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:65
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:222
-	__( 'End Date', 'event_espresso' ),
+	__('End Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateRegistrationsLink.tsx:13
-	__( 'view ALL registrations for this date.', 'event_espresso' ),
+	__('view ALL registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateSoldLink.tsx:13
-	__( 'view approved registrations for this date.', 'event_espresso' ),
+	__('view approved registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:35
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/TableView.tsx:33
-	__( 'Event Dates', 'event_espresso' ),
+	__('Event Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:38
-	__( 'loading event dates…', 'event_espresso' ),
+	__('loading event dates…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:22
-	__( 'Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso' ),
+	__('Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:32
-	__( 'Ticket Assignments', 'event_espresso' ),
+	__('Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:25
-	__( 'Number of related tickets', 'event_espresso' ),
+	__('Number of related tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:26
-	__( 'There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso' ),
+	__('There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:34
-	__( 'assign tickets', 'event_espresso' ),
+	__('assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:21
-	__( 'event datetime main menu', 'event_espresso' ),
+	__('event datetime main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:33
-	__( 'edit datetime', 'event_espresso' ),
+	__('edit datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:34
-	__( 'copy datetime', 'event_espresso' ),
+	__('copy datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
-	__( 'delete permanently', 'event_espresso' ),
+	__('delete permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
-	__( 'trash datetime', 'event_espresso' ),
+	__('trash datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Permanently Delete Datetime?', 'event_espresso' ),
+	__('Permanently Delete Datetime?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Move Datetime to Trash?', 'event_espresso' ),
+	__('Move Datetime to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:20
-	__( 'Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:23
-	__( 'Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso' ),
+	__('Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:33
-	__( 'delete', 'event_espresso' ),
+	__('delete', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:36
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:40
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:43
-	__( 'bulk actions', 'event_espresso' ),
+	__('bulk actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:40
-	__( 'edit datetime details', 'event_espresso' ),
+	__('edit datetime details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'delete datetimes', 'event_espresso' ),
+	__('delete datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'trash datetimes', 'event_espresso' ),
+	__('trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these datetimes?', 'event_espresso' ),
+	__('Are you sure you want to trash these datetimes?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete datetimes permanently', 'event_espresso' ),
+	__('Delete datetimes permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash datetimes', 'event_espresso' ),
+	__('Trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit date details', 'event_espresso' ),
+	__('Bulk edit date details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected dates.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected dates.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/formValidation.ts:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/formValidation.ts:12
-	__( 'Name must be at least three characters', 'event_espresso' ),
+	__('Name must be at least three characters', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:66
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:66
-	__( 'Shift dates', 'event_espresso' ),
+	__('Shift dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:91
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:90
-	__( 'earlier', 'event_espresso' ),
+	__('earlier', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:95
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:94
-	__( 'later', 'event_espresso' ),
+	__('later', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCapacity.tsx:31
 	/* translators: click to edit capacity<linebreak>(registration limit)… */
-	__( 'click to edit capacity%s(registration limit)…', 'event_espresso' ),
+	__('click to edit capacity%s(registration limit)…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:31
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:27
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:34
-	__( 'starts', 'event_espresso' ),
+	__('starts', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:34
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:47
-	__( 'ends', 'event_espresso' ),
+	__('ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'started', 'event_espresso' ),
+	__('started', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'ended', 'event_espresso' ),
+	__('ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:46
-	__( 'Edit Event Date', 'event_espresso' ),
+	__('Edit Event Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:50
-	__( 'edit start and end dates', 'event_espresso' ),
+	__('edit start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:16
-	__( 'sold', 'event_espresso' ),
+	__('sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:21
-	__( 'capacity', 'event_espresso' ),
+	__('capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:26
-	__( 'reg list', 'event_espresso' ),
+	__('reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:43
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:35
-	__( 'add description…', 'event_espresso' ),
+	__('add description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:36
-	__( 'Edit description', 'event_espresso' ),
+	__('Edit description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:37
-	__( 'click to edit description…', 'event_espresso' ),
+	__('click to edit description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:10
-	__( 'Move Date to Trash', 'event_espresso' ),
+	__('Move Date to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:13
 	// Reference: packages/constants/src/datetime.ts:6
-	__( 'Active', 'event_espresso' ),
+	__('Active', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:13
-	__( 'Trashed', 'event_espresso' ),
+	__('Trashed', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:14
 	// Reference: packages/constants/src/datetime.ts:8
-	__( 'Expired', 'event_espresso' ),
+	__('Expired', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:16
-	__( 'Sold Out', 'event_espresso' ),
+	__('Sold Out', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:17
 	// Reference: packages/constants/src/datetime.ts:12
-	__( 'Upcoming', 'event_espresso' ),
+	__('Upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:7
-	__( 'Edit Event Date Details', 'event_espresso' ),
+	__('Edit Event Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:8
-	__( 'View Registrations for this Date', 'event_espresso' ),
+	__('View Registrations for this Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:9
-	__( 'Manage Ticket Assignments', 'event_espresso' ),
+	__('Manage Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:41
-	__( 'click to edit title…', 'event_espresso' ),
+	__('click to edit title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:42
-	__( 'add title…', 'event_espresso' ),
+	__('add title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/ActiveDatesFilters.tsx:17
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/ActiveTicketsFilters.tsx:17
-	__( 'ON', 'event_espresso' ),
+	__('ON', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:10
-	__( 'end dates only', 'event_espresso' ),
+	__('end dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:11
-	__( 'start and end dates', 'event_espresso' ),
+	__('start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:16
-	__( 'dates above 90% capacity', 'event_espresso' ),
+	__('dates above 90% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:17
-	__( 'dates above 75% capacity', 'event_espresso' ),
+	__('dates above 75% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:18
-	__( 'dates above 50% capacity', 'event_espresso' ),
+	__('dates above 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:19
-	__( 'dates below 50% capacity', 'event_espresso' ),
+	__('dates below 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:23
-	__( 'all dates', 'event_espresso' ),
+	__('all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:24
-	__( 'all active and upcoming', 'event_espresso' ),
+	__('all active and upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:25
-	__( 'active dates only', 'event_espresso' ),
+	__('active dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:26
-	__( 'upcoming dates only', 'event_espresso' ),
+	__('upcoming dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:27
-	__( 'next active or upcoming only', 'event_espresso' ),
+	__('next active or upcoming only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:28
-	__( 'sold out dates only', 'event_espresso' ),
+	__('sold out dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:29
-	__( 'recently expired dates', 'event_espresso' ),
+	__('recently expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:30
-	__( 'all expired dates', 'event_espresso' ),
+	__('all expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:31
-	__( 'trashed dates only', 'event_espresso' ),
+	__('trashed dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:35
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:9
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:61
-	__( 'start date', 'event_espresso' ),
+	__('start date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:36
-	__( 'name', 'event_espresso' ),
+	__('name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:37
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:31
@@ -557,176 +557,176 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/HeaderCell.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:31
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:23
-	__( 'ID', 'event_espresso' ),
+	__('ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:47
-	__( 'custom order', 'event_espresso' ),
+	__('custom order', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:51
-	__( 'display', 'event_espresso' ),
+	__('display', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:43
-	__( 'recurrence', 'event_espresso' ),
+	__('recurrence', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:53
-	__( 'sales', 'event_espresso' ),
+	__('sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:55
-	__( 'sort by', 'event_espresso' ),
+	__('sort by', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:46
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:54
 	// Reference: packages/ee-components/src/EntityList/EntityListFilterBar.tsx:46
-	__( 'search', 'event_espresso' ),
+	__('search', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:47
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:56
-	__( 'status', 'event_espresso' ),
+	__('status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:9
-	__( 'start dates only', 'event_espresso' ),
+	__('start dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/NewDateModal.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/OptionsModalButton.tsx:18
-	__( 'Add New Date', 'event_espresso' ),
+	__('Add New Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
-	__( 'Add Single Date', 'event_espresso' ),
+	__('Add Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:44
-	__( 'Add a single date that only occurs once', 'event_espresso' ),
+	__('Add a single date that only occurs once', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:46
-	__( 'Single Date', 'event_espresso' ),
+	__('Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:106
-	__( 'Reg list', 'event_espresso' ),
+	__('Reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:107
-	__( 'Regs', 'event_espresso' ),
+	__('Regs', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:122
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:121
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:59
-	__( 'Actions', 'event_espresso' ),
+	__('Actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:52
-	__( 'Start', 'event_espresso' ),
+	__('Start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:66
-	__( 'End', 'event_espresso' ),
+	__('End', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:82
-	__( 'Cap', 'event_espresso' ),
+	__('Cap', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:94
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:98
-	__( 'Sold', 'event_espresso' ),
+	__('Sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:33
 	// Reference: packages/form-builder/src/constants.ts:67
-	__( 'Text Input', 'event_espresso' ),
+	__('Text Input', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:34
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:32
-	__( 'Attendee First Name', 'event_espresso' ),
+	__('Attendee First Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:39
 	/* translators: field name */
-	__( 'Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso' ),
+	__('Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:40
 	// Reference: packages/form-builder/src/constants.ts:82
-	__( 'Email Address', 'event_espresso' ),
+	__('Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:40
-	__( 'Attendee Email Address', 'event_espresso' ),
+	__('Attendee Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:49
-	__( 'Please add the required fields', 'event_espresso' ),
+	__('Please add the required fields', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/RegistrationForm.tsx:12
-	__( 'Registration Form', 'event_espresso' ),
+	__('Registration Form', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:13
-	__( 'primary registrant', 'event_espresso' ),
+	__('primary registrant', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:17
-	__( 'purchaser', 'event_espresso' ),
+	__('purchaser', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:21
-	__( 'registrants', 'event_espresso' ),
+	__('registrants', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:36
-	__( 'Attendee Last Name', 'event_espresso' ),
+	__('Attendee Last Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:44
-	__( 'Attendee Address', 'event_espresso' ),
+	__('Attendee Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:9
-	__( 'all', 'event_espresso' ),
+	__('all', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:18
-	__( 'Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:22
-	__( 'Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:32
-	__( 'Please Update Assignments', 'event_espresso' ),
+	__('Please Update Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:26
-	__( 'There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso' ),
+	__('There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:29
-	__( 'Alert!', 'event_espresso' ),
+	__('Alert!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:42
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:49
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/TicketAssignmentsManagerModal.tsx:45
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/Table.tsx:13
-	__( 'Ticket Assignment Manager', 'event_espresso' ),
+	__('Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:10
-	__( 'existing relation', 'event_espresso' ),
+	__('existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:15
-	__( 'remove existing relation', 'event_espresso' ),
+	__('remove existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:20
-	__( 'add new relation', 'event_espresso' ),
+	__('add new relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:25
-	__( 'invalid relation', 'event_espresso' ),
+	__('invalid relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:29
-	__( 'no relation', 'event_espresso' ),
+	__('no relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:15
-	__( 'Assignments', 'event_espresso' ),
+	__('Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:16
-	__( 'Event Dates are listed below', 'event_espresso' ),
+	__('Event Dates are listed below', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:17
-	__( 'Tickets are listed along the top', 'event_espresso' ),
+	__('Tickets are listed along the top', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:18
-	__( 'Click the cell buttons to toggle assigments', 'event_espresso' ),
+	__('Click the cell buttons to toggle assigments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/useSubmitButtonProps.ts:29
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:16
@@ -735,1575 +735,1575 @@ 
 	// Reference: packages/tpc/src/buttons/useSubmitButtonProps.tsx:29
 	// Reference: packages/ui-components/src/Modal/useSubmitButtonProps.tsx:13
 	// Reference: packages/ui-components/src/Stepper/buttons/Submit.tsx:7
-	__( 'Submit', 'event_espresso' ),
+	__('Submit', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:20
-	__( 'All Dates', 'event_espresso' ),
+	__('All Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:27
-	__( 'dates by month', 'event_espresso' ),
+	__('dates by month', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowExpiredTicketsControl.tsx:16
-	__( 'show expired tickets', 'event_espresso' ),
+	__('show expired tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedDatesControl.tsx:13
-	__( 'show trashed dates', 'event_espresso' ),
+	__('show trashed dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedTicketsControl.tsx:16
-	__( 'show trashed tickets', 'event_espresso' ),
+	__('show trashed tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/Container.tsx:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actions/Actions.tsx:25
-	__( 'Default tickets', 'event_espresso' ),
+	__('Default tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/ModalBody.tsx:63
 	// Reference: packages/edtr-services/src/constants.ts:26
-	__( 'ticket', 'event_espresso' ),
+	__('ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:33
-	__( 'Set ticket prices', 'event_espresso' ),
+	__('Set ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:31
-	__( 'Skip prices - Save', 'event_espresso' ),
+	__('Skip prices - Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:37
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:57
-	__( 'Ticket details', 'event_espresso' ),
+	__('Ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:38
-	__( 'Save', 'event_espresso' ),
+	__('Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:22
 	/* translators: %s ticket id */
-	__( 'Edit ticket %s', 'event_espresso' ),
+	__('Edit ticket %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:25
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:33
-	__( 'New Ticket Details', 'event_espresso' ),
+	__('New Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'primary information about the ticket', 'event_espresso' ),
+	__('primary information about the ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'Ticket Details', 'event_espresso' ),
+	__('Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:12
-	__( 'apply ticket price modifiers and taxes', 'event_espresso' ),
+	__('apply ticket price modifiers and taxes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:14
-	__( 'Price Calculator', 'event_espresso' ),
+	__('Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'Assign Dates', 'event_espresso' ),
+	__('Assign Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:39
-	__( 'Skip prices - assign dates', 'event_espresso' ),
+	__('Skip prices - assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:50
-	__( 'Save and assign dates', 'event_espresso' ),
+	__('Save and assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:29
 	/* translators: %1$s ticket name, %2$s ticket id */
-	__( 'Edit ticket "%1$s" - %2$s', 'event_espresso' ),
+	__('Edit ticket "%1$s" - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:43
-	__( 'modal for ticket', 'event_espresso' ),
+	__('modal for ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:101
-	__( 'The maximum number of this ticket available for sale.', 'event_espresso' ),
+	__('The maximum number of this ticket available for sale.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:103
-	__( 'Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:119
-	__( 'Number of Uses', 'event_espresso' ),
+	__('Number of Uses', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:120
-	__( 'Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso' ),
+	__('Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:124
-	__( 'Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso' ),
+	__('Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:132
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:127
-	__( 'Minimum Quantity', 'event_espresso' ),
+	__('Minimum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:137
-	__( 'The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:141
-	__( 'Leave blank for no minimum.', 'event_espresso' ),
+	__('Leave blank for no minimum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:147
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:135
-	__( 'Maximum Quantity', 'event_espresso' ),
+	__('Maximum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:153
-	__( 'The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:157
-	__( 'Leave blank for no maximum.', 'event_espresso' ),
+	__('Leave blank for no maximum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:163
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:144
-	__( 'Required Ticket', 'event_espresso' ),
+	__('Required Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:165
-	__( 'If enabled, the ticket must be selected and will appear first in frontend ticket lists.', 'event_espresso' ),
+	__('If enabled, the ticket must be selected and will appear first in frontend ticket lists.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:177
-	__( 'Visibility', 'event_espresso' ),
+	__('Visibility', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:211
-	__( 'Ticket Sales', 'event_espresso' ),
+	__('Ticket Sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:95
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:110
-	__( 'Quantity For Sale', 'event_espresso' ),
+	__('Quantity For Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:13
-	__( 'total registrations.', 'event_espresso' ),
+	__('total registrations.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:14
-	__( 'view ALL registrations for this ticket.', 'event_espresso' ),
+	__('view ALL registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketSoldLink.tsx:13
-	__( 'view approved registrations for this ticket.', 'event_espresso' ),
+	__('view approved registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:36
-	__( 'Available Tickets', 'event_espresso' ),
+	__('Available Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:39
-	__( 'loading tickets…', 'event_espresso' ),
+	__('loading tickets…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:26
-	__( 'Number of related dates', 'event_espresso' ),
+	__('Number of related dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:27
-	__( 'There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso' ),
+	__('There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:37
-	__( 'assign dates', 'event_espresso' ),
+	__('assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Permanently Delete Ticket?', 'event_espresso' ),
+	__('Permanently Delete Ticket?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Move Ticket to Trash?', 'event_espresso' ),
+	__('Move Ticket to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:22
-	__( 'Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Trash.tsx:6
-	__( 'trash ticket', 'event_espresso' ),
+	__('trash ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:25
-	__( 'ticket main menu', 'event_espresso' ),
+	__('ticket main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:38
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Edit.tsx:15
-	__( 'edit ticket', 'event_espresso' ),
+	__('edit ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:39
-	__( 'copy ticket', 'event_espresso' ),
+	__('copy ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:44
-	__( 'edit ticket details', 'event_espresso' ),
+	__('edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:48
-	__( 'delete tickets', 'event_espresso' ),
+	__('delete tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:48
-	__( 'trash tickets', 'event_espresso' ),
+	__('trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:52
-	__( 'edit ticket prices', 'event_espresso' ),
+	__('edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these tickets?', 'event_espresso' ),
+	__('Are you sure you want to trash these tickets?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete tickets permanently', 'event_espresso' ),
+	__('Delete tickets permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash tickets', 'event_espresso' ),
+	__('Trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit ticket details', 'event_espresso' ),
+	__('Bulk edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected tickets.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected tickets.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/EditPrices.tsx:19
-	__( 'Bulk edit ticket prices', 'event_espresso' ),
+	__('Bulk edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:20
-	__( 'Edit all prices together', 'event_espresso' ),
+	__('Edit all prices together', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:21
-	__( 'Edit all the selected ticket prices dynamically', 'event_espresso' ),
+	__('Edit all the selected ticket prices dynamically', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:25
-	__( 'Edit prices individually', 'event_espresso' ),
+	__('Edit prices individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:26
-	__( 'Edit prices for each ticket individually', 'event_espresso' ),
+	__('Edit prices for each ticket individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:14
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:34
 	// Reference: packages/form/src/ResetButton.tsx:18
 	// Reference: packages/tpc/src/buttons/useResetButtonProps.tsx:12
-	__( 'Reset', 'event_espresso' ),
+	__('Reset', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:15
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:76
 	// Reference: packages/ui-components/src/Modal/useCancelButtonProps.tsx:10
-	__( 'Cancel', 'event_espresso' ),
+	__('Cancel', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/editSeparately/TPCInstance.tsx:26
 	/* translators: %s ticket name */
-	__( 'Edit prices for Ticket: %s', 'event_espresso' ),
+	__('Edit prices for Ticket: %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:30
-	__( 'sales start', 'event_espresso' ),
+	__('sales start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:33
-	__( 'sales began', 'event_espresso' ),
+	__('sales began', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:35
-	__( 'sales ended', 'event_espresso' ),
+	__('sales ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:36
-	__( 'sales end', 'event_espresso' ),
+	__('sales end', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:50
-	__( 'Edit Ticket Sale Dates', 'event_espresso' ),
+	__('Edit Ticket Sale Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:54
-	__( 'edit ticket sales start and end dates', 'event_espresso' ),
+	__('edit ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:21
-	__( 'quantity', 'event_espresso' ),
+	__('quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:28
 	// Reference: packages/edtr-services/src/apollo/mutations/tickets/useUpdateTicketQtyByCapacity.ts:78
-	__( 'Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso' ),
+	__('Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:51
-	__( 'edit quantity of tickets available…', 'event_espresso' ),
+	__('edit quantity of tickets available…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:10
-	__( 'Move Ticket to Trash', 'event_espresso' ),
+	__('Move Ticket to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:52
-	__( 'On Sale', 'event_espresso' ),
+	__('On Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:17
-	__( 'Pending', 'event_espresso' ),
+	__('Pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:7
-	__( 'Edit Ticket Details', 'event_espresso' ),
+	__('Edit Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:8
-	__( 'Manage Date Assignments', 'event_espresso' ),
+	__('Manage Date Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:9
 	// Reference: packages/tpc/src/components/table/Table.tsx:43
-	__( 'Ticket Price Calculator', 'event_espresso' ),
+	__('Ticket Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:39
-	__( 'edit ticket total…', 'event_espresso' ),
+	__('edit ticket total…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:53
-	__( 'set price…', 'event_espresso' ),
+	__('set price…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:23
-	__( 'tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso' ),
+	__('tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:24
-	__( 'tickets list is unlinked and is showing tickets for all event dates', 'event_espresso' ),
+	__('tickets list is unlinked and is showing tickets for all event dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:10
-	__( 'ticket sales start and end dates', 'event_espresso' ),
+	__('ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:15
-	__( 'tickets with 90% or more sold', 'event_espresso' ),
+	__('tickets with 90% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:16
-	__( 'tickets with 75% or more sold', 'event_espresso' ),
+	__('tickets with 75% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:17
-	__( 'tickets with 50% or more sold', 'event_espresso' ),
+	__('tickets with 50% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:19
-	__( 'tickets with less than 50% sold', 'event_espresso' ),
+	__('tickets with less than 50% sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:28
-	__( 'all tickets for all dates', 'event_espresso' ),
+	__('all tickets for all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:29
-	__( 'all on sale and sale pending', 'event_espresso' ),
+	__('all on sale and sale pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:30
-	__( 'on sale tickets only', 'event_espresso' ),
+	__('on sale tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:31
-	__( 'sale pending tickets only', 'event_espresso' ),
+	__('sale pending tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:32
-	__( 'next on sale or sale pending only', 'event_espresso' ),
+	__('next on sale or sale pending only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:33
-	__( 'sold out tickets only', 'event_espresso' ),
+	__('sold out tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:34
-	__( 'expired tickets only', 'event_espresso' ),
+	__('expired tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:35
-	__( 'trashed tickets only', 'event_espresso' ),
+	__('trashed tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:40
-	__( 'all tickets for above dates', 'event_espresso' ),
+	__('all tickets for above dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:44
-	__( 'ticket sale date', 'event_espresso' ),
+	__('ticket sale date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:45
-	__( 'ticket name', 'event_espresso' ),
+	__('ticket name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:46
-	__( 'ticket ID', 'event_espresso' ),
+	__('ticket ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:52
-	__( 'link', 'event_espresso' ),
+	__('link', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:8
-	__( 'ticket sales start date only', 'event_espresso' ),
+	__('ticket sales start date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:9
-	__( 'ticket sales end date only', 'event_espresso' ),
+	__('ticket sales end date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:18
-	__( 'Add New Ticket', 'event_espresso' ),
+	__('Add New Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:32
-	__( 'Add a single ticket and assign the dates to it', 'event_espresso' ),
+	__('Add a single ticket and assign the dates to it', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:34
-	__( 'Single Ticket', 'event_espresso' ),
+	__('Single Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/TableView.tsx:39
-	__( 'Tickets', 'event_espresso' ),
+	__('Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:108
-	__( 'Reg List', 'event_espresso' ),
+	__('Reg List', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:51
-	__( 'Goes on Sale', 'event_espresso' ),
+	__('Goes on Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:65
-	__( 'Sale Ends', 'event_espresso' ),
+	__('Sale Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:66
-	__( 'Ends', 'event_espresso' ),
+	__('Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:78
-	__( 'Price', 'event_espresso' ),
+	__('Price', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:88
-	__( 'Qty', 'event_espresso' ),
+	__('Qty', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:103
-	__( 'Venue telephone', 'event_espresso' ),
+	__('Venue telephone', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:110
-	__( 'Edit this Venue', 'event_espresso' ),
+	__('Edit this Venue', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:119
-	__( 'Select a Venue for the Event', 'event_espresso' ),
+	__('Select a Venue for the Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:21
-	__( 'Venue Details', 'event_espresso' ),
+	__('Venue Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:38
-	__( 'unlimited space', 'event_espresso' ),
+	__('unlimited space', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:41
 	/* translators: %d venue capacity */
-	__( 'Space for up to %d people', 'event_espresso' ),
+	__('Space for up to %d people', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:52
-	__( 'Venue address', 'event_espresso' ),
+	__('Venue address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:58
-	__( 'Venue Details card', 'event_espresso' ),
+	__('Venue Details card', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:67
-	__( 'no image', 'event_espresso' ),
+	__('no image', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:71
-	__( 'Venue name', 'event_espresso' ),
+	__('Venue name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:95
-	__( 'Venue capacity', 'event_espresso' ),
+	__('Venue capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:29
-	__( 'Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso' ),
+	__('Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:40
-	__( 'Skip', 'event_espresso' ),
+	__('Skip', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:42
-	__( 'Sure I\'ll help', 'event_espresso' ),
+	__('Sure I\'ll help', 'event_espresso'),
 
 	// Reference: packages/adapters/src/Pagination/Pagination.tsx:23
-	__( 'pagination', 'event_espresso' ),
+	__('pagination', 'event_espresso'),
 
 	// Reference: packages/adapters/src/TagSelector/TagSelector.tsx:113
-	__( 'toggle menu', 'event_espresso' ),
+	__('toggle menu', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:10
-	__( 'Postponed', 'event_espresso' ),
+	__('Postponed', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:11
-	__( 'SoldOut', 'event_espresso' ),
+	__('SoldOut', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:7
 	// Reference: packages/predicates/src/registration/statusOptions.ts:11
-	__( 'Cancelled', 'event_espresso' ),
+	__('Cancelled', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:9
-	__( 'Inactive', 'event_espresso' ),
+	__('Inactive', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:25
-	__( 'error creating %s', 'event_espresso' ),
+	__('error creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:26
-	__( 'error deleting %s', 'event_espresso' ),
+	__('error deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:27
-	__( 'error updating %s', 'event_espresso' ),
+	__('error updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:28
-	__( 'creating %s', 'event_espresso' ),
+	__('creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:29
-	__( 'deleting %s', 'event_espresso' ),
+	__('deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:30
-	__( 'updating %s', 'event_espresso' ),
+	__('updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:31
-	__( 'successfully created %s', 'event_espresso' ),
+	__('successfully created %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:32
-	__( 'successfully deleted %s', 'event_espresso' ),
+	__('successfully deleted %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:33
-	__( 'successfully updated %s', 'event_espresso' ),
+	__('successfully updated %s', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:13
-	__( 'day in range', 'event_espresso' ),
+	__('day in range', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:17
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:79
-	__( 'end date', 'event_espresso' ),
+	__('end date', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateTimePicker.tsx:17
 	// Reference: packages/dates/src/components/TimePicker.tsx:17
 	// Reference: packages/form-builder/src/state/utils.ts:433
-	__( 'time', 'event_espresso' ),
+	__('time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:7
-	__( 'End Date & Time must be set later than the Start Date & Time', 'event_espresso' ),
+	__('End Date & Time must be set later than the Start Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:9
-	__( 'Start Date & Time must be set before the End Date & Time', 'event_espresso' ),
+	__('Start Date & Time must be set before the End Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:16
-	__( 'month(s)', 'event_espresso' ),
+	__('month(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:17
-	__( 'week(s)', 'event_espresso' ),
+	__('week(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:18
-	__( 'day(s)', 'event_espresso' ),
+	__('day(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:19
-	__( 'hour(s)', 'event_espresso' ),
+	__('hour(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:20
-	__( 'minute(s)', 'event_espresso' ),
+	__('minute(s)', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/mutations/useReorderEntities.ts:63
-	__( 'order updated', 'event_espresso' ),
+	__('order updated', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:24
-	__( 'datetime', 'event_espresso' ),
+	__('datetime', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:27
-	__( 'price', 'event_espresso' ),
+	__('price', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:28
 	// Reference: packages/tpc/src/inputs/PriceTypeInput.tsx:20
-	__( 'price type', 'event_espresso' ),
+	__('price type', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:38
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:39
-	__( 'End date has been adjusted', 'event_espresso' ),
+	__('End date has been adjusted', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:59
-	__( 'Required', 'event_espresso' ),
+	__('Required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:64
-	__( 'Start Date is required', 'event_espresso' ),
+	__('Start Date is required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:68
-	__( 'End Date is required', 'event_espresso' ),
+	__('End Date is required', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:32
-	__( 'no results found', 'event_espresso' ),
+	__('no results found', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:33
-	__( 'try changing filter settings', 'event_espresso' ),
+	__('try changing filter settings', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:38
 	/* translators: %d entity id */
-	__( 'select entity with id %d', 'event_espresso' ),
+	__('select entity with id %d', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:41
-	__( 'select all entities', 'event_espresso' ),
+	__('select all entities', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'Note: ', 'event_espresso' ),
+	__('Note: ', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'any changes will be applied to ALL of the selected entities.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected entities.', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:27
-	__( 'Bulk edit details', 'event_espresso' ),
+	__('Bulk edit details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:17
-	__( 'Are you sure you want to bulk update the details?', 'event_espresso' ),
+	__('Are you sure you want to bulk update the details?', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:18
-	__( 'Bulk update details', 'event_espresso' ),
+	__('Bulk update details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:27
-	__( 'set custom dates order', 'event_espresso' ),
+	__('set custom dates order', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:28
-	__( 'set custom tickets order', 'event_espresso' ),
+	__('set custom tickets order', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:30
-	__( 'Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:31
-	__( 'Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:32
-	__( 'delete form element', 'event_espresso' ),
+	__('delete form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:49
-	__( 'form element settings', 'event_espresso' ),
+	__('form element settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:59
-	__( 'copy form element', 'event_espresso' ),
+	__('copy form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:69
-	__( 'click, hold, and drag to reorder form element', 'event_espresso' ),
+	__('click, hold, and drag to reorder form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:20
-	__( 'remove option', 'event_espresso' ),
+	__('remove option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:42
-	__( 'value', 'event_espresso' ),
+	__('value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:52
-	__( 'label', 'event_espresso' ),
+	__('label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:63
-	__( 'click, hold, and drag to reorder field option', 'event_espresso' ),
+	__('click, hold, and drag to reorder field option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:61
-	__( 'Options are the choices you give people to select from.', 'event_espresso' ),
+	__('Options are the choices you give people to select from.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:63
-	__( 'The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso' ),
+	__('The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:96
-	__( 'add new option', 'event_espresso' ),
+	__('add new option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:25
-	__( 'Styles', 'event_espresso' ),
+	__('Styles', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:30
-	__( 'Validation', 'event_espresso' ),
+	__('Validation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:18
-	__( 'Change input type', 'event_espresso' ),
+	__('Change input type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:19
-	__( 'Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso' ),
+	__('Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:40
-	__( 'type', 'event_espresso' ),
+	__('type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:17
-	__( 'public label', 'event_espresso' ),
+	__('public label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:33
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:22
-	__( 'admin label', 'event_espresso' ),
+	__('admin label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:40
-	__( 'content', 'event_espresso' ),
+	__('content', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:48
-	__( 'options', 'event_espresso' ),
+	__('options', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:51
-	__( 'placeholder', 'event_espresso' ),
+	__('placeholder', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:57
-	__( 'admin only', 'event_espresso' ),
+	__('admin only', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:62
-	__( 'help text', 'event_espresso' ),
+	__('help text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:71
-	__( 'maps to', 'event_espresso' ),
+	__('maps to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:15
 	// Reference: packages/form-builder/src/FormSection/Tabs/Styles.tsx:13
-	__( 'css class', 'event_espresso' ),
+	__('css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:20
-	__( 'help text css class', 'event_espresso' ),
+	__('help text css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:27
-	__( 'size', 'event_espresso' ),
+	__('size', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:35
-	__( 'step', 'event_espresso' ),
+	__('step', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:41
-	__( 'maxlength', 'event_espresso' ),
+	__('maxlength', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:123
-	__( 'min', 'event_espresso' ),
+	__('min', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:128
-	__( 'max', 'event_espresso' ),
+	__('max', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:28
-	__( 'Germany', 'event_espresso' ),
+	__('Germany', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:32
-	__( 'France', 'event_espresso' ),
+	__('France', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:36
-	__( 'United Kingdom', 'event_espresso' ),
+	__('United Kingdom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:40
-	__( 'United States', 'event_espresso' ),
+	__('United States', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:44
-	__( 'Custom', 'event_espresso' ),
+	__('Custom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:54
-	__( 'required', 'event_espresso' ),
+	__('required', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:59
-	__( 'required text', 'event_espresso' ),
+	__('required text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:66
-	__( 'autocomplete', 'event_espresso' ),
+	__('autocomplete', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:74
-	__( 'custom format', 'event_espresso' ),
+	__('custom format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:75
-	__( 'format', 'event_espresso' ),
+	__('format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:83
-	__( 'pattern', 'event_espresso' ),
+	__('pattern', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:110
-	__( 'add new form element', 'event_espresso' ),
+	__('add new form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:117
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:52
-	__( 'Add', 'event_espresso' ),
+	__('Add', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:76
-	__( 'Add Form Element', 'event_espresso' ),
+	__('Add Form Element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:85
-	__( 'form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso' ),
+	__('form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:92
-	__( 'load existing form section', 'event_espresso' ),
+	__('load existing form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:32
-	__( 'delete form section', 'event_espresso' ),
+	__('delete form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:47
-	__( 'form section settings', 'event_espresso' ),
+	__('form section settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:57
-	__( 'copy form section', 'event_espresso' ),
+	__('copy form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:74
-	__( 'click, hold, and drag to reorder form section', 'event_espresso' ),
+	__('click, hold, and drag to reorder form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSections.tsx:26
-	__( 'Add Form Section', 'event_espresso' ),
+	__('Add Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:47
-	__( 'save form section for use in other forms', 'event_espresso' ),
+	__('save form section for use in other forms', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:51
-	__( 'save as', 'event_espresso' ),
+	__('save as', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:55
-	__( 'default', 'event_espresso' ),
+	__('default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:58
-	__( ' a copy of this form section will be automatically added to ALL new events', 'event_espresso' ),
+	__(' a copy of this form section will be automatically added to ALL new events', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:61
-	__( 'shared', 'event_espresso' ),
+	__('shared', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:64
-	__( 'a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso' ),
+	__('a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:27
-	__( 'show label', 'event_espresso' ),
+	__('show label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:33
-	__( 'applies to', 'event_espresso' ),
+	__('applies to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:102
 	// Reference: packages/form-builder/src/state/utils.ts:436
-	__( 'URL', 'event_espresso' ),
+	__('URL', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:104
-	__( 'adds a text input for entering a URL address', 'event_espresso' ),
+	__('adds a text input for entering a URL address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:107
-	__( 'Date', 'event_espresso' ),
+	__('Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:109
-	__( 'adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:112
 	// Reference: packages/form-builder/src/state/utils.ts:369
-	__( 'Local Date', 'event_espresso' ),
+	__('Local Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:117
-	__( 'Month', 'event_espresso' ),
+	__('Month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:119
-	__( 'adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:122
-	__( 'Time', 'event_espresso' ),
+	__('Time', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:124
-	__( 'adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:127
-	__( 'Week', 'event_espresso' ),
+	__('Week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:129
-	__( 'adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:132
-	__( 'Day Selector', 'event_espresso' ),
+	__('Day Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:134
-	__( 'adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:137
-	__( 'Month Selector', 'event_espresso' ),
+	__('Month Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:139
-	__( 'adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:142
-	__( 'Year Selector', 'event_espresso' ),
+	__('Year Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:144
-	__( 'adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:147
-	__( 'Radio Buttons', 'event_espresso' ),
+	__('Radio Buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:149
-	__( 'adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso' ),
+	__('adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:152
 	// Reference: packages/form-builder/src/state/utils.ts:375
-	__( 'Decimal Number', 'event_espresso' ),
+	__('Decimal Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:154
-	__( 'adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:157
 	// Reference: packages/form-builder/src/state/utils.ts:378
-	__( 'Whole Number', 'event_espresso' ),
+	__('Whole Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:159
-	__( 'adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:162
-	__( 'Number Range', 'event_espresso' ),
+	__('Number Range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:167
-	__( 'Phone Number', 'event_espresso' ),
+	__('Phone Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:172
-	__( 'Dropdown', 'event_espresso' ),
+	__('Dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:174
-	__( 'adds a dropdown selector that accepts a single value', 'event_espresso' ),
+	__('adds a dropdown selector that accepts a single value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:177
-	__( 'Multi Select', 'event_espresso' ),
+	__('Multi Select', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:179
-	__( 'adds a dropdown selector that accepts multiple values', 'event_espresso' ),
+	__('adds a dropdown selector that accepts multiple values', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:182
-	__( 'Toggle/Switch', 'event_espresso' ),
+	__('Toggle/Switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:184
-	__( 'adds a toggle or a switch to accept true or false value', 'event_espresso' ),
+	__('adds a toggle or a switch to accept true or false value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:187
-	__( 'Multi Checkbox', 'event_espresso' ),
+	__('Multi Checkbox', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:189
-	__( 'adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso' ),
+	__('adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:192
-	__( 'Country Selector', 'event_espresso' ),
+	__('Country Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:194
-	__( 'adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso' ),
+	__('adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:197
-	__( 'State Selector', 'event_espresso' ),
+	__('State Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:202
-	__( 'Button', 'event_espresso' ),
+	__('Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:204
-	__( 'adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso' ),
+	__('adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:207
-	__( 'Reset Button', 'event_espresso' ),
+	__('Reset Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:209
-	__( 'adds a button that will reset the form back to its original state.', 'event_espresso' ),
+	__('adds a button that will reset the form back to its original state.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:55
-	__( 'Form Section', 'event_espresso' ),
+	__('Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:57
-	__( 'Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso' ),
+	__('Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:62
-	__( 'HTML Block', 'event_espresso' ),
+	__('HTML Block', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:64
-	__( 'allows you to add HTML like headings or text paragraphs to your form', 'event_espresso' ),
+	__('allows you to add HTML like headings or text paragraphs to your form', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:69
-	__( 'adds a text input that only accepts plain text', 'event_espresso' ),
+	__('adds a text input that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:72
-	__( 'Plain Text Area', 'event_espresso' ),
+	__('Plain Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:74
-	__( 'adds a textarea block that only accepts plain text', 'event_espresso' ),
+	__('adds a textarea block that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:77
-	__( 'HTML Text Area', 'event_espresso' ),
+	__('HTML Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:79
-	__( 'adds a textarea block that accepts text including simple HTML markup', 'event_espresso' ),
+	__('adds a textarea block that accepts text including simple HTML markup', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:84
-	__( 'adds a text input that only accepts a valid email address', 'event_espresso' ),
+	__('adds a text input that only accepts a valid email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:87
-	__( 'Email Confirmation', 'event_espresso' ),
+	__('Email Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:92
-	__( 'Password', 'event_espresso' ),
+	__('Password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:94
-	__( 'adds a text input that accepts text but masks what the user enters', 'event_espresso' ),
+	__('adds a text input that accepts text but masks what the user enters', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:97
-	__( 'Password Confirmation', 'event_espresso' ),
+	__('Password Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useElementMutator.ts:54
-	__( 'element', 'event_espresso' ),
+	__('element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useSectionMutator.ts:54
-	__( 'section', 'event_espresso' ),
+	__('section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:360
-	__( 'click', 'event_espresso' ),
+	__('click', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:363
-	__( 'checkboxes', 'event_espresso' ),
+	__('checkboxes', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:366
-	__( 'date', 'event_espresso' ),
+	__('date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:372
-	__( 'day', 'event_espresso' ),
+	__('day', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:381
-	__( 'email address', 'event_espresso' ),
+	__('email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:384
-	__( 'confirm email address', 'event_espresso' ),
+	__('confirm email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:388
-	__( 'month', 'event_espresso' ),
+	__('month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:391
-	__( 'password', 'event_espresso' ),
+	__('password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:394
-	__( 'confirm password', 'event_espresso' ),
+	__('confirm password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:397
-	__( 'radio buttons', 'event_espresso' ),
+	__('radio buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:400
-	__( 'number range', 'event_espresso' ),
+	__('number range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:403
-	__( 'selection dropdown', 'event_espresso' ),
+	__('selection dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:406
-	__( 'country', 'event_espresso' ),
+	__('country', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:409
-	__( 'multi-select dropdown', 'event_espresso' ),
+	__('multi-select dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:412
-	__( 'state/province', 'event_espresso' ),
+	__('state/province', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:415
-	__( 'on/off switch', 'event_espresso' ),
+	__('on/off switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:418
-	__( 'reset', 'event_espresso' ),
+	__('reset', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:421
-	__( 'phone number', 'event_espresso' ),
+	__('phone number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:424
-	__( 'text', 'event_espresso' ),
+	__('text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:427
-	__( 'simple textarea', 'event_espresso' ),
+	__('simple textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:430
-	__( 'html textarea', 'event_espresso' ),
+	__('html textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:439
-	__( 'week', 'event_espresso' ),
+	__('week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:442
-	__( 'year', 'event_espresso' ),
+	__('year', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:12
-	__( 'Select Image', 'event_espresso' ),
+	__('Select Image', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:44
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:11
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:12
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityTemplate.tsx:32
-	__( 'Select', 'event_espresso' ),
+	__('Select', 'event_espresso'),
 
 	// Reference: packages/form/src/renderers/FormRenderer.tsx:51
-	__( 'Form Errors', 'event_espresso' ),
+	__('Form Errors', 'event_espresso'),
 
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:36
 	/* translators: %d the entry number */
-	__( 'Entry %d', 'event_espresso' ),
+	__('Entry %d', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:11
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:17
-	__( 'sold out', 'event_espresso' ),
+	__('sold out', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:14
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:14
-	__( 'expired', 'event_espresso' ),
+	__('expired', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:17
-	__( 'upcoming', 'event_espresso' ),
+	__('upcoming', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:20
-	__( 'active', 'event_espresso' ),
+	__('active', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:23
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:11
-	__( 'trashed', 'event_espresso' ),
+	__('trashed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:26
-	__( 'cancelled', 'event_espresso' ),
+	__('cancelled', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:29
-	__( 'postponed', 'event_espresso' ),
+	__('postponed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:33
-	__( 'inactive', 'event_espresso' ),
+	__('inactive', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:20
-	__( 'pending', 'event_espresso' ),
+	__('pending', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:23
-	__( 'on sale', 'event_espresso' ),
+	__('on sale', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/ticketVisibilityOptions.ts:6
-	__( 'Where the ticket can be viewed throughout the UI. ', 'event_espresso' ),
+	__('Where the ticket can be viewed throughout the UI. ', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:16
-	__( 'Declined', 'event_espresso' ),
+	__('Declined', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:21
-	__( 'Incomplete', 'event_espresso' ),
+	__('Incomplete', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:26
-	__( 'Not Approved', 'event_espresso' ),
+	__('Not Approved', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:31
-	__( 'Pending Payment', 'event_espresso' ),
+	__('Pending Payment', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:36
-	__( 'Wait List', 'event_espresso' ),
+	__('Wait List', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:6
-	__( 'Approved', 'event_espresso' ),
+	__('Approved', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:9
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:10
-	__( 'Select media', 'event_espresso' ),
+	__('Select media', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/RichTextEditor.tsx:84
-	__( 'Write something…', 'event_espresso' ),
+	__('Write something…', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/Toolbar.tsx:20
-	__( 'RTE Toolbar', 'event_espresso' ),
+	__('RTE Toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:11
-	__( 'Normal', 'event_espresso' ),
+	__('Normal', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:12
-	__( 'H1', 'event_espresso' ),
+	__('H1', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:13
-	__( 'H2', 'event_espresso' ),
+	__('H2', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:14
-	__( 'H3', 'event_espresso' ),
+	__('H3', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:15
-	__( 'H4', 'event_espresso' ),
+	__('H4', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:16
-	__( 'H5', 'event_espresso' ),
+	__('H5', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:17
-	__( 'H6', 'event_espresso' ),
+	__('H6', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:18
-	__( 'Block quote', 'event_espresso' ),
+	__('Block quote', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:19
-	__( 'Code', 'event_espresso' ),
+	__('Code', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:36
-	__( 'Set color', 'event_espresso' ),
+	__('Set color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:45
-	__( 'Text color', 'event_espresso' ),
+	__('Text color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:47
-	__( 'Background color', 'event_espresso' ),
+	__('Background color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:39
-	__( 'Add image', 'event_espresso' ),
+	__('Add image', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:51
-	__( 'Image URL', 'event_espresso' ),
+	__('Image URL', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:55
-	__( 'Alt text', 'event_espresso' ),
+	__('Alt text', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:56
-	__( 'Width', 'event_espresso' ),
+	__('Width', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:60
-	__( 'Height', 'event_espresso' ),
+	__('Height', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:54
-	__( 'Edit link', 'event_espresso' ),
+	__('Edit link', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:64
-	__( 'URL title', 'event_espresso' ),
+	__('URL title', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:11
-	__( 'Unordered list', 'event_espresso' ),
+	__('Unordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:12
-	__( 'Ordered list', 'event_espresso' ),
+	__('Ordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:13
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:13
-	__( 'Indent', 'event_espresso' ),
+	__('Indent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:14
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:14
-	__( 'Outdent', 'event_espresso' ),
+	__('Outdent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:11
-	__( 'Unordered textalign', 'event_espresso' ),
+	__('Unordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:12
-	__( 'Ordered textalign', 'event_espresso' ),
+	__('Ordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/render/Image/Toolbar.tsx:32
-	__( 'Image toolbar', 'event_espresso' ),
+	__('Image toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:62
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:35
-	__( 'Visual editor', 'event_espresso' ),
+	__('Visual editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:66
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:39
-	__( 'HTML editor', 'event_espresso' ),
+	__('HTML editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:68
-	__( 'Add Media', 'event_espresso' ),
+	__('Add Media', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/AddPriceModifierButton.tsx:16
-	__( 'add new price modifier after this row', 'event_espresso' ),
+	__('add new price modifier after this row', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:14
-	__( 'Delete all prices', 'event_espresso' ),
+	__('Delete all prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:27
-	__( 'Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:31
-	__( 'Delete all prices?', 'event_espresso' ),
+	__('Delete all prices?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeletePriceModifierButton.tsx:12
-	__( 'delete price modifier', 'event_espresso' ),
+	__('delete price modifier', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:14
-	__( 'Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso' ),
+	__('Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:17
-	__( 'Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso' ),
+	__('Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Disable reverse calculate', 'event_espresso' ),
+	__('Disable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Enable reverse calculate', 'event_espresso' ),
+	__('Enable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/TicketPriceCalculatorButton.tsx:28
-	__( 'ticket price calculator', 'event_espresso' ),
+	__('ticket price calculator', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/AddDefaultTaxesButton.tsx:9
-	__( 'Add default taxes', 'event_espresso' ),
+	__('Add default taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:10
-	__( 'Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso' ),
+	__('Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:14
-	__( 'Remove all taxes?', 'event_espresso' ),
+	__('Remove all taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:7
-	__( 'Remove taxes', 'event_espresso' ),
+	__('Remove taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/AddDefaultPricesButton.tsx:9
-	__( 'Add default prices', 'event_espresso' ),
+	__('Add default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultPricesInfo.tsx:29
-	__( 'Modify default prices.', 'event_espresso' ),
+	__('Modify default prices.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultTaxesInfo.tsx:29
-	__( 'New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso' ),
+	__('New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/LockedTicketsBanner.tsx:12
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:74
-	__( 'Price editing is disabled!', 'event_espresso' ),
+	__('Price editing is disabled!', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:12
-	__( 'One or more price types are missing. Maybe they were placed in the trash?', 'event_espresso' ),
+	__('One or more price types are missing. Maybe they were placed in the trash?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:17
 	/* translators: %s link to price types admin */
-	__( 'Go to the%sto restore (untrash) your price types and/or create some new ones.', 'event_espresso' ),
+	__('Go to the%sto restore (untrash) your price types and/or create some new ones.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:18
-	__( 'price types admin page', 'event_espresso' ),
+	__('price types admin page', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:26
-	__( 'Missing Price Types!', 'event_espresso' ),
+	__('Missing Price Types!', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:14
-	__( 'This Ticket is Currently Free', 'event_espresso' ),
+	__('This Ticket is Currently Free', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:21
 	/* translators: %s default prices */
-	__( 'Click the button below to load your %s into the calculator.', 'event_espresso' ),
+	__('Click the button below to load your %s into the calculator.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:22
-	__( 'default prices', 'event_espresso' ),
+	__('default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:29
-	__( 'Additional ticket price modifiers can be added or removed.', 'event_espresso' ),
+	__('Additional ticket price modifiers can be added or removed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:31
-	__( 'Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso' ),
+	__('Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:22
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:7
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:10
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:52
-	__( 'Changes will be lost if you proceed.', 'event_espresso' ),
+	__('Changes will be lost if you proceed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:33
 	/* translators: %s ticket name */
-	__( 'Price Calculator for Ticket: %s', 'event_espresso' ),
+	__('Price Calculator for Ticket: %s', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:48
-	__( 'Total', 'event_espresso' ),
+	__('Total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:57
-	__( 'ticket total', 'event_espresso' ),
+	__('ticket total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:29
-	__( 'Order', 'event_espresso' ),
+	__('Order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:35
-	__( 'Price Type', 'event_espresso' ),
+	__('Price Type', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:41
-	__( 'Label', 'event_espresso' ),
+	__('Label', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:53
-	__( 'Amount', 'event_espresso' ),
+	__('Amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:22
-	__( 'Copy ticket', 'event_espresso' ),
+	__('Copy ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:26
-	__( 'Copy and archive this ticket', 'event_espresso' ),
+	__('Copy and archive this ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:29
-	__( 'OK', 'event_espresso' ),
+	__('OK', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:34
-	__( 'amount', 'event_espresso' ),
+	__('amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:46
-	__( 'amount…', 'event_espresso' ),
+	__('amount…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:14
-	__( 'description…', 'event_espresso' ),
+	__('description…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:9
-	__( 'price description', 'event_espresso' ),
+	__('price description', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceIdInput.tsx:6
-	__( 'price id', 'event_espresso' ),
+	__('price id', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:13
-	__( 'label…', 'event_espresso' ),
+	__('label…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:8
-	__( 'price name', 'event_espresso' ),
+	__('price name', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceOrderInput.tsx:14
-	__( 'price order', 'event_espresso' ),
+	__('price order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/utils/constants.ts:8
-	__( 'Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso' ),
+	__('Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/ActiveFilters.tsx:8
-	__( 'active filters:', 'event_espresso' ),
+	__('active filters:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/FilterTag/index.tsx:15
 	/* translators: %s filter name */
-	__( 'remove filter - %s', 'event_espresso' ),
+	__('remove filter - %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:105
-	__( 'Country:', 'event_espresso' ),
+	__('Country:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:113
-	__( 'Zip:', 'event_espresso' ),
+	__('Zip:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:81
-	__( 'Address:', 'event_espresso' ),
+	__('Address:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:89
-	__( 'City:', 'event_espresso' ),
+	__('City:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:97
-	__( 'State:', 'event_espresso' ),
+	__('State:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarDateRange/CalendarDateRange.tsx:37
-	__( 'to', 'event_espresso' ),
+	__('to', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarPageDate/CalendarPageDate.tsx:54
-	__( 'TO', 'event_espresso' ),
+	__('TO', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/ColorPicker.tsx:60
-	__( 'Custom color', 'event_espresso' ),
+	__('Custom color', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/Swatch.tsx:23
 	/* translators: color name */
-	__( 'Color: %s', 'event_espresso' ),
+	__('Color: %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:13
-	__( 'Cyan bluish gray', 'event_espresso' ),
+	__('Cyan bluish gray', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:17
-	__( 'White', 'event_espresso' ),
+	__('White', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:21
-	__( 'Pale pink', 'event_espresso' ),
+	__('Pale pink', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:25
-	__( 'Vivid red', 'event_espresso' ),
+	__('Vivid red', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:29
-	__( 'Luminous vivid orange', 'event_espresso' ),
+	__('Luminous vivid orange', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:33
-	__( 'Luminous vivid amber', 'event_espresso' ),
+	__('Luminous vivid amber', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:37
-	__( 'Light green cyan', 'event_espresso' ),
+	__('Light green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:41
-	__( 'Vivid green cyan', 'event_espresso' ),
+	__('Vivid green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:45
-	__( 'Pale cyan blue', 'event_espresso' ),
+	__('Pale cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:49
-	__( 'Vivid cyan blue', 'event_espresso' ),
+	__('Vivid cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:53
-	__( 'Vivid purple', 'event_espresso' ),
+	__('Vivid purple', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:9
-	__( 'Black', 'event_espresso' ),
+	__('Black', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:8
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:24
-	__( 'Are you sure you want to close this?', 'event_espresso' ),
+	__('Are you sure you want to close this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:9
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:25
-	__( 'Yes, discard changes', 'event_espresso' ),
+	__('Yes, discard changes', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmDelete.tsx:7
-	__( 'Are you sure you want to delete this?', 'event_espresso' ),
+	__('Are you sure you want to delete this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:11
-	__( 'Please confirm this action.', 'event_espresso' ),
+	__('Please confirm this action.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:39
-	__( 'cancel', 'event_espresso' ),
+	__('cancel', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:40
-	__( 'confirm', 'event_espresso' ),
+	__('confirm', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CurrencyDisplay/CurrencyDisplay.tsx:34
-	__( 'free', 'event_espresso' ),
+	__('free', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DateTimeRangePicker/DateTimeRangePicker.tsx:117
 	// Reference: packages/ui-components/src/Popover/PopoverForm/PopoverForm.tsx:44
-	__( 'save', 'event_espresso' ),
+	__('save', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Hide Debug Info', 'event_espresso' ),
+	__('Hide Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Show Debug Info', 'event_espresso' ),
+	__('Show Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:49
-	__( 'Edit Start and End Dates and Times', 'event_espresso' ),
+	__('Edit Start and End Dates and Times', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/CopyEntity.tsx:8
-	__( 'copy', 'event_espresso' ),
+	__('copy', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/EditEntity.tsx:8
-	__( 'edit', 'event_espresso' ),
+	__('edit', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/TrashEntity.tsx:8
-	__( 'trash', 'event_espresso' ),
+	__('trash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/Untrash.tsx:8
-	__( 'untrash', 'event_espresso' ),
+	__('untrash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/EntityList.tsx:23
-	__( 'OOPS!', 'event_espresso' ),
+	__('OOPS!', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/EntityList.tsx:23
-	__( 'Error Loading Entites List', 'event_espresso' ),
+	__('Error Loading Entites List', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/RegistrationsLink/index.tsx:12
-	__( 'click to open the registrations admin page in a new tab or window', 'event_espresso' ),
+	__('click to open the registrations admin page in a new tab or window', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/CardViewFilterButton.tsx:22
-	__( 'card view', 'event_espresso' ),
+	__('card view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/TableViewFilterButton.tsx:21
-	__( 'table view', 'event_espresso' ),
+	__('table view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'hide bulk actions', 'event_espresso' ),
+	__('hide bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'show bulk actions', 'event_espresso' ),
+	__('show bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleFiltersButton.tsx:9
-	__( 'hide filters', 'event_espresso' ),
+	__('hide filters', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleFiltersButton.tsx:9
-	__( 'show filters', 'event_espresso' ),
+	__('show filters', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Legend/ToggleLegendButton.tsx:26
-	__( 'hide legend', 'event_espresso' ),
+	__('hide legend', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Legend/ToggleLegendButton.tsx:26
-	__( 'show legend', 'event_espresso' ),
+	__('show legend', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/LoadingNotice/LoadingNotice.tsx:11
-	__( 'loading…', 'event_espresso' ),
+	__('loading…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Modal/Modal.tsx:59
-	__( 'close modal', 'event_espresso' ),
+	__('close modal', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:10
-	__( 'jump to previous', 'event_espresso' ),
+	__('jump to previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:11
-	__( 'jump to next', 'event_espresso' ),
+	__('jump to next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:12
-	__( 'page', 'event_espresso' ),
+	__('page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:8
-	__( 'previous', 'event_espresso' ),
+	__('previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:9
-	__( 'next', 'event_espresso' ),
+	__('next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/PerPage.tsx:37
-	__( 'items per page', 'event_espresso' ),
+	__('items per page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
 	/* translators: %s is per page value */
-	__( '%s / page', 'event_espresso' ),
+	__('%s / page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:13
-	__( 'Next Page', 'event_espresso' ),
+	__('Next Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:14
-	__( 'Previous Page', 'event_espresso' ),
+	__('Previous Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/PercentSign/index.tsx:10
-	__( '%', 'event_espresso' ),
+	__('%', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:31
 	/* translators: entity type to select */
-	__( 'Select an existing %s to use as a template.', 'event_espresso' ),
+	__('Select an existing %s to use as a template.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:38
-	__( 'or', 'event_espresso' ),
+	__('or', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:43
 	/* translators: entity type to add */
-	__( 'Add a new %s and insert details manually', 'event_espresso' ),
+	__('Add a new %s and insert details manually', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:48
-	__( 'Add New', 'event_espresso' ),
+	__('Add New', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Next.tsx:8
-	__( 'Next', 'event_espresso' ),
+	__('Next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Previous.tsx:8
-	__( 'Previous', 'event_espresso' ),
+	__('Previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Steps/Steps.tsx:31
-	__( 'Steps', 'event_espresso' ),
+	__('Steps', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TabbableText/index.tsx:21
-	__( 'click to edit…', 'event_espresso' ),
+	__('click to edit…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:14
-	__( 'The Website\'s Time Zone', 'event_espresso' ),
+	__('The Website\'s Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:19
-	__( 'UTC (Greenwich Mean Time)', 'event_espresso' ),
+	__('UTC (Greenwich Mean Time)', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:9
-	__( 'Your Local Time Zone', 'event_espresso' ),
+	__('Your Local Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:25
-	__( 'click for timezone information', 'event_espresso' ),
+	__('click for timezone information', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:30
-	__( 'This Date Converted To:', 'event_espresso' ),
+	__('This Date Converted To:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:120
-	__( 'Add New Venue', 'event_espresso' ),
+	__('Add New Venue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:36
-	__( '~ no venue ~', 'event_espresso' ),
+	__('~ no venue ~', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:43
-	__( 'assign venue…', 'event_espresso' ),
+	__('assign venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:44
-	__( 'click to select a venue…', 'event_espresso' ),
+	__('click to select a venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:51
-	__( 'select all', 'event_espresso' ),
+	__('select all', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:54
-	__( 'apply', 'event_espresso' )
+	__('apply', 'event_espresso')
 );
 /* THIS IS THE END OF THE GENERATED FILE */

espresso.php

Indentation +107 added lines, -107 removed lines

@@ -37,138 +37,138 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time.
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time.
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
+					);
+					?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
-        require_once __DIR__ . '/vendor/autoload.php';
+		require_once __DIR__ . '/vendor/autoload.php';
 
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version(): string
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '5.0.12.rc.000');
-        }
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version(): string
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '5.0.12.rc.000');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-            update_option('event-espresso-core_allow_tracking', 'no');
-            update_option('event-espresso-core_tracking_notice', 'hide');
-            // Run WP GraphQL activation callback
-            espressoLoadWpGraphQL();
-            graphql_activation_callback();
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+			update_option('event-espresso-core_allow_tracking', 'no');
+			update_option('event-espresso-core_tracking_notice', 'hide');
+			// Run WP GraphQL activation callback
+			espressoLoadWpGraphQL();
+			graphql_activation_callback();
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        /**
-         * espresso_plugin_deactivation
-         */
-        function espresso_plugin_deactivation()
-        {
-            // Run WP GraphQL deactivation callback
-            espressoLoadWpGraphQL();
-            graphql_deactivation_callback();
-            delete_option('event-espresso-core_allow_tracking');
-            delete_option('event-espresso-core_tracking_notice');
-        }
-        register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
+		/**
+		 * espresso_plugin_deactivation
+		 */
+		function espresso_plugin_deactivation()
+		{
+			// Run WP GraphQL deactivation callback
+			espressoLoadWpGraphQL();
+			graphql_deactivation_callback();
+			delete_option('event-espresso-core_allow_tracking');
+			delete_option('event-espresso-core_tracking_notice');
+		}
+		register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin(string $plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin(string $plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
 
 
 if (! function_exists('espressoLoadWpGraphQL')) {
-    function espressoLoadWpGraphQL()
-    {
-        if (
-            ! class_exists('WPGraphQL')
-            && is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
-        ) {
-            require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
-        }
-    }
+	function espressoLoadWpGraphQL()
+	{
+		if (
+			! class_exists('WPGraphQL')
+			&& is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
+		) {
+			require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
+		}
+	}
 }

core/helpers/EEH_MSG_Template.helper.php

Indentation +1258 added lines, -1258 removed lines

@@ -13,1265 +13,1265 @@
  */
 class EEH_MSG_Template
 {
-    /**
-     * Holds a collection of EE_Message_Template_Pack objects.
-     * @type EE_Messages_Template_Pack_Collection
-     */
-    protected static $_template_pack_collection;
-
-
-    /**
-     * @throws EE_Error
-     */
-    private static function _set_autoloader()
-    {
-        EED_Messages::set_autoloaders();
-    }
-
-
-    /**
-     * generate_new_templates
-     * This will handle the messenger, message_type selection when "adding a new custom template" for an event and will
-     * automatically create the defaults for the event.  The user would then be redirected to edit the default context
-     * for the event.
-     *
-     * @access protected
-     * @param string $messenger     the messenger we are generating templates for
-     * @param array  $message_types array of message types that the templates are generated for.
-     * @param int    $GRP_ID        If a non global template is being generated then it is expected we'll have a GRP_ID
-     *                              to use as the base for the new generated template.
-     * @param bool   $global        true indicates generating templates on messenger activation. false requires GRP_ID
-     *                              for event specific template generation.
-     * @return array  @see EEH_MSG_Template::_create_new_templates for the return value of each element in the array
-     *                for templates that are generated.  If this is an empty array then it means no templates were
-     *                generated which usually means there was an error.  Anything in the array with an empty value for
-     *                `MTP_context` means that it was not a new generated template but just reactivated (which only
-     *                happens for global templates that already exist in the database.
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = false)
-    {
-        // make sure message_type is an array.
-        $message_types = (array) $message_types;
-        $templates = array();
-
-        if (empty($messenger)) {
-            throw new EE_Error(esc_html__('We need a messenger to generate templates!', 'event_espresso'));
-        }
-
-        // if we STILL have empty $message_types then we need to generate an error message b/c we NEED message types to do the template files.
-        if (empty($message_types)) {
-            throw new EE_Error(esc_html__('We need at least one message type to generate templates!', 'event_espresso'));
-        }
-
-        EEH_MSG_Template::_set_autoloader();
-        foreach ($message_types as $message_type) {
-
-            // if this is global template generation.
-            if ($global) {
-                // let's attempt to get the GRP_ID for this combo IF GRP_ID is empty.
-                if (empty($GRP_ID)) {
-                    $GRP_ID = EEM_Message_Template_Group::instance()->get_one(
-                        array(
-                            array(
-                                'MTP_messenger'    => $messenger,
-                                'MTP_message_type' => $message_type,
-                                'MTP_is_global'    => true,
-                            ),
-                        )
-                    );
-                    $GRP_ID = $GRP_ID instanceof EE_Message_Template_Group ? $GRP_ID->ID() : 0;
-                }
-                // First let's determine if we already HAVE global templates for this messenger and message_type combination.
-                //  If we do then NO generation!!
-                if (EEH_MSG_Template::already_generated($messenger, $message_type, $GRP_ID)) {
-                    $templates[] = array(
-                        'GRP_ID' => $GRP_ID,
-                        'MTP_context' => '',
-                    );
-                    // we already have generated templates for this so let's go to the next message type.
-                    continue;
-                }
-            }
-            $new_message_template_group = EEH_MSG_Template::create_new_templates(
-                $messenger,
-                $message_type,
-                $GRP_ID,
-                $global
-            );
-
-            if (! $new_message_template_group) {
-                continue;
-            }
-            $templates[] = $new_message_template_group;
-        }
-
-        return $templates;
-    }
-
-
-    /**
-     * The purpose of this method is to determine if there are already generated templates in the database for the
-     * given variables.
-     *
-     * @param string $messenger    messenger
-     * @param string $message_type message type
-     * @param int    $GRP_ID       GRP ID ( if a custom template) (if not provided then we're just doing global
-     *                             template check)
-     * @return bool                true = generated, false = hasn't been generated.
-     * @throws EE_Error
-     */
-    public static function already_generated($messenger, $message_type, $GRP_ID = 0)
-    {
-        EEH_MSG_Template::_set_autoloader();
-        // what method we use depends on whether we have an GRP_ID or not
-        $count = empty($GRP_ID)
-            ? EEM_Message_Template::instance()->count(
-                array(
-                    array(
-                        'Message_Template_Group.MTP_messenger'    => $messenger,
-                        'Message_Template_Group.MTP_message_type' => $message_type,
-                        'Message_Template_Group.MTP_is_global'    => true
-                    )
-                )
-            )
-            : EEM_Message_Template::instance()->count(array( array( 'GRP_ID' => $GRP_ID ) ));
-
-        return $count > 0;
-    }
-
-
-    /**
-     * Updates all message templates matching the incoming messengers and message types to active status.
-     *
-     * @static
-     * @param array $messenger_names    Messenger slug
-     * @param array $message_type_names Message type slug
-     * @return  int                         count of updated records.
-     * @throws EE_Error
-     */
-    public static function update_to_active($messenger_names, $message_type_names)
-    {
-        $messenger_names = is_array($messenger_names) ? $messenger_names : array( $messenger_names );
-        $message_type_names = is_array($message_type_names) ? $message_type_names : array( $message_type_names );
-        return EEM_Message_Template_Group::instance()->update(
-            array( 'MTP_is_active' => 1 ),
-            array(
-                array(
-                    'MTP_messenger'     => array( 'IN', $messenger_names ),
-                    'MTP_message_type'  => array( 'IN', $message_type_names )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Updates all message template groups matching the incoming arguments to inactive status.
-     *
-     * @static
-     * @param array $messenger_names    The messenger slugs.
-     *                                  If empty then all templates matching the message types are marked inactive.
-     *                                  Otherwise only templates matching the messengers and message types.
-     * @param array $message_type_names The message type slugs.
-     *                                  If empty then all templates matching the messengers are marked inactive.
-     *                                  Otherwise only templates matching the messengers and message types.
-     *
-     * @return int  count of updated records.
-     * @throws EE_Error
-     */
-    public static function update_to_inactive($messenger_names = array(), $message_type_names = array())
-    {
-        return EEM_Message_Template_Group::instance()->deactivate_message_template_groups_for(
-            $messenger_names,
-            $message_type_names
-        );
-    }
-
-
-    /**
-     * The purpose of this function is to return all installed message objects
-     * (messengers and message type regardless of whether they are ACTIVE or not)
-     *
-     * @param string $type
-     * @return array array consisting of installed messenger objects and installed message type objects.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     * @static
-     */
-    public static function get_installed_message_objects($type = 'all')
-    {
-        self::_set_autoloader();
-        $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        return array(
-            'messenger' => $message_resource_manager->installed_messengers(),
-            'message_type' => $message_resource_manager->installed_message_types()
-        );
-    }
-
-
-    /**
-     * This will return an array of shortcodes => labels from the
-     * messenger and message_type objects associated with this
-     * template.
-     *
-     * @param string $message_type
-     * @param string $messenger
-     * @param array  $fields                        What fields we're returning valid shortcodes for.
-     *                                              If empty then we assume all fields are to be returned. Optional.
-     * @param string $context                       What context we're going to return shortcodes for. Optional.
-     * @param bool   $merged                        If TRUE then we don't return shortcodes indexed by field,
-     *                                              but instead an array of the unique shortcodes for all the given (
-     *                                              or all) fields. Optional.
-     * @return array                                an array of shortcodes in the format
-     *                                              array( '[shortcode] => 'label')
-     *                                              OR
-     *                                              FALSE if no shortcodes found.
-     * @throws ReflectionException
-     * @throws EE_Error*@since 4.3.0
-     *
-     */
-    public static function get_shortcodes(
-        $message_type,
-        $messenger,
-        $fields = array(),
-        $context = 'admin',
-        $merged = false
-    ) {
-        $messenger_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $messenger)));
-        $mt_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $message_type)));
-        /** @var EE_Message_Resource_Manager $message_resource_manager */
-        $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        // convert slug to object
-        $messenger = $message_resource_manager->get_messenger($messenger);
-
-        // if messenger isn't a EE_messenger resource then bail.
-        if (! $messenger instanceof EE_messenger) {
-            return array();
-        }
-
-        // validate class for getting our list of shortcodes
-        $classname = 'EE_Messages_' . $messenger_name . '_' . $mt_name . '_Validator';
-        if (! class_exists($classname)) {
-            $msg[] = esc_html__('The Validator class was unable to load', 'event_espresso');
-            $msg[] = sprintf(
-                esc_html__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'),
-                $classname
-            );
-            throw new EE_Error(implode('||', $msg));
-        }
-
-        /** @type EE_Messages_Validator $_VLD */
-        $_VLD = new $classname(array(), $context);
-        $valid_shortcodes = $_VLD->get_validators();
-
-        // let's make sure we're only getting the shortcode part of the validators
-        $shortcodes = array();
-        foreach ($valid_shortcodes as $field => $validators) {
-            $shortcodes[ $field ] = $validators['shortcodes'];
-        }
-        $valid_shortcodes = $shortcodes;
-
-        // if not all fields let's make sure we ONLY include the shortcodes for the specified fields.
-        if (! empty($fields)) {
-            $specified_shortcodes = array();
-            foreach ($fields as $field) {
-                if (isset($valid_shortcodes[ $field ])) {
-                    $specified_shortcodes[ $field ] = $valid_shortcodes[ $field ];
-                }
-            }
-            $valid_shortcodes = $specified_shortcodes;
-        }
-
-        // if not merged then let's replace the fields with the localized fields
-        if (! $merged) {
-            // let's get all the fields for the set messenger so that we can get the localized label and use that in the returned array.
-            $field_settings = $messenger->get_template_fields();
-            $localized = array();
-            foreach ($valid_shortcodes as $field => $shortcodes) {
-                // get localized field label
-                if (isset($field_settings[ $field ])) {
-                    // possible that this is used as a main field.
-                    if (empty($field_settings[ $field ])) {
-                        if (isset($field_settings['extra'][ $field ])) {
-                            $_field = $field_settings['extra'][ $field ]['main']['label'];
-                        } else {
-                            $_field = $field;
-                        }
-                    } else {
-                        $_field = $field_settings[ $field ]['label'];
-                    }
-                } elseif (isset($field_settings['extra'])) {
-                    // loop through extra "main fields" and see if any of their children have our field
-                    foreach ($field_settings['extra'] as $fields) {
-                        if (isset($fields[ $field ])) {
-                            $_field = $fields[ $field ]['label'];
-                        } else {
-                            $_field = $field;
-                        }
-                    }
-                } else {
-                    $_field = $field;
-                }
-                if (isset($_field)) {
-                    $localized[ (string) $_field ] = $shortcodes;
-                }
-            }
-            $valid_shortcodes = $localized;
-        }
-
-        // if $merged then let's merge all the shortcodes into one list NOT indexed by field.
-        if ($merged) {
-            $merged_codes = array();
-            foreach ($valid_shortcodes as $shortcode) {
-                foreach ($shortcode as $code => $label) {
-                    if (isset($merged_codes[ $code ])) {
-                        continue;
-                    } else {
-                        $merged_codes[ $code ] = $label;
-                    }
-                }
-            }
-            $valid_shortcodes = $merged_codes;
-        }
-
-        return $valid_shortcodes;
-    }
-
-
-    /**
-     * Get Messenger object.
-     *
-     * @param string $messenger messenger slug for the messenger object we want to retrieve.
-     * @return EE_messenger
-     * @throws ReflectionException
-     * @throws EE_Error*@since 4.3.0
-     * @deprecated 4.9.0
-     */
-    public static function messenger_obj($messenger)
-    {
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        return $Message_Resource_Manager->get_messenger($messenger);
-    }
-
-
-    /**
-     * get Message type object
-     *
-     * @param string $message_type the slug for the message type object to retrieve
-     * @return EE_message_type
-     * @throws ReflectionException
-     * @throws EE_Error*@since 4.3.0
-     * @deprecated 4.9.0
-     */
-    public static function message_type_obj($message_type)
-    {
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        return $Message_Resource_Manager->get_message_type($message_type);
-    }
-
-
-    /**
-     * Given a message_type slug, will return whether that message type is active in the system or not.
-     *
-     * @since    4.3.0
-     * @param string $message_type message type to check for.
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function is_mt_active($message_type)
-    {
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $active_mts = $Message_Resource_Manager->list_of_active_message_types();
-        return in_array($message_type, $active_mts);
-    }
-
-
-    /**
-     * Given a messenger slug, will return whether that messenger is active in the system or not.
-     *
-     * @since    4.3.0
-     *
-     * @param string $messenger slug for messenger to check.
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function is_messenger_active($messenger)
-    {
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $active_messenger = $Message_Resource_Manager->get_active_messenger($messenger);
-        return $active_messenger instanceof EE_messenger;
-    }
-
-
-    /**
-     * Used to return active messengers array stored in the wp options table.
-     * If no value is present in the option then an empty array is returned.
-     *
-     * @deprecated 4.9
-     * @since      4.3.1
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_active_messengers_in_db()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__('Please use EE_Message_Resource_Manager::get_active_messengers_option() instead.', 'event_espresso'),
-            '4.9.0'
-        );
-        /** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        return $Message_Resource_Manager->get_active_messengers_option();
-    }
-
-
-    /**
-     * Used to update the active messengers array stored in the wp options table.
-     *
-     * @since      4.3.1
-     * @deprecated 4.9.0
-     *
-     * @param array $data_to_save Incoming data to save.
-     *
-     * @return bool FALSE if not updated, TRUE if updated.
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function update_active_messengers_in_db($data_to_save)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__('Please use EE_Message_Resource_Manager::update_active_messengers_option() instead.', 'event_espresso'),
-            '4.9.0'
-        );
-        /** @var EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        return $Message_Resource_Manager->update_active_messengers_option($data_to_save);
-    }
-
-
-    /**
-     * This does some validation of incoming params, determines what type of url is being prepped and returns the
-     * appropriate url trigger
-     *
-     * @param EE_message_type $message_type
-     * @param EE_Message $message
-     * @param EE_Registration | null $registration  The registration object must be included if this
-     *                                              is going to be a registration trigger url.
-     * @param string $sending_messenger             The (optional) sending messenger for the url.
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public static function get_url_trigger(
-        EE_message_type $message_type,
-        EE_Message $message,
-        $registration = null,
-        $sending_messenger = ''
-    ) {
-        // first determine if the url can be to the EE_Message object.
-        if (! $message_type->always_generate()) {
-            return EEH_MSG_Template::generate_browser_trigger($message);
-        }
-
-        // if $registration object is not valid then exit early because there's nothing that can be generated.
-        if (! $registration instanceof EE_Registration) {
-            throw new EE_Error(
-                esc_html__('Incoming value for registration is not a valid EE_Registration object.', 'event_espresso')
-            );
-        }
-
-        // validate given context
-        $contexts = $message_type->get_contexts();
-        if ($message->context() !== '' && ! isset($contexts[ $message->context() ])) {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__('The context %s is not a valid context for %s.', 'event_espresso'),
-                    $message->context(),
-                    get_class($message_type)
-                )
-            );
-        }
-
-        // valid sending messenger but only if sending messenger set.  Otherwise generating messenger is used.
-        if (! empty($sending_messenger)) {
-            $with_messengers = $message_type->with_messengers();
-            if (
-                ! isset($with_messengers[ $message->messenger() ])
-                 || ! in_array($sending_messenger, $with_messengers[ $message->messenger() ])
-            ) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'The given sending messenger string (%1$s) does not match a valid sending messenger with the %2$s.  If this is incorrect, make sure that the message type has defined this messenger as a sending messenger in its $_with_messengers array.',
-                            'event_espresso'
-                        ),
-                        $sending_messenger,
-                        get_class($message_type)
-                    )
-                );
-            }
-        } else {
-            $sending_messenger = $message->messenger();
-        }
-        return EEH_MSG_Template::generate_url_trigger(
-            $sending_messenger,
-            $message->messenger(),
-            $message->context(),
-            $message->message_type(),
-            $registration,
-            $message->GRP_ID()
-        );
-    }
-
-
-    /**
-     * This returns the url for triggering a in browser view of a specific EE_Message object.
-     * @param EE_Message $message
-     * @return string.
-     */
-    public static function generate_browser_trigger(EE_Message $message)
-    {
-        $query_args = array(
-            'ee' => 'msg_browser_trigger',
-            'token' => $message->MSG_token()
-        );
-        return apply_filters(
-            'FHEE__EEH_MSG_Template__generate_browser_trigger',
-            add_query_arg($query_args, site_url()),
-            $message
-        );
-    }
-
-
-
-
-
-
-    /**
-     * This returns the url for triggering an in browser view of the error saved on the incoming message object.
-     * @param EE_Message $message
-     * @return string
-     */
-    public static function generate_error_display_trigger(EE_Message $message)
-    {
-        return apply_filters(
-            'FHEE__EEH_MSG_Template__generate_error_display_trigger',
-            add_query_arg(
-                array(
-                    'ee' => 'msg_browser_error_trigger',
-                    'token' => $message->MSG_token()
-                ),
-                site_url()
-            ),
-            $message
-        );
-    }
-
-
-    /**
-     * This generates a url trigger for the msg_url_trigger route using the given arguments
-     *
-     * @param string          $sending_messenger      The sending messenger slug.
-     * @param string          $generating_messenger   The generating messenger slug.
-     * @param string          $context                The context for the template.
-     * @param string          $message_type           The message type slug
-     * @param EE_Registration $registration
-     * @param integer         $message_template_group id   The EE_Message_Template_Group ID for the template.
-     * @param integer         $data_id                The id to the EE_Base_Class for getting the data used by the
-     *                                                trigger.
-     * @return string          The generated url.
-     * @throws EE_Error
-     */
-    public static function generate_url_trigger(
-        $sending_messenger,
-        $generating_messenger,
-        $context,
-        $message_type,
-        EE_Registration $registration,
-        $message_template_group,
-        $data_id = 0
-    ) {
-        $query_args = array(
-            'ee' => 'msg_url_trigger',
-            'snd_msgr' => $sending_messenger,
-            'gen_msgr' => $generating_messenger,
-            'message_type' => $message_type,
-            'context' => $context,
-            'token' => $registration->reg_url_link(),
-            'GRP_ID' => $message_template_group,
-            'id' => $data_id
-            );
-        $url = add_query_arg($query_args, get_home_url());
-
-        // made it here so now we can just get the url and filter it.  Filtered globally and by message type.
-        return apply_filters(
-            'FHEE__EEH_MSG_Template__generate_url_trigger',
-            $url,
-            $sending_messenger,
-            $generating_messenger,
-            $context,
-            $message_type,
-            $registration,
-            $message_template_group,
-            $data_id
-        );
-    }
-
-
-
-
-    /**
-     * Return the specific css for the action icon given.
-     *
-     * @param string $type  What action to return.
-     * @return string[]
-     * @since 4.9.0
-     */
-    public static function get_message_action_icon($type)
-    {
-        $action_icons = self::get_message_action_icons();
-        return isset($action_icons[ $type ]) ? $action_icons[ $type ] : [];
-    }
-
-
-    /**
-     * This is used for retrieving the css classes used for the icons representing message actions.
-     *
-     * @since 4.9.0
-     *
-     * @return array
-     */
-    public static function get_message_action_icons()
-    {
-        return apply_filters(
-            'FHEE__EEH_MSG_Template__message_action_icons',
-            array(
-                'view' => array(
-                    'label' => esc_html__('View Message', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-visibility',
-                ),
-                'error' => array(
-                    'label' => esc_html__('View Error Message', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-info',
-                ),
-                'see_notifications_for' => array(
-                    'label' => esc_html__('View Related Messages', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-megaphone',
-                ),
-                'generate_now' => array(
-                    'label' => esc_html__('Generate the message now.', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-admin-tools',
-                ),
-                'send_now' => array(
-                    'label' => esc_html__('Send Immediately', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-controls-forward',
-                ),
-                'queue_for_resending' => array(
-                    'label' => esc_html__('Queue for Resending', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-controls-repeat',
-                ),
-                'view_transaction' => array(
-                    'label' => esc_html__('View related Transaction', 'event_espresso'),
-                    'css_class' => 'dashicons dashicons-cart',
-                )
-            )
-        );
-    }
-
-
-    /**
-     * This returns the url for a given action related to EE_Message.
-     *
-     * @param string     $type         What type of action to return the url for.
-     * @param EE_Message $message      Required for generating the correct url for some types.
-     * @param array      $query_params Any additional query params to be included with the generated url.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 4.9.0
-     *
-     */
-    public static function get_message_action_url($type, EE_Message $message = null, $query_params = array())
-    {
-        $action_urls = self::get_message_action_urls($message, $query_params);
-        return isset($action_urls[ $type ])  ? $action_urls[ $type ] : '';
-    }
-
-
-    /**
-     * This returns all the current urls for EE_Message actions.
-     *
-     * @since 4.9.0
-     *
-     * @param EE_Message $message      The EE_Message object required to generate correct urls for some types.
-     * @param array      $query_params Any additional query_params to be included with the generated url.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_message_action_urls(EE_Message $message = null, $query_params = array())
-    {
-        EE_Registry::instance()->load_helper('URL');
-        // if $message is not an instance of EE_Message then let's just do a dummy.
-        $message = empty($message) ? EE_Message_Factory::create() : $message;
-        $action_urls =  apply_filters(
-            'FHEE__EEH_MSG_Template__get_message_action_url',
-            array(
-                'view' => EEH_MSG_Template::generate_browser_trigger($message),
-                'error' => EEH_MSG_Template::generate_error_display_trigger($message),
-                'see_notifications_for' => EEH_URL::add_query_args_and_nonce(
-                    array_merge(
-                        array(
-                            'page' => 'espresso_messages',
-                            'action' => 'default',
-                            'filterby' => 1,
-                        ),
-                        $query_params
-                    ),
-                    admin_url('admin.php')
-                ),
-                'generate_now' => EEH_URL::add_query_args_and_nonce(
-                    array(
-                        'page' => 'espresso_messages',
-                        'action' => 'generate_now',
-                        'MSG_ID' => $message->ID()
-                    ),
-                    admin_url('admin.php')
-                ),
-                'send_now' => EEH_URL::add_query_args_and_nonce(
-                    array(
-                        'page' => 'espresso_messages',
-                        'action' => 'send_now',
-                        'MSG_ID' => $message->ID()
-                    ),
-                    admin_url('admin.php')
-                ),
-                'queue_for_resending' => EEH_URL::add_query_args_and_nonce(
-                    array(
-                        'page' => 'espresso_messages',
-                        'action' => 'queue_for_resending',
-                        'MSG_ID' => $message->ID()
-                    ),
-                    admin_url('admin.php')
-                ),
-            )
-        );
-        if (
-            $message->TXN_ID() > 0
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_read_transaction',
-                'espresso_transactions_default',
-                $message->TXN_ID()
-            )
-        ) {
-            $action_urls['view_transaction'] = EEH_URL::add_query_args_and_nonce(
-                array(
-                    'page' => 'espresso_transactions',
-                    'action' => 'view_transaction',
-                    'TXN_ID' => $message->TXN_ID()
-                ),
-                admin_url('admin.php')
-            );
-        } else {
-            $action_urls['view_transaction'] = '';
-        }
-        return $action_urls;
-    }
-
-
-    /**
-     * This returns a generated link html including the icon used for the action link for EE_Message actions.
-     *
-     * @param string          $type         What type of action the link is for (if invalid type is passed in then an
-     *                                      empty string is returned)
-     * @param EE_Message|null $message      The EE_Message object (required for some actions to generate correctly)
-     * @param array           $query_params Any extra query params to include in the generated link.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 4.9.0
-     *
-     */
-    public static function get_message_action_link($type, EE_Message $message = null, $query_params = array())
-    {
-        $url = EEH_MSG_Template::get_message_action_url($type, $message, $query_params);
-        $icon_css = EEH_MSG_Template::get_message_action_icon($type);
-        $label = $icon_css['label'] ?? null;
-        $label = $label ? 'aria-label="' . $label . '"' : '';
-        $class = $label ? ' ee-aria-tooltip' : '';
-
-        if (empty($url) || empty($icon_css) || ! isset($icon_css['css_class'])) {
-            return '';
-        }
-
-        $icon_css_class = $icon_css['css_class'] . apply_filters(
-            'FHEE__EEH_MSG_Template__get_message_action_link__icon_css_class',
-            ' js-ee-message-action-link ee-message-action-link-' . $type,
-            $type,
-            $message,
-            $query_params
-        );
-
-        return '
+	/**
+	 * Holds a collection of EE_Message_Template_Pack objects.
+	 * @type EE_Messages_Template_Pack_Collection
+	 */
+	protected static $_template_pack_collection;
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	private static function _set_autoloader()
+	{
+		EED_Messages::set_autoloaders();
+	}
+
+
+	/**
+	 * generate_new_templates
+	 * This will handle the messenger, message_type selection when "adding a new custom template" for an event and will
+	 * automatically create the defaults for the event.  The user would then be redirected to edit the default context
+	 * for the event.
+	 *
+	 * @access protected
+	 * @param string $messenger     the messenger we are generating templates for
+	 * @param array  $message_types array of message types that the templates are generated for.
+	 * @param int    $GRP_ID        If a non global template is being generated then it is expected we'll have a GRP_ID
+	 *                              to use as the base for the new generated template.
+	 * @param bool   $global        true indicates generating templates on messenger activation. false requires GRP_ID
+	 *                              for event specific template generation.
+	 * @return array  @see EEH_MSG_Template::_create_new_templates for the return value of each element in the array
+	 *                for templates that are generated.  If this is an empty array then it means no templates were
+	 *                generated which usually means there was an error.  Anything in the array with an empty value for
+	 *                `MTP_context` means that it was not a new generated template but just reactivated (which only
+	 *                happens for global templates that already exist in the database.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_new_templates($messenger, $message_types, $GRP_ID = 0, $global = false)
+	{
+		// make sure message_type is an array.
+		$message_types = (array) $message_types;
+		$templates = array();
+
+		if (empty($messenger)) {
+			throw new EE_Error(esc_html__('We need a messenger to generate templates!', 'event_espresso'));
+		}
+
+		// if we STILL have empty $message_types then we need to generate an error message b/c we NEED message types to do the template files.
+		if (empty($message_types)) {
+			throw new EE_Error(esc_html__('We need at least one message type to generate templates!', 'event_espresso'));
+		}
+
+		EEH_MSG_Template::_set_autoloader();
+		foreach ($message_types as $message_type) {
+
+			// if this is global template generation.
+			if ($global) {
+				// let's attempt to get the GRP_ID for this combo IF GRP_ID is empty.
+				if (empty($GRP_ID)) {
+					$GRP_ID = EEM_Message_Template_Group::instance()->get_one(
+						array(
+							array(
+								'MTP_messenger'    => $messenger,
+								'MTP_message_type' => $message_type,
+								'MTP_is_global'    => true,
+							),
+						)
+					);
+					$GRP_ID = $GRP_ID instanceof EE_Message_Template_Group ? $GRP_ID->ID() : 0;
+				}
+				// First let's determine if we already HAVE global templates for this messenger and message_type combination.
+				//  If we do then NO generation!!
+				if (EEH_MSG_Template::already_generated($messenger, $message_type, $GRP_ID)) {
+					$templates[] = array(
+						'GRP_ID' => $GRP_ID,
+						'MTP_context' => '',
+					);
+					// we already have generated templates for this so let's go to the next message type.
+					continue;
+				}
+			}
+			$new_message_template_group = EEH_MSG_Template::create_new_templates(
+				$messenger,
+				$message_type,
+				$GRP_ID,
+				$global
+			);
+
+			if (! $new_message_template_group) {
+				continue;
+			}
+			$templates[] = $new_message_template_group;
+		}
+
+		return $templates;
+	}
+
+
+	/**
+	 * The purpose of this method is to determine if there are already generated templates in the database for the
+	 * given variables.
+	 *
+	 * @param string $messenger    messenger
+	 * @param string $message_type message type
+	 * @param int    $GRP_ID       GRP ID ( if a custom template) (if not provided then we're just doing global
+	 *                             template check)
+	 * @return bool                true = generated, false = hasn't been generated.
+	 * @throws EE_Error
+	 */
+	public static function already_generated($messenger, $message_type, $GRP_ID = 0)
+	{
+		EEH_MSG_Template::_set_autoloader();
+		// what method we use depends on whether we have an GRP_ID or not
+		$count = empty($GRP_ID)
+			? EEM_Message_Template::instance()->count(
+				array(
+					array(
+						'Message_Template_Group.MTP_messenger'    => $messenger,
+						'Message_Template_Group.MTP_message_type' => $message_type,
+						'Message_Template_Group.MTP_is_global'    => true
+					)
+				)
+			)
+			: EEM_Message_Template::instance()->count(array( array( 'GRP_ID' => $GRP_ID ) ));
+
+		return $count > 0;
+	}
+
+
+	/**
+	 * Updates all message templates matching the incoming messengers and message types to active status.
+	 *
+	 * @static
+	 * @param array $messenger_names    Messenger slug
+	 * @param array $message_type_names Message type slug
+	 * @return  int                         count of updated records.
+	 * @throws EE_Error
+	 */
+	public static function update_to_active($messenger_names, $message_type_names)
+	{
+		$messenger_names = is_array($messenger_names) ? $messenger_names : array( $messenger_names );
+		$message_type_names = is_array($message_type_names) ? $message_type_names : array( $message_type_names );
+		return EEM_Message_Template_Group::instance()->update(
+			array( 'MTP_is_active' => 1 ),
+			array(
+				array(
+					'MTP_messenger'     => array( 'IN', $messenger_names ),
+					'MTP_message_type'  => array( 'IN', $message_type_names )
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * Updates all message template groups matching the incoming arguments to inactive status.
+	 *
+	 * @static
+	 * @param array $messenger_names    The messenger slugs.
+	 *                                  If empty then all templates matching the message types are marked inactive.
+	 *                                  Otherwise only templates matching the messengers and message types.
+	 * @param array $message_type_names The message type slugs.
+	 *                                  If empty then all templates matching the messengers are marked inactive.
+	 *                                  Otherwise only templates matching the messengers and message types.
+	 *
+	 * @return int  count of updated records.
+	 * @throws EE_Error
+	 */
+	public static function update_to_inactive($messenger_names = array(), $message_type_names = array())
+	{
+		return EEM_Message_Template_Group::instance()->deactivate_message_template_groups_for(
+			$messenger_names,
+			$message_type_names
+		);
+	}
+
+
+	/**
+	 * The purpose of this function is to return all installed message objects
+	 * (messengers and message type regardless of whether they are ACTIVE or not)
+	 *
+	 * @param string $type
+	 * @return array array consisting of installed messenger objects and installed message type objects.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 * @static
+	 */
+	public static function get_installed_message_objects($type = 'all')
+	{
+		self::_set_autoloader();
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return array(
+			'messenger' => $message_resource_manager->installed_messengers(),
+			'message_type' => $message_resource_manager->installed_message_types()
+		);
+	}
+
+
+	/**
+	 * This will return an array of shortcodes => labels from the
+	 * messenger and message_type objects associated with this
+	 * template.
+	 *
+	 * @param string $message_type
+	 * @param string $messenger
+	 * @param array  $fields                        What fields we're returning valid shortcodes for.
+	 *                                              If empty then we assume all fields are to be returned. Optional.
+	 * @param string $context                       What context we're going to return shortcodes for. Optional.
+	 * @param bool   $merged                        If TRUE then we don't return shortcodes indexed by field,
+	 *                                              but instead an array of the unique shortcodes for all the given (
+	 *                                              or all) fields. Optional.
+	 * @return array                                an array of shortcodes in the format
+	 *                                              array( '[shortcode] => 'label')
+	 *                                              OR
+	 *                                              FALSE if no shortcodes found.
+	 * @throws ReflectionException
+	 * @throws EE_Error*@since 4.3.0
+	 *
+	 */
+	public static function get_shortcodes(
+		$message_type,
+		$messenger,
+		$fields = array(),
+		$context = 'admin',
+		$merged = false
+	) {
+		$messenger_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $messenger)));
+		$mt_name = str_replace(' ', '_', ucwords(str_replace('_', ' ', $message_type)));
+		/** @var EE_Message_Resource_Manager $message_resource_manager */
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		// convert slug to object
+		$messenger = $message_resource_manager->get_messenger($messenger);
+
+		// if messenger isn't a EE_messenger resource then bail.
+		if (! $messenger instanceof EE_messenger) {
+			return array();
+		}
+
+		// validate class for getting our list of shortcodes
+		$classname = 'EE_Messages_' . $messenger_name . '_' . $mt_name . '_Validator';
+		if (! class_exists($classname)) {
+			$msg[] = esc_html__('The Validator class was unable to load', 'event_espresso');
+			$msg[] = sprintf(
+				esc_html__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'),
+				$classname
+			);
+			throw new EE_Error(implode('||', $msg));
+		}
+
+		/** @type EE_Messages_Validator $_VLD */
+		$_VLD = new $classname(array(), $context);
+		$valid_shortcodes = $_VLD->get_validators();
+
+		// let's make sure we're only getting the shortcode part of the validators
+		$shortcodes = array();
+		foreach ($valid_shortcodes as $field => $validators) {
+			$shortcodes[ $field ] = $validators['shortcodes'];
+		}
+		$valid_shortcodes = $shortcodes;
+
+		// if not all fields let's make sure we ONLY include the shortcodes for the specified fields.
+		if (! empty($fields)) {
+			$specified_shortcodes = array();
+			foreach ($fields as $field) {
+				if (isset($valid_shortcodes[ $field ])) {
+					$specified_shortcodes[ $field ] = $valid_shortcodes[ $field ];
+				}
+			}
+			$valid_shortcodes = $specified_shortcodes;
+		}
+
+		// if not merged then let's replace the fields with the localized fields
+		if (! $merged) {
+			// let's get all the fields for the set messenger so that we can get the localized label and use that in the returned array.
+			$field_settings = $messenger->get_template_fields();
+			$localized = array();
+			foreach ($valid_shortcodes as $field => $shortcodes) {
+				// get localized field label
+				if (isset($field_settings[ $field ])) {
+					// possible that this is used as a main field.
+					if (empty($field_settings[ $field ])) {
+						if (isset($field_settings['extra'][ $field ])) {
+							$_field = $field_settings['extra'][ $field ]['main']['label'];
+						} else {
+							$_field = $field;
+						}
+					} else {
+						$_field = $field_settings[ $field ]['label'];
+					}
+				} elseif (isset($field_settings['extra'])) {
+					// loop through extra "main fields" and see if any of their children have our field
+					foreach ($field_settings['extra'] as $fields) {
+						if (isset($fields[ $field ])) {
+							$_field = $fields[ $field ]['label'];
+						} else {
+							$_field = $field;
+						}
+					}
+				} else {
+					$_field = $field;
+				}
+				if (isset($_field)) {
+					$localized[ (string) $_field ] = $shortcodes;
+				}
+			}
+			$valid_shortcodes = $localized;
+		}
+
+		// if $merged then let's merge all the shortcodes into one list NOT indexed by field.
+		if ($merged) {
+			$merged_codes = array();
+			foreach ($valid_shortcodes as $shortcode) {
+				foreach ($shortcode as $code => $label) {
+					if (isset($merged_codes[ $code ])) {
+						continue;
+					} else {
+						$merged_codes[ $code ] = $label;
+					}
+				}
+			}
+			$valid_shortcodes = $merged_codes;
+		}
+
+		return $valid_shortcodes;
+	}
+
+
+	/**
+	 * Get Messenger object.
+	 *
+	 * @param string $messenger messenger slug for the messenger object we want to retrieve.
+	 * @return EE_messenger
+	 * @throws ReflectionException
+	 * @throws EE_Error*@since 4.3.0
+	 * @deprecated 4.9.0
+	 */
+	public static function messenger_obj($messenger)
+	{
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->get_messenger($messenger);
+	}
+
+
+	/**
+	 * get Message type object
+	 *
+	 * @param string $message_type the slug for the message type object to retrieve
+	 * @return EE_message_type
+	 * @throws ReflectionException
+	 * @throws EE_Error*@since 4.3.0
+	 * @deprecated 4.9.0
+	 */
+	public static function message_type_obj($message_type)
+	{
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->get_message_type($message_type);
+	}
+
+
+	/**
+	 * Given a message_type slug, will return whether that message type is active in the system or not.
+	 *
+	 * @since    4.3.0
+	 * @param string $message_type message type to check for.
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function is_mt_active($message_type)
+	{
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$active_mts = $Message_Resource_Manager->list_of_active_message_types();
+		return in_array($message_type, $active_mts);
+	}
+
+
+	/**
+	 * Given a messenger slug, will return whether that messenger is active in the system or not.
+	 *
+	 * @since    4.3.0
+	 *
+	 * @param string $messenger slug for messenger to check.
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function is_messenger_active($messenger)
+	{
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$active_messenger = $Message_Resource_Manager->get_active_messenger($messenger);
+		return $active_messenger instanceof EE_messenger;
+	}
+
+
+	/**
+	 * Used to return active messengers array stored in the wp options table.
+	 * If no value is present in the option then an empty array is returned.
+	 *
+	 * @deprecated 4.9
+	 * @since      4.3.1
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_active_messengers_in_db()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__('Please use EE_Message_Resource_Manager::get_active_messengers_option() instead.', 'event_espresso'),
+			'4.9.0'
+		);
+		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->get_active_messengers_option();
+	}
+
+
+	/**
+	 * Used to update the active messengers array stored in the wp options table.
+	 *
+	 * @since      4.3.1
+	 * @deprecated 4.9.0
+	 *
+	 * @param array $data_to_save Incoming data to save.
+	 *
+	 * @return bool FALSE if not updated, TRUE if updated.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function update_active_messengers_in_db($data_to_save)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__('Please use EE_Message_Resource_Manager::update_active_messengers_option() instead.', 'event_espresso'),
+			'4.9.0'
+		);
+		/** @var EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		return $Message_Resource_Manager->update_active_messengers_option($data_to_save);
+	}
+
+
+	/**
+	 * This does some validation of incoming params, determines what type of url is being prepped and returns the
+	 * appropriate url trigger
+	 *
+	 * @param EE_message_type $message_type
+	 * @param EE_Message $message
+	 * @param EE_Registration | null $registration  The registration object must be included if this
+	 *                                              is going to be a registration trigger url.
+	 * @param string $sending_messenger             The (optional) sending messenger for the url.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function get_url_trigger(
+		EE_message_type $message_type,
+		EE_Message $message,
+		$registration = null,
+		$sending_messenger = ''
+	) {
+		// first determine if the url can be to the EE_Message object.
+		if (! $message_type->always_generate()) {
+			return EEH_MSG_Template::generate_browser_trigger($message);
+		}
+
+		// if $registration object is not valid then exit early because there's nothing that can be generated.
+		if (! $registration instanceof EE_Registration) {
+			throw new EE_Error(
+				esc_html__('Incoming value for registration is not a valid EE_Registration object.', 'event_espresso')
+			);
+		}
+
+		// validate given context
+		$contexts = $message_type->get_contexts();
+		if ($message->context() !== '' && ! isset($contexts[ $message->context() ])) {
+			throw new EE_Error(
+				sprintf(
+					esc_html__('The context %s is not a valid context for %s.', 'event_espresso'),
+					$message->context(),
+					get_class($message_type)
+				)
+			);
+		}
+
+		// valid sending messenger but only if sending messenger set.  Otherwise generating messenger is used.
+		if (! empty($sending_messenger)) {
+			$with_messengers = $message_type->with_messengers();
+			if (
+				! isset($with_messengers[ $message->messenger() ])
+				 || ! in_array($sending_messenger, $with_messengers[ $message->messenger() ])
+			) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'The given sending messenger string (%1$s) does not match a valid sending messenger with the %2$s.  If this is incorrect, make sure that the message type has defined this messenger as a sending messenger in its $_with_messengers array.',
+							'event_espresso'
+						),
+						$sending_messenger,
+						get_class($message_type)
+					)
+				);
+			}
+		} else {
+			$sending_messenger = $message->messenger();
+		}
+		return EEH_MSG_Template::generate_url_trigger(
+			$sending_messenger,
+			$message->messenger(),
+			$message->context(),
+			$message->message_type(),
+			$registration,
+			$message->GRP_ID()
+		);
+	}
+
+
+	/**
+	 * This returns the url for triggering a in browser view of a specific EE_Message object.
+	 * @param EE_Message $message
+	 * @return string.
+	 */
+	public static function generate_browser_trigger(EE_Message $message)
+	{
+		$query_args = array(
+			'ee' => 'msg_browser_trigger',
+			'token' => $message->MSG_token()
+		);
+		return apply_filters(
+			'FHEE__EEH_MSG_Template__generate_browser_trigger',
+			add_query_arg($query_args, site_url()),
+			$message
+		);
+	}
+
+
+
+
+
+
+	/**
+	 * This returns the url for triggering an in browser view of the error saved on the incoming message object.
+	 * @param EE_Message $message
+	 * @return string
+	 */
+	public static function generate_error_display_trigger(EE_Message $message)
+	{
+		return apply_filters(
+			'FHEE__EEH_MSG_Template__generate_error_display_trigger',
+			add_query_arg(
+				array(
+					'ee' => 'msg_browser_error_trigger',
+					'token' => $message->MSG_token()
+				),
+				site_url()
+			),
+			$message
+		);
+	}
+
+
+	/**
+	 * This generates a url trigger for the msg_url_trigger route using the given arguments
+	 *
+	 * @param string          $sending_messenger      The sending messenger slug.
+	 * @param string          $generating_messenger   The generating messenger slug.
+	 * @param string          $context                The context for the template.
+	 * @param string          $message_type           The message type slug
+	 * @param EE_Registration $registration
+	 * @param integer         $message_template_group id   The EE_Message_Template_Group ID for the template.
+	 * @param integer         $data_id                The id to the EE_Base_Class for getting the data used by the
+	 *                                                trigger.
+	 * @return string          The generated url.
+	 * @throws EE_Error
+	 */
+	public static function generate_url_trigger(
+		$sending_messenger,
+		$generating_messenger,
+		$context,
+		$message_type,
+		EE_Registration $registration,
+		$message_template_group,
+		$data_id = 0
+	) {
+		$query_args = array(
+			'ee' => 'msg_url_trigger',
+			'snd_msgr' => $sending_messenger,
+			'gen_msgr' => $generating_messenger,
+			'message_type' => $message_type,
+			'context' => $context,
+			'token' => $registration->reg_url_link(),
+			'GRP_ID' => $message_template_group,
+			'id' => $data_id
+			);
+		$url = add_query_arg($query_args, get_home_url());
+
+		// made it here so now we can just get the url and filter it.  Filtered globally and by message type.
+		return apply_filters(
+			'FHEE__EEH_MSG_Template__generate_url_trigger',
+			$url,
+			$sending_messenger,
+			$generating_messenger,
+			$context,
+			$message_type,
+			$registration,
+			$message_template_group,
+			$data_id
+		);
+	}
+
+
+
+
+	/**
+	 * Return the specific css for the action icon given.
+	 *
+	 * @param string $type  What action to return.
+	 * @return string[]
+	 * @since 4.9.0
+	 */
+	public static function get_message_action_icon($type)
+	{
+		$action_icons = self::get_message_action_icons();
+		return isset($action_icons[ $type ]) ? $action_icons[ $type ] : [];
+	}
+
+
+	/**
+	 * This is used for retrieving the css classes used for the icons representing message actions.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @return array
+	 */
+	public static function get_message_action_icons()
+	{
+		return apply_filters(
+			'FHEE__EEH_MSG_Template__message_action_icons',
+			array(
+				'view' => array(
+					'label' => esc_html__('View Message', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-visibility',
+				),
+				'error' => array(
+					'label' => esc_html__('View Error Message', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-info',
+				),
+				'see_notifications_for' => array(
+					'label' => esc_html__('View Related Messages', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-megaphone',
+				),
+				'generate_now' => array(
+					'label' => esc_html__('Generate the message now.', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-admin-tools',
+				),
+				'send_now' => array(
+					'label' => esc_html__('Send Immediately', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-controls-forward',
+				),
+				'queue_for_resending' => array(
+					'label' => esc_html__('Queue for Resending', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-controls-repeat',
+				),
+				'view_transaction' => array(
+					'label' => esc_html__('View related Transaction', 'event_espresso'),
+					'css_class' => 'dashicons dashicons-cart',
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * This returns the url for a given action related to EE_Message.
+	 *
+	 * @param string     $type         What type of action to return the url for.
+	 * @param EE_Message $message      Required for generating the correct url for some types.
+	 * @param array      $query_params Any additional query params to be included with the generated url.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 4.9.0
+	 *
+	 */
+	public static function get_message_action_url($type, EE_Message $message = null, $query_params = array())
+	{
+		$action_urls = self::get_message_action_urls($message, $query_params);
+		return isset($action_urls[ $type ])  ? $action_urls[ $type ] : '';
+	}
+
+
+	/**
+	 * This returns all the current urls for EE_Message actions.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @param EE_Message $message      The EE_Message object required to generate correct urls for some types.
+	 * @param array      $query_params Any additional query_params to be included with the generated url.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_message_action_urls(EE_Message $message = null, $query_params = array())
+	{
+		EE_Registry::instance()->load_helper('URL');
+		// if $message is not an instance of EE_Message then let's just do a dummy.
+		$message = empty($message) ? EE_Message_Factory::create() : $message;
+		$action_urls =  apply_filters(
+			'FHEE__EEH_MSG_Template__get_message_action_url',
+			array(
+				'view' => EEH_MSG_Template::generate_browser_trigger($message),
+				'error' => EEH_MSG_Template::generate_error_display_trigger($message),
+				'see_notifications_for' => EEH_URL::add_query_args_and_nonce(
+					array_merge(
+						array(
+							'page' => 'espresso_messages',
+							'action' => 'default',
+							'filterby' => 1,
+						),
+						$query_params
+					),
+					admin_url('admin.php')
+				),
+				'generate_now' => EEH_URL::add_query_args_and_nonce(
+					array(
+						'page' => 'espresso_messages',
+						'action' => 'generate_now',
+						'MSG_ID' => $message->ID()
+					),
+					admin_url('admin.php')
+				),
+				'send_now' => EEH_URL::add_query_args_and_nonce(
+					array(
+						'page' => 'espresso_messages',
+						'action' => 'send_now',
+						'MSG_ID' => $message->ID()
+					),
+					admin_url('admin.php')
+				),
+				'queue_for_resending' => EEH_URL::add_query_args_and_nonce(
+					array(
+						'page' => 'espresso_messages',
+						'action' => 'queue_for_resending',
+						'MSG_ID' => $message->ID()
+					),
+					admin_url('admin.php')
+				),
+			)
+		);
+		if (
+			$message->TXN_ID() > 0
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_read_transaction',
+				'espresso_transactions_default',
+				$message->TXN_ID()
+			)
+		) {
+			$action_urls['view_transaction'] = EEH_URL::add_query_args_and_nonce(
+				array(
+					'page' => 'espresso_transactions',
+					'action' => 'view_transaction',
+					'TXN_ID' => $message->TXN_ID()
+				),
+				admin_url('admin.php')
+			);
+		} else {
+			$action_urls['view_transaction'] = '';
+		}
+		return $action_urls;
+	}
+
+
+	/**
+	 * This returns a generated link html including the icon used for the action link for EE_Message actions.
+	 *
+	 * @param string          $type         What type of action the link is for (if invalid type is passed in then an
+	 *                                      empty string is returned)
+	 * @param EE_Message|null $message      The EE_Message object (required for some actions to generate correctly)
+	 * @param array           $query_params Any extra query params to include in the generated link.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 4.9.0
+	 *
+	 */
+	public static function get_message_action_link($type, EE_Message $message = null, $query_params = array())
+	{
+		$url = EEH_MSG_Template::get_message_action_url($type, $message, $query_params);
+		$icon_css = EEH_MSG_Template::get_message_action_icon($type);
+		$label = $icon_css['label'] ?? null;
+		$label = $label ? 'aria-label="' . $label . '"' : '';
+		$class = $label ? ' ee-aria-tooltip' : '';
+
+		if (empty($url) || empty($icon_css) || ! isset($icon_css['css_class'])) {
+			return '';
+		}
+
+		$icon_css_class = $icon_css['css_class'] . apply_filters(
+			'FHEE__EEH_MSG_Template__get_message_action_link__icon_css_class',
+			' js-ee-message-action-link ee-message-action-link-' . $type,
+			$type,
+			$message,
+			$query_params
+		);
+
+		return '
             <a href="' . $url . '" ' . $label . ' class="button button--icon-only' . $class . '">
                 <span class="' .  esc_attr($icon_css_class) . '"></span>
             </a>';
-    }
-
-
-
-
-
-    /**
-     * This returns an array with keys as reg statuses and values as the corresponding message type slug (filtered).
-     *
-     * @since 4.9.0
-     * @return array
-     */
-    public static function reg_status_to_message_type_array()
-    {
-        return (array) apply_filters(
-            'FHEE__EEH_MSG_Template__reg_status_to_message_type_array',
-            array(
-                EEM_Registration::status_id_approved => 'registration',
-                EEM_Registration::status_id_pending_payment => 'pending_approval',
-                EEM_Registration::status_id_not_approved => 'not_approved_registration',
-                EEM_Registration::status_id_cancelled => 'cancelled_registration',
-                EEM_Registration::status_id_declined => 'declined_registration'
-            )
-        );
-    }
-
-
-
-
-    /**
-     * This returns the corresponding registration message type slug to the given reg status. If there isn't a
-     * match, then returns an empty string.
-     *
-     * @since 4.9.0
-     * @param $reg_status
-     * @return string
-     */
-    public static function convert_reg_status_to_message_type($reg_status)
-    {
-        $reg_status_array = self::reg_status_to_message_type_array();
-        return isset($reg_status_array[ $reg_status ]) ? $reg_status_array[ $reg_status ] : '';
-    }
-
-
-    /**
-     * This returns an array with keys as payment stati and values as the corresponding message type slug (filtered).
-     *
-     * @since 4.9.0
-     * @return array
-     */
-    public static function payment_status_to_message_type_array()
-    {
-        return (array) apply_filters(
-            'FHEE__EEH_MSG_Template__payment_status_to_message_type_array',
-            array(
-                EEM_Payment::status_id_approved => 'payment',
-                EEM_Payment::status_id_pending => 'payment_pending',
-                EEM_Payment::status_id_cancelled => 'payment_cancelled',
-                EEM_Payment::status_id_declined => 'payment_declined',
-                EEM_Payment::status_id_failed => 'payment_failed'
-            )
-        );
-    }
-
-
-
-
-    /**
-     * This returns the corresponding payment message type slug to the given payment status. If there isn't a match then
-     * an empty string is returned
-     *
-     * @since 4.9.0
-     * @param $payment_status
-     * @return string
-     */
-    public static function convert_payment_status_to_message_type($payment_status)
-    {
-        $payment_status_array = self::payment_status_to_message_type_array();
-        return isset($payment_status_array[ $payment_status ]) ? $payment_status_array[ $payment_status ] : '';
-    }
-
-
-    /**
-     * This is used to retrieve the template pack for the given name.
-     *
-     * @param string $template_pack_name  should match the set `dbref` property value on the EE_Messages_Template_Pack.
-     *
-     * @return EE_Messages_Template_Pack
-     */
-    public static function get_template_pack($template_pack_name)
-    {
-        if (! self::$_template_pack_collection instanceof EE_Object_Collection) {
-            self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
-        }
-
-        // first see if in collection already
-        $template_pack = self::$_template_pack_collection->get_by_name($template_pack_name);
-
-        if ($template_pack instanceof EE_Messages_Template_Pack) {
-            return $template_pack;
-        }
-
-        // nope...let's get it.
-        // not set yet so let's attempt to get it.
-        $pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
-            ' ',
-            '_',
-            ucwords(
-                str_replace('_', ' ', $template_pack_name)
-            )
-        );
-        if (! class_exists($pack_class_name) && $template_pack_name !== 'default') {
-            return self::get_template_pack('default');
-        } else {
-            $template_pack = new $pack_class_name();
-            self::$_template_pack_collection->add($template_pack);
-            return $template_pack;
-        }
-    }
-
-
-
-
-    /**
-     * Globs template packs installed in core and returns the template pack collection with all installed template packs
-     * in it.
-     *
-     * @since 4.9.0
-     *
-     * @return EE_Messages_Template_Pack_Collection
-     */
-    public static function get_template_pack_collection()
-    {
-        $new_collection = false;
-        if (! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection) {
-            self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
-            $new_collection = true;
-        }
-
-        // glob the defaults directory for messages
-        $templates = glob(EE_LIBRARIES . 'messages/defaults/*', GLOB_ONLYDIR);
-        foreach ($templates as $template_path) {
-            // grab folder name
-            $template = basename($template_path);
-
-            if (! $new_collection) {
-                // already have it?
-                if (self::$_template_pack_collection->get_by_name($template) instanceof EE_Messages_Template_Pack) {
-                    continue;
-                }
-            }
-
-            // setup classname.
-            $template_pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
-                ' ',
-                '_',
-                ucwords(
-                    str_replace(
-                        '_',
-                        ' ',
-                        $template
-                    )
-                )
-            );
-            if (! class_exists($template_pack_class_name)) {
-                continue;
-            }
-            self::$_template_pack_collection->add(new $template_pack_class_name());
-        }
-
-        /**
-         * Filter for plugins to add in any additional template packs
-         * Note the filter name here is for backward compat, this used to be found in EED_Messages.
-         */
-        $additional_template_packs = apply_filters('FHEE__EED_Messages__get_template_packs__template_packs', array());
-        foreach ((array) $additional_template_packs as $template_pack) {
-            if (
-                self::$_template_pack_collection->get_by_name(
-                    $template_pack->dbref
-                ) instanceof EE_Messages_Template_Pack
-            ) {
-                continue;
-            }
-            self::$_template_pack_collection->add($template_pack);
-        }
-        return self::$_template_pack_collection;
-    }
-
-
-    /**
-     * This is a wrapper for the protected _create_new_templates function
-     *
-     * @param string $messenger_name
-     * @param string $message_type_name message type that the templates are being created for
-     * @param int    $GRP_ID
-     * @param bool   $global
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function create_new_templates($messenger_name, $message_type_name, $GRP_ID = 0, $global = false)
-    {
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
-        $message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
-        if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type, $global)) {
-            return array();
-        }
-        // whew made it this far!  Okay, let's go ahead and create the templates then
-        return EEH_MSG_Template::_create_new_templates($messenger, $message_type, $GRP_ID, $global);
-    }
-
-
-    /**
-     * @param EE_messenger     $messenger
-     * @param EE_message_type  $message_type
-     * @param                  $GRP_ID
-     * @param                  $global
-     * @return array|mixed
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected static function _create_new_templates(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global)
-    {
-        // if we're creating a custom template then we don't need to use the defaults class
-        if (! $global) {
-            return EEH_MSG_Template::_create_custom_template_group($messenger, $message_type, $GRP_ID);
-        }
-        /** @type EE_Messages_Template_Defaults $Message_Template_Defaults */
-        $Message_Template_Defaults = EE_Registry::factory(
-            'EE_Messages_Template_Defaults',
-            array( $messenger, $message_type, $GRP_ID )
-        );
-        // generate templates
-        $success = $Message_Template_Defaults->create_new_templates();
-
-        // if creating the template failed.  Then we should deactivate the related message_type for the messenger because
-        // its not active if it doesn't have a template.  Note this is only happening for GLOBAL template creation
-        // attempts.
-        if (! $success) {
-            /** @var EE_Message_Resource_Manager $message_resource_manager */
-            $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-            $message_resource_manager->deactivate_message_type_for_messenger($message_type->name, $messenger->name);
-        }
-
-        /**
-         * $success is in an array in the following format
-         * array(
-         *    'GRP_ID' => $new_grp_id,
-         *    'MTP_context' => $first_context_in_new_templates,
-         * )
-         */
-        return $success;
-    }
-
-
-    /**
-     * This creates a custom template using the incoming GRP_ID
-     *
-     * @param EE_messenger    $messenger
-     * @param EE_message_type $message_type
-     * @param int             $GRP_ID           GRP_ID for the template_group being used as the base
-     * @return  array $success              This will be an array in the format:
-     *                                          array(
-     *                                          'GRP_ID' => $new_grp_id,
-     *                                          'MTP_context' => $first_context_in_created_template
-     *                                          )
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @access private
-     */
-    private static function _create_custom_template_group(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID)
-    {
-        // defaults
-        $success = array( 'GRP_ID' => null, 'MTP_context' => '' );
-        // get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
-        $Message_Template_Group = empty($GRP_ID)
-            ? EEM_Message_Template_Group::instance()->get_one(
-                array(
-                    array(
-                        'MTP_messenger'    => $messenger->name,
-                        'MTP_message_type' => $message_type->name,
-                        'MTP_is_global'    => true
-                    )
-                )
-            )
-            : EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
-        // if we don't have a mtg at this point then we need to bail.
-        if (! $Message_Template_Group instanceof EE_Message_Template_Group) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html__(
-                        'Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.',
-                        'event_espresso'
-                    ),
-                    $GRP_ID
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return $success;
-        }
-        // let's get all the related message_template objects for this group.
-        $message_templates = $Message_Template_Group->message_templates();
-        // now we have what we need to setup the new template
-        $new_mtg = clone $Message_Template_Group;
-        $new_mtg->set('GRP_ID', 0);
-        $new_mtg->set('MTP_is_global', false);
-
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $template_name = $request->isAjax() && $request->requestParamIsSet('templateName')
-            ? $request->getRequestParam('templateName')
-            : sprintf(
-                esc_html__('Custom %1$s', 'event_espresso'),
-                ucwords($message_type->label['singular']) ?? esc_html__('Template', 'event_espresso')
-            );
-        $template_description = $request->isAjax() && $request->requestParamIsSet('templateDescription')
-            ? $request->getRequestParam('templateDescription')
-            : sprintf(
-                esc_html__(
-                    'This is a custom template that was created for the %s messenger and %s message type.',
-                    'event_espresso'
-                ),
-                $new_mtg->messenger_obj()->label['singular'],
-                $new_mtg->message_type_obj()->label['singular']
-            );
-        $new_mtg->set('MTP_name', $template_name);
-        $new_mtg->set('MTP_description', $template_description);
-        // remove ALL relations on this template group so they don't get saved!
-        $new_mtg->_remove_relations('Message_Template');
-        $new_mtg->save();
-        $success['GRP_ID'] = $new_mtg->ID();
-        $success['template_name'] = $template_name;
-        // add new message templates and add relation to.
-        foreach ($message_templates as $message_template) {
-            if (! $message_template instanceof EE_Message_Template) {
-                continue;
-            }
-            $new_message_template = clone $message_template;
-            $new_message_template->set('MTP_ID', 0);
-            $new_message_template->set('GRP_ID', $new_mtg->ID()); // relation
-            $new_message_template->save();
-            if (empty($success['MTP_context']) && $new_message_template->get('MTP_context') !== 'admin') {
-                $success['MTP_context'] = $new_message_template->get('MTP_context');
-            }
-        }
-        return $success;
-    }
-
-
-    /**
-     * message_type_has_active_templates_for_messenger
-     *
-     * @param EE_messenger    $messenger
-     * @param EE_message_type $message_type
-     * @param bool            $global
-     * @return bool
-     * @throws EE_Error
-     */
-    public static function message_type_has_active_templates_for_messenger(
-        EE_messenger $messenger,
-        EE_message_type $message_type,
-        $global = false
-    ) {
-        // is given message_type valid for given messenger (if this is not a global save)
-        if ($global) {
-            return true;
-        }
-        $active_templates = EEM_Message_Template_Group::instance()->count(
-            array(
-                array(
-                    'MTP_is_active'    => true,
-                    'MTP_messenger'    => $messenger->name,
-                    'MTP_message_type' => $message_type->name
-                )
-            )
-        );
-        if ($active_templates > 0) {
-            return true;
-        }
-        EE_Error::add_error(
-            sprintf(
-                esc_html__(
-                    'The %1$s message type is not registered with the %2$s messenger. Please visit the Messenger activation page to assign this message type first if you want to use it.',
-                    'event_espresso'
-                ),
-                $message_type->name,
-                $messenger->name
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * get_fields
-     * This takes a given messenger and message type and returns all the template fields indexed by context (and with field type).
-     *
-     * @param string $messenger_name    name of EE_messenger
-     * @param string $message_type_name name of EE_message_type
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_fields($messenger_name, $message_type_name)
-    {
-        $template_fields = array();
-        /** @type EE_Message_Resource_Manager $Message_Resource_Manager */
-        $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
-        $message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
-        if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type)) {
-            return array();
-        }
-
-        $excluded_fields_for_messenger = $message_type->excludedFieldsForMessenger($messenger_name);
-
-        // okay now let's assemble an array with the messenger template fields added to the message_type contexts.
-        foreach ($message_type->get_contexts() as $context => $details) {
-            foreach ($messenger->get_template_fields() as $field => $value) {
-                if (in_array($field, $excluded_fields_for_messenger, true)) {
-                    continue;
-                }
-                $template_fields[ $context ][ $field ] = $value;
-            }
-        }
-        if (empty($template_fields)) {
-            EE_Error::add_error(
-                esc_html__('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return array();
-        }
-        return $template_fields;
-    }
+	}
+
+
+
+
+
+	/**
+	 * This returns an array with keys as reg statuses and values as the corresponding message type slug (filtered).
+	 *
+	 * @since 4.9.0
+	 * @return array
+	 */
+	public static function reg_status_to_message_type_array()
+	{
+		return (array) apply_filters(
+			'FHEE__EEH_MSG_Template__reg_status_to_message_type_array',
+			array(
+				EEM_Registration::status_id_approved => 'registration',
+				EEM_Registration::status_id_pending_payment => 'pending_approval',
+				EEM_Registration::status_id_not_approved => 'not_approved_registration',
+				EEM_Registration::status_id_cancelled => 'cancelled_registration',
+				EEM_Registration::status_id_declined => 'declined_registration'
+			)
+		);
+	}
+
+
+
+
+	/**
+	 * This returns the corresponding registration message type slug to the given reg status. If there isn't a
+	 * match, then returns an empty string.
+	 *
+	 * @since 4.9.0
+	 * @param $reg_status
+	 * @return string
+	 */
+	public static function convert_reg_status_to_message_type($reg_status)
+	{
+		$reg_status_array = self::reg_status_to_message_type_array();
+		return isset($reg_status_array[ $reg_status ]) ? $reg_status_array[ $reg_status ] : '';
+	}
+
+
+	/**
+	 * This returns an array with keys as payment stati and values as the corresponding message type slug (filtered).
+	 *
+	 * @since 4.9.0
+	 * @return array
+	 */
+	public static function payment_status_to_message_type_array()
+	{
+		return (array) apply_filters(
+			'FHEE__EEH_MSG_Template__payment_status_to_message_type_array',
+			array(
+				EEM_Payment::status_id_approved => 'payment',
+				EEM_Payment::status_id_pending => 'payment_pending',
+				EEM_Payment::status_id_cancelled => 'payment_cancelled',
+				EEM_Payment::status_id_declined => 'payment_declined',
+				EEM_Payment::status_id_failed => 'payment_failed'
+			)
+		);
+	}
+
+
+
+
+	/**
+	 * This returns the corresponding payment message type slug to the given payment status. If there isn't a match then
+	 * an empty string is returned
+	 *
+	 * @since 4.9.0
+	 * @param $payment_status
+	 * @return string
+	 */
+	public static function convert_payment_status_to_message_type($payment_status)
+	{
+		$payment_status_array = self::payment_status_to_message_type_array();
+		return isset($payment_status_array[ $payment_status ]) ? $payment_status_array[ $payment_status ] : '';
+	}
+
+
+	/**
+	 * This is used to retrieve the template pack for the given name.
+	 *
+	 * @param string $template_pack_name  should match the set `dbref` property value on the EE_Messages_Template_Pack.
+	 *
+	 * @return EE_Messages_Template_Pack
+	 */
+	public static function get_template_pack($template_pack_name)
+	{
+		if (! self::$_template_pack_collection instanceof EE_Object_Collection) {
+			self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
+		}
+
+		// first see if in collection already
+		$template_pack = self::$_template_pack_collection->get_by_name($template_pack_name);
+
+		if ($template_pack instanceof EE_Messages_Template_Pack) {
+			return $template_pack;
+		}
+
+		// nope...let's get it.
+		// not set yet so let's attempt to get it.
+		$pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+			' ',
+			'_',
+			ucwords(
+				str_replace('_', ' ', $template_pack_name)
+			)
+		);
+		if (! class_exists($pack_class_name) && $template_pack_name !== 'default') {
+			return self::get_template_pack('default');
+		} else {
+			$template_pack = new $pack_class_name();
+			self::$_template_pack_collection->add($template_pack);
+			return $template_pack;
+		}
+	}
+
+
+
+
+	/**
+	 * Globs template packs installed in core and returns the template pack collection with all installed template packs
+	 * in it.
+	 *
+	 * @since 4.9.0
+	 *
+	 * @return EE_Messages_Template_Pack_Collection
+	 */
+	public static function get_template_pack_collection()
+	{
+		$new_collection = false;
+		if (! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection) {
+			self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
+			$new_collection = true;
+		}
+
+		// glob the defaults directory for messages
+		$templates = glob(EE_LIBRARIES . 'messages/defaults/*', GLOB_ONLYDIR);
+		foreach ($templates as $template_path) {
+			// grab folder name
+			$template = basename($template_path);
+
+			if (! $new_collection) {
+				// already have it?
+				if (self::$_template_pack_collection->get_by_name($template) instanceof EE_Messages_Template_Pack) {
+					continue;
+				}
+			}
+
+			// setup classname.
+			$template_pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+				' ',
+				'_',
+				ucwords(
+					str_replace(
+						'_',
+						' ',
+						$template
+					)
+				)
+			);
+			if (! class_exists($template_pack_class_name)) {
+				continue;
+			}
+			self::$_template_pack_collection->add(new $template_pack_class_name());
+		}
+
+		/**
+		 * Filter for plugins to add in any additional template packs
+		 * Note the filter name here is for backward compat, this used to be found in EED_Messages.
+		 */
+		$additional_template_packs = apply_filters('FHEE__EED_Messages__get_template_packs__template_packs', array());
+		foreach ((array) $additional_template_packs as $template_pack) {
+			if (
+				self::$_template_pack_collection->get_by_name(
+					$template_pack->dbref
+				) instanceof EE_Messages_Template_Pack
+			) {
+				continue;
+			}
+			self::$_template_pack_collection->add($template_pack);
+		}
+		return self::$_template_pack_collection;
+	}
+
+
+	/**
+	 * This is a wrapper for the protected _create_new_templates function
+	 *
+	 * @param string $messenger_name
+	 * @param string $message_type_name message type that the templates are being created for
+	 * @param int    $GRP_ID
+	 * @param bool   $global
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function create_new_templates($messenger_name, $message_type_name, $GRP_ID = 0, $global = false)
+	{
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
+		$message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
+		if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type, $global)) {
+			return array();
+		}
+		// whew made it this far!  Okay, let's go ahead and create the templates then
+		return EEH_MSG_Template::_create_new_templates($messenger, $message_type, $GRP_ID, $global);
+	}
+
+
+	/**
+	 * @param EE_messenger     $messenger
+	 * @param EE_message_type  $message_type
+	 * @param                  $GRP_ID
+	 * @param                  $global
+	 * @return array|mixed
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected static function _create_new_templates(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global)
+	{
+		// if we're creating a custom template then we don't need to use the defaults class
+		if (! $global) {
+			return EEH_MSG_Template::_create_custom_template_group($messenger, $message_type, $GRP_ID);
+		}
+		/** @type EE_Messages_Template_Defaults $Message_Template_Defaults */
+		$Message_Template_Defaults = EE_Registry::factory(
+			'EE_Messages_Template_Defaults',
+			array( $messenger, $message_type, $GRP_ID )
+		);
+		// generate templates
+		$success = $Message_Template_Defaults->create_new_templates();
+
+		// if creating the template failed.  Then we should deactivate the related message_type for the messenger because
+		// its not active if it doesn't have a template.  Note this is only happening for GLOBAL template creation
+		// attempts.
+		if (! $success) {
+			/** @var EE_Message_Resource_Manager $message_resource_manager */
+			$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+			$message_resource_manager->deactivate_message_type_for_messenger($message_type->name, $messenger->name);
+		}
+
+		/**
+		 * $success is in an array in the following format
+		 * array(
+		 *    'GRP_ID' => $new_grp_id,
+		 *    'MTP_context' => $first_context_in_new_templates,
+		 * )
+		 */
+		return $success;
+	}
+
+
+	/**
+	 * This creates a custom template using the incoming GRP_ID
+	 *
+	 * @param EE_messenger    $messenger
+	 * @param EE_message_type $message_type
+	 * @param int             $GRP_ID           GRP_ID for the template_group being used as the base
+	 * @return  array $success              This will be an array in the format:
+	 *                                          array(
+	 *                                          'GRP_ID' => $new_grp_id,
+	 *                                          'MTP_context' => $first_context_in_created_template
+	 *                                          )
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @access private
+	 */
+	private static function _create_custom_template_group(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID)
+	{
+		// defaults
+		$success = array( 'GRP_ID' => null, 'MTP_context' => '' );
+		// get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
+		$Message_Template_Group = empty($GRP_ID)
+			? EEM_Message_Template_Group::instance()->get_one(
+				array(
+					array(
+						'MTP_messenger'    => $messenger->name,
+						'MTP_message_type' => $message_type->name,
+						'MTP_is_global'    => true
+					)
+				)
+			)
+			: EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
+		// if we don't have a mtg at this point then we need to bail.
+		if (! $Message_Template_Group instanceof EE_Message_Template_Group) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html__(
+						'Something went wrong with generating the custom template from this group id: %s.  This usually happens when there is no matching message template group in the db.',
+						'event_espresso'
+					),
+					$GRP_ID
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return $success;
+		}
+		// let's get all the related message_template objects for this group.
+		$message_templates = $Message_Template_Group->message_templates();
+		// now we have what we need to setup the new template
+		$new_mtg = clone $Message_Template_Group;
+		$new_mtg->set('GRP_ID', 0);
+		$new_mtg->set('MTP_is_global', false);
+
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$template_name = $request->isAjax() && $request->requestParamIsSet('templateName')
+			? $request->getRequestParam('templateName')
+			: sprintf(
+				esc_html__('Custom %1$s', 'event_espresso'),
+				ucwords($message_type->label['singular']) ?? esc_html__('Template', 'event_espresso')
+			);
+		$template_description = $request->isAjax() && $request->requestParamIsSet('templateDescription')
+			? $request->getRequestParam('templateDescription')
+			: sprintf(
+				esc_html__(
+					'This is a custom template that was created for the %s messenger and %s message type.',
+					'event_espresso'
+				),
+				$new_mtg->messenger_obj()->label['singular'],
+				$new_mtg->message_type_obj()->label['singular']
+			);
+		$new_mtg->set('MTP_name', $template_name);
+		$new_mtg->set('MTP_description', $template_description);
+		// remove ALL relations on this template group so they don't get saved!
+		$new_mtg->_remove_relations('Message_Template');
+		$new_mtg->save();
+		$success['GRP_ID'] = $new_mtg->ID();
+		$success['template_name'] = $template_name;
+		// add new message templates and add relation to.
+		foreach ($message_templates as $message_template) {
+			if (! $message_template instanceof EE_Message_Template) {
+				continue;
+			}
+			$new_message_template = clone $message_template;
+			$new_message_template->set('MTP_ID', 0);
+			$new_message_template->set('GRP_ID', $new_mtg->ID()); // relation
+			$new_message_template->save();
+			if (empty($success['MTP_context']) && $new_message_template->get('MTP_context') !== 'admin') {
+				$success['MTP_context'] = $new_message_template->get('MTP_context');
+			}
+		}
+		return $success;
+	}
+
+
+	/**
+	 * message_type_has_active_templates_for_messenger
+	 *
+	 * @param EE_messenger    $messenger
+	 * @param EE_message_type $message_type
+	 * @param bool            $global
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	public static function message_type_has_active_templates_for_messenger(
+		EE_messenger $messenger,
+		EE_message_type $message_type,
+		$global = false
+	) {
+		// is given message_type valid for given messenger (if this is not a global save)
+		if ($global) {
+			return true;
+		}
+		$active_templates = EEM_Message_Template_Group::instance()->count(
+			array(
+				array(
+					'MTP_is_active'    => true,
+					'MTP_messenger'    => $messenger->name,
+					'MTP_message_type' => $message_type->name
+				)
+			)
+		);
+		if ($active_templates > 0) {
+			return true;
+		}
+		EE_Error::add_error(
+			sprintf(
+				esc_html__(
+					'The %1$s message type is not registered with the %2$s messenger. Please visit the Messenger activation page to assign this message type first if you want to use it.',
+					'event_espresso'
+				),
+				$message_type->name,
+				$messenger->name
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * get_fields
+	 * This takes a given messenger and message type and returns all the template fields indexed by context (and with field type).
+	 *
+	 * @param string $messenger_name    name of EE_messenger
+	 * @param string $message_type_name name of EE_message_type
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_fields($messenger_name, $message_type_name)
+	{
+		$template_fields = array();
+		/** @type EE_Message_Resource_Manager $Message_Resource_Manager */
+		$Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
+		$message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
+		if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type)) {
+			return array();
+		}
+
+		$excluded_fields_for_messenger = $message_type->excludedFieldsForMessenger($messenger_name);
+
+		// okay now let's assemble an array with the messenger template fields added to the message_type contexts.
+		foreach ($message_type->get_contexts() as $context => $details) {
+			foreach ($messenger->get_template_fields() as $field => $value) {
+				if (in_array($field, $excluded_fields_for_messenger, true)) {
+					continue;
+				}
+				$template_fields[ $context ][ $field ] = $value;
+			}
+		}
+		if (empty($template_fields)) {
+			EE_Error::add_error(
+				esc_html__('Something went wrong and we couldn\'t get any templates assembled', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return array();
+		}
+		return $template_fields;
+	}
 }

Spacing +58 added lines, -58 removed lines

@@ -101,7 +101,7 @@ 
                 $global
             );
 
-            if (! $new_message_template_group) {
+            if ( ! $new_message_template_group) {
                 continue;
             }
             $templates[] = $new_message_template_group;
@@ -136,7 +136,7 @@ 
                     )
                 )
             )
-            : EEM_Message_Template::instance()->count(array( array( 'GRP_ID' => $GRP_ID ) ));
+            : EEM_Message_Template::instance()->count(array(array('GRP_ID' => $GRP_ID)));
 
         return $count > 0;
     }
@@ -153,14 +153,14 @@ 
      */
     public static function update_to_active($messenger_names, $message_type_names)
     {
-        $messenger_names = is_array($messenger_names) ? $messenger_names : array( $messenger_names );
-        $message_type_names = is_array($message_type_names) ? $message_type_names : array( $message_type_names );
+        $messenger_names = is_array($messenger_names) ? $messenger_names : array($messenger_names);
+        $message_type_names = is_array($message_type_names) ? $message_type_names : array($message_type_names);
         return EEM_Message_Template_Group::instance()->update(
-            array( 'MTP_is_active' => 1 ),
+            array('MTP_is_active' => 1),
             array(
                 array(
-                    'MTP_messenger'     => array( 'IN', $messenger_names ),
-                    'MTP_message_type'  => array( 'IN', $message_type_names )
+                    'MTP_messenger'     => array('IN', $messenger_names),
+                    'MTP_message_type'  => array('IN', $message_type_names)
                 )
             )
         );
@@ -248,13 +248,13 @@ 
         $messenger = $message_resource_manager->get_messenger($messenger);
 
         // if messenger isn't a EE_messenger resource then bail.
-        if (! $messenger instanceof EE_messenger) {
+        if ( ! $messenger instanceof EE_messenger) {
             return array();
         }
 
         // validate class for getting our list of shortcodes
-        $classname = 'EE_Messages_' . $messenger_name . '_' . $mt_name . '_Validator';
-        if (! class_exists($classname)) {
+        $classname = 'EE_Messages_'.$messenger_name.'_'.$mt_name.'_Validator';
+        if ( ! class_exists($classname)) {
             $msg[] = esc_html__('The Validator class was unable to load', 'event_espresso');
             $msg[] = sprintf(
                 esc_html__('The class name compiled was %s. Please check and make sure the spelling and case is correct for the class name and that there is an autoloader in place for this class', 'event_espresso'),
@@ -270,44 +270,44 @@ 
         // let's make sure we're only getting the shortcode part of the validators
         $shortcodes = array();
         foreach ($valid_shortcodes as $field => $validators) {
-            $shortcodes[ $field ] = $validators['shortcodes'];
+            $shortcodes[$field] = $validators['shortcodes'];
         }
         $valid_shortcodes = $shortcodes;
 
         // if not all fields let's make sure we ONLY include the shortcodes for the specified fields.
-        if (! empty($fields)) {
+        if ( ! empty($fields)) {
             $specified_shortcodes = array();
             foreach ($fields as $field) {
-                if (isset($valid_shortcodes[ $field ])) {
-                    $specified_shortcodes[ $field ] = $valid_shortcodes[ $field ];
+                if (isset($valid_shortcodes[$field])) {
+                    $specified_shortcodes[$field] = $valid_shortcodes[$field];
                 }
             }
             $valid_shortcodes = $specified_shortcodes;
         }
 
         // if not merged then let's replace the fields with the localized fields
-        if (! $merged) {
+        if ( ! $merged) {
             // let's get all the fields for the set messenger so that we can get the localized label and use that in the returned array.
             $field_settings = $messenger->get_template_fields();
             $localized = array();
             foreach ($valid_shortcodes as $field => $shortcodes) {
                 // get localized field label
-                if (isset($field_settings[ $field ])) {
+                if (isset($field_settings[$field])) {
                     // possible that this is used as a main field.
-                    if (empty($field_settings[ $field ])) {
-                        if (isset($field_settings['extra'][ $field ])) {
-                            $_field = $field_settings['extra'][ $field ]['main']['label'];
+                    if (empty($field_settings[$field])) {
+                        if (isset($field_settings['extra'][$field])) {
+                            $_field = $field_settings['extra'][$field]['main']['label'];
                         } else {
                             $_field = $field;
                         }
                     } else {
-                        $_field = $field_settings[ $field ]['label'];
+                        $_field = $field_settings[$field]['label'];
                     }
                 } elseif (isset($field_settings['extra'])) {
                     // loop through extra "main fields" and see if any of their children have our field
                     foreach ($field_settings['extra'] as $fields) {
-                        if (isset($fields[ $field ])) {
-                            $_field = $fields[ $field ]['label'];
+                        if (isset($fields[$field])) {
+                            $_field = $fields[$field]['label'];
                         } else {
                             $_field = $field;
                         }
@@ -316,7 +316,7 @@ 
                     $_field = $field;
                 }
                 if (isset($_field)) {
-                    $localized[ (string) $_field ] = $shortcodes;
+                    $localized[(string) $_field] = $shortcodes;
                 }
             }
             $valid_shortcodes = $localized;
@@ -327,10 +327,10 @@ 
             $merged_codes = array();
             foreach ($valid_shortcodes as $shortcode) {
                 foreach ($shortcode as $code => $label) {
-                    if (isset($merged_codes[ $code ])) {
+                    if (isset($merged_codes[$code])) {
                         continue;
                     } else {
-                        $merged_codes[ $code ] = $label;
+                        $merged_codes[$code] = $label;
                     }
                 }
             }
@@ -481,12 +481,12 @@ 
         $sending_messenger = ''
     ) {
         // first determine if the url can be to the EE_Message object.
-        if (! $message_type->always_generate()) {
+        if ( ! $message_type->always_generate()) {
             return EEH_MSG_Template::generate_browser_trigger($message);
         }
 
         // if $registration object is not valid then exit early because there's nothing that can be generated.
-        if (! $registration instanceof EE_Registration) {
+        if ( ! $registration instanceof EE_Registration) {
             throw new EE_Error(
                 esc_html__('Incoming value for registration is not a valid EE_Registration object.', 'event_espresso')
             );
@@ -494,7 +494,7 @@ 
 
         // validate given context
         $contexts = $message_type->get_contexts();
-        if ($message->context() !== '' && ! isset($contexts[ $message->context() ])) {
+        if ($message->context() !== '' && ! isset($contexts[$message->context()])) {
             throw new EE_Error(
                 sprintf(
                     esc_html__('The context %s is not a valid context for %s.', 'event_espresso'),
@@ -505,11 +505,11 @@ 
         }
 
         // valid sending messenger but only if sending messenger set.  Otherwise generating messenger is used.
-        if (! empty($sending_messenger)) {
+        if ( ! empty($sending_messenger)) {
             $with_messengers = $message_type->with_messengers();
             if (
-                ! isset($with_messengers[ $message->messenger() ])
-                 || ! in_array($sending_messenger, $with_messengers[ $message->messenger() ])
+                ! isset($with_messengers[$message->messenger()])
+                 || ! in_array($sending_messenger, $with_messengers[$message->messenger()])
             ) {
                 throw new EE_Error(
                     sprintf(
@@ -642,7 +642,7 @@ 
     public static function get_message_action_icon($type)
     {
         $action_icons = self::get_message_action_icons();
-        return isset($action_icons[ $type ]) ? $action_icons[ $type ] : [];
+        return isset($action_icons[$type]) ? $action_icons[$type] : [];
     }
 
 
@@ -707,7 +707,7 @@ 
     public static function get_message_action_url($type, EE_Message $message = null, $query_params = array())
     {
         $action_urls = self::get_message_action_urls($message, $query_params);
-        return isset($action_urls[ $type ])  ? $action_urls[ $type ] : '';
+        return isset($action_urls[$type]) ? $action_urls[$type] : '';
     }
 
 
@@ -728,7 +728,7 @@ 
         EE_Registry::instance()->load_helper('URL');
         // if $message is not an instance of EE_Message then let's just do a dummy.
         $message = empty($message) ? EE_Message_Factory::create() : $message;
-        $action_urls =  apply_filters(
+        $action_urls = apply_filters(
             'FHEE__EEH_MSG_Template__get_message_action_url',
             array(
                 'view' => EEH_MSG_Template::generate_browser_trigger($message),
@@ -812,24 +812,24 @@ 
         $url = EEH_MSG_Template::get_message_action_url($type, $message, $query_params);
         $icon_css = EEH_MSG_Template::get_message_action_icon($type);
         $label = $icon_css['label'] ?? null;
-        $label = $label ? 'aria-label="' . $label . '"' : '';
+        $label = $label ? 'aria-label="'.$label.'"' : '';
         $class = $label ? ' ee-aria-tooltip' : '';
 
         if (empty($url) || empty($icon_css) || ! isset($icon_css['css_class'])) {
             return '';
         }
 
-        $icon_css_class = $icon_css['css_class'] . apply_filters(
+        $icon_css_class = $icon_css['css_class'].apply_filters(
             'FHEE__EEH_MSG_Template__get_message_action_link__icon_css_class',
-            ' js-ee-message-action-link ee-message-action-link-' . $type,
+            ' js-ee-message-action-link ee-message-action-link-'.$type,
             $type,
             $message,
             $query_params
         );
 
         return '
-            <a href="' . $url . '" ' . $label . ' class="button button--icon-only' . $class . '">
-                <span class="' .  esc_attr($icon_css_class) . '"></span>
+            <a href="' . $url.'" '.$label.' class="button button--icon-only'.$class.'">
+                <span class="' .  esc_attr($icon_css_class).'"></span>
             </a>';
     }
 
@@ -871,7 +871,7 @@ 
     public static function convert_reg_status_to_message_type($reg_status)
     {
         $reg_status_array = self::reg_status_to_message_type_array();
-        return isset($reg_status_array[ $reg_status ]) ? $reg_status_array[ $reg_status ] : '';
+        return isset($reg_status_array[$reg_status]) ? $reg_status_array[$reg_status] : '';
     }
 
 
@@ -909,7 +909,7 @@ 
     public static function convert_payment_status_to_message_type($payment_status)
     {
         $payment_status_array = self::payment_status_to_message_type_array();
-        return isset($payment_status_array[ $payment_status ]) ? $payment_status_array[ $payment_status ] : '';
+        return isset($payment_status_array[$payment_status]) ? $payment_status_array[$payment_status] : '';
     }
 
 
@@ -922,7 +922,7 @@ 
      */
     public static function get_template_pack($template_pack_name)
     {
-        if (! self::$_template_pack_collection instanceof EE_Object_Collection) {
+        if ( ! self::$_template_pack_collection instanceof EE_Object_Collection) {
             self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
         }
 
@@ -935,14 +935,14 @@ 
 
         // nope...let's get it.
         // not set yet so let's attempt to get it.
-        $pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+        $pack_class_name = 'EE_Messages_Template_Pack_'.str_replace(
             ' ',
             '_',
             ucwords(
                 str_replace('_', ' ', $template_pack_name)
             )
         );
-        if (! class_exists($pack_class_name) && $template_pack_name !== 'default') {
+        if ( ! class_exists($pack_class_name) && $template_pack_name !== 'default') {
             return self::get_template_pack('default');
         } else {
             $template_pack = new $pack_class_name();
@@ -965,18 +965,18 @@ 
     public static function get_template_pack_collection()
     {
         $new_collection = false;
-        if (! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection) {
+        if ( ! self::$_template_pack_collection instanceof EE_Messages_Template_Pack_Collection) {
             self::$_template_pack_collection = new EE_Messages_Template_Pack_Collection();
             $new_collection = true;
         }
 
         // glob the defaults directory for messages
-        $templates = glob(EE_LIBRARIES . 'messages/defaults/*', GLOB_ONLYDIR);
+        $templates = glob(EE_LIBRARIES.'messages/defaults/*', GLOB_ONLYDIR);
         foreach ($templates as $template_path) {
             // grab folder name
             $template = basename($template_path);
 
-            if (! $new_collection) {
+            if ( ! $new_collection) {
                 // already have it?
                 if (self::$_template_pack_collection->get_by_name($template) instanceof EE_Messages_Template_Pack) {
                     continue;
@@ -984,7 +984,7 @@ 
             }
 
             // setup classname.
-            $template_pack_class_name = 'EE_Messages_Template_Pack_' . str_replace(
+            $template_pack_class_name = 'EE_Messages_Template_Pack_'.str_replace(
                 ' ',
                 '_',
                 ucwords(
@@ -995,7 +995,7 @@ 
                     )
                 )
             );
-            if (! class_exists($template_pack_class_name)) {
+            if ( ! class_exists($template_pack_class_name)) {
                 continue;
             }
             self::$_template_pack_collection->add(new $template_pack_class_name());
@@ -1037,7 +1037,7 @@ 
         $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
         $messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
         $message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
-        if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type, $global)) {
+        if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type, $global)) {
             return array();
         }
         // whew made it this far!  Okay, let's go ahead and create the templates then
@@ -1057,13 +1057,13 @@ 
     protected static function _create_new_templates(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID, $global)
     {
         // if we're creating a custom template then we don't need to use the defaults class
-        if (! $global) {
+        if ( ! $global) {
             return EEH_MSG_Template::_create_custom_template_group($messenger, $message_type, $GRP_ID);
         }
         /** @type EE_Messages_Template_Defaults $Message_Template_Defaults */
         $Message_Template_Defaults = EE_Registry::factory(
             'EE_Messages_Template_Defaults',
-            array( $messenger, $message_type, $GRP_ID )
+            array($messenger, $message_type, $GRP_ID)
         );
         // generate templates
         $success = $Message_Template_Defaults->create_new_templates();
@@ -1071,7 +1071,7 @@ 
         // if creating the template failed.  Then we should deactivate the related message_type for the messenger because
         // its not active if it doesn't have a template.  Note this is only happening for GLOBAL template creation
         // attempts.
-        if (! $success) {
+        if ( ! $success) {
             /** @var EE_Message_Resource_Manager $message_resource_manager */
             $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
             $message_resource_manager->deactivate_message_type_for_messenger($message_type->name, $messenger->name);
@@ -1106,7 +1106,7 @@ 
     private static function _create_custom_template_group(EE_messenger $messenger, EE_message_type $message_type, $GRP_ID)
     {
         // defaults
-        $success = array( 'GRP_ID' => null, 'MTP_context' => '' );
+        $success = array('GRP_ID' => null, 'MTP_context' => '');
         // get the template group to use as a template from the db.  If $GRP_ID is empty then we'll assume the base will be the global template matching the messenger and message type.
         $Message_Template_Group = empty($GRP_ID)
             ? EEM_Message_Template_Group::instance()->get_one(
@@ -1120,7 +1120,7 @@ 
             )
             : EEM_Message_Template_Group::instance()->get_one_by_ID($GRP_ID);
         // if we don't have a mtg at this point then we need to bail.
-        if (! $Message_Template_Group instanceof EE_Message_Template_Group) {
+        if ( ! $Message_Template_Group instanceof EE_Message_Template_Group) {
             EE_Error::add_error(
                 sprintf(
                     esc_html__(
@@ -1169,7 +1169,7 @@ 
         $success['template_name'] = $template_name;
         // add new message templates and add relation to.
         foreach ($message_templates as $message_template) {
-            if (! $message_template instanceof EE_Message_Template) {
+            if ( ! $message_template instanceof EE_Message_Template) {
                 continue;
             }
             $new_message_template = clone $message_template;
@@ -1248,7 +1248,7 @@ 
         $Message_Resource_Manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
         $messenger = $Message_Resource_Manager->valid_messenger($messenger_name);
         $message_type = $Message_Resource_Manager->valid_message_type($message_type_name);
-        if (! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type)) {
+        if ( ! EEH_MSG_Template::message_type_has_active_templates_for_messenger($messenger, $message_type)) {
             return array();
         }
 
@@ -1260,7 +1260,7 @@ 
                 if (in_array($field, $excluded_fields_for_messenger, true)) {
                     continue;
                 }
-                $template_fields[ $context ][ $field ] = $value;
+                $template_fields[$context][$field] = $value;
             }
         }
         if (empty($template_fields)) {

core/helpers/EEH_Event_Query.helper.php

Indentation +677 added lines, -677 removed lines

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

Spacing +39 added lines, -39 removed lines

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

core/EE_Dependency_Map.core.php

Indentation +1142 added lines, -1142 removed lines

@@ -20,1146 +20,1146 @@
  */
 class EE_Dependency_Map
 {
-    /**
-     * This means that the requested class dependency is not present in the dependency map
-     */
-    const not_registered = 0;
-
-    /**
-     * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
-     */
-    const load_new_object = 1;
-
-    /**
-     * This instructs class loaders to return a previously instantiated and cached object for the requested class.
-     * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
-     */
-    const load_from_cache = 2;
-
-    /**
-     * When registering a dependency,
-     * this indicates to keep any existing dependencies that already exist,
-     * and simply discard any new dependencies declared in the incoming data
-     */
-    const KEEP_EXISTING_DEPENDENCIES = 0;
-
-    /**
-     * When registering a dependency,
-     * this indicates to overwrite any existing dependencies that already exist using the incoming data
-     */
-    const OVERWRITE_DEPENDENCIES = 1;
-
-    protected static ?EE_Dependency_Map $_instance = null;
-
-    private ClassInterfaceCache $class_cache;
-
-    protected ?RequestInterface $request = null;
-
-    protected ?LegacyRequestInterface $legacy_request = null;
-
-    protected ?ResponseInterface $response = null;
-
-    protected ?LoaderInterface $loader = null;
-
-    protected array $_dependency_map = [];
-
-    protected array $_class_loaders = [];
-
-
-    /**
-     * EE_Dependency_Map constructor.
-     *
-     * @param ClassInterfaceCache $class_cache
-     */
-    protected function __construct(ClassInterfaceCache $class_cache)
-    {
-        $this->class_cache = $class_cache;
-        do_action('EE_Dependency_Map____construct', $this);
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidAliasException
-     */
-    public function initialize()
-    {
-        $this->_register_core_dependencies();
-        $this->_register_core_class_loaders();
-        $this->_register_core_aliases();
-    }
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @param ClassInterfaceCache|null $class_cache
-     * @return EE_Dependency_Map
-     */
-    public static function instance(ClassInterfaceCache $class_cache = null): EE_Dependency_Map
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (
-            ! EE_Dependency_Map::$_instance instanceof EE_Dependency_Map
-            && $class_cache instanceof ClassInterfaceCache
-        ) {
-            EE_Dependency_Map::$_instance = new EE_Dependency_Map($class_cache);
-        }
-        return EE_Dependency_Map::$_instance;
-    }
-
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function setRequest(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-
-    /**
-     * @param LegacyRequestInterface $legacy_request
-     */
-    public function setLegacyRequest(LegacyRequestInterface $legacy_request)
-    {
-        $this->legacy_request = $legacy_request;
-    }
-
-
-    /**
-     * @param ResponseInterface $response
-     */
-    public function setResponse(ResponseInterface $response)
-    {
-        $this->response = $response;
-    }
-
-
-    /**
-     * @param LoaderInterface $loader
-     */
-    public function setLoader(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-
-    /**
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public static function register_dependencies(
-        string $class,
-        array $dependencies,
-        int $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ): bool {
-        return EE_Dependency_Map::$_instance->registerDependencies($class, $dependencies, $overwrite);
-    }
-
-
-    /**
-     * Assigns an array of class names and corresponding load sources (new or cached)
-     * to the class specified by the first parameter.
-     * IMPORTANT !!!
-     * The order of elements in the incoming $dependencies array MUST match
-     * the order of the constructor parameters for the class in question.
-     * This is especially important when overriding any existing dependencies that are registered.
-     * the third parameter controls whether any duplicate dependencies are overwritten or not.
-     *
-     * @param string $class
-     * @param array  $dependencies
-     * @param int    $overwrite
-     * @return bool
-     */
-    public function registerDependencies(
-        string $class,
-        array $dependencies,
-        int $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
-    ): bool {
-        if (empty($dependencies)) {
-            return false;
-        }
-        $class      = trim($class, '\\');
-        $registered = false;
-        if (empty(EE_Dependency_Map::$_instance->_dependency_map[ $class ])) {
-            EE_Dependency_Map::$_instance->_dependency_map[ $class ] = [];
-        }
-        // we need to make sure that any aliases used when registering a dependency
-        // get resolved to the correct class name
-        foreach ($dependencies as $dependency => $load_source) {
-            $alias = EE_Dependency_Map::$_instance->getFqnForAlias($dependency);
-            if (
-                $overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
-                || ! isset(
-                    EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $dependency ],
-                    EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $alias ]
-                )
-            ) {
-                unset($dependencies[ $dependency ]);
-                $dependencies[ $alias ] = $load_source;
-                $registered             = true;
-            }
-        }
-        // now add our two lists of dependencies together.
-        // using Union (+=) favours the arrays in precedence from left to right,
-        // so $dependencies is NOT overwritten because it is listed first
-        // ie: with A = B + C, entries in B take precedence over duplicate entries in C
-        // Union is way faster than array_merge() but should be used with caution...
-        // especially with numerically indexed arrays
-        $dependencies += EE_Dependency_Map::$_instance->_dependency_map[ $class ];
-        // now we need to ensure that the resulting dependencies
-        // array only has the entries that are required for the class
-        // so first count how many dependencies were originally registered for the class
-        $dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]);
-        // if that count is non-zero (meaning dependencies were already registered)
-        EE_Dependency_Map::$_instance->_dependency_map[ $class ] = $dependency_count
-            // then truncate the  final array to match that count
-            ? array_slice($dependencies, 0, $dependency_count)
-            // otherwise just take the incoming array because nothing previously existed
-            : $dependencies;
-        return $registered
-               || count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]) === count($dependencies);
-    }
-
-
-    /**
-     * @param string          $class_name
-     * @param callable|string $loader
-     * @param bool            $overwrite
-     * @return bool
-     * @throws DomainException
-     */
-    public static function register_class_loader(
-        string $class_name,
-        $loader = 'load_core',
-        bool $overwrite = false
-    ): bool {
-        return EE_Dependency_Map::$_instance->registerClassLoader($class_name, $loader, $overwrite);
-    }
-
-
-    /**
-     * @param string         $class_name
-     * @param Closure|string $loader
-     * @param bool           $overwrite
-     * @return bool
-     * @throws DomainException
-     */
-    public function registerClassLoader(string $class_name, $loader = 'load_core', bool $overwrite = false): bool
-    {
-        if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
-            throw new DomainException(
-                esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
-            );
-        }
-        // check that loader is callable or method starts with "load_" and exists in EE_Registry
-        if (
-            ! is_callable($loader)
-            && (
-                strpos($loader, 'load_') !== 0
-                || ! method_exists('EE_Registry', $loader)
-            )
-        ) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        '"%1$s" is not a valid loader method on EE_Registry.',
-                        'event_espresso'
-                    ),
-                    $loader
-                )
-            );
-        }
-        $class_name = EE_Dependency_Map::$_instance->getFqnForAlias($class_name);
-        if ($overwrite || ! isset(EE_Dependency_Map::$_instance->_class_loaders[ $class_name ])) {
-            EE_Dependency_Map::$_instance->_class_loaders[ $class_name ] = $loader;
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function dependency_map(): array
-    {
-        return $this->_dependency_map;
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name
-     *
-     * @param string $class_name
-     * @return boolean
-     */
-    public function has(string $class_name = ''): bool
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        return isset($this->_dependency_map[ $class_name ]);
-    }
-
-
-    /**
-     * returns TRUE if dependency map contains a listing for the provided class name AND dependency
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return bool
-     */
-    public function has_dependency_for_class(string $class_name = '', string $dependency = ''): bool
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency, $class_name);
-        return isset($this->_dependency_map[ $class_name ][ $dependency ]);
-    }
-
-
-    /**
-     * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
-     *
-     * @param string $class_name
-     * @param string $dependency
-     * @return int
-     */
-    public function loading_strategy_for_class_dependency(string $class_name = '', string $dependency = ''): int
-    {
-        // all legacy models have the same dependencies
-        if (strpos($class_name, 'EEM_') === 0) {
-            $class_name = 'LEGACY_MODELS';
-        }
-        $dependency = $this->getFqnForAlias($dependency);
-        return $this->has_dependency_for_class($class_name, $dependency)
-            ? $this->_dependency_map[ $class_name ][ $dependency ]
-            : EE_Dependency_Map::not_registered;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return string | Closure
-     */
-    public function class_loader(string $class_name)
-    {
-        // all legacy models use load_model()
-        if (strpos($class_name, 'EEM_') === 0) {
-            return 'load_model';
-        }
-        // EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
-        // perform strpos() first to avoid loading regex every time we load a class
-        if (
-            strpos($class_name, 'EE_CPT_') === 0
-            && preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
-        ) {
-            return 'load_core';
-        }
-        $class_name = $this->getFqnForAlias($class_name);
-        return $this->_class_loaders[ $class_name ] ?? '';
-    }
-
-
-    /**
-     * @return array
-     */
-    public function class_loaders(): array
-    {
-        return $this->_class_loaders;
-    }
-
-
-    /**
-     * adds an alias for a classname
-     *
-     * @param string $fqcn      the class name that should be used (concrete class to replace interface)
-     * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
-     * @param string $for_class the class that has the dependency (is type hinting for the interface)
-     * @throws InvalidAliasException
-     */
-    public function add_alias(string $fqcn, string $alias, string $for_class = '')
-    {
-        $this->class_cache->addAlias($fqcn, $alias, $for_class);
-    }
-
-
-    /**
-     * Returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     */
-    public function isAlias(string $fqn = '', string $for_class = ''): bool
-    {
-        return $this->class_cache->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     */
-    public function getFqnForAlias(string $alias = '', string $for_class = ''): string
-    {
-        return $this->class_cache->getFqnForAlias($alias, $for_class);
-    }
-
-
-    /**
-     * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
-     * if one exists, or whether a new object should be generated every time the requested class is loaded.
-     * This is done by using the following class constants:
-     *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
-     *        EE_Dependency_Map::load_new_object - generates a new object every time
-     */
-    protected function _register_core_dependencies()
-    {
-        $this->_dependency_map = [
-            'EE_Admin'                                                                                                           => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Request_Handler'                                                                                                 => [
-                'EventEspresso\core\services\request\Request'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Response' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_System'                                                                                                          => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
-                'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\Router'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Session'                                                                                                         => [
-                'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\encryption\Base64Encoder'     => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\session\SessionStartHandler'                                                            => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache
-            ],
-            'EE_Cart'                                                                                                            => [
-                'EE_Session' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messenger_Collection_Loader'                                                                                     => [
-                'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Message_Type_Collection_Loader'                                                                                  => [
-                'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Message_Resource_Manager'                                                                                        => [
-                'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
-                'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
-                'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Message_Factory'                                                                                                 => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_messages'                                                                                                        => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Generator'                                                                                              => [
-                'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
-                'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
-                'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
-                'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Processor'                                                                                              => [
-                'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Messages_Queue'                                                                                                  => [
-                'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
-            ],
-            'EE_Messages_Template_Defaults'                                                                                      => [
-                'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
-                'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Message_To_Generate_From_Request'                                                                                => [
-                'EE_Message_Resource_Manager'                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandBus'                                                                    => [
-                'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\services\commands\CommandHandler'                                                                     => [
-                'EE_Registry'         => EE_Dependency_Map::load_from_cache,
-                'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandHandlerManager'                                                         => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CompositeCommandHandler'                                                       => [
-                'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\CommandFactory'                                                                => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\commands\middleware\CapChecker'                                                         => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                                => [
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                            => [
-                'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\registration\CreateRegistrationCommandHandler'                          => [
-                'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => [
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => [
-                'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => [
-                'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => [
-                'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => [
-                'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => [
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                          => [
-                'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler'                                  => [
-                'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\values\session\SessionLifespan'                                                           => [
-                'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\caffeinated\admin\extend\registration_form\forms\SessionLifespanForm'                                 => [
-                'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\caffeinated\admin\extend\registration_form\forms\SessionLifespanFormHandler'                          => [
-                'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\database\TableManager'                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Data_Migration_Class_Base'                                                                                       => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_1_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_2_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_3_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_4_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_5_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_6_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_7_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_8_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_9_0'                                                                                                  => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_4_10_0'                                                                                                 => [
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-                'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_DMS_Core_5_0_0'                                                                                                  => [
-                'EE_DMS_Core_4_10_0'                                 => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\I18nRegistry'                                                                    => [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\Registry'                                                                        => [
-                'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\assets\AssetManifest'   => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled'                                                    => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout'                                                     => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees'                                               => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoEvents'                                                       => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou'                                                     => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector'                                               => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage'                                                      => [
-                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\cache\BasicCacheManager'                                                                => [
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                          => [
-                'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                         => [
-                'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\values\EmailAddress'                                                                      => [
-                null,
-                'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\orm\ModelFieldFactory'                                                                  => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'LEGACY_MODELS'                                                                                                      => [
-                null,
-                'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Module_Request_Router'                                                                                           => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Registration_Processor'                                                                                          => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                             => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                           => [
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-                'EE_Session'             => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\DisplayTicketSelector'                                                        => [
-                'EventEspresso\core\domain\entities\users\CurrentUser' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'          => EE_Dependency_Map::load_from_cache,
-                'EE_Ticket_Selector_Config'                            => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                        => [
-                'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
-                'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
-                'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\ProcessTicketSelectorPostData'                                                => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'                                   => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                            => [
-                'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                                     => [
-                'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                       => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                                      => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_CPT_Strategy'                                                                                                    => [
-                'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\loaders\ObjectIdentifier'                                                               => [
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\CPTs\CptQueryModifier'                                                                           => [
-                null,
-                null,
-                null,
-                'EventEspresso\core\services\request\CurrentPage' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'      => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\dependencies\DependencyResolver'                                                        => [
-                'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-                'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver'                                      => [
-                'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
-                'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'                                                 => [
-                'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'                                    => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\RouteMatchSpecificationManager'                                                 => [
-                'EventEspresso\core\services\routing\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'    => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\request\files\FilesDataHandler'                                                         => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\libraries\batch\BatchRequestProcessor'                                                             => [
-                'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\converters\RestApiSpoofer'                                                       => [
-                'WP_REST_Server'                                               => EE_Dependency_Map::load_from_cache,
-                'EED_Core_Rest_Api'                                            => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\libraries\rest_api\controllers\model\Read' => EE_Dependency_Map::load_from_cache,
-                null,
-            ],
-            'EventEspresso\core\services\routing\RouteHandler'                                                                   => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataNodeHandler'                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteCollection'                 => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\json\JsonDataNodeHandler'                                                               => [
-                'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\routing\Router'                                                                         => [
-                'EE_Dependency_Map'                                => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'       => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteHandler' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\AssetManifest'                                                                   => [
-                'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\AssetManifestFactory'                                                            => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\assets\BaristaFactory'                                                                  => [
-                'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'              => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\FeatureFlagsConfig' => [
-                'EventEspresso\core\domain\Domain'                                    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\json\JsonDataHandler'                    => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\capabilities\FeatureFlags'       => [
-                'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\capabilities\FeatureFlagsConfig'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\addon\AddonManager'                                                                     => [
-                'EventEspresso\core\services\addon\AddonCollection'              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\Psr4Autoloader'                              => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\v1\RegisterAddon'         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\IncompatibleAddonHandler' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'  => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'                                                      => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\libraries\batch\JobHandlers\ExecuteBatchDeletion'                                                  => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\libraries\batch\JobHandlers\PreviewEventDeletion'                                                  => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\events\data\PreviewDeletion'                                               => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-                'EEM_Event'                                                   => EE_Dependency_Map::load_from_cache,
-                'EEM_Datetime'                                                => EE_Dependency_Map::load_from_cache,
-                'EEM_Registration'                                            => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\admin\events\data\ConfirmDeletion'                                               => [
-                'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\request\CurrentPage'                                                                    => [
-                'EE_CPT_Strategy'                             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\shortcodes\LegacyShortcodesManager'                                                     => [
-                'EE_Registry'                                     => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\CurrentPage' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\shortcodes\ShortcodesManager'                                                           => [
-                'EventEspresso\core\services\shortcodes\LegacyShortcodesManager' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\CurrentPage'                => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\entities\users\CurrentUser'                                                               => [
-                'EventEspresso\core\domain\entities\users\EventManagers' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\form\meta\InputTypes'                                                                   => [
-                'EventEspresso\core\services\form\meta\inputs\Block'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Button'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\DateTime' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Input'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Number'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Phone'    => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Select'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\form\meta\inputs\Text'     => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormDependencyHandler'                                   => [
-                'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\calculators\LineItemCalculator'                                                         => [
-                'EventEspresso\core\services\helpers\DecimalValues' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\helpers\DecimalValues'                                                                  => [
-                'EE_Currency_Config' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EE_Brewing_Regular'                                                                                                 => [
-                'EE_Dependency_Map'                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\loaders\Loader'         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\routing\RouteHandler'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\messages\MessageTemplateRequestData'                                             => [
-                'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\messages\MessageTemplateValidator'                                               => [
-                'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\messages\MessageTemplateManager'                                                 => [
-                'EEM_Message_Template'                                                   => EE_Dependency_Map::load_from_cache,
-                'EEM_Message_Template_Group'                                             => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\messages\MessageTemplateRequestData' => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\messages\MessageTemplateValidator'   => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\services\request\Request'                            => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\services\request\sanitizers\RequestSanitizer'                                                    => [
-                'EventEspresso\core\domain\services\validation\email\strategies\Basic' => EE_Dependency_Map::load_from_cache,
-            ],
-        ];
-    }
-
-
-    /**
-     * Registers how core classes are loaded.
-     * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
-     *        'EE_Request_Handler' => 'load_core'
-     *        'EE_Messages_Queue'  => 'load_lib'
-     *        'EEH_Debug_Tools'    => 'load_helper'
-     * or, if greater control is required, by providing a custom closure. For example:
-     *        'Some_Class' => function () {
-     *            return new Some_Class();
-     *        },
-     * This is required for instantiating dependencies
-     * where an interface has been type hinted in a class constructor. For example:
-     *        'Required_Interface' => function () {
-     *            return new A_Class_That_Implements_Required_Interface();
-     *        },
-     */
-    protected function _register_core_class_loaders()
-    {
-        $this->_class_loaders = [
-            // load_core
-            'EE_Dependency_Map'                            => function () {
-                return $this;
-            },
-            'EE_Capabilities'                              => 'load_core',
-            'EE_Encryption'                                => 'load_core',
-            'EE_Front_Controller'                          => 'load_core',
-            'EE_Module_Request_Router'                     => 'load_core',
-            'EE_Registry'                                  => 'load_core',
-            'EE_Request'                                   => function () {
-                return $this->legacy_request;
-            },
-            'EventEspresso\core\services\request\Request'  => function () {
-                return $this->request;
-            },
-            'EventEspresso\core\services\request\Response' => function () {
-                return $this->response;
-            },
-            'EE_Base'                                      => 'load_core',
-            'EE_Request_Handler'                           => 'load_core',
-            'EE_Session'                                   => 'load_core',
-            'EE_Cron_Tasks'                                => 'load_core',
-            'EE_System'                                    => 'load_core',
-            'EE_Maintenance_Mode'                          => 'load_core',
-            'EE_Register_CPTs'                             => 'load_core',
-            'EE_Admin'                                     => 'load_core',
-            'EE_CPT_Strategy'                              => 'load_core',
-            // load_class
-            'EE_Registration_Processor'                    => 'load_class',
-            // load_lib
-            'EE_Message_Resource_Manager'                  => 'load_lib',
-            'EE_Message_Type_Collection'                   => 'load_lib',
-            'EE_Message_Type_Collection_Loader'            => 'load_lib',
-            'EE_Messenger_Collection'                      => 'load_lib',
-            'EE_Messenger_Collection_Loader'               => 'load_lib',
-            'EE_Messages_Processor'                        => 'load_lib',
-            'EE_Message_Repository'                        => 'load_lib',
-            'EE_Messages_Queue'                            => 'load_lib',
-            'EE_Messages_Data_Handler_Collection'          => 'load_lib',
-            'EE_Message_Template_Group_Collection'         => 'load_lib',
-            'EE_Payment_Method_Manager'                    => 'load_lib',
-            'EE_Payment_Processor'                         => 'load_core',
-            'EE_DMS_Core_4_1_0'                            => 'load_dms',
-            'EE_DMS_Core_4_2_0'                            => 'load_dms',
-            'EE_DMS_Core_4_3_0'                            => 'load_dms',
-            'EE_DMS_Core_4_5_0'                            => 'load_dms',
-            'EE_DMS_Core_4_6_0'                            => 'load_dms',
-            'EE_DMS_Core_4_7_0'                            => 'load_dms',
-            'EE_DMS_Core_4_8_0'                            => 'load_dms',
-            'EE_DMS_Core_4_9_0'                            => 'load_dms',
-            'EE_DMS_Core_4_10_0'                           => 'load_dms',
-            'EE_DMS_Core_5_0_0'                            => 'load_dms',
-            'EE_Messages_Generator'                        => static function () {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Generator',
-                    [],
-                    false,
-                    false
-                );
-            },
-            'EE_Messages_Template_Defaults'                => static function ($arguments = []) {
-                return EE_Registry::instance()->load_lib(
-                    'Messages_Template_Defaults',
-                    $arguments,
-                    false,
-                    false
-                );
-            },
-            // load_helper
-            'EEH_Parse_Shortcodes'                         => static function () {
-                if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
-                    return new EEH_Parse_Shortcodes();
-                }
-                return null;
-            },
-            'EE_Template_Config'                           => static function () {
-                return EE_Config::instance()->template_settings;
-            },
-            'EE_Currency_Config'                           => static function () {
-                return EE_Currency_Config::getCurrencyConfig();
-            },
-            'EE_Registration_Config'                       => static function () {
-                return EE_Config::instance()->registration;
-            },
-            'EE_Core_Config'                               => static function () {
-                return EE_Config::instance()->core;
-            },
-            'EventEspresso\core\services\loaders\Loader'   => static function () {
-                return LoaderFactory::getLoader();
-            },
-            'EE_Network_Config'                            => static function () {
-                return EE_Network_Config::instance();
-            },
-            'EE_Config'                                    => static function () {
-                return EE_Config::instance();
-            },
-            'EventEspresso\core\domain\Domain'             => static function () {
-                return DomainFactory::getEventEspressoCoreDomain();
-            },
-            'EE_Admin_Config'                              => static function () {
-                return EE_Config::instance()->admin;
-            },
-            'EE_Organization_Config'                       => static function () {
-                return EE_Config::instance()->organization;
-            },
-            'EE_Network_Core_Config'                       => static function () {
-                return EE_Network_Config::instance()->core;
-            },
-            'EE_Environment_Config'                        => static function () {
-                return EE_Config::instance()->environment;
-            },
-            'EED_Core_Rest_Api'                            => static function () {
-                return EED_Core_Rest_Api::instance();
-            },
-            'WP_REST_Server'                               => static function () {
-                return rest_get_server();
-            },
-            'EventEspresso\core\Psr4Autoloader'            => static function () {
-                return EE_Psr4AutoloaderInit::psr4_loader();
-            },
-            'EE_Ticket_Selector_Config'                    => function () {
-                return EE_Config::instance()->template_settings->EED_Ticket_Selector;
-            },
-        ];
-    }
-
-
-    /**
-     * can be used for supplying alternate names for classes,
-     * or for connecting interface names to instantiable classes
-     *
-     * @throws InvalidAliasException
-     */
-    protected function _register_core_aliases()
-    {
-        $aliases = [
-            'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
-            'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
-            'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
-            'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
-            'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
-            'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
-            'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
-            'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
-            'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
-            'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\domain\services\commands\registration\CreateRegistrationCommand',
-            'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\domain\services\commands\registration\CopyRegistrationDetailsCommand',
-            'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\domain\services\commands\registration\CopyRegistrationPaymentsCommand',
-            'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\domain\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
-            'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\domain\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
-            'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\domain\services\commands\ticket\CreateTicketLineItemCommand',
-            'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\domain\services\commands\transaction\CreateTransactionCommandHandler',
-            'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler',
-            'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
-            'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
-            'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-            'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
-            'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
-            'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
-            'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
-            'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
-            'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
-            'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
-            'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
-            'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
-            'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
-            'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
-            'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
-            'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
-            'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
-            'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
-            'Registration_Processor'                                                       => 'EE_Registration_Processor',
-            'EventEspresso\core\services\assets\AssetManifestInterface'                    => 'EventEspresso\core\services\assets\AssetManifest',
-        ];
-        foreach ($aliases as $alias => $fqn) {
-            if (is_array($fqn)) {
-                foreach ($fqn as $class => $for_class) {
-                    $this->class_cache->addAlias($class, $alias, $for_class);
-                }
-                continue;
-            }
-            $this->class_cache->addAlias($fqn, $alias);
-        }
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
-            $this->class_cache->addAlias(
-                'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
-                'EventEspresso\core\services\notices\NoticeConverterInterface'
-            );
-        }
-    }
-
-
-    public function debug($for_class = '')
-    {
-        if (method_exists($this->class_cache, 'debug')) {
-            $this->class_cache->debug($for_class);
-        }
-    }
-
-
-    /**
-     * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
-     * request Primarily used by unit tests.
-     */
-    public function reset()
-    {
-        $this->_register_core_class_loaders();
-        $this->_register_core_dependencies();
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be is_alias()
-     * because it returns TRUE if the provided fully qualified name IS an alias
-     * WHY?
-     * Because if a class is type hinting for a concretion,
-     * then why would we need to find another class to supply it?
-     * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
-     * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
-     * Don't go looking for some substitute.
-     * Whereas if a class is type hinting for an interface...
-     * then we need to find an actual class to use.
-     * So the interface IS the alias for some other FQN,
-     * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
-     * represents some other class.
-     *
-     * @param string $fqn
-     * @param string $for_class
-     * @return bool
-     * @deprecated 4.9.62.p
-     */
-    public function has_alias(string $fqn = '', string $for_class = ''): bool
-    {
-        return $this->isAlias($fqn, $for_class);
-    }
-
-
-    /**
-     * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
-     * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
-     * functions recursively, so that multiple aliases can be used to drill down to a FQN
-     *  for example:
-     *      if the following two entries were added to the _aliases array:
-     *          array(
-     *              'interface_alias'           => 'some\namespace\interface'
-     *              'some\namespace\interface'  => 'some\namespace\classname'
-     *          )
-     *      then one could use EE_Registry::instance()->create( 'interface_alias' )
-     *      to load an instance of 'some\namespace\classname'
-     *
-     * @param string $alias
-     * @param string $for_class
-     * @return string
-     * @deprecated 4.9.62.p
-     */
-    public function get_alias(string $alias = '', string $for_class = ''): string
-    {
-        return $this->getFqnForAlias($alias, $for_class);
-    }
+	/**
+	 * This means that the requested class dependency is not present in the dependency map
+	 */
+	const not_registered = 0;
+
+	/**
+	 * This instructs class loaders to ALWAYS return a newly instantiated object for the requested class.
+	 */
+	const load_new_object = 1;
+
+	/**
+	 * This instructs class loaders to return a previously instantiated and cached object for the requested class.
+	 * IF a previously instantiated object does not exist, a new one will be created and added to the cache.
+	 */
+	const load_from_cache = 2;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to keep any existing dependencies that already exist,
+	 * and simply discard any new dependencies declared in the incoming data
+	 */
+	const KEEP_EXISTING_DEPENDENCIES = 0;
+
+	/**
+	 * When registering a dependency,
+	 * this indicates to overwrite any existing dependencies that already exist using the incoming data
+	 */
+	const OVERWRITE_DEPENDENCIES = 1;
+
+	protected static ?EE_Dependency_Map $_instance = null;
+
+	private ClassInterfaceCache $class_cache;
+
+	protected ?RequestInterface $request = null;
+
+	protected ?LegacyRequestInterface $legacy_request = null;
+
+	protected ?ResponseInterface $response = null;
+
+	protected ?LoaderInterface $loader = null;
+
+	protected array $_dependency_map = [];
+
+	protected array $_class_loaders = [];
+
+
+	/**
+	 * EE_Dependency_Map constructor.
+	 *
+	 * @param ClassInterfaceCache $class_cache
+	 */
+	protected function __construct(ClassInterfaceCache $class_cache)
+	{
+		$this->class_cache = $class_cache;
+		do_action('EE_Dependency_Map____construct', $this);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidAliasException
+	 */
+	public function initialize()
+	{
+		$this->_register_core_dependencies();
+		$this->_register_core_class_loaders();
+		$this->_register_core_aliases();
+	}
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @param ClassInterfaceCache|null $class_cache
+	 * @return EE_Dependency_Map
+	 */
+	public static function instance(ClassInterfaceCache $class_cache = null): EE_Dependency_Map
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (
+			! EE_Dependency_Map::$_instance instanceof EE_Dependency_Map
+			&& $class_cache instanceof ClassInterfaceCache
+		) {
+			EE_Dependency_Map::$_instance = new EE_Dependency_Map($class_cache);
+		}
+		return EE_Dependency_Map::$_instance;
+	}
+
+
+	/**
+	 * @param RequestInterface $request
+	 */
+	public function setRequest(RequestInterface $request)
+	{
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @param LegacyRequestInterface $legacy_request
+	 */
+	public function setLegacyRequest(LegacyRequestInterface $legacy_request)
+	{
+		$this->legacy_request = $legacy_request;
+	}
+
+
+	/**
+	 * @param ResponseInterface $response
+	 */
+	public function setResponse(ResponseInterface $response)
+	{
+		$this->response = $response;
+	}
+
+
+	/**
+	 * @param LoaderInterface $loader
+	 */
+	public function setLoader(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public static function register_dependencies(
+		string $class,
+		array $dependencies,
+		int $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	): bool {
+		return EE_Dependency_Map::$_instance->registerDependencies($class, $dependencies, $overwrite);
+	}
+
+
+	/**
+	 * Assigns an array of class names and corresponding load sources (new or cached)
+	 * to the class specified by the first parameter.
+	 * IMPORTANT !!!
+	 * The order of elements in the incoming $dependencies array MUST match
+	 * the order of the constructor parameters for the class in question.
+	 * This is especially important when overriding any existing dependencies that are registered.
+	 * the third parameter controls whether any duplicate dependencies are overwritten or not.
+	 *
+	 * @param string $class
+	 * @param array  $dependencies
+	 * @param int    $overwrite
+	 * @return bool
+	 */
+	public function registerDependencies(
+		string $class,
+		array $dependencies,
+		int $overwrite = EE_Dependency_Map::KEEP_EXISTING_DEPENDENCIES
+	): bool {
+		if (empty($dependencies)) {
+			return false;
+		}
+		$class      = trim($class, '\\');
+		$registered = false;
+		if (empty(EE_Dependency_Map::$_instance->_dependency_map[ $class ])) {
+			EE_Dependency_Map::$_instance->_dependency_map[ $class ] = [];
+		}
+		// we need to make sure that any aliases used when registering a dependency
+		// get resolved to the correct class name
+		foreach ($dependencies as $dependency => $load_source) {
+			$alias = EE_Dependency_Map::$_instance->getFqnForAlias($dependency);
+			if (
+				$overwrite === EE_Dependency_Map::OVERWRITE_DEPENDENCIES
+				|| ! isset(
+					EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $dependency ],
+					EE_Dependency_Map::$_instance->_dependency_map[ $class ][ $alias ]
+				)
+			) {
+				unset($dependencies[ $dependency ]);
+				$dependencies[ $alias ] = $load_source;
+				$registered             = true;
+			}
+		}
+		// now add our two lists of dependencies together.
+		// using Union (+=) favours the arrays in precedence from left to right,
+		// so $dependencies is NOT overwritten because it is listed first
+		// ie: with A = B + C, entries in B take precedence over duplicate entries in C
+		// Union is way faster than array_merge() but should be used with caution...
+		// especially with numerically indexed arrays
+		$dependencies += EE_Dependency_Map::$_instance->_dependency_map[ $class ];
+		// now we need to ensure that the resulting dependencies
+		// array only has the entries that are required for the class
+		// so first count how many dependencies were originally registered for the class
+		$dependency_count = count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]);
+		// if that count is non-zero (meaning dependencies were already registered)
+		EE_Dependency_Map::$_instance->_dependency_map[ $class ] = $dependency_count
+			// then truncate the  final array to match that count
+			? array_slice($dependencies, 0, $dependency_count)
+			// otherwise just take the incoming array because nothing previously existed
+			: $dependencies;
+		return $registered
+			   || count(EE_Dependency_Map::$_instance->_dependency_map[ $class ]) === count($dependencies);
+	}
+
+
+	/**
+	 * @param string          $class_name
+	 * @param callable|string $loader
+	 * @param bool            $overwrite
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public static function register_class_loader(
+		string $class_name,
+		$loader = 'load_core',
+		bool $overwrite = false
+	): bool {
+		return EE_Dependency_Map::$_instance->registerClassLoader($class_name, $loader, $overwrite);
+	}
+
+
+	/**
+	 * @param string         $class_name
+	 * @param Closure|string $loader
+	 * @param bool           $overwrite
+	 * @return bool
+	 * @throws DomainException
+	 */
+	public function registerClassLoader(string $class_name, $loader = 'load_core', bool $overwrite = false): bool
+	{
+		if (! $loader instanceof Closure && strpos($class_name, '\\') !== false) {
+			throw new DomainException(
+				esc_html__('Don\'t use class loaders for FQCNs.', 'event_espresso')
+			);
+		}
+		// check that loader is callable or method starts with "load_" and exists in EE_Registry
+		if (
+			! is_callable($loader)
+			&& (
+				strpos($loader, 'load_') !== 0
+				|| ! method_exists('EE_Registry', $loader)
+			)
+		) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'"%1$s" is not a valid loader method on EE_Registry.',
+						'event_espresso'
+					),
+					$loader
+				)
+			);
+		}
+		$class_name = EE_Dependency_Map::$_instance->getFqnForAlias($class_name);
+		if ($overwrite || ! isset(EE_Dependency_Map::$_instance->_class_loaders[ $class_name ])) {
+			EE_Dependency_Map::$_instance->_class_loaders[ $class_name ] = $loader;
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function dependency_map(): array
+	{
+		return $this->_dependency_map;
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name
+	 *
+	 * @param string $class_name
+	 * @return boolean
+	 */
+	public function has(string $class_name = ''): bool
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		return isset($this->_dependency_map[ $class_name ]);
+	}
+
+
+	/**
+	 * returns TRUE if dependency map contains a listing for the provided class name AND dependency
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return bool
+	 */
+	public function has_dependency_for_class(string $class_name = '', string $dependency = ''): bool
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency, $class_name);
+		return isset($this->_dependency_map[ $class_name ][ $dependency ]);
+	}
+
+
+	/**
+	 * returns loading strategy for whether a previously cached dependency should be loaded or a new instance returned
+	 *
+	 * @param string $class_name
+	 * @param string $dependency
+	 * @return int
+	 */
+	public function loading_strategy_for_class_dependency(string $class_name = '', string $dependency = ''): int
+	{
+		// all legacy models have the same dependencies
+		if (strpos($class_name, 'EEM_') === 0) {
+			$class_name = 'LEGACY_MODELS';
+		}
+		$dependency = $this->getFqnForAlias($dependency);
+		return $this->has_dependency_for_class($class_name, $dependency)
+			? $this->_dependency_map[ $class_name ][ $dependency ]
+			: EE_Dependency_Map::not_registered;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return string | Closure
+	 */
+	public function class_loader(string $class_name)
+	{
+		// all legacy models use load_model()
+		if (strpos($class_name, 'EEM_') === 0) {
+			return 'load_model';
+		}
+		// EE_CPT_*_Strategy classes like EE_CPT_Event_Strategy, EE_CPT_Venue_Strategy, etc
+		// perform strpos() first to avoid loading regex every time we load a class
+		if (
+			strpos($class_name, 'EE_CPT_') === 0
+			&& preg_match('/^EE_CPT_([a-zA-Z]+)_Strategy$/', $class_name)
+		) {
+			return 'load_core';
+		}
+		$class_name = $this->getFqnForAlias($class_name);
+		return $this->_class_loaders[ $class_name ] ?? '';
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function class_loaders(): array
+	{
+		return $this->_class_loaders;
+	}
+
+
+	/**
+	 * adds an alias for a classname
+	 *
+	 * @param string $fqcn      the class name that should be used (concrete class to replace interface)
+	 * @param string $alias     the class name that would be type hinted for (abstract parent or interface)
+	 * @param string $for_class the class that has the dependency (is type hinting for the interface)
+	 * @throws InvalidAliasException
+	 */
+	public function add_alias(string $fqcn, string $alias, string $for_class = '')
+	{
+		$this->class_cache->addAlias($fqcn, $alias, $for_class);
+	}
+
+
+	/**
+	 * Returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 */
+	public function isAlias(string $fqn = '', string $for_class = ''): bool
+	{
+		return $this->class_cache->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * Returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 */
+	public function getFqnForAlias(string $alias = '', string $for_class = ''): string
+	{
+		return $this->class_cache->getFqnForAlias($alias, $for_class);
+	}
+
+
+	/**
+	 * Registers the core dependencies and whether a previously instantiated object should be loaded from the cache,
+	 * if one exists, or whether a new object should be generated every time the requested class is loaded.
+	 * This is done by using the following class constants:
+	 *        EE_Dependency_Map::load_from_cache - loads previously instantiated object
+	 *        EE_Dependency_Map::load_new_object - generates a new object every time
+	 */
+	protected function _register_core_dependencies()
+	{
+		$this->_dependency_map = [
+			'EE_Admin'                                                                                                           => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Request_Handler'                                                                                                 => [
+				'EventEspresso\core\services\request\Request'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Response' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_System'                                                                                                          => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EE_Maintenance_Mode'                         => EE_Dependency_Map::load_from_cache,
+				'EE_Registry'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\Router'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Session'                                                                                                         => [
+				'EventEspresso\core\services\cache\TransientCacheStorage'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\values\session\SessionLifespan' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\session\SessionStartHandler'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\encryption\Base64Encoder'     => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\session\SessionStartHandler'                                                            => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache
+			],
+			'EE_Cart'                                                                                                            => [
+				'EE_Session' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messenger_Collection_Loader'                                                                                     => [
+				'EE_Messenger_Collection' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Message_Type_Collection_Loader'                                                                                  => [
+				'EE_Message_Type_Collection' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Message_Resource_Manager'                                                                                        => [
+				'EE_Messenger_Collection_Loader'    => EE_Dependency_Map::load_new_object,
+				'EE_Message_Type_Collection_Loader' => EE_Dependency_Map::load_new_object,
+				'EEM_Message_Template_Group'        => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Message_Factory'                                                                                                 => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_messages'                                                                                                        => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Generator'                                                                                              => [
+				'EE_Messages_Queue'                    => EE_Dependency_Map::load_new_object,
+				'EE_Messages_Data_Handler_Collection'  => EE_Dependency_Map::load_new_object,
+				'EE_Message_Template_Group_Collection' => EE_Dependency_Map::load_new_object,
+				'EEH_Parse_Shortcodes'                 => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Processor'                                                                                              => [
+				'EE_Message_Resource_Manager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Messages_Queue'                                                                                                  => [
+				'EE_Message_Repository' => EE_Dependency_Map::load_new_object,
+			],
+			'EE_Messages_Template_Defaults'                                                                                      => [
+				'EEM_Message_Template_Group' => EE_Dependency_Map::load_from_cache,
+				'EEM_Message_Template'       => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Message_To_Generate_From_Request'                                                                                => [
+				'EE_Message_Resource_Manager'                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandBus'                                                                    => [
+				'EventEspresso\core\services\commands\CommandHandlerManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\services\commands\CommandHandler'                                                                     => [
+				'EE_Registry'         => EE_Dependency_Map::load_from_cache,
+				'CommandBusInterface' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandHandlerManager'                                                         => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CompositeCommandHandler'                                                       => [
+				'EventEspresso\core\services\commands\CommandBus'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\commands\CommandFactory' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\CommandFactory'                                                                => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\commands\middleware\CapChecker'                                                         => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker'                                                => [
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\RegistrationsCapChecker'                                            => [
+				'EE_Capabilities' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\registration\CreateRegistrationCommandHandler'                          => [
+				'EventEspresso\core\domain\services\registration\CreateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\registration\CopyRegistrationDetailsCommandHandler'                     => [
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\registration\CopyRegistrationPaymentsCommandHandler'                    => [
+				'EventEspresso\core\domain\services\registration\CopyRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler'         => [
+				'EventEspresso\core\domain\services\registration\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler' => [
+				'EventEspresso\core\domain\services\registration\UpdateRegistrationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\ticket\CreateTicketLineItemCommandHandler'                              => [
+				'EventEspresso\core\domain\services\ticket\CreateTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\ticket\CancelTicketLineItemCommandHandler'                              => [
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\CancelRegistrationService'                                          => [
+				'EventEspresso\core\domain\services\ticket\CancelTicketLineItemService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler'                                  => [
+				'EEM_Attendee' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\values\session\SessionLifespan'                                                           => [
+				'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\caffeinated\admin\extend\registration_form\forms\SessionLifespanForm'                                 => [
+				'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\caffeinated\admin\extend\registration_form\forms\SessionLifespanFormHandler'                          => [
+				'EventEspresso\core\domain\values\session\SessionLifespanOption' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\database\TableManager'                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Data_Migration_Class_Base'                                                                                       => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_1_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_2_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_3_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_4_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_5_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_6_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_7_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_8_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_9_0'                                                                                                  => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_4_10_0'                                                                                                 => [
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+				'EE_DMS_Core_4_9_0'                                  => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_DMS_Core_5_0_0'                                                                                                  => [
+				'EE_DMS_Core_4_10_0'                                 => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableManager'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\I18nRegistry'                                                                    => [
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\Registry'                                                                        => [
+				'EventEspresso\core\services\assets\AssetCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\assets\AssetManifest'   => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCancelled'                                                    => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoCheckout'                                                     => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEventAttendees'                                               => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoEvents'                                                       => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoThankYou'                                                     => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTicketSelector'                                               => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\shortcodes\EspressoTxnPage'                                                      => [
+				'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\cache\BasicCacheManager'                                                                => [
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\cache\PostRelatedCacheManager'                                                          => [
+				'EventEspresso\core\services\cache\TransientCacheStorage' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\validation\email\EmailValidationService'                                         => [
+				'EE_Registration_Config'                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\values\EmailAddress'                                                                      => [
+				null,
+				'EventEspresso\core\domain\services\validation\email\EmailValidationService' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\orm\ModelFieldFactory'                                                                  => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'LEGACY_MODELS'                                                                                                      => [
+				null,
+				'EventEspresso\core\services\database\ModelFieldFactory' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Module_Request_Router'                                                                                           => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Registration_Processor'                                                                                          => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\notifications\PersistentAdminNoticeManager'                                             => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\caffeinated\modules\recaptcha_invisible\InvisibleRecaptcha'                                           => [
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+				'EE_Session'             => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\DisplayTicketSelector'                                                        => [
+				'EventEspresso\core\domain\entities\users\CurrentUser' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'          => EE_Dependency_Map::load_from_cache,
+				'EE_Ticket_Selector_Config'                            => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\ProcessTicketSelector'                                                        => [
+				'EE_Core_Config'                                                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                             => EE_Dependency_Map::load_from_cache,
+				'EE_Session'                                                              => EE_Dependency_Map::load_from_cache,
+				'EEM_Ticket'                                                              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\ProcessTicketSelectorPostData'                                                => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'                                   => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\modules\ticket_selector\TicketDatetimeAvailabilityTracker'                                            => [
+				'EEM_Datetime' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'                                     => [
+				'EE_Core_Config'                             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomPostTypes'                                       => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\custom_post_types\RegisterCustomTaxonomies'                                      => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_CPT_Strategy'                                                                                                    => [
+				'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\entities\custom_post_types\CustomTaxonomyDefinitions' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\loaders\ObjectIdentifier'                                                               => [
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\CPTs\CptQueryModifier'                                                                           => [
+				null,
+				null,
+				null,
+				'EventEspresso\core\services\request\CurrentPage' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'      => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\dependencies\DependencyResolver'                                                        => [
+				'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+				'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver'                                      => [
+				'EventEspresso\core\services\container\Mirror'            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\ClassInterfaceCache' => EE_Dependency_Map::load_from_cache,
+				'EE_Dependency_Map'                                       => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'                                                 => [
+				'EventEspresso\core\services\routing\RouteMatchSpecificationDependencyResolver' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'                                    => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\RouteMatchSpecificationManager'                                                 => [
+				'EventEspresso\core\services\routing\RouteMatchSpecificationCollection' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteMatchSpecificationFactory'    => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\request\files\FilesDataHandler'                                                         => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\libraries\batch\BatchRequestProcessor'                                                             => [
+				'EventEspresso\core\services\loaders\Loader'  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\converters\RestApiSpoofer'                                                       => [
+				'WP_REST_Server'                                               => EE_Dependency_Map::load_from_cache,
+				'EED_Core_Rest_Api'                                            => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\libraries\rest_api\controllers\model\Read' => EE_Dependency_Map::load_from_cache,
+				null,
+			],
+			'EventEspresso\core\services\routing\RouteHandler'                                                                   => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataNodeHandler'                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteCollection'                 => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\json\JsonDataNodeHandler'                                                               => [
+				'EventEspresso\core\services\json\JsonDataNodeValidator' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\routing\Router'                                                                         => [
+				'EE_Dependency_Map'                                => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'       => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteHandler' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\AssetManifest'                                                                   => [
+				'EventEspresso\core\domain\Domain' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\AssetManifestFactory'                                                            => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\assets\BaristaFactory'                                                                  => [
+				'EventEspresso\core\services\assets\AssetManifestFactory' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'              => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\FeatureFlagsConfig' => [
+				'EventEspresso\core\domain\Domain'                                    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\json\JsonDataHandler'                    => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\capabilities\FeatureFlags'       => [
+				'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\capabilities\FeatureFlagsConfig'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\addon\AddonManager'                                                                     => [
+				'EventEspresso\core\services\addon\AddonCollection'              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\Psr4Autoloader'                              => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\v1\RegisterAddon'         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\IncompatibleAddonHandler' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'  => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\addon\api\ThirdPartyPluginHandler'                                                      => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\libraries\batch\JobHandlers\ExecuteBatchDeletion'                                                  => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\libraries\batch\JobHandlers\PreviewEventDeletion'                                                  => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\events\data\PreviewDeletion'                                               => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+				'EEM_Event'                                                   => EE_Dependency_Map::load_from_cache,
+				'EEM_Datetime'                                                => EE_Dependency_Map::load_from_cache,
+				'EEM_Registration'                                            => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\admin\events\data\ConfirmDeletion'                                               => [
+				'EventEspresso\core\services\orm\tree_traversal\NodeGroupDao' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\request\CurrentPage'                                                                    => [
+				'EE_CPT_Strategy'                             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\shortcodes\LegacyShortcodesManager'                                                     => [
+				'EE_Registry'                                     => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\CurrentPage' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\shortcodes\ShortcodesManager'                                                           => [
+				'EventEspresso\core\services\shortcodes\LegacyShortcodesManager' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\CurrentPage'                => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\entities\users\CurrentUser'                                                               => [
+				'EventEspresso\core\domain\entities\users\EventManagers' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\form\meta\InputTypes'                                                                   => [
+				'EventEspresso\core\services\form\meta\inputs\Block'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Button'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\DateTime' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Input'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Number'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Phone'    => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Select'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\form\meta\inputs\Text'     => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormDependencyHandler'                                   => [
+				'EE_Dependency_Map' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\calculators\LineItemCalculator'                                                         => [
+				'EventEspresso\core\services\helpers\DecimalValues' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\helpers\DecimalValues'                                                                  => [
+				'EE_Currency_Config' => EE_Dependency_Map::load_from_cache,
+			],
+			'EE_Brewing_Regular'                                                                                                 => [
+				'EE_Dependency_Map'                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\loaders\Loader'         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\routing\RouteHandler'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\database\TableAnalysis' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\messages\MessageTemplateRequestData'                                             => [
+				'EventEspresso\core\services\request\Request' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\messages\MessageTemplateValidator'                                               => [
+				'EventEspresso\core\services\loaders\Loader' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\messages\MessageTemplateManager'                                                 => [
+				'EEM_Message_Template'                                                   => EE_Dependency_Map::load_from_cache,
+				'EEM_Message_Template_Group'                                             => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\messages\MessageTemplateRequestData' => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\messages\MessageTemplateValidator'   => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\services\request\Request'                            => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\services\request\sanitizers\RequestSanitizer'                                                    => [
+				'EventEspresso\core\domain\services\validation\email\strategies\Basic' => EE_Dependency_Map::load_from_cache,
+			],
+		];
+	}
+
+
+	/**
+	 * Registers how core classes are loaded.
+	 * This can either be done by simply providing the name of one of the EE_Registry loader methods such as:
+	 *        'EE_Request_Handler' => 'load_core'
+	 *        'EE_Messages_Queue'  => 'load_lib'
+	 *        'EEH_Debug_Tools'    => 'load_helper'
+	 * or, if greater control is required, by providing a custom closure. For example:
+	 *        'Some_Class' => function () {
+	 *            return new Some_Class();
+	 *        },
+	 * This is required for instantiating dependencies
+	 * where an interface has been type hinted in a class constructor. For example:
+	 *        'Required_Interface' => function () {
+	 *            return new A_Class_That_Implements_Required_Interface();
+	 *        },
+	 */
+	protected function _register_core_class_loaders()
+	{
+		$this->_class_loaders = [
+			// load_core
+			'EE_Dependency_Map'                            => function () {
+				return $this;
+			},
+			'EE_Capabilities'                              => 'load_core',
+			'EE_Encryption'                                => 'load_core',
+			'EE_Front_Controller'                          => 'load_core',
+			'EE_Module_Request_Router'                     => 'load_core',
+			'EE_Registry'                                  => 'load_core',
+			'EE_Request'                                   => function () {
+				return $this->legacy_request;
+			},
+			'EventEspresso\core\services\request\Request'  => function () {
+				return $this->request;
+			},
+			'EventEspresso\core\services\request\Response' => function () {
+				return $this->response;
+			},
+			'EE_Base'                                      => 'load_core',
+			'EE_Request_Handler'                           => 'load_core',
+			'EE_Session'                                   => 'load_core',
+			'EE_Cron_Tasks'                                => 'load_core',
+			'EE_System'                                    => 'load_core',
+			'EE_Maintenance_Mode'                          => 'load_core',
+			'EE_Register_CPTs'                             => 'load_core',
+			'EE_Admin'                                     => 'load_core',
+			'EE_CPT_Strategy'                              => 'load_core',
+			// load_class
+			'EE_Registration_Processor'                    => 'load_class',
+			// load_lib
+			'EE_Message_Resource_Manager'                  => 'load_lib',
+			'EE_Message_Type_Collection'                   => 'load_lib',
+			'EE_Message_Type_Collection_Loader'            => 'load_lib',
+			'EE_Messenger_Collection'                      => 'load_lib',
+			'EE_Messenger_Collection_Loader'               => 'load_lib',
+			'EE_Messages_Processor'                        => 'load_lib',
+			'EE_Message_Repository'                        => 'load_lib',
+			'EE_Messages_Queue'                            => 'load_lib',
+			'EE_Messages_Data_Handler_Collection'          => 'load_lib',
+			'EE_Message_Template_Group_Collection'         => 'load_lib',
+			'EE_Payment_Method_Manager'                    => 'load_lib',
+			'EE_Payment_Processor'                         => 'load_core',
+			'EE_DMS_Core_4_1_0'                            => 'load_dms',
+			'EE_DMS_Core_4_2_0'                            => 'load_dms',
+			'EE_DMS_Core_4_3_0'                            => 'load_dms',
+			'EE_DMS_Core_4_5_0'                            => 'load_dms',
+			'EE_DMS_Core_4_6_0'                            => 'load_dms',
+			'EE_DMS_Core_4_7_0'                            => 'load_dms',
+			'EE_DMS_Core_4_8_0'                            => 'load_dms',
+			'EE_DMS_Core_4_9_0'                            => 'load_dms',
+			'EE_DMS_Core_4_10_0'                           => 'load_dms',
+			'EE_DMS_Core_5_0_0'                            => 'load_dms',
+			'EE_Messages_Generator'                        => static function () {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Generator',
+					[],
+					false,
+					false
+				);
+			},
+			'EE_Messages_Template_Defaults'                => static function ($arguments = []) {
+				return EE_Registry::instance()->load_lib(
+					'Messages_Template_Defaults',
+					$arguments,
+					false,
+					false
+				);
+			},
+			// load_helper
+			'EEH_Parse_Shortcodes'                         => static function () {
+				if (EE_Registry::instance()->load_helper('Parse_Shortcodes')) {
+					return new EEH_Parse_Shortcodes();
+				}
+				return null;
+			},
+			'EE_Template_Config'                           => static function () {
+				return EE_Config::instance()->template_settings;
+			},
+			'EE_Currency_Config'                           => static function () {
+				return EE_Currency_Config::getCurrencyConfig();
+			},
+			'EE_Registration_Config'                       => static function () {
+				return EE_Config::instance()->registration;
+			},
+			'EE_Core_Config'                               => static function () {
+				return EE_Config::instance()->core;
+			},
+			'EventEspresso\core\services\loaders\Loader'   => static function () {
+				return LoaderFactory::getLoader();
+			},
+			'EE_Network_Config'                            => static function () {
+				return EE_Network_Config::instance();
+			},
+			'EE_Config'                                    => static function () {
+				return EE_Config::instance();
+			},
+			'EventEspresso\core\domain\Domain'             => static function () {
+				return DomainFactory::getEventEspressoCoreDomain();
+			},
+			'EE_Admin_Config'                              => static function () {
+				return EE_Config::instance()->admin;
+			},
+			'EE_Organization_Config'                       => static function () {
+				return EE_Config::instance()->organization;
+			},
+			'EE_Network_Core_Config'                       => static function () {
+				return EE_Network_Config::instance()->core;
+			},
+			'EE_Environment_Config'                        => static function () {
+				return EE_Config::instance()->environment;
+			},
+			'EED_Core_Rest_Api'                            => static function () {
+				return EED_Core_Rest_Api::instance();
+			},
+			'WP_REST_Server'                               => static function () {
+				return rest_get_server();
+			},
+			'EventEspresso\core\Psr4Autoloader'            => static function () {
+				return EE_Psr4AutoloaderInit::psr4_loader();
+			},
+			'EE_Ticket_Selector_Config'                    => function () {
+				return EE_Config::instance()->template_settings->EED_Ticket_Selector;
+			},
+		];
+	}
+
+
+	/**
+	 * can be used for supplying alternate names for classes,
+	 * or for connecting interface names to instantiable classes
+	 *
+	 * @throws InvalidAliasException
+	 */
+	protected function _register_core_aliases()
+	{
+		$aliases = [
+			'CommandBusInterface'                                                          => 'EventEspresso\core\services\commands\CommandBusInterface',
+			'EventEspresso\core\services\commands\CommandBusInterface'                     => 'EventEspresso\core\services\commands\CommandBus',
+			'CommandHandlerManagerInterface'                                               => 'EventEspresso\core\services\commands\CommandHandlerManagerInterface',
+			'EventEspresso\core\services\commands\CommandHandlerManagerInterface'          => 'EventEspresso\core\services\commands\CommandHandlerManager',
+			'CapChecker'                                                                   => 'EventEspresso\core\services\commands\middleware\CapChecker',
+			'AddActionHook'                                                                => 'EventEspresso\core\services\commands\middleware\AddActionHook',
+			'CapabilitiesChecker'                                                          => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CapabilitiesCheckerInterface'                                                 => 'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface',
+			'EventEspresso\core\domain\services\capabilities\CapabilitiesCheckerInterface' => 'EventEspresso\core\domain\services\capabilities\CapabilitiesChecker',
+			'CreateRegistrationService'                                                    => 'EventEspresso\core\domain\services\registration\CreateRegistrationService',
+			'CreateRegistrationCommandHandler'                                             => 'EventEspresso\core\domain\services\commands\registration\CreateRegistrationCommand',
+			'CopyRegistrationDetailsCommandHandler'                                        => 'EventEspresso\core\domain\services\commands\registration\CopyRegistrationDetailsCommand',
+			'CopyRegistrationPaymentsCommandHandler'                                       => 'EventEspresso\core\domain\services\commands\registration\CopyRegistrationPaymentsCommand',
+			'CancelRegistrationAndTicketLineItemCommandHandler'                            => 'EventEspresso\core\domain\services\commands\registration\CancelRegistrationAndTicketLineItemCommandHandler',
+			'UpdateRegistrationAndTransactionAfterChangeCommandHandler'                    => 'EventEspresso\core\domain\services\commands\registration\UpdateRegistrationAndTransactionAfterChangeCommandHandler',
+			'CreateTicketLineItemCommandHandler'                                           => 'EventEspresso\core\domain\services\commands\ticket\CreateTicketLineItemCommand',
+			'CreateTransactionCommandHandler'                                              => 'EventEspresso\core\domain\services\commands\transaction\CreateTransactionCommandHandler',
+			'CreateAttendeeCommandHandler'                                                 => 'EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler',
+			'TableManager'                                                                 => 'EventEspresso\core\services\database\TableManager',
+			'TableAnalysis'                                                                => 'EventEspresso\core\services\database\TableAnalysis',
+			'EspressoShortcode'                                                            => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'ShortcodeInterface'                                                           => 'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+			'EventEspresso\core\services\shortcodes\ShortcodeInterface'                    => 'EventEspresso\core\services\shortcodes\EspressoShortcode',
+			'EventEspresso\core\services\cache\CacheStorageInterface'                      => 'EventEspresso\core\services\cache\TransientCacheStorage',
+			'LoaderInterface'                                                              => 'EventEspresso\core\services\loaders\LoaderInterface',
+			'EventEspresso\core\services\loaders\LoaderInterface'                          => 'EventEspresso\core\services\loaders\Loader',
+			'CommandFactoryInterface'                                                      => 'EventEspresso\core\services\commands\CommandFactoryInterface',
+			'EventEspresso\core\services\commands\CommandFactoryInterface'                 => 'EventEspresso\core\services\commands\CommandFactory',
+			'EmailValidatorInterface'                                                      => 'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface',
+			'EventEspresso\core\domain\services\validation\email\EmailValidatorInterface'  => 'EventEspresso\core\domain\services\validation\email\EmailValidationService',
+			'NoticeConverterInterface'                                                     => 'EventEspresso\core\services\notices\NoticeConverterInterface',
+			'EventEspresso\core\services\notices\NoticeConverterInterface'                 => 'EventEspresso\core\services\notices\ConvertNoticesToEeErrors',
+			'NoticesContainerInterface'                                                    => 'EventEspresso\core\services\notices\NoticesContainerInterface',
+			'EventEspresso\core\services\notices\NoticesContainerInterface'                => 'EventEspresso\core\services\notices\NoticesContainer',
+			'EventEspresso\core\services\request\RequestInterface'                         => 'EventEspresso\core\services\request\Request',
+			'EventEspresso\core\services\request\ResponseInterface'                        => 'EventEspresso\core\services\request\Response',
+			'EventEspresso\core\domain\DomainInterface'                                    => 'EventEspresso\core\domain\Domain',
+			'Registration_Processor'                                                       => 'EE_Registration_Processor',
+			'EventEspresso\core\services\assets\AssetManifestInterface'                    => 'EventEspresso\core\services\assets\AssetManifest',
+		];
+		foreach ($aliases as $alias => $fqn) {
+			if (is_array($fqn)) {
+				foreach ($fqn as $class => $for_class) {
+					$this->class_cache->addAlias($class, $alias, $for_class);
+				}
+				continue;
+			}
+			$this->class_cache->addAlias($fqn, $alias);
+		}
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && is_admin()) {
+			$this->class_cache->addAlias(
+				'EventEspresso\core\services\notices\ConvertNoticesToAdminNotices',
+				'EventEspresso\core\services\notices\NoticeConverterInterface'
+			);
+		}
+	}
+
+
+	public function debug($for_class = '')
+	{
+		if (method_exists($this->class_cache, 'debug')) {
+			$this->class_cache->debug($for_class);
+		}
+	}
+
+
+	/**
+	 * This is used to reset the internal map and class_loaders to their original default state at the beginning of the
+	 * request Primarily used by unit tests.
+	 */
+	public function reset()
+	{
+		$this->_register_core_class_loaders();
+		$this->_register_core_dependencies();
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be is_alias()
+	 * because it returns TRUE if the provided fully qualified name IS an alias
+	 * WHY?
+	 * Because if a class is type hinting for a concretion,
+	 * then why would we need to find another class to supply it?
+	 * ie: if a class asks for `Fully/Qualified/Namespace/SpecificClassName`,
+	 * then give it an instance of `Fully/Qualified/Namespace/SpecificClassName`.
+	 * Don't go looking for some substitute.
+	 * Whereas if a class is type hinting for an interface...
+	 * then we need to find an actual class to use.
+	 * So the interface IS the alias for some other FQN,
+	 * and we need to find out if `Fully/Qualified/Namespace/SomeInterface`
+	 * represents some other class.
+	 *
+	 * @param string $fqn
+	 * @param string $for_class
+	 * @return bool
+	 * @deprecated 4.9.62.p
+	 */
+	public function has_alias(string $fqn = '', string $for_class = ''): bool
+	{
+		return $this->isAlias($fqn, $for_class);
+	}
+
+
+	/**
+	 * PLZ NOTE: a better name for this method would be get_fqn_for_alias()
+	 * because it returns a FQN for provided alias if one exists, otherwise returns the original $alias
+	 * functions recursively, so that multiple aliases can be used to drill down to a FQN
+	 *  for example:
+	 *      if the following two entries were added to the _aliases array:
+	 *          array(
+	 *              'interface_alias'           => 'some\namespace\interface'
+	 *              'some\namespace\interface'  => 'some\namespace\classname'
+	 *          )
+	 *      then one could use EE_Registry::instance()->create( 'interface_alias' )
+	 *      to load an instance of 'some\namespace\classname'
+	 *
+	 * @param string $alias
+	 * @param string $for_class
+	 * @return string
+	 * @deprecated 4.9.62.p
+	 */
+	public function get_alias(string $alias = '', string $for_class = ''): string
+	{
+		return $this->getFqnForAlias($alias, $for_class);
+	}
 }

core/admin/templates/admin_details_wrapper_post_body_content.template.php

Indentation +12 added lines, -12 removed lines

@@ -9,18 +9,18 @@
  */
 
 if (! empty($post_body_content)) :
-    if ($add_page_frame && ! $is_ajax) {
-        if (
-            strpos($post_body_content, 'class="padding"') === false
-            || strpos($post_body_content, 'class="padding"') < 120
-        ) {
-            $post_body_content = '<div class="padding">' . $post_body_content . '</div>';
-        }
-        if (strpos($post_body_content, '<div class="ee-admin-container">') === false) {
-            $post_body_content = '<div class="ee-admin-container">' . $post_body_content . '</div>';
-        }
-    }
-    ?>
+	if ($add_page_frame && ! $is_ajax) {
+		if (
+			strpos($post_body_content, 'class="padding"') === false
+			|| strpos($post_body_content, 'class="padding"') < 120
+		) {
+			$post_body_content = '<div class="padding">' . $post_body_content . '</div>';
+		}
+		if (strpos($post_body_content, '<div class="ee-admin-container">') === false) {
+			$post_body_content = '<div class="ee-admin-container">' . $post_body_content . '</div>';
+		}
+	}
+	?>
     <div id="post-body-content">
         <?php echo wp_kses($post_body_content, AllowedTags::getWithFullTags()); ?>
     </div>

Spacing +3 added lines, -3 removed lines

@@ -8,16 +8,16 @@
  * @var string $post_body_content
  */
 
-if (! empty($post_body_content)) :
+if ( ! empty($post_body_content)) :
     if ($add_page_frame && ! $is_ajax) {
         if (
             strpos($post_body_content, 'class="padding"') === false
             || strpos($post_body_content, 'class="padding"') < 120
         ) {
-            $post_body_content = '<div class="padding">' . $post_body_content . '</div>';
+            $post_body_content = '<div class="padding">'.$post_body_content.'</div>';
         }
         if (strpos($post_body_content, '<div class="ee-admin-container">') === false) {
-            $post_body_content = '<div class="ee-admin-container">' . $post_body_content . '</div>';
+            $post_body_content = '<div class="ee-admin-container">'.$post_body_content.'</div>';
         }
     }
     ?>

core/admin/templates/admin_details_wrapper_no_sidebar.template.php

Spacing +2 added lines, -2 removed lines

@@ -11,11 +11,11 @@
  */
 ?>
 
-<div id="<?php echo esc_attr($admin_page_wrapper_div_id);?>" class="<?php echo esc_attr($admin_page_wrapper_div_class);?>"
+<div id="<?php echo esc_attr($admin_page_wrapper_div_id); ?>" class="<?php echo esc_attr($admin_page_wrapper_div_class); ?>"
 >
     <div id="post-body" class="metabox-holder columns-1">
 
-        <?php if (! empty($admin_page_header)) : ?>
+        <?php if ( ! empty($admin_page_header)) : ?>
             <div id="admin-page-header">
                 <?php echo wp_kses($admin_page_header, AllowedTags::getWithFormTags()); ?>
             </div>

core/admin/templates/admin_details_wrapper.template.php

Spacing +2 added lines, -2 removed lines

@@ -15,12 +15,12 @@
 do_action('add_meta_boxes', (string) $post_type, $post);
 ?>
 
-<?php if (! empty($admin_page_header)) : ?>
+<?php if ( ! empty($admin_page_header)) : ?>
     <div id="admin-page-header">
         <?php echo wp_kses($admin_page_header, AllowedTags::getWithFormTags()); ?>
     </div>
 <?php endif; ?>
-<div id="<?php echo esc_attr($admin_page_wrapper_div_id);?>" class="<?php echo esc_attr($admin_page_wrapper_div_class);?>">
+<div id="<?php echo esc_attr($admin_page_wrapper_div_id); ?>" class="<?php echo esc_attr($admin_page_wrapper_div_class); ?>">
     <!-- admin-page-header -->
     <div id="post-body" class="metabox-holder columns-2">
 

core/admin/EE_Admin_Hooks.core.php

Indentation +749 added lines, -749 removed lines

@@ -15,753 +15,753 @@
 abstract class EE_Admin_Hooks extends EE_Base
 {
 
-    /**
-     * This just holds an instance of the page object for this hook
-     *
-     * @var EE_Admin_Page|EE_Admin_Page_CPT|null
-     * @deprecated  5.0.8.p
-     */
-    protected $_page_object = null;
-
-    /**
-     * This holds the EE_Admin_Page object from the calling admin page that this object hooks into.
-     *
-     * @var EE_Admin_Page|EE_Admin_Page_CPT|null
-     */
-    protected                   $_adminpage_obj = null;
-
-    protected ?EE_Registry      $EE             = null;
-
-    protected ?RequestInterface $request        = null;
-
-    /**
-     * This is set by child classes and is an associative array of ajax hooks in the format:
-     * array(
-     *    'ajax_action_ref' => 'executing_method'; //must be public
-     * )
-     */
-    protected array $_ajax_func = [];
-
-    /**
-     * This is an array of methods that get executed on a page routes admin_init hook. Use the following format:
-     * array(
-     *    'page_route' => 'executing_method' //must be public
-     * )
-     */
-    protected array $_init_func = [];
-
-    /**
-     * This is an array of methods that output metabox content for the given page route.  Use the following format:
-     * [
-     *      0 => [
-     *          'page_route' => 'string_for_page_route',    must correspond to a page route in the class being connected
-     *                                                      with (i.e. "edit_event") If this is in an array then the
-     *                                                      same params below will be used but the metabox will be
-     *                                                      added to each route.
-     *          'func' =>  'executing_method',              must be public (i.e. public function executing_method
-     *                                                      ($post, $callback_args){} ).
-     *                                                      Note if you include callback args in the array then you
-     *                                                      need to declare them in the method arguments.
-     *          'id' => 'identifier_for_metabox',           so it can be removed by addons
-     *                                                      (optional, class will set it automatically)
-     *          'priority' => 'default',                    default 'default' (optional)
-     *          'label' => esc_html__('Localized Title', 'event_espresso'),
-     *          'context' => 'advanced'                     advanced is default (optional),
-     *      ]
-     *      'callback_args' => array() //any callback args to include (optional)
-     * ]
-     * Why are we indexing numerically?  Because it's possible there may be more than one metabox per page_route.
-     */
-    protected array $_metaboxes = [];
-
-    /**
-     * This is an array of values that indicate any metaboxes we want removed from a given page route.  Usually this is
-     * used when caffeinated functionality is replacing decaffeinated functionality.  Use the following format for the
-     * array: array(
-     *    0 => array(
-     *        'page_route' => 'string_for_page_route' //can be string or array of strings that match a page_route(s)
-     *        that are in the class being connected with (i.e. 'edit', or 'create_new').
-     *        'id' => 'identifier_for_metabox', //what the id is of the metabox being removed
-     *        'context' => 'normal', //the context for the metabox being removed (has to match)
-     *        'screen' => 'screen_id', //(optional), if not included then this class will attempt to remove the metabox
-     *        using the currently loaded screen object->id  however, there may be cases where you have to specify the
-     *        id for the screen the metabox is on.
-     *    )
-     * )
-     */
-    protected array $_remove_metaboxes = [];
-
-    protected array $_req_data         = [];
-
-    /**
-     * This parent class takes care of loading the scripts and styles if the child class has set the properties for
-     * them in the following format.  Note, the first array index ('register') is for defining all the registers.  The
-     * second array index is for indicating what routes each script/style loads on. array(
-     * 'registers' => array(
-     *        'script_ref' => array( // if more than one script is to be loaded its best to use the 'dependency'
-     *        argument to link scripts together.
-     *            'type' => 'js' // 'js' or 'css' (defaults to js).  This tells us what type of wp_function to use
-     *            'url' => 'http://urltoscript.css.js',
-     *            'depends' => array('jquery'), //an array of dependencies for the scripts. REMEMBER, if a script has
-     *            already been registered elsewhere in the system.  You can just use the depends array to make sure it
-     *            gets loaded before the one you are setting here.
-     *            'footer' => TRUE //defaults to true (styles don't use this parameter)
-     *        ),
-     *    'enqueues' => array( //this time each key corresponds to the script ref followed by an array of page routes
-     *    the script gets enqueued on.
-     *        'script_ref' => array('route_one', 'route_two')
-     *    ),
-     *    'localize' => array( //this allows you to set a localized object.  Indicate which script the object is being
-     *    attached to and then include an array indexed by the name of the object and the array of key/value pairs for
-     *    the object.
-     *        'scrip_ref' => array(
-     *            'NAME_OF_JS_OBJECT' => array(
-     *                'translate_ref' => esc_html__('localized_string', 'event_espresso'),
-     *                'some_data' => 5
-     *            )
-     *        )
-     *    )
-     * )
-     */
-    protected array $_scripts_styles = [];
-
-    protected array $_scripts        = [];
-
-    protected array $_styles         = [];
-
-    /**
-     * this optional property can be set by child classes to override the priority for the automatic action/filter hook
-     * loading in the `_load_routed_hooks()` method.  Please follow this format: array(
-     *    'wp_hook_reference' => 1
-     *    )
-     * )
-     */
-    protected array $_wp_action_filters_priority = [];
-
-    /**
-     * this is just a flag set automatically to indicate whether we've got an extended hook class running (i.e.
-     * espresso_events_Registration_Form_Hooks_Extend extends espresso_events_Registration_Form_Hooks).  This flag is
-     * used later to make sure we require the needed files.
-     */
-    protected bool $_extend = false;
-
-    /**
-     * we're just going to use this to hold the name of the caller class (child class name)
-     */
-    public string    $caller         = '';
-
-    protected string $_current_route = '';
-
-
-    /**
-     * child classes MUST set this property so that the page object can be loaded correctly
-     */
-    protected string $_name = '';
-
-
-    /**
-     * constructor
-     *
-     * @param EE_Admin_Page $admin_page
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        $this->_adminpage_obj = $admin_page;
-        $this->request        = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $this->_req_data      = $this->request->requestParams();
-        $current_page         = $this->request->getRequestParam('page');
-        $current_page         = $this->request->getRequestParam('current_page', $current_page);
-        // first let's verify we're on the right page
-        if ($current_page !== $this->_adminpage_obj->page_slug) {
-            return;
-        }
-        $this->_set_defaults();
-        $this->_set_hooks_properties();
-        // get out nothing more to be done here.
-        // allow for extends to modify properties
-        if (method_exists($this, '_extend_properties')) {
-            $this->_extend_properties();
-        }
-        // $this->_set_page_object();
-        $this->_init_hooks();
-        $this->_load_custom_methods();
-        $this->_load_routed_hooks();
-        add_action('admin_enqueue_scripts', [$this, 'enqueue_scripts_styles']);
-        add_action('admin_enqueue_scripts', [$this, 'add_metaboxes'], 20);
-        add_action('admin_enqueue_scripts', [$this, 'remove_metaboxes'], 15);
-        $this->_ajax_hooks();
-    }
-
-
-    /**
-     * used by child classes to set the following properties:
-     * $_ajax_func (optional)
-     * $_init_func (optional)
-     * $_metaboxes (optional)
-     * $_scripts (optional)
-     * $_styles (optional)
-     * $_name (required)
-     * Also in this method will be registered any scripts or styles loaded on the targeted page (as indicated in the
-     * _scripts/_styles properties) Also children should place in this method any filters/actions that have to happen
-     * really early on page load (just after admin_init) if they want to have them registered for handling early.
-     *
-     * @abstract
-     * @return void
-     */
-    abstract protected function _set_hooks_properties();
-
-
-    /**
-     * The hooks for enqueue_scripts and enqueue_styles will be run in here.  Child classes need to define their
-     * scripts and styles in the relevant $_scripts and $_styles properties.  Child classes must have also already
-     * registered the scripts and styles using wp_register_script and wp_register_style functions.
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public function enqueue_scripts_styles()
-    {
-        if (! empty($this->_scripts_styles)) {
-            // first let's do all the registrations
-            if (! isset($this->_scripts_styles['registers'])) {
-                $msg[] = esc_html__(
-                    'There is no "registers" index in the <code>$this->_scripts_styles</code> property.',
-                    'event_espresso'
-                );
-                $msg[] = sprintf(
-                    esc_html__(
-                        'Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child',
-                        'event_espresso'
-                    ),
-                    '<strong>' . $this->caller . '</strong>'
-                );
-                throw new EE_Error(implode('||', $msg));
-            }
-            $defaults = [
-                'type'    => 'js',
-                'url'     => '',
-                'depends' => [],
-                'version' => EVENT_ESPRESSO_VERSION,
-                'footer'  => true,
-            ];
-            foreach ($this->_scripts_styles['registers'] as $ref => $details) {
-                $details = wp_parse_args($details, $defaults);
-                $type    = $details['type'];
-                $url     = $details['url'];
-                $depends = $details['depends'];
-                $version = $details['version'];
-                $footer  = $details['footer'];
-                // let's make sure that we set the 'registers' type if it's not set!
-                // We need it later to determine which enqueue we do
-                $this->_scripts_styles['registers'][ $ref ]['type'] = $type;
-                // let's make sure we're not missing any REQUIRED parameters
-                if (empty($url)) {
-                    $msg[] = sprintf(
-                        esc_html__('Missing the url for the requested %s', 'event_espresso'),
-                        $type == 'js' ? 'script' : 'stylesheet'
-                    );
-                    $msg[] = sprintf(
-                        esc_html__(
-                            'Double-check your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref',
-                            'event_espresso'
-                        ),
-                        '<strong>' . $this->caller . '</strong>',
-                        $ref
-                    );
-                    throw new EE_Error(implode('||', $msg));
-                }
-                // made it here so let's do the appropriate registration
-                $type == 'js'
-                    ? wp_register_script($ref, $url, $depends, $version, $footer)
-                    : wp_register_style(
-                    $ref,
-                    $url,
-                    $depends,
-                    $version
-                );
-            }
-            // k now let's do the enqueues
-            if (! isset($this->_scripts_styles['enqueues'])) {
-                return;
-            }  //not sure if we should throw an error here or not.
-
-            foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
-                // make sure $routes is an array
-                $routes = (array) $routes;
-                if (in_array($this->_current_route, $routes)) {
-                    $this->_scripts_styles['registers'][ $ref ]['type'] == 'js' ? wp_enqueue_script($ref)
-                        : wp_enqueue_style($ref);
-                    // if we have a localization for the script let's do that too.
-                    if (isset($this->_scripts_styles['localize'][ $ref ])) {
-                        foreach ($this->_scripts_styles['localize'][ $ref ] as $object_name => $indexes) {
-                            wp_localize_script(
-                                $ref,
-                                $object_name,
-                                $this->_scripts_styles['localize'][ $ref ][ $object_name ]
-                            );
-                        }
-                    }
-                }
-            }
-            // let's do the deregisters
-            if (! isset($this->_scripts_styles['deregisters'])) {
-                return;
-            }
-            foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
-                $defaults = ['type' => 'js'];
-                $details  = wp_parse_args($details, $defaults);
-                $details['type'] === 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
-            }
-        }
-    }
-
-
-    /**
-     * just set the defaults for the hooks properties.
-     *
-     * @return void
-     */
-    private function _set_defaults()
-    {
-        $this->_ajax_func                  = [];
-        $this->_init_func                  = [];
-        $this->_metaboxes                  = [];
-        $this->_scripts                    = [];
-        $this->_styles                     = [];
-        $this->_wp_action_filters_priority = [];
-        $this->_current_route              = $this->getCurrentRoute();
-        $this->caller                      = get_class($this);
-        $this->_extend                     = (bool) stripos($this->caller, 'Extend');
-    }
-
-
-    /**
-     * A helper for determining the current route.
-     *
-     * @return string
-     */
-    private function getCurrentRoute(): string
-    {
-        $action = $this->request->getRequestParam('action');
-        // list tables do something else with 'action' for bulk actions.
-        $action = $action !== '-1' && $action !== '' ? $action : 'default';
-        $route  = $this->request->getRequestParam('route');
-        // we set a 'route' variable in some cases where action is being used by something else.
-        return $action === 'default' && $route !== '' ? $route : $action;
-    }
-
-
-    /**
-     * this sets the _page_object property
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws Throwable
-     * @deprecated  5.0.8.p
-     */
-    protected function _set_page_object()
-    {
-        if ($this->_page_object instanceof EE_Admin_Page) {
-            return;
-        }
-        // first make sure $this->_name is set
-        if (empty($this->_name)) {
-            $msg[] = esc_html__('We can\'t load the page object', 'event_espresso');
-            $msg[] = sprintf(
-                esc_html__("This is because the %s child class has not set the '_name' property", 'event_espresso'),
-                $this->caller
-            );
-            throw new EE_Error(implode('||', $msg));
-        }
-        // change "the_message" to "the message"
-        $class_name = str_replace('_', ' ', $this->_name);
-        // change "the message" to "The_Message_Admin_Page"
-        $class_name = str_replace(' ', '_', ucwords($class_name)) . '_Admin_Page';
-        // first default file (if exists)
-        $decaf_file = EE_ADMIN_PAGES . "$this->_name/$class_name.core.php";
-        if (is_readable($decaf_file)) {
-            require_once($decaf_file);
-        }
-        // now we have to do require for extended file (if needed)
-        if ($this->_extend) {
-            require_once EE_CORE_CAF_ADMIN_EXTEND . "$this->_name/Extend_$class_name.core.php";
-            // and extend the class name as well
-            $class_name = 'Extend_' . $class_name;
-        }
-        // let's make sure the class exists
-        if (! class_exists($class_name)) {
-            $msg[] = esc_html__('We can\'t load the page object', 'event_espresso');
-            $msg[] = sprintf(
-                esc_html__(
-                    'The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class',
-                    'event_espresso'
-                ),
-                $class_name
-            );
-            throw new EE_Error(implode('||', $msg));
-        }
-        // do NOT load admin pages that are ALREADY LOADED!!!
-        if ($class_name !== $this->_adminpage_obj->class_name) {
-            return;
-        }
-        $this->_page_object = LoaderFactory::getLoader()->getShared($class_name, [false]);
-        $this->_page_object->initializePage();
-    }
-
-
-    /**
-     * Child "hook" classes can declare any methods that they want executed when a specific page route is loaded.  The
-     * advantage of this is when doing things like running our own db interactions on saves etc.  Remember that
-     * $this->_req_data (all the _POST and _GET data) is available to your methods.
-     *
-     * @return void
-     */
-    private function _load_custom_methods()
-    {
-        /**
-         * method cannot be named 'default' (@see http://us3.php
-         * .net/manual/en/reserved.keywords.php) so need to
-         * handle routes that are "default"
-         *
-         * @since 4.3.0
-         */
-        $method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
-        // these run before the Admin_Page route executes.
-        if (is_callable($this, $method_callback)) {
-            call_user_func([$this, $method_callback]);
-        }
-        // these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the second fires right before the actual redirect happens.
-        // first the actions
-        // note that these action hooks will have the $query_args value available.
-        $admin_class_name = get_class($this->_adminpage_obj);
-        if (method_exists($this, '_redirect_action_early_' . $this->_current_route)) {
-            add_action(
-                'AHEE__'
-                . $admin_class_name
-                . '___redirect_after_action__before_redirect_modification_'
-                . $this->_current_route,
-                [$this, '_redirect_action_early_' . $this->_current_route]
-            );
-        }
-        if (method_exists($this, '_redirect_action_' . $this->_current_route)) {
-            add_action(
-                'AHEE_redirect_' . $admin_class_name . $this->_current_route,
-                [$this, '_redirect_action_' . $this->_current_route]
-            );
-        }
-        // let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
-        if (method_exists($this, '_redirect_filter_' . $this->_current_route)) {
-            add_filter(
-                'FHEE_redirect_' . $admin_class_name . $this->_current_route,
-                [$this, '_redirect_filter_' . $this->_current_route],
-                10,
-                2
-            );
-        }
-    }
-
-
-    /**
-     * This method will search for a corresponding method with a name matching the route and the wp_hook to run.  This
-     * allows child hook classes to target hooking into a specific wp action or filter hook ONLY on a certain route.
-     * just remember, methods MUST be public Future hooks should be added in here to be access by child classes.
-     *
-     * @return void
-     */
-    private function _load_routed_hooks()
-    {
-        // this array provides the hook action names that will be referenced.  Key is the action. Value is an array with the type (action or filter) and the number of parameters for the hook.  We'll default all priorities for automatic hooks to 10.
-        $hook_filter_array = [
-            'admin_footer'                                                                            => [
-                'type'     => 'action',
-                'argnum'   => 1,
-                'priority' => 10,
-            ],
-            'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => [
-                'type'     => 'filter',
-                'argnum'   => 1,
-                'priority' => 10,
-            ],
-            'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug                               => [
-                'type'     => 'filter',
-                'argnum'   => 1,
-                'priority' => 10,
-            ],
-            'FHEE_list_table_views'                                                                   => [
-                'type'     => 'filter',
-                'argnum'   => 1,
-                'priority' => 10,
-            ],
-            'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes'                              => [
-                'type'     => 'action',
-                'argnum'   => 1,
-                'priority' => 10,
-            ],
-        ];
-        foreach ($hook_filter_array as $hook => $args) {
-            if (method_exists($this, $this->_current_route . '_' . $hook)) {
-                if (isset($this->_wp_action_filters_priority[ $hook ])) {
-                    $args['priority'] = $this->_wp_action_filters_priority[ $hook ];
-                }
-                if ($args['type'] == 'action') {
-                    add_action(
-                        $hook,
-                        [$this, $this->_current_route . '_' . $hook],
-                        $args['priority'],
-                        $args['argnum']
-                    );
-                } else {
-                    add_filter(
-                        $hook,
-                        [$this, $this->_current_route . '_' . $hook],
-                        $args['priority'],
-                        $args['argnum']
-                    );
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Loop through the $_ajax_func array and add_actions for the array.
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    private function _ajax_hooks()
-    {
-        if (empty($this->_ajax_func)) {
-            return;
-        } //get out there's nothing to take care of.
-        foreach ($this->_ajax_func as $action => $method) {
-            // make sure method exists
-            if (! method_exists($this, $method)) {
-                $msg[] = esc_html__(
-                             'There is no corresponding method for the hook labeled in the _ajax_func array',
-                             'event_espresso'
-                         ) . '<br />';
-                $msg[] = sprintf(
-                    esc_html__(
-                        'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
-                        'event_espresso'
-                    ),
-                    $method,
-                    $this->caller
-                );
-                throw new EE_Error(implode('||', $msg));
-            }
-            add_action('wp_ajax_' . $action, [$this, $method]);
-        }
-    }
-
-
-    /**
-     * Loop through the $_init_func array and add_actions for the array.
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    protected function _init_hooks()
-    {
-        if (empty($this->_init_func)) {
-            return;
-        }
-        // get out there's nothing to take care of.
-        // We need to determine what page_route we are on!
-        foreach ($this->_init_func as $route => $method) {
-            // make sure method exists
-            if (! method_exists($this, $method)) {
-                $msg[] = esc_html__(
-                             'There is no corresponding method for the hook labeled in the _init_func array',
-                             'event_espresso'
-                         ) . '<br />';
-                $msg[] = sprintf(
-                    esc_html__(
-                        'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
-                        'event_espresso'
-                    ),
-                    $method,
-                    $this->caller
-                );
-                throw new EE_Error(implode('||', $msg));
-            }
-            if ($route == $this->_current_route) {
-                add_action('admin_init', [$this, $method]);
-            }
-        }
-    }
-
-
-    /**
-     * Loop through the _metaboxes property and add_metaboxes accordingly
-     * //todo we could eventually make this a config component class (i.e. new EE_Metabox);
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public function add_metaboxes()
-    {
-        if (empty($this->_metaboxes)) {
-            return;
-        } //get out we don't have any metaboxes to set for this connection
-        $this->_handle_metabox_array($this->_metaboxes);
-    }
-
-
-    /**
-     * @param array     $boxes
-     * @param bool|null $add
-     * @throws EE_Error
-     */
-    private function _handle_metabox_array(array $boxes, ?bool $add = true)
-    {
-        foreach ($boxes as $box) {
-            if (! isset($box['page_route'])) {
-                continue;
-            }
-            // we don't have a valid array
-            // let's make sure $box['page_route'] is an array so the "foreach" will work.
-            $box['page_route'] = (array) $box['page_route'];
-            foreach ($box['page_route'] as $route) {
-                if ($route != $this->_current_route) {
-                    continue;
-                } //get out we only add metaboxes for set route.
-                if ($add) {
-                    $this->_add_metabox($box);
-                } else {
-                    $this->_remove_metabox($box);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Loop through the _remove_metaboxes property and remove metaboxes accordingly.
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public function remove_metaboxes()
-    {
-        if (empty($this->_remove_metaboxes)) {
-            return;
-        } //get out there are no metaboxes to remove
-        $this->_handle_metabox_array($this->_remove_metaboxes, false);
-    }
-
-
-    /**
-     * This just handles adding a metabox
-     *
-     * @param array $args an array of args that have been set for this metabox by the child class
-     * @throws EE_Error
-     */
-    private function _add_metabox(array $args)
-    {
-        $current_screen    = get_current_screen();
-        $screen_id         = is_object($current_screen) ? $current_screen->id : null;
-        $callback          = $args['func'] ?? 'some_invalid_callback';
-        $callback_function = is_array($callback) ? end($callback) : $callback;
-        // set defaults
-        $defaults      = [
-            'callback_args' => [],
-            'context'       => 'advanced',
-            'func'          => $callback,
-            'id'            => $this->caller . '_' . $callback_function . '_metabox',
-            'label'         => $this->caller,
-            'page'          => $args['page'] ?? $screen_id,
-            'priority'      => 'default',
-        ];
-        $args          = wp_parse_args($args, $defaults);
-        $callback_args = $args['callback_args'];
-        $context       = $args['context'];
-        $id            = $args['id'];
-        $label         = $args['label'];
-        $page          = $args['page'];
-        $priority      = $args['priority'];
-        // make sure method exists
-        if (! method_exists($this, $callback_function)) {
-            $msg[] =
-                esc_html__('There is no corresponding method to display the metabox content', 'event_espresso')
-                . '<br />';
-            $msg[] = sprintf(
-                esc_html__(
-                    'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
-                    'event_espresso'
-                ),
-                $callback_function,
-                $this->caller
-            );
-            throw new EE_Error(implode('||', $msg));
-        }
-        // everything checks out so let's add the metabox
-        add_meta_box($id, $label, [$this, $callback_function], $page, $context, $priority, $callback_args);
-        add_filter(
-            "postbox_classes_{$page}_$id",
-            function ($classes) {
-                $classes[] = 'ee-admin-container';
-                return $classes;
-            }
-        );
-    }
-
-
-    private function _remove_metabox($args)
-    {
-        $current_screen = get_current_screen();
-        $screen_id      = is_object($current_screen) ? $current_screen->id : null;
-        $func           = $args['func'] ?? 'some_invalid_callback';
-        // set defaults
-        $defaults = [
-            'context' => 'default',
-            'id'      => $args['id'] ?? "{$this->_current_route}_{$this->caller}_{$func}_metabox",
-            'screen'  => $args['screen'] ?? $screen_id,
-        ];
-        $args     = wp_parse_args($args, $defaults);
-        $context  = $args['context'];
-        $id       = $args['id'];
-        $screen   = $args['screen'];
-        // everything checks out so lets remove the box!
-        remove_meta_box($id, $screen, $context);
-    }
-
-    /**
-     * This is used whenever we're DOING_AJAX to return a formatted json array that our calling javascript can expect
-     * The returned json object is created from an array in the following format:
-     * array(
-     *  'error' => FALSE, //(default FALSE), contains any errors and/or exceptions (exceptions return json early),
-     *  'success' => FALSE, //(default FALSE) - contains any special success message.
-     *  'notices' => '', // - contains any EE_Error formatted notices
-     *  'content' => 'string can be html', //this is a string of formatted content (can be html)
-     *  'data' => array() //this can be any key/value pairs that a method returns for later json parsing by the js.
-     *  We're also going to include the template args with every package (so js can pick out any specific template args
-     *  that might be included in here)
-     * )
-     * The json object is populated by whatever is set in the $_template_args property.
-     *
-     * @param string $content
-     * @param array $data
-     */
-    public function returnJson(string $content = '', array $data = []): void
-    {
-        // make sure any EE_Error notices have been handled.
-        $notices = EE_Error::get_notices(false);
-        wp_send_json(
-            [
-                'success'   => $notices['success'] ?? false,
-                'errors'    => $notices['errors'] ?? false,
-                'attention' => $notices['attention'] ?? false,
-                'notices'   => $notices,
-                'content'   => $content,
-                'data'      => $data,
-                // special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
-                'isEEajax'  => true,
-            ]
-        );
-    }
+	/**
+	 * This just holds an instance of the page object for this hook
+	 *
+	 * @var EE_Admin_Page|EE_Admin_Page_CPT|null
+	 * @deprecated  5.0.8.p
+	 */
+	protected $_page_object = null;
+
+	/**
+	 * This holds the EE_Admin_Page object from the calling admin page that this object hooks into.
+	 *
+	 * @var EE_Admin_Page|EE_Admin_Page_CPT|null
+	 */
+	protected                   $_adminpage_obj = null;
+
+	protected ?EE_Registry      $EE             = null;
+
+	protected ?RequestInterface $request        = null;
+
+	/**
+	 * This is set by child classes and is an associative array of ajax hooks in the format:
+	 * array(
+	 *    'ajax_action_ref' => 'executing_method'; //must be public
+	 * )
+	 */
+	protected array $_ajax_func = [];
+
+	/**
+	 * This is an array of methods that get executed on a page routes admin_init hook. Use the following format:
+	 * array(
+	 *    'page_route' => 'executing_method' //must be public
+	 * )
+	 */
+	protected array $_init_func = [];
+
+	/**
+	 * This is an array of methods that output metabox content for the given page route.  Use the following format:
+	 * [
+	 *      0 => [
+	 *          'page_route' => 'string_for_page_route',    must correspond to a page route in the class being connected
+	 *                                                      with (i.e. "edit_event") If this is in an array then the
+	 *                                                      same params below will be used but the metabox will be
+	 *                                                      added to each route.
+	 *          'func' =>  'executing_method',              must be public (i.e. public function executing_method
+	 *                                                      ($post, $callback_args){} ).
+	 *                                                      Note if you include callback args in the array then you
+	 *                                                      need to declare them in the method arguments.
+	 *          'id' => 'identifier_for_metabox',           so it can be removed by addons
+	 *                                                      (optional, class will set it automatically)
+	 *          'priority' => 'default',                    default 'default' (optional)
+	 *          'label' => esc_html__('Localized Title', 'event_espresso'),
+	 *          'context' => 'advanced'                     advanced is default (optional),
+	 *      ]
+	 *      'callback_args' => array() //any callback args to include (optional)
+	 * ]
+	 * Why are we indexing numerically?  Because it's possible there may be more than one metabox per page_route.
+	 */
+	protected array $_metaboxes = [];
+
+	/**
+	 * This is an array of values that indicate any metaboxes we want removed from a given page route.  Usually this is
+	 * used when caffeinated functionality is replacing decaffeinated functionality.  Use the following format for the
+	 * array: array(
+	 *    0 => array(
+	 *        'page_route' => 'string_for_page_route' //can be string or array of strings that match a page_route(s)
+	 *        that are in the class being connected with (i.e. 'edit', or 'create_new').
+	 *        'id' => 'identifier_for_metabox', //what the id is of the metabox being removed
+	 *        'context' => 'normal', //the context for the metabox being removed (has to match)
+	 *        'screen' => 'screen_id', //(optional), if not included then this class will attempt to remove the metabox
+	 *        using the currently loaded screen object->id  however, there may be cases where you have to specify the
+	 *        id for the screen the metabox is on.
+	 *    )
+	 * )
+	 */
+	protected array $_remove_metaboxes = [];
+
+	protected array $_req_data         = [];
+
+	/**
+	 * This parent class takes care of loading the scripts and styles if the child class has set the properties for
+	 * them in the following format.  Note, the first array index ('register') is for defining all the registers.  The
+	 * second array index is for indicating what routes each script/style loads on. array(
+	 * 'registers' => array(
+	 *        'script_ref' => array( // if more than one script is to be loaded its best to use the 'dependency'
+	 *        argument to link scripts together.
+	 *            'type' => 'js' // 'js' or 'css' (defaults to js).  This tells us what type of wp_function to use
+	 *            'url' => 'http://urltoscript.css.js',
+	 *            'depends' => array('jquery'), //an array of dependencies for the scripts. REMEMBER, if a script has
+	 *            already been registered elsewhere in the system.  You can just use the depends array to make sure it
+	 *            gets loaded before the one you are setting here.
+	 *            'footer' => TRUE //defaults to true (styles don't use this parameter)
+	 *        ),
+	 *    'enqueues' => array( //this time each key corresponds to the script ref followed by an array of page routes
+	 *    the script gets enqueued on.
+	 *        'script_ref' => array('route_one', 'route_two')
+	 *    ),
+	 *    'localize' => array( //this allows you to set a localized object.  Indicate which script the object is being
+	 *    attached to and then include an array indexed by the name of the object and the array of key/value pairs for
+	 *    the object.
+	 *        'scrip_ref' => array(
+	 *            'NAME_OF_JS_OBJECT' => array(
+	 *                'translate_ref' => esc_html__('localized_string', 'event_espresso'),
+	 *                'some_data' => 5
+	 *            )
+	 *        )
+	 *    )
+	 * )
+	 */
+	protected array $_scripts_styles = [];
+
+	protected array $_scripts        = [];
+
+	protected array $_styles         = [];
+
+	/**
+	 * this optional property can be set by child classes to override the priority for the automatic action/filter hook
+	 * loading in the `_load_routed_hooks()` method.  Please follow this format: array(
+	 *    'wp_hook_reference' => 1
+	 *    )
+	 * )
+	 */
+	protected array $_wp_action_filters_priority = [];
+
+	/**
+	 * this is just a flag set automatically to indicate whether we've got an extended hook class running (i.e.
+	 * espresso_events_Registration_Form_Hooks_Extend extends espresso_events_Registration_Form_Hooks).  This flag is
+	 * used later to make sure we require the needed files.
+	 */
+	protected bool $_extend = false;
+
+	/**
+	 * we're just going to use this to hold the name of the caller class (child class name)
+	 */
+	public string    $caller         = '';
+
+	protected string $_current_route = '';
+
+
+	/**
+	 * child classes MUST set this property so that the page object can be loaded correctly
+	 */
+	protected string $_name = '';
+
+
+	/**
+	 * constructor
+	 *
+	 * @param EE_Admin_Page $admin_page
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		$this->_adminpage_obj = $admin_page;
+		$this->request        = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$this->_req_data      = $this->request->requestParams();
+		$current_page         = $this->request->getRequestParam('page');
+		$current_page         = $this->request->getRequestParam('current_page', $current_page);
+		// first let's verify we're on the right page
+		if ($current_page !== $this->_adminpage_obj->page_slug) {
+			return;
+		}
+		$this->_set_defaults();
+		$this->_set_hooks_properties();
+		// get out nothing more to be done here.
+		// allow for extends to modify properties
+		if (method_exists($this, '_extend_properties')) {
+			$this->_extend_properties();
+		}
+		// $this->_set_page_object();
+		$this->_init_hooks();
+		$this->_load_custom_methods();
+		$this->_load_routed_hooks();
+		add_action('admin_enqueue_scripts', [$this, 'enqueue_scripts_styles']);
+		add_action('admin_enqueue_scripts', [$this, 'add_metaboxes'], 20);
+		add_action('admin_enqueue_scripts', [$this, 'remove_metaboxes'], 15);
+		$this->_ajax_hooks();
+	}
+
+
+	/**
+	 * used by child classes to set the following properties:
+	 * $_ajax_func (optional)
+	 * $_init_func (optional)
+	 * $_metaboxes (optional)
+	 * $_scripts (optional)
+	 * $_styles (optional)
+	 * $_name (required)
+	 * Also in this method will be registered any scripts or styles loaded on the targeted page (as indicated in the
+	 * _scripts/_styles properties) Also children should place in this method any filters/actions that have to happen
+	 * really early on page load (just after admin_init) if they want to have them registered for handling early.
+	 *
+	 * @abstract
+	 * @return void
+	 */
+	abstract protected function _set_hooks_properties();
+
+
+	/**
+	 * The hooks for enqueue_scripts and enqueue_styles will be run in here.  Child classes need to define their
+	 * scripts and styles in the relevant $_scripts and $_styles properties.  Child classes must have also already
+	 * registered the scripts and styles using wp_register_script and wp_register_style functions.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function enqueue_scripts_styles()
+	{
+		if (! empty($this->_scripts_styles)) {
+			// first let's do all the registrations
+			if (! isset($this->_scripts_styles['registers'])) {
+				$msg[] = esc_html__(
+					'There is no "registers" index in the <code>$this->_scripts_styles</code> property.',
+					'event_espresso'
+				);
+				$msg[] = sprintf(
+					esc_html__(
+						'Make sure you read the phpdoc comments above the definition of the $_scripts_styles property in the <code>EE_Admin_Hooks</code> class and modify according in the %s child',
+						'event_espresso'
+					),
+					'<strong>' . $this->caller . '</strong>'
+				);
+				throw new EE_Error(implode('||', $msg));
+			}
+			$defaults = [
+				'type'    => 'js',
+				'url'     => '',
+				'depends' => [],
+				'version' => EVENT_ESPRESSO_VERSION,
+				'footer'  => true,
+			];
+			foreach ($this->_scripts_styles['registers'] as $ref => $details) {
+				$details = wp_parse_args($details, $defaults);
+				$type    = $details['type'];
+				$url     = $details['url'];
+				$depends = $details['depends'];
+				$version = $details['version'];
+				$footer  = $details['footer'];
+				// let's make sure that we set the 'registers' type if it's not set!
+				// We need it later to determine which enqueue we do
+				$this->_scripts_styles['registers'][ $ref ]['type'] = $type;
+				// let's make sure we're not missing any REQUIRED parameters
+				if (empty($url)) {
+					$msg[] = sprintf(
+						esc_html__('Missing the url for the requested %s', 'event_espresso'),
+						$type == 'js' ? 'script' : 'stylesheet'
+					);
+					$msg[] = sprintf(
+						esc_html__(
+							'Double-check your <code>$this->_scripts_styles</code> array in %s and make sure that there is a "url" set for the %s ref',
+							'event_espresso'
+						),
+						'<strong>' . $this->caller . '</strong>',
+						$ref
+					);
+					throw new EE_Error(implode('||', $msg));
+				}
+				// made it here so let's do the appropriate registration
+				$type == 'js'
+					? wp_register_script($ref, $url, $depends, $version, $footer)
+					: wp_register_style(
+					$ref,
+					$url,
+					$depends,
+					$version
+				);
+			}
+			// k now let's do the enqueues
+			if (! isset($this->_scripts_styles['enqueues'])) {
+				return;
+			}  //not sure if we should throw an error here or not.
+
+			foreach ($this->_scripts_styles['enqueues'] as $ref => $routes) {
+				// make sure $routes is an array
+				$routes = (array) $routes;
+				if (in_array($this->_current_route, $routes)) {
+					$this->_scripts_styles['registers'][ $ref ]['type'] == 'js' ? wp_enqueue_script($ref)
+						: wp_enqueue_style($ref);
+					// if we have a localization for the script let's do that too.
+					if (isset($this->_scripts_styles['localize'][ $ref ])) {
+						foreach ($this->_scripts_styles['localize'][ $ref ] as $object_name => $indexes) {
+							wp_localize_script(
+								$ref,
+								$object_name,
+								$this->_scripts_styles['localize'][ $ref ][ $object_name ]
+							);
+						}
+					}
+				}
+			}
+			// let's do the deregisters
+			if (! isset($this->_scripts_styles['deregisters'])) {
+				return;
+			}
+			foreach ($this->_scripts_styles['deregisters'] as $ref => $details) {
+				$defaults = ['type' => 'js'];
+				$details  = wp_parse_args($details, $defaults);
+				$details['type'] === 'js' ? wp_deregister_script($ref) : wp_deregister_style($ref);
+			}
+		}
+	}
+
+
+	/**
+	 * just set the defaults for the hooks properties.
+	 *
+	 * @return void
+	 */
+	private function _set_defaults()
+	{
+		$this->_ajax_func                  = [];
+		$this->_init_func                  = [];
+		$this->_metaboxes                  = [];
+		$this->_scripts                    = [];
+		$this->_styles                     = [];
+		$this->_wp_action_filters_priority = [];
+		$this->_current_route              = $this->getCurrentRoute();
+		$this->caller                      = get_class($this);
+		$this->_extend                     = (bool) stripos($this->caller, 'Extend');
+	}
+
+
+	/**
+	 * A helper for determining the current route.
+	 *
+	 * @return string
+	 */
+	private function getCurrentRoute(): string
+	{
+		$action = $this->request->getRequestParam('action');
+		// list tables do something else with 'action' for bulk actions.
+		$action = $action !== '-1' && $action !== '' ? $action : 'default';
+		$route  = $this->request->getRequestParam('route');
+		// we set a 'route' variable in some cases where action is being used by something else.
+		return $action === 'default' && $route !== '' ? $route : $action;
+	}
+
+
+	/**
+	 * this sets the _page_object property
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws Throwable
+	 * @deprecated  5.0.8.p
+	 */
+	protected function _set_page_object()
+	{
+		if ($this->_page_object instanceof EE_Admin_Page) {
+			return;
+		}
+		// first make sure $this->_name is set
+		if (empty($this->_name)) {
+			$msg[] = esc_html__('We can\'t load the page object', 'event_espresso');
+			$msg[] = sprintf(
+				esc_html__("This is because the %s child class has not set the '_name' property", 'event_espresso'),
+				$this->caller
+			);
+			throw new EE_Error(implode('||', $msg));
+		}
+		// change "the_message" to "the message"
+		$class_name = str_replace('_', ' ', $this->_name);
+		// change "the message" to "The_Message_Admin_Page"
+		$class_name = str_replace(' ', '_', ucwords($class_name)) . '_Admin_Page';
+		// first default file (if exists)
+		$decaf_file = EE_ADMIN_PAGES . "$this->_name/$class_name.core.php";
+		if (is_readable($decaf_file)) {
+			require_once($decaf_file);
+		}
+		// now we have to do require for extended file (if needed)
+		if ($this->_extend) {
+			require_once EE_CORE_CAF_ADMIN_EXTEND . "$this->_name/Extend_$class_name.core.php";
+			// and extend the class name as well
+			$class_name = 'Extend_' . $class_name;
+		}
+		// let's make sure the class exists
+		if (! class_exists($class_name)) {
+			$msg[] = esc_html__('We can\'t load the page object', 'event_espresso');
+			$msg[] = sprintf(
+				esc_html__(
+					'The class name that was given is %s. Check the spelling and make sure its correct, also there needs to be an autoloader setup for the class',
+					'event_espresso'
+				),
+				$class_name
+			);
+			throw new EE_Error(implode('||', $msg));
+		}
+		// do NOT load admin pages that are ALREADY LOADED!!!
+		if ($class_name !== $this->_adminpage_obj->class_name) {
+			return;
+		}
+		$this->_page_object = LoaderFactory::getLoader()->getShared($class_name, [false]);
+		$this->_page_object->initializePage();
+	}
+
+
+	/**
+	 * Child "hook" classes can declare any methods that they want executed when a specific page route is loaded.  The
+	 * advantage of this is when doing things like running our own db interactions on saves etc.  Remember that
+	 * $this->_req_data (all the _POST and _GET data) is available to your methods.
+	 *
+	 * @return void
+	 */
+	private function _load_custom_methods()
+	{
+		/**
+		 * method cannot be named 'default' (@see http://us3.php
+		 * .net/manual/en/reserved.keywords.php) so need to
+		 * handle routes that are "default"
+		 *
+		 * @since 4.3.0
+		 */
+		$method_callback = $this->_current_route == 'default' ? 'default_callback' : $this->_current_route;
+		// these run before the Admin_Page route executes.
+		if (is_callable($this, $method_callback)) {
+			call_user_func([$this, $method_callback]);
+		}
+		// these run via the _redirect_after_action method in EE_Admin_Page which usually happens after non_UI methods in EE_Admin_Page classes.  There are two redirect actions, the first fires before $query_args might be manipulated by "save and close" actions and the second fires right before the actual redirect happens.
+		// first the actions
+		// note that these action hooks will have the $query_args value available.
+		$admin_class_name = get_class($this->_adminpage_obj);
+		if (method_exists($this, '_redirect_action_early_' . $this->_current_route)) {
+			add_action(
+				'AHEE__'
+				. $admin_class_name
+				. '___redirect_after_action__before_redirect_modification_'
+				. $this->_current_route,
+				[$this, '_redirect_action_early_' . $this->_current_route]
+			);
+		}
+		if (method_exists($this, '_redirect_action_' . $this->_current_route)) {
+			add_action(
+				'AHEE_redirect_' . $admin_class_name . $this->_current_route,
+				[$this, '_redirect_action_' . $this->_current_route]
+			);
+		}
+		// let's hook into the _redirect itself and allow for changing where the user goes after redirect.  This will have $query_args and $redirect_url available.
+		if (method_exists($this, '_redirect_filter_' . $this->_current_route)) {
+			add_filter(
+				'FHEE_redirect_' . $admin_class_name . $this->_current_route,
+				[$this, '_redirect_filter_' . $this->_current_route],
+				10,
+				2
+			);
+		}
+	}
+
+
+	/**
+	 * This method will search for a corresponding method with a name matching the route and the wp_hook to run.  This
+	 * allows child hook classes to target hooking into a specific wp action or filter hook ONLY on a certain route.
+	 * just remember, methods MUST be public Future hooks should be added in here to be access by child classes.
+	 *
+	 * @return void
+	 */
+	private function _load_routed_hooks()
+	{
+		// this array provides the hook action names that will be referenced.  Key is the action. Value is an array with the type (action or filter) and the number of parameters for the hook.  We'll default all priorities for automatic hooks to 10.
+		$hook_filter_array = [
+			'admin_footer'                                                                            => [
+				'type'     => 'action',
+				'argnum'   => 1,
+				'priority' => 10,
+			],
+			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug . '_' . $this->_current_route => [
+				'type'     => 'filter',
+				'argnum'   => 1,
+				'priority' => 10,
+			],
+			'FHEE_list_table_views_' . $this->_adminpage_obj->page_slug                               => [
+				'type'     => 'filter',
+				'argnum'   => 1,
+				'priority' => 10,
+			],
+			'FHEE_list_table_views'                                                                   => [
+				'type'     => 'filter',
+				'argnum'   => 1,
+				'priority' => 10,
+			],
+			'AHEE__EE_Admin_Page___display_admin_page__modify_metaboxes'                              => [
+				'type'     => 'action',
+				'argnum'   => 1,
+				'priority' => 10,
+			],
+		];
+		foreach ($hook_filter_array as $hook => $args) {
+			if (method_exists($this, $this->_current_route . '_' . $hook)) {
+				if (isset($this->_wp_action_filters_priority[ $hook ])) {
+					$args['priority'] = $this->_wp_action_filters_priority[ $hook ];
+				}
+				if ($args['type'] == 'action') {
+					add_action(
+						$hook,
+						[$this, $this->_current_route . '_' . $hook],
+						$args['priority'],
+						$args['argnum']
+					);
+				} else {
+					add_filter(
+						$hook,
+						[$this, $this->_current_route . '_' . $hook],
+						$args['priority'],
+						$args['argnum']
+					);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Loop through the $_ajax_func array and add_actions for the array.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	private function _ajax_hooks()
+	{
+		if (empty($this->_ajax_func)) {
+			return;
+		} //get out there's nothing to take care of.
+		foreach ($this->_ajax_func as $action => $method) {
+			// make sure method exists
+			if (! method_exists($this, $method)) {
+				$msg[] = esc_html__(
+							 'There is no corresponding method for the hook labeled in the _ajax_func array',
+							 'event_espresso'
+						 ) . '<br />';
+				$msg[] = sprintf(
+					esc_html__(
+						'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
+						'event_espresso'
+					),
+					$method,
+					$this->caller
+				);
+				throw new EE_Error(implode('||', $msg));
+			}
+			add_action('wp_ajax_' . $action, [$this, $method]);
+		}
+	}
+
+
+	/**
+	 * Loop through the $_init_func array and add_actions for the array.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function _init_hooks()
+	{
+		if (empty($this->_init_func)) {
+			return;
+		}
+		// get out there's nothing to take care of.
+		// We need to determine what page_route we are on!
+		foreach ($this->_init_func as $route => $method) {
+			// make sure method exists
+			if (! method_exists($this, $method)) {
+				$msg[] = esc_html__(
+							 'There is no corresponding method for the hook labeled in the _init_func array',
+							 'event_espresso'
+						 ) . '<br />';
+				$msg[] = sprintf(
+					esc_html__(
+						'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
+						'event_espresso'
+					),
+					$method,
+					$this->caller
+				);
+				throw new EE_Error(implode('||', $msg));
+			}
+			if ($route == $this->_current_route) {
+				add_action('admin_init', [$this, $method]);
+			}
+		}
+	}
+
+
+	/**
+	 * Loop through the _metaboxes property and add_metaboxes accordingly
+	 * //todo we could eventually make this a config component class (i.e. new EE_Metabox);
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function add_metaboxes()
+	{
+		if (empty($this->_metaboxes)) {
+			return;
+		} //get out we don't have any metaboxes to set for this connection
+		$this->_handle_metabox_array($this->_metaboxes);
+	}
+
+
+	/**
+	 * @param array     $boxes
+	 * @param bool|null $add
+	 * @throws EE_Error
+	 */
+	private function _handle_metabox_array(array $boxes, ?bool $add = true)
+	{
+		foreach ($boxes as $box) {
+			if (! isset($box['page_route'])) {
+				continue;
+			}
+			// we don't have a valid array
+			// let's make sure $box['page_route'] is an array so the "foreach" will work.
+			$box['page_route'] = (array) $box['page_route'];
+			foreach ($box['page_route'] as $route) {
+				if ($route != $this->_current_route) {
+					continue;
+				} //get out we only add metaboxes for set route.
+				if ($add) {
+					$this->_add_metabox($box);
+				} else {
+					$this->_remove_metabox($box);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Loop through the _remove_metaboxes property and remove metaboxes accordingly.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function remove_metaboxes()
+	{
+		if (empty($this->_remove_metaboxes)) {
+			return;
+		} //get out there are no metaboxes to remove
+		$this->_handle_metabox_array($this->_remove_metaboxes, false);
+	}
+
+
+	/**
+	 * This just handles adding a metabox
+	 *
+	 * @param array $args an array of args that have been set for this metabox by the child class
+	 * @throws EE_Error
+	 */
+	private function _add_metabox(array $args)
+	{
+		$current_screen    = get_current_screen();
+		$screen_id         = is_object($current_screen) ? $current_screen->id : null;
+		$callback          = $args['func'] ?? 'some_invalid_callback';
+		$callback_function = is_array($callback) ? end($callback) : $callback;
+		// set defaults
+		$defaults      = [
+			'callback_args' => [],
+			'context'       => 'advanced',
+			'func'          => $callback,
+			'id'            => $this->caller . '_' . $callback_function . '_metabox',
+			'label'         => $this->caller,
+			'page'          => $args['page'] ?? $screen_id,
+			'priority'      => 'default',
+		];
+		$args          = wp_parse_args($args, $defaults);
+		$callback_args = $args['callback_args'];
+		$context       = $args['context'];
+		$id            = $args['id'];
+		$label         = $args['label'];
+		$page          = $args['page'];
+		$priority      = $args['priority'];
+		// make sure method exists
+		if (! method_exists($this, $callback_function)) {
+			$msg[] =
+				esc_html__('There is no corresponding method to display the metabox content', 'event_espresso')
+				. '<br />';
+			$msg[] = sprintf(
+				esc_html__(
+					'The method name given in the array is %s, check the spelling and make sure it exists in the %s class',
+					'event_espresso'
+				),
+				$callback_function,
+				$this->caller
+			);
+			throw new EE_Error(implode('||', $msg));
+		}
+		// everything checks out so let's add the metabox
+		add_meta_box($id, $label, [$this, $callback_function], $page, $context, $priority, $callback_args);
+		add_filter(
+			"postbox_classes_{$page}_$id",
+			function ($classes) {
+				$classes[] = 'ee-admin-container';
+				return $classes;
+			}
+		);
+	}
+
+
+	private function _remove_metabox($args)
+	{
+		$current_screen = get_current_screen();
+		$screen_id      = is_object($current_screen) ? $current_screen->id : null;
+		$func           = $args['func'] ?? 'some_invalid_callback';
+		// set defaults
+		$defaults = [
+			'context' => 'default',
+			'id'      => $args['id'] ?? "{$this->_current_route}_{$this->caller}_{$func}_metabox",
+			'screen'  => $args['screen'] ?? $screen_id,
+		];
+		$args     = wp_parse_args($args, $defaults);
+		$context  = $args['context'];
+		$id       = $args['id'];
+		$screen   = $args['screen'];
+		// everything checks out so lets remove the box!
+		remove_meta_box($id, $screen, $context);
+	}
+
+	/**
+	 * This is used whenever we're DOING_AJAX to return a formatted json array that our calling javascript can expect
+	 * The returned json object is created from an array in the following format:
+	 * array(
+	 *  'error' => FALSE, //(default FALSE), contains any errors and/or exceptions (exceptions return json early),
+	 *  'success' => FALSE, //(default FALSE) - contains any special success message.
+	 *  'notices' => '', // - contains any EE_Error formatted notices
+	 *  'content' => 'string can be html', //this is a string of formatted content (can be html)
+	 *  'data' => array() //this can be any key/value pairs that a method returns for later json parsing by the js.
+	 *  We're also going to include the template args with every package (so js can pick out any specific template args
+	 *  that might be included in here)
+	 * )
+	 * The json object is populated by whatever is set in the $_template_args property.
+	 *
+	 * @param string $content
+	 * @param array $data
+	 */
+	public function returnJson(string $content = '', array $data = []): void
+	{
+		// make sure any EE_Error notices have been handled.
+		$notices = EE_Error::get_notices(false);
+		wp_send_json(
+			[
+				'success'   => $notices['success'] ?? false,
+				'errors'    => $notices['errors'] ?? false,
+				'attention' => $notices['attention'] ?? false,
+				'notices'   => $notices,
+				'content'   => $content,
+				'data'      => $data,
+				// special flag so any ajax.Success methods in js can identify this return package as a EEajax package.
+				'isEEajax'  => true,
+			]
+		);
+	}
 }