eventespresso / event-espresso-core

core/domain/services/custom_post_types/RegisterCustomTaxonomyTerms.php

Indentation +165 added lines, -165 removed lines

@@ -16,181 +16,181 @@
  */
 class RegisterCustomTaxonomyTerms
 {
-    /**
-     * @var array[] $custom_taxonomy_terms
-     */
-    public $custom_taxonomy_terms = array();
+	/**
+	 * @var array[] $custom_taxonomy_terms
+	 */
+	public $custom_taxonomy_terms = array();
 
 
-    /**
-     * RegisterCustomTaxonomyTerms constructor.
-     */
-    public function __construct()
-    {
-        // hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts
-        // IF they don't have a term for that taxonomy set.
-        add_action('save_post', array($this, 'saveDefaultTerm'), 100, 2);
-        do_action(
-            'AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end',
-            $this
-        );
-    }
+	/**
+	 * RegisterCustomTaxonomyTerms constructor.
+	 */
+	public function __construct()
+	{
+		// hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts
+		// IF they don't have a term for that taxonomy set.
+		add_action('save_post', array($this, 'saveDefaultTerm'), 100, 2);
+		do_action(
+			'AHEE__EventEspresso_core_domain_services_custom_post_types_RegisterCustomTaxonomyTerms__construct_end',
+			$this
+		);
+	}
 
 
-    public function registerCustomTaxonomyTerms()
-    {
-        // setup default terms in any of our taxonomies (but only if we're in admin).
-        // Why not added via register_activation_hook?
-        // Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies
-        // (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
-        // Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
-        // if ( is_admin() ) {
-        // $this->set_must_use_event_types();
-        // }
-        // set default terms
-        $this->registerCustomTaxonomyTerm(
-            'espresso_event_type',
-            'single-event',
-            [EspressoPostType::EVENTS]
-        );
-    }
+	public function registerCustomTaxonomyTerms()
+	{
+		// setup default terms in any of our taxonomies (but only if we're in admin).
+		// Why not added via register_activation_hook?
+		// Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies
+		// (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
+		// Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
+		// if ( is_admin() ) {
+		// $this->set_must_use_event_types();
+		// }
+		// set default terms
+		$this->registerCustomTaxonomyTerm(
+			'espresso_event_type',
+			'single-event',
+			[EspressoPostType::EVENTS]
+		);
+	}
 
 
-    /**
-     * Allows us to set what the default will be for terms when a cpt is PUBLISHED.
-     *
-     * @param string $taxonomy  The taxonomy we're using for the default term
-     * @param string $term_slug The slug of the term that will be the default.
-     * @param array  $cpt_slugs An array of custom post types we want the default assigned to
-     */
-    public function registerCustomTaxonomyTerm($taxonomy, $term_slug, array $cpt_slugs = array())
-    {
-        $this->custom_taxonomy_terms[][ $term_slug ] = new CustomTaxonomyTerm(
-            $taxonomy,
-            $term_slug,
-            $cpt_slugs
-        );
-    }
+	/**
+	 * Allows us to set what the default will be for terms when a cpt is PUBLISHED.
+	 *
+	 * @param string $taxonomy  The taxonomy we're using for the default term
+	 * @param string $term_slug The slug of the term that will be the default.
+	 * @param array  $cpt_slugs An array of custom post types we want the default assigned to
+	 */
+	public function registerCustomTaxonomyTerm($taxonomy, $term_slug, array $cpt_slugs = array())
+	{
+		$this->custom_taxonomy_terms[][ $term_slug ] = new CustomTaxonomyTerm(
+			$taxonomy,
+			$term_slug,
+			$cpt_slugs
+		);
+	}
 
 
-    /**
-     * hooked into the wp 'save_post' action hook for setting our default terms found in the $_default_terms property
-     *
-     * @param  int          $post_id ID of CPT being saved
-     * @param  WP_Post|null $post    Post object
-     * @return void
-     */
-    public function saveDefaultTerm(int $post_id, ?WP_Post $post)
-    {
-        if (! $post || empty($this->custom_taxonomy_terms)) {
-            return;
-        }
-        // no default terms set so lets just exit.
-        foreach ($this->custom_taxonomy_terms as $custom_taxonomy_terms) {
-            foreach ($custom_taxonomy_terms as $custom_taxonomy_term) {
-                if (
-                    $post->post_status === 'publish'
-                    && $custom_taxonomy_term instanceof CustomTaxonomyTerm
-                    && in_array($post->post_type, $custom_taxonomy_term->customPostTypeSlugs(), true)
-                ) {
-                    // note some error proofing going on here to save unnecessary db queries
-                    $taxonomies = get_object_taxonomies($post->post_type);
-                    foreach ($taxonomies as $taxonomy) {
-                        $terms = wp_get_post_terms($post_id, $taxonomy);
-                        if (empty($terms) && $taxonomy === $custom_taxonomy_term->taxonomySlug()) {
-                            wp_set_object_terms(
-                                $post_id,
-                                array($custom_taxonomy_term->termSlug()),
-                                $taxonomy
-                            );
-                        }
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * hooked into the wp 'save_post' action hook for setting our default terms found in the $_default_terms property
+	 *
+	 * @param  int          $post_id ID of CPT being saved
+	 * @param  WP_Post|null $post    Post object
+	 * @return void
+	 */
+	public function saveDefaultTerm(int $post_id, ?WP_Post $post)
+	{
+		if (! $post || empty($this->custom_taxonomy_terms)) {
+			return;
+		}
+		// no default terms set so lets just exit.
+		foreach ($this->custom_taxonomy_terms as $custom_taxonomy_terms) {
+			foreach ($custom_taxonomy_terms as $custom_taxonomy_term) {
+				if (
+					$post->post_status === 'publish'
+					&& $custom_taxonomy_term instanceof CustomTaxonomyTerm
+					&& in_array($post->post_type, $custom_taxonomy_term->customPostTypeSlugs(), true)
+				) {
+					// note some error proofing going on here to save unnecessary db queries
+					$taxonomies = get_object_taxonomies($post->post_type);
+					foreach ($taxonomies as $taxonomy) {
+						$terms = wp_get_post_terms($post_id, $taxonomy);
+						if (empty($terms) && $taxonomy === $custom_taxonomy_term->taxonomySlug()) {
+							wp_set_object_terms(
+								$post_id,
+								array($custom_taxonomy_term->termSlug()),
+								$taxonomy
+							);
+						}
+					}
+				}
+			}
+		}
+	}
 
 
-    /**
-     * @return void
-     */
-    public function setMustUseEventTypes()
-    {
-        $term_details = array(
-            // Attendee's register for the first date-time only
-            'single-event'    => array(
-                'term' => esc_html__('Single Event', 'event_espresso'),
-                'desc' => esc_html__(
-                    'A single event that spans one or more consecutive days.',
-                    'event_espresso'
-                ),
-            ),
-            // example: a party or two-day long workshop
-            // Attendee's can register for any of the date-times
-            'multi-event'     => array(
-                'term' => esc_html__('Multi Event', 'event_espresso'),
-                'desc' => esc_html__(
-                    'Multiple, separate, but related events that occur on consecutive days.',
-                    'event_espresso'
-                ),
-            ),
-            // example: a three day music festival or week long conference
-            // Attendee's register for the first date-time only
-            'event-series'    => array(
-                'term' => esc_html__('Event Series', 'event_espresso'),
-                'desc' => esc_html__(
-                    ' Multiple events that occur over multiple non-consecutive days.',
-                    'event_espresso'
-                ),
-            ),
-            // example: an 8 week introduction to basket weaving course
-            // Attendee's can register for any of the date-times.
-            'recurring-event' => array(
-                'term' => esc_html__('Recurring Event', 'event_espresso'),
-                'desc' => esc_html__(
-                    'Multiple events that occur over multiple non-consecutive days.',
-                    'event_espresso'
-                ),
-            ),
-            // example: a yoga class
-            'ongoing'         => array(
-                'term' => esc_html__('Ongoing Event', 'event_espresso'),
-                'desc' => esc_html__(
-                    'An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event',
-                    'event_espresso'
-                ),
-            )
-            // example: access to a museum
-            // 'walk-in' => array( esc_html__('Walk In', 'event_espresso'), esc_html__('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
-            // 'reservation' => array( esc_html__('Reservation', 'event_espresso'), esc_html__('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
-            // 'multiple-session' => array( esc_html__('Multiple Session', 'event_espresso'), esc_html__('Multiple event, multiple datetime, hierarchically organized, custom entry events. Attendees may be required to register for a parent event before being allowed to register for child events. Attendees can register for any combination of child events as long as the datetimes do not conflict. Parent and child events may have additional fees or registration questions.') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
-            // 'appointment' => array( esc_html__('Appointments', 'event_espresso'), esc_html__('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
-        );
-        $this->setMustUseTerms('espresso_event_type', $term_details);
-    }
+	/**
+	 * @return void
+	 */
+	public function setMustUseEventTypes()
+	{
+		$term_details = array(
+			// Attendee's register for the first date-time only
+			'single-event'    => array(
+				'term' => esc_html__('Single Event', 'event_espresso'),
+				'desc' => esc_html__(
+					'A single event that spans one or more consecutive days.',
+					'event_espresso'
+				),
+			),
+			// example: a party or two-day long workshop
+			// Attendee's can register for any of the date-times
+			'multi-event'     => array(
+				'term' => esc_html__('Multi Event', 'event_espresso'),
+				'desc' => esc_html__(
+					'Multiple, separate, but related events that occur on consecutive days.',
+					'event_espresso'
+				),
+			),
+			// example: a three day music festival or week long conference
+			// Attendee's register for the first date-time only
+			'event-series'    => array(
+				'term' => esc_html__('Event Series', 'event_espresso'),
+				'desc' => esc_html__(
+					' Multiple events that occur over multiple non-consecutive days.',
+					'event_espresso'
+				),
+			),
+			// example: an 8 week introduction to basket weaving course
+			// Attendee's can register for any of the date-times.
+			'recurring-event' => array(
+				'term' => esc_html__('Recurring Event', 'event_espresso'),
+				'desc' => esc_html__(
+					'Multiple events that occur over multiple non-consecutive days.',
+					'event_espresso'
+				),
+			),
+			// example: a yoga class
+			'ongoing'         => array(
+				'term' => esc_html__('Ongoing Event', 'event_espresso'),
+				'desc' => esc_html__(
+					'An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event',
+					'event_espresso'
+				),
+			)
+			// example: access to a museum
+			// 'walk-in' => array( esc_html__('Walk In', 'event_espresso'), esc_html__('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
+			// 'reservation' => array( esc_html__('Reservation', 'event_espresso'), esc_html__('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
+			// 'multiple-session' => array( esc_html__('Multiple Session', 'event_espresso'), esc_html__('Multiple event, multiple datetime, hierarchically organized, custom entry events. Attendees may be required to register for a parent event before being allowed to register for child events. Attendees can register for any combination of child events as long as the datetimes do not conflict. Parent and child events may have additional fees or registration questions.') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
+			// 'appointment' => array( esc_html__('Appointments', 'event_espresso'), esc_html__('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
+		);
+		$this->setMustUseTerms('espresso_event_type', $term_details);
+	}
 
 
-    /**
-     * wrapper method for handling the setting up of initial terms in the db (if they don't already exist).
-     * Note this should ONLY be used for terms that always must be present.  Be aware that if an initial term is
-     * deleted then it WILL be recreated.
-     *
-     * @param string $taxonomy     The name of the taxonomy
-     * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
-     *                             description as the elements in the array
-     * @return void
-     */
-    public function setMustUseTerms($taxonomy, $term_details)
-    {
-        $term_details = (array) $term_details;
-        foreach ($term_details as $slug => $details) {
-            if (isset($details['term'], $details['desc']) && ! term_exists($slug, $taxonomy)) {
-                $insert_arr = array(
-                    'slug'        => $slug,
-                    'description' => $details['desc'],
-                );
-                wp_insert_term($details['term'], $taxonomy, $insert_arr);
-            }
-        }
-    }
+	/**
+	 * wrapper method for handling the setting up of initial terms in the db (if they don't already exist).
+	 * Note this should ONLY be used for terms that always must be present.  Be aware that if an initial term is
+	 * deleted then it WILL be recreated.
+	 *
+	 * @param string $taxonomy     The name of the taxonomy
+	 * @param array  $term_details An array of term details indexed by slug and containing Name of term, and
+	 *                             description as the elements in the array
+	 * @return void
+	 */
+	public function setMustUseTerms($taxonomy, $term_details)
+	{
+		$term_details = (array) $term_details;
+		foreach ($term_details as $slug => $details) {
+			if (isset($details['term'], $details['desc']) && ! term_exists($slug, $taxonomy)) {
+				$insert_arr = array(
+					'slug'        => $slug,
+					'description' => $details['desc'],
+				);
+				wp_insert_term($details['term'], $taxonomy, $insert_arr);
+			}
+		}
+	}
 }

core/domain/services/capabilities/user_caps/RegistrationsListTableUserCapabilities.php

Indentation +146 added lines, -146 removed lines

@@ -15,150 +15,150 @@
  */
 class RegistrationsListTableUserCapabilities extends UserCapabilities
 {
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanReadRegistration(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_read_registration',
-            'espresso_registrations_view_registration',
-            $registration->ID()
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanEditRegistration(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_edit_registration',
-            'registration_list_table_checkbox_input',
-            $registration->ID()
-        );
-    }
-
-
-    public function userCanTrashRegistrations(): bool
-    {
-        return $this->hasGlobalCap('ee_delete_registrations', 'espresso_registrations_trash_registrations');
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanTrashRegistration(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_delete_registration',
-            'espresso_registrations_trash_registrations',
-            $registration->ID()
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanDeleteRegistration(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_delete_registration',
-            'espresso_registrations_ee_delete_registrations',
-            $registration->ID()
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanRestoreRegistration(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_delete_registration',
-            'espresso_registrations_restore_registrations',
-            $registration->ID()
-        );
-    }
-
-
-    public function userCanViewTransaction(): bool
-    {
-        return $this->hasGlobalCap('ee_read_transaction', 'espresso_transactions_view_transaction');
-    }
-
-
-    public function userCanReadGlobalMessages(): bool
-    {
-        return $this->hasGlobalCap('ee_read_global_messages', 'view_filtered_messages');
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanResendMessage(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_send_message',
-            'espresso_registrations_resend_registration',
-            $registration->ID()
-        );
-    }
-
-
-    public function userCanEditEvent(int $EVT_ID): bool
-    {
-        return $this->hasEntityCap('ee_edit_event', 'edit_event', $EVT_ID);
-    }
-
-
-    public function userCanEditContacts(): bool
-    {
-        return $this->hasGlobalCap('ee_edit_contacts', 'espresso_registrations_edit_attendee');
-    }
-
-
-    public function userCanReadRegistrationCheckins(): bool
-    {
-        return $this->hasGlobalCap('ee_read_checkins', 'espresso_registrations_registration_checkins');
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanReadRegistrationCheckin(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_read_checkin',
-            'espresso_registrations_registration_checkins',
-            $registration->ID()
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function userCanEditRegistrationCheckin(EE_Registration $registration): bool
-    {
-        return $this->hasEntityCap(
-            'ee_edit_checkin',
-            'espresso_registrations_toggle_checkin_status',
-            $registration->ID()
-        );
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanReadRegistration(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_read_registration',
+			'espresso_registrations_view_registration',
+			$registration->ID()
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanEditRegistration(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_edit_registration',
+			'registration_list_table_checkbox_input',
+			$registration->ID()
+		);
+	}
+
+
+	public function userCanTrashRegistrations(): bool
+	{
+		return $this->hasGlobalCap('ee_delete_registrations', 'espresso_registrations_trash_registrations');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanTrashRegistration(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_delete_registration',
+			'espresso_registrations_trash_registrations',
+			$registration->ID()
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanDeleteRegistration(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_delete_registration',
+			'espresso_registrations_ee_delete_registrations',
+			$registration->ID()
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanRestoreRegistration(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_delete_registration',
+			'espresso_registrations_restore_registrations',
+			$registration->ID()
+		);
+	}
+
+
+	public function userCanViewTransaction(): bool
+	{
+		return $this->hasGlobalCap('ee_read_transaction', 'espresso_transactions_view_transaction');
+	}
+
+
+	public function userCanReadGlobalMessages(): bool
+	{
+		return $this->hasGlobalCap('ee_read_global_messages', 'view_filtered_messages');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanResendMessage(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_send_message',
+			'espresso_registrations_resend_registration',
+			$registration->ID()
+		);
+	}
+
+
+	public function userCanEditEvent(int $EVT_ID): bool
+	{
+		return $this->hasEntityCap('ee_edit_event', 'edit_event', $EVT_ID);
+	}
+
+
+	public function userCanEditContacts(): bool
+	{
+		return $this->hasGlobalCap('ee_edit_contacts', 'espresso_registrations_edit_attendee');
+	}
+
+
+	public function userCanReadRegistrationCheckins(): bool
+	{
+		return $this->hasGlobalCap('ee_read_checkins', 'espresso_registrations_registration_checkins');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanReadRegistrationCheckin(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_read_checkin',
+			'espresso_registrations_registration_checkins',
+			$registration->ID()
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function userCanEditRegistrationCheckin(EE_Registration $registration): bool
+	{
+		return $this->hasEntityCap(
+			'ee_edit_checkin',
+			'espresso_registrations_toggle_checkin_status',
+			$registration->ID()
+		);
+	}
 }

core/domain/services/capabilities/user_caps/UserCapabilities.php

Indentation +41 added lines, -41 removed lines

@@ -6,45 +6,45 @@
 
 abstract class UserCapabilities
 {
-    private EE_Capabilities $capabilities;
-
-    private array $caps = [];
-
-
-    /**
-     * @param EE_Capabilities $capabilities
-     */
-    public function __construct(EE_Capabilities $capabilities)
-    {
-        $this->capabilities = $capabilities;
-    }
-
-
-    /**
-     * @param string     $cap
-     * @param string     $context
-     * @param int|string $ID
-     * @return bool
-     */
-    protected function hasEntityCap(string $cap, string $context, $ID): bool
-    {
-        if (! isset($this->caps[ $cap ][ $context ][ $ID ])) {
-            $this->caps[ $cap ][ $context ][ $ID ] = $this->capabilities->current_user_can($cap, $context, $ID);
-        }
-        return $this->caps[ $cap ][ $context ][ $ID ];
-    }
-
-
-    /**
-     * @param string $cap
-     * @param string $context
-     * @return bool
-     */
-    protected function hasGlobalCap(string $cap, string $context): bool
-    {
-        if (! isset($this->caps[ $cap ][ $context ])) {
-            $this->caps[ $cap ][ $context ] = $this->capabilities->current_user_can($cap, $context);
-        }
-        return $this->caps[ $cap ][ $context ];
-    }
+	private EE_Capabilities $capabilities;
+
+	private array $caps = [];
+
+
+	/**
+	 * @param EE_Capabilities $capabilities
+	 */
+	public function __construct(EE_Capabilities $capabilities)
+	{
+		$this->capabilities = $capabilities;
+	}
+
+
+	/**
+	 * @param string     $cap
+	 * @param string     $context
+	 * @param int|string $ID
+	 * @return bool
+	 */
+	protected function hasEntityCap(string $cap, string $context, $ID): bool
+	{
+		if (! isset($this->caps[ $cap ][ $context ][ $ID ])) {
+			$this->caps[ $cap ][ $context ][ $ID ] = $this->capabilities->current_user_can($cap, $context, $ID);
+		}
+		return $this->caps[ $cap ][ $context ][ $ID ];
+	}
+
+
+	/**
+	 * @param string $cap
+	 * @param string $context
+	 * @return bool
+	 */
+	protected function hasGlobalCap(string $cap, string $context): bool
+	{
+		if (! isset($this->caps[ $cap ][ $context ])) {
+			$this->caps[ $cap ][ $context ] = $this->capabilities->current_user_can($cap, $context);
+		}
+		return $this->caps[ $cap ][ $context ];
+	}
 }

core/domain/services/capabilities/FeatureFlag.php

Indentation +162 added lines, -162 removed lines

@@ -11,166 +11,166 @@
 class FeatureFlag
 {
 
-    /**
-     * Whether to use the New Event Editor (EDTR) or continue using the legacy Event Editor
-     * deafult: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
-     */
-    public const  USE_ADVANCED_EVENT_EDITOR = 'ee_advanced_event_editor';
-
-    /**
-     * Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR)
-     * default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
-     */
-    public const  USE_EVENT_EDITOR_BULK_EDIT = 'ee_event_editor_bulk_edit';
-
-    /**
-     * Whether to enable the new Default Ticket Manager in the EDTR
-     * default: Enabled
-     */
-    public const  USE_DEFAULT_TICKET_MANAGER = 'use_default_ticket_manager';
-
-    /**
-     * Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce
-     * default: Disabled
-     */
-    public const  USE_EVENT_DESCRIPTION_RTE = 'use_event_description_rte';
-
-    /**
-     * Whether to enable the Rich Text Editor for all other RTE fields in the EDTR
-     * default: Disabled
-     */
-    public const  USE_EXPERIMENTAL_RTE = 'use_experimental_rte';
-
-    /**
-     * Whether to enable the new Registration Form Builder in the EDTR
-     * or continue using the legacy Question Groups and Registration Form admin pages
-     * default: Disabled
-     */
-    public const  USE_REG_FORM_BUILDER = 'use_reg_form_builder';
-
-    /**
-     * Whether to enable the new Registration Options meta box in the EDTR
-     * or continue using the legacy Event Registration Options
-     * default: Disabled
-     */
-    public const  USE_REG_OPTIONS_META_BOX = 'use_reg_options_meta_box';
-
-    /**
-     * Whether to enable the new Single Page Checkout form refactor changes
-     * default: Disabled
-     *
-     * @since 5.0.18.p
-     */
-    public const  USE_SPCO_FORM_REFACTOR = 'use_spco_form_refactor';
-
-    /**
-     * Whether to enable the new Reg Form Ticket Questions functionality
-     * default: Disabled
-     */
-    public const  USE_REG_FORM_TICKET_QUESTIONS = 'use_reg_form_ticket_questions';
-
-    /**
-     * Whether to use the EDD Plugin Licensing system to manage licenses for the EE plugins
-     * default: Disabled
-     */
-    public const USE_EDD_PLUGIN_LICENSING = 'use_edd_plugin_licensing';
-
-    /**
-     * Whether to use the new Datetime Status Controls in the EDTR
-     * default: Disabled
-     */
-    public const USE_DATETIME_STATUS_CONTROLS = 'use_datetime_status_controls';
-
-
-
-    public static function getFormOptions(): array
-    {
-        return [
-            FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT => [
-                'name' => esc_html__('Event Editor Bulk Edit','event_espresso'),
-                'html_label_text' => esc_html__('Use Event Editor Bulk Edit','event_espresso'),
-                'help_text' => sprintf(
-                    esc_html__(
-                        'Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR).%1$s%2$sPLEASE NOTE: Bulk Editing is ALWAYS enabled if the Recurring Events Manager add-on is active.%3$s%1$s default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs',
-                        'event_espresso'
-                    ),
-                    '<br/>',
-                    '<strong>',
-                    '</strong>'
-                )
-            ],
-            FeatureFlag::USE_DEFAULT_TICKET_MANAGER => [
-                'name' => esc_html__('Default Ticket Manager','event_espresso'),
-                'html_label_text' => esc_html__('Use Default Ticket Manager','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the new Default Ticket Manager in the EDTR. default: Enabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_EVENT_DESCRIPTION_RTE => [
-                'name' => esc_html__('Event Description RTE','event_espresso'),
-                'html_label_text' => esc_html__('Use Rich Text Editor for Event Description','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_EXPERIMENTAL_RTE => [
-                'name' => esc_html__('Rich Text Editor','event_espresso'),
-                'html_label_text' => esc_html__('Use Rich Text Editor for other RTE fields','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the Rich Text Editor for all other RTE fields in the EDTR. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_REG_FORM_BUILDER => [
-                'name' => esc_html__('Registration Form Builder','event_espresso'),
-                'html_label_text' => esc_html__('Use Registration Form Builder','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the new Registration Form Builder in the EDTR or continue using the legacy Question Groups and Registration Form admin pages. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_REG_OPTIONS_META_BOX => [
-                'name' => esc_html__('Registration Options','event_espresso'),
-                'html_label_text' => esc_html__('Use Registration Options','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the new Registration Options meta box in the EDTR or continue using the legacy Event Registration Options. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_SPCO_FORM_REFACTOR => [
-                'name' => esc_html__('SPCO Form Refactor','event_espresso'),
-                'html_label_text' => esc_html__('Use SPCO Form Refactor','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the new Single Page Checkout form refactor changes or continue using the legacy Single Page Checkout form. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_REG_FORM_TICKET_QUESTIONS => [
-                'name' => esc_html__('Reg Form Ticket Questions','event_espresso'),
-                'html_label_text' => esc_html__('Use Reg Form Ticket Questions','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to enable the new Reg Form Ticket Questions functionality. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_EDD_PLUGIN_LICENSING => [
-                'name' => esc_html__('EDD Plugin Licensing','event_espresso'),
-                'html_label_text' => esc_html__('Use EDD Plugin Licensing','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to use the EDD Plugin Licensing system to manage licenses for the EE plugins. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-            FeatureFlag::USE_DATETIME_STATUS_CONTROLS => [
-                'name' => esc_html__('Datetime Status Controls','event_espresso'),
-                'html_label_text' => esc_html__('Use Datetime Status Controls','event_espresso'),
-                'help_text' => esc_html__(
-                    'Whether to use the new Datetime Status Controls in the EDTR. default: Disabled',
-                    'event_espresso'
-                )
-            ],
-        ];
-    }
+	/**
+	 * Whether to use the New Event Editor (EDTR) or continue using the legacy Event Editor
+	 * deafult: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
+	 */
+	public const  USE_ADVANCED_EVENT_EDITOR = 'ee_advanced_event_editor';
+
+	/**
+	 * Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR)
+	 * default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs
+	 */
+	public const  USE_EVENT_EDITOR_BULK_EDIT = 'ee_event_editor_bulk_edit';
+
+	/**
+	 * Whether to enable the new Default Ticket Manager in the EDTR
+	 * default: Enabled
+	 */
+	public const  USE_DEFAULT_TICKET_MANAGER = 'use_default_ticket_manager';
+
+	/**
+	 * Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce
+	 * default: Disabled
+	 */
+	public const  USE_EVENT_DESCRIPTION_RTE = 'use_event_description_rte';
+
+	/**
+	 * Whether to enable the Rich Text Editor for all other RTE fields in the EDTR
+	 * default: Disabled
+	 */
+	public const  USE_EXPERIMENTAL_RTE = 'use_experimental_rte';
+
+	/**
+	 * Whether to enable the new Registration Form Builder in the EDTR
+	 * or continue using the legacy Question Groups and Registration Form admin pages
+	 * default: Disabled
+	 */
+	public const  USE_REG_FORM_BUILDER = 'use_reg_form_builder';
+
+	/**
+	 * Whether to enable the new Registration Options meta box in the EDTR
+	 * or continue using the legacy Event Registration Options
+	 * default: Disabled
+	 */
+	public const  USE_REG_OPTIONS_META_BOX = 'use_reg_options_meta_box';
+
+	/**
+	 * Whether to enable the new Single Page Checkout form refactor changes
+	 * default: Disabled
+	 *
+	 * @since 5.0.18.p
+	 */
+	public const  USE_SPCO_FORM_REFACTOR = 'use_spco_form_refactor';
+
+	/**
+	 * Whether to enable the new Reg Form Ticket Questions functionality
+	 * default: Disabled
+	 */
+	public const  USE_REG_FORM_TICKET_QUESTIONS = 'use_reg_form_ticket_questions';
+
+	/**
+	 * Whether to use the EDD Plugin Licensing system to manage licenses for the EE plugins
+	 * default: Disabled
+	 */
+	public const USE_EDD_PLUGIN_LICENSING = 'use_edd_plugin_licensing';
+
+	/**
+	 * Whether to use the new Datetime Status Controls in the EDTR
+	 * default: Disabled
+	 */
+	public const USE_DATETIME_STATUS_CONTROLS = 'use_datetime_status_controls';
+
+
+
+	public static function getFormOptions(): array
+	{
+		return [
+			FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT => [
+				'name' => esc_html__('Event Editor Bulk Edit','event_espresso'),
+				'html_label_text' => esc_html__('Use Event Editor Bulk Edit','event_espresso'),
+				'help_text' => sprintf(
+					esc_html__(
+						'Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR).%1$s%2$sPLEASE NOTE: Bulk Editing is ALWAYS enabled if the Recurring Events Manager add-on is active.%3$s%1$s default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs',
+						'event_espresso'
+					),
+					'<br/>',
+					'<strong>',
+					'</strong>'
+				)
+			],
+			FeatureFlag::USE_DEFAULT_TICKET_MANAGER => [
+				'name' => esc_html__('Default Ticket Manager','event_espresso'),
+				'html_label_text' => esc_html__('Use Default Ticket Manager','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the new Default Ticket Manager in the EDTR. default: Enabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_EVENT_DESCRIPTION_RTE => [
+				'name' => esc_html__('Event Description RTE','event_espresso'),
+				'html_label_text' => esc_html__('Use Rich Text Editor for Event Description','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_EXPERIMENTAL_RTE => [
+				'name' => esc_html__('Rich Text Editor','event_espresso'),
+				'html_label_text' => esc_html__('Use Rich Text Editor for other RTE fields','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the Rich Text Editor for all other RTE fields in the EDTR. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_REG_FORM_BUILDER => [
+				'name' => esc_html__('Registration Form Builder','event_espresso'),
+				'html_label_text' => esc_html__('Use Registration Form Builder','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the new Registration Form Builder in the EDTR or continue using the legacy Question Groups and Registration Form admin pages. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_REG_OPTIONS_META_BOX => [
+				'name' => esc_html__('Registration Options','event_espresso'),
+				'html_label_text' => esc_html__('Use Registration Options','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the new Registration Options meta box in the EDTR or continue using the legacy Event Registration Options. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_SPCO_FORM_REFACTOR => [
+				'name' => esc_html__('SPCO Form Refactor','event_espresso'),
+				'html_label_text' => esc_html__('Use SPCO Form Refactor','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the new Single Page Checkout form refactor changes or continue using the legacy Single Page Checkout form. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_REG_FORM_TICKET_QUESTIONS => [
+				'name' => esc_html__('Reg Form Ticket Questions','event_espresso'),
+				'html_label_text' => esc_html__('Use Reg Form Ticket Questions','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to enable the new Reg Form Ticket Questions functionality. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_EDD_PLUGIN_LICENSING => [
+				'name' => esc_html__('EDD Plugin Licensing','event_espresso'),
+				'html_label_text' => esc_html__('Use EDD Plugin Licensing','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to use the EDD Plugin Licensing system to manage licenses for the EE plugins. default: Disabled',
+					'event_espresso'
+				)
+			],
+			FeatureFlag::USE_DATETIME_STATUS_CONTROLS => [
+				'name' => esc_html__('Datetime Status Controls','event_espresso'),
+				'html_label_text' => esc_html__('Use Datetime Status Controls','event_espresso'),
+				'help_text' => esc_html__(
+					'Whether to use the new Datetime Status Controls in the EDTR. default: Disabled',
+					'event_espresso'
+				)
+			],
+		];
+	}
 }

Spacing +20 added lines, -20 removed lines

@@ -87,8 +87,8 @@ 
     {
         return [
             FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT => [
-                'name' => esc_html__('Event Editor Bulk Edit','event_espresso'),
-                'html_label_text' => esc_html__('Use Event Editor Bulk Edit','event_espresso'),
+                'name' => esc_html__('Event Editor Bulk Edit', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Event Editor Bulk Edit', 'event_espresso'),
                 'help_text' => sprintf(
                     esc_html__(
                         'Whether to enable the Bulk Edit feature in the Advanced Event Editor (EDTR).%1$s%2$sPLEASE NOTE: Bulk Editing is ALWAYS enabled if the Recurring Events Manager add-on is active.%3$s%1$s default: Enabled for Caffeinated sites, disabled for Decaf or Multisite installs',
@@ -100,72 +100,72 @@ 
                 )
             ],
             FeatureFlag::USE_DEFAULT_TICKET_MANAGER => [
-                'name' => esc_html__('Default Ticket Manager','event_espresso'),
-                'html_label_text' => esc_html__('Use Default Ticket Manager','event_espresso'),
+                'name' => esc_html__('Default Ticket Manager', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Default Ticket Manager', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the new Default Ticket Manager in the EDTR. default: Enabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_EVENT_DESCRIPTION_RTE => [
-                'name' => esc_html__('Event Description RTE','event_espresso'),
-                'html_label_text' => esc_html__('Use Rich Text Editor for Event Description','event_espresso'),
+                'name' => esc_html__('Event Description RTE', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Rich Text Editor for Event Description', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the Rich Text Editor for the Event Description field in the EDTR or use tinymce. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_EXPERIMENTAL_RTE => [
-                'name' => esc_html__('Rich Text Editor','event_espresso'),
-                'html_label_text' => esc_html__('Use Rich Text Editor for other RTE fields','event_espresso'),
+                'name' => esc_html__('Rich Text Editor', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Rich Text Editor for other RTE fields', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the Rich Text Editor for all other RTE fields in the EDTR. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_REG_FORM_BUILDER => [
-                'name' => esc_html__('Registration Form Builder','event_espresso'),
-                'html_label_text' => esc_html__('Use Registration Form Builder','event_espresso'),
+                'name' => esc_html__('Registration Form Builder', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Registration Form Builder', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the new Registration Form Builder in the EDTR or continue using the legacy Question Groups and Registration Form admin pages. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_REG_OPTIONS_META_BOX => [
-                'name' => esc_html__('Registration Options','event_espresso'),
-                'html_label_text' => esc_html__('Use Registration Options','event_espresso'),
+                'name' => esc_html__('Registration Options', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Registration Options', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the new Registration Options meta box in the EDTR or continue using the legacy Event Registration Options. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_SPCO_FORM_REFACTOR => [
-                'name' => esc_html__('SPCO Form Refactor','event_espresso'),
-                'html_label_text' => esc_html__('Use SPCO Form Refactor','event_espresso'),
+                'name' => esc_html__('SPCO Form Refactor', 'event_espresso'),
+                'html_label_text' => esc_html__('Use SPCO Form Refactor', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the new Single Page Checkout form refactor changes or continue using the legacy Single Page Checkout form. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_REG_FORM_TICKET_QUESTIONS => [
-                'name' => esc_html__('Reg Form Ticket Questions','event_espresso'),
-                'html_label_text' => esc_html__('Use Reg Form Ticket Questions','event_espresso'),
+                'name' => esc_html__('Reg Form Ticket Questions', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Reg Form Ticket Questions', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to enable the new Reg Form Ticket Questions functionality. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_EDD_PLUGIN_LICENSING => [
-                'name' => esc_html__('EDD Plugin Licensing','event_espresso'),
-                'html_label_text' => esc_html__('Use EDD Plugin Licensing','event_espresso'),
+                'name' => esc_html__('EDD Plugin Licensing', 'event_espresso'),
+                'html_label_text' => esc_html__('Use EDD Plugin Licensing', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to use the EDD Plugin Licensing system to manage licenses for the EE plugins. default: Disabled',
                     'event_espresso'
                 )
             ],
             FeatureFlag::USE_DATETIME_STATUS_CONTROLS => [
-                'name' => esc_html__('Datetime Status Controls','event_espresso'),
-                'html_label_text' => esc_html__('Use Datetime Status Controls','event_espresso'),
+                'name' => esc_html__('Datetime Status Controls', 'event_espresso'),
+                'html_label_text' => esc_html__('Use Datetime Status Controls', 'event_espresso'),
                 'help_text' => esc_html__(
                     'Whether to use the new Datetime Status Controls in the EDTR. default: Disabled',
                     'event_espresso'

core/domain/services/capabilities/FeatureFlagsConfig.php

Indentation +123 added lines, -123 removed lines

@@ -17,127 +17,127 @@
  */
 class FeatureFlagsConfig extends JsonDataWordpressOption
 {
-    /**
-     * WP option name for saving the Feature Flags configuration
-     */
-    private const OPTION_NAME = 'ee_feature_flags';
-
-    /**
-     * use FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT instead
-     * this hasn't been deleted because it's used in the REM add-on
-     *
-     * @deprecated 5.0.18.p
-     */
-    public const  USE_EVENT_EDITOR_BULK_EDIT = FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT;
-
-
-
-    protected Domain $domain;
-
-
-    public function __construct(Domain $domain, JsonDataHandler $json_data_handler)
-    {
-        $this->domain = $domain;
-        parent::__construct($json_data_handler, FeatureFlagsConfig::OPTION_NAME, $this->getDefaultFeatureFlagOptions());
-    }
-
-
-    /**
-     * see the FeatureFlag::USE_* constants for descriptions of each feature flag and their default values
-     *
-     * @return stdClass
-     */
-    public function getDefaultFeatureFlagOptions(): stdClass
-    {
-        return (object) [
-            FeatureFlag::USE_ADVANCED_EVENT_EDITOR     => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
-            FeatureFlag::USE_DEFAULT_TICKET_MANAGER    => true,
-            FeatureFlag::USE_EDD_PLUGIN_LICENSING      => defined('EE_USE_EDD_PLUGIN_LICENSING') && EE_USE_EDD_PLUGIN_LICENSING,
-            FeatureFlag::USE_EVENT_DESCRIPTION_RTE     => false,
-            FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT    => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
-            FeatureFlag::USE_EXPERIMENTAL_RTE          => false,
-            FeatureFlag::USE_REG_FORM_BUILDER          => false,
-            FeatureFlag::USE_REG_FORM_TICKET_QUESTIONS => false,
-            FeatureFlag::USE_REG_OPTIONS_META_BOX      => false,
-            FeatureFlag::USE_SPCO_FORM_REFACTOR        => false,
-        ];
-    }
-
-
-    /**
-     * @return stdClass
-     */
-    public function getFeatureFlags(): stdClass
-    {
-        $default_options = $this->getDefaultFeatureFlagOptions();
-        if (apply_filters('FHEE__FeatureFlagsConfig__getFeatureFlags__use_default_feature_flags', true)) {
-            return $default_options;
-        }
-        $feature_flags = $this->getAll();
-        // ensure that all feature flags are set
-        foreach ($default_options as $key => $value) {
-            // if the feature flag is not set, use the default value
-            if (!isset($feature_flags->$key)) {
-                $feature_flags->$key = $value;
-            }
-        }
-        return $feature_flags;
-    }
-
-
-    public function saveFeatureFlagsConfig(stdClass $feature_flags): int
-    {
-        return $this->updateOption($feature_flags);
-    }
-
-
-    /**
-     * enables a feature flag, ex:
-     * $this->enableFeatureFlag(FeatureFlag::USE_ADVANCED_EVENT_EDITOR);
-     *
-     * @param string $feature_flag the feature flag to enable. One of the FeatureFlag::USE_* constants
-     * @param bool   $add_if_missing
-     * @return int
-     */
-    public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false): int
-    {
-        $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag) && ! $add_if_missing) {
-                return WordPressOption::UPDATE_ERROR;
-        }
-        $feature_flags->{$feature_flag} = true;
-        // if feature flag is the advanced event editor or bulk edit options
-        // then only enabled if the site is Caffeinated and not MultiSite
-        if (
-            $feature_flag === FeatureFlag::USE_ADVANCED_EVENT_EDITOR
-            || $feature_flag === FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT
-        ) {
-            $feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
-        }
-        return $this->saveFeatureFlagsConfig($feature_flags);
-    }
-
-
-    /**
-     * disables a feature flag, ex:
-     * $this->disableFeatureFlag(FeatureFlag::USE_ADVANCED_EVENT_EDITOR);
-     *
-     * @param string $feature_flag the feature flag to disable. One of the FeatureFlag::USE_* constants
-     * @return int
-     */
-    public function disableFeatureFlag(string $feature_flag): int
-    {
-        $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
-            return WordPressOption::UPDATE_ERROR;
-        }
-        $feature_flags->{$feature_flag} = false;
-        return $this->saveFeatureFlagsConfig($feature_flags);
-    }
-
-
-    public function getFeatureFlagsFormOptions(): ?array
-    {
-        return FeatureFlag::getFormOptions();
-    }
+	/**
+	 * WP option name for saving the Feature Flags configuration
+	 */
+	private const OPTION_NAME = 'ee_feature_flags';
+
+	/**
+	 * use FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT instead
+	 * this hasn't been deleted because it's used in the REM add-on
+	 *
+	 * @deprecated 5.0.18.p
+	 */
+	public const  USE_EVENT_EDITOR_BULK_EDIT = FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT;
+
+
+
+	protected Domain $domain;
+
+
+	public function __construct(Domain $domain, JsonDataHandler $json_data_handler)
+	{
+		$this->domain = $domain;
+		parent::__construct($json_data_handler, FeatureFlagsConfig::OPTION_NAME, $this->getDefaultFeatureFlagOptions());
+	}
+
+
+	/**
+	 * see the FeatureFlag::USE_* constants for descriptions of each feature flag and their default values
+	 *
+	 * @return stdClass
+	 */
+	public function getDefaultFeatureFlagOptions(): stdClass
+	{
+		return (object) [
+			FeatureFlag::USE_ADVANCED_EVENT_EDITOR     => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
+			FeatureFlag::USE_DEFAULT_TICKET_MANAGER    => true,
+			FeatureFlag::USE_EDD_PLUGIN_LICENSING      => defined('EE_USE_EDD_PLUGIN_LICENSING') && EE_USE_EDD_PLUGIN_LICENSING,
+			FeatureFlag::USE_EVENT_DESCRIPTION_RTE     => false,
+			FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT    => $this->domain->isCaffeinated() && ! $this->domain->isMultiSite(),
+			FeatureFlag::USE_EXPERIMENTAL_RTE          => false,
+			FeatureFlag::USE_REG_FORM_BUILDER          => false,
+			FeatureFlag::USE_REG_FORM_TICKET_QUESTIONS => false,
+			FeatureFlag::USE_REG_OPTIONS_META_BOX      => false,
+			FeatureFlag::USE_SPCO_FORM_REFACTOR        => false,
+		];
+	}
+
+
+	/**
+	 * @return stdClass
+	 */
+	public function getFeatureFlags(): stdClass
+	{
+		$default_options = $this->getDefaultFeatureFlagOptions();
+		if (apply_filters('FHEE__FeatureFlagsConfig__getFeatureFlags__use_default_feature_flags', true)) {
+			return $default_options;
+		}
+		$feature_flags = $this->getAll();
+		// ensure that all feature flags are set
+		foreach ($default_options as $key => $value) {
+			// if the feature flag is not set, use the default value
+			if (!isset($feature_flags->$key)) {
+				$feature_flags->$key = $value;
+			}
+		}
+		return $feature_flags;
+	}
+
+
+	public function saveFeatureFlagsConfig(stdClass $feature_flags): int
+	{
+		return $this->updateOption($feature_flags);
+	}
+
+
+	/**
+	 * enables a feature flag, ex:
+	 * $this->enableFeatureFlag(FeatureFlag::USE_ADVANCED_EVENT_EDITOR);
+	 *
+	 * @param string $feature_flag the feature flag to enable. One of the FeatureFlag::USE_* constants
+	 * @param bool   $add_if_missing
+	 * @return int
+	 */
+	public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false): int
+	{
+		$feature_flags = $this->getFeatureFlags();
+		if (! property_exists($feature_flags, $feature_flag) && ! $add_if_missing) {
+				return WordPressOption::UPDATE_ERROR;
+		}
+		$feature_flags->{$feature_flag} = true;
+		// if feature flag is the advanced event editor or bulk edit options
+		// then only enabled if the site is Caffeinated and not MultiSite
+		if (
+			$feature_flag === FeatureFlag::USE_ADVANCED_EVENT_EDITOR
+			|| $feature_flag === FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT
+		) {
+			$feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
+		}
+		return $this->saveFeatureFlagsConfig($feature_flags);
+	}
+
+
+	/**
+	 * disables a feature flag, ex:
+	 * $this->disableFeatureFlag(FeatureFlag::USE_ADVANCED_EVENT_EDITOR);
+	 *
+	 * @param string $feature_flag the feature flag to disable. One of the FeatureFlag::USE_* constants
+	 * @return int
+	 */
+	public function disableFeatureFlag(string $feature_flag): int
+	{
+		$feature_flags = $this->getFeatureFlags();
+		if (! property_exists($feature_flags, $feature_flag)) {
+			return WordPressOption::UPDATE_ERROR;
+		}
+		$feature_flags->{$feature_flag} = false;
+		return $this->saveFeatureFlagsConfig($feature_flags);
+	}
+
+
+	public function getFeatureFlagsFormOptions(): ?array
+	{
+		return FeatureFlag::getFormOptions();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
         // ensure that all feature flags are set
         foreach ($default_options as $key => $value) {
             // if the feature flag is not set, use the default value
-            if (!isset($feature_flags->$key)) {
+            if ( ! isset($feature_flags->$key)) {
                 $feature_flags->$key = $value;
             }
         }
@@ -102,7 +102,7 @@ 
     public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false): int
     {
         $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag) && ! $add_if_missing) {
+        if ( ! property_exists($feature_flags, $feature_flag) && ! $add_if_missing) {
                 return WordPressOption::UPDATE_ERROR;
         }
         $feature_flags->{$feature_flag} = true;
@@ -128,7 +128,7 @@ 
     public function disableFeatureFlag(string $feature_flag): int
     {
         $feature_flags = $this->getFeatureFlags();
-        if (! property_exists($feature_flags, $feature_flag)) {
+        if ( ! property_exists($feature_flags, $feature_flag)) {
             return WordPressOption::UPDATE_ERROR;
         }
         $feature_flags->{$feature_flag} = false;

core/domain/deprecated/v4_9.php

Indentation +914 added lines, -914 removed lines

@@ -19,43 +19,43 @@ 
  */
 class EE_Message_Template_Defaults extends EE_Base
 {
-    /**
-     * EE_Message_Template_Defaults constructor.
-     *
-     * @param EE_messages $messages
-     * @param             $messenger_name
-     * @param             $message_type_name
-     * @param int         $GRP_ID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_messages $messages,
-        $messenger_name,
-        $message_type_name,
-        $GRP_ID = 0
-    ) {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            esc_html__(
-                'The class EE_Message_Template_Defaults has been deprecated and replaced by EE_Messages_Template_Defaults.',
-                'event_espresso'
-            ),
-            '4.9.0'
-        );
-        /** @var EE_Message_Resource_Manager $message_resource_manager */
-        $message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-        $messenger                = $message_resource_manager->get_messenger($messenger_name);
-        $message_type             = $message_resource_manager->get_message_type($message_type_name);
-        return EE_Registry::instance()->load_lib(
-            'Messages_Template_Defaults',
-            [
-                $messenger,
-                $message_type,
-                $GRP_ID,
-            ]
-        );
-    }
+	/**
+	 * EE_Message_Template_Defaults constructor.
+	 *
+	 * @param EE_messages $messages
+	 * @param             $messenger_name
+	 * @param             $message_type_name
+	 * @param int         $GRP_ID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_messages $messages,
+		$messenger_name,
+		$message_type_name,
+		$GRP_ID = 0
+	) {
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			esc_html__(
+				'The class EE_Message_Template_Defaults has been deprecated and replaced by EE_Messages_Template_Defaults.',
+				'event_espresso'
+			),
+			'4.9.0'
+		);
+		/** @var EE_Message_Resource_Manager $message_resource_manager */
+		$message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+		$messenger                = $message_resource_manager->get_messenger($messenger_name);
+		$message_type             = $message_resource_manager->get_message_type($message_type_name);
+		return EE_Registry::instance()->load_lib(
+			'Messages_Template_Defaults',
+			[
+				$messenger,
+				$message_type,
+				$GRP_ID,
+			]
+		);
+	}
 }
 
 
@@ -72,565 +72,565 @@ 
  */
 class EE_messages
 {
-    /** @type EE_messenger[] */
-    protected $_active_messengers = [];
-
-    /** @type array */
-    protected $_active_message_types = [];
-
-    /** @type EE_message_type[] */
-    protected $_installed_message_types = [];
-
-    /** @type EE_messenger */
-    protected $_messenger;
-
-    /** @type EE_message_type */
-    protected $_message_type;
-
-    /** @type array */
-    protected $_contexts = [];
-
-    /** @type EE_Message_Resource_Manager $_message_resource_manager */
-    protected $_message_resource_manager;
-
-
-    /**
-     * EE_messages constructor.
-     *
-     * @deprecated 4.9.0
-     */
-    public function __construct()
-    {
-    }
-
-
-    /**
-     * @param string $method
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function _class_is_deprecated($method)
-    {
-        EE_Error::doing_it_wrong(
-            'EE_messages::' . $method,
-            esc_html__('EE_messages has been deprecated.  Please use EE_Message_Resource_Manager instead.'),
-            '4.9.0',
-            '4.10.0.p'
-        );
-        // Please use EE_Message_Resource_Manager instead
-        $this->_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
-    }
-
-
-    /**
-     * @param string $messenger_name
-     * @return boolean TRUE if it was PREVIOUSLY active, and FALSE if it was previously inactive
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function ensure_messenger_is_active($messenger_name)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->ensure_messenger_is_active($messenger_name);
-    }
-
-
-    /**
-     * @param string $message_type message type name
-     * @param        $messenger
-     * @return bool true if it got activated (or was active) and false if not.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function ensure_message_type_is_active($message_type, $messenger)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->ensure_message_type_is_active($message_type, $messenger);
-    }
-
-
-    /**
-     * @param string $messenger_name
-     * @param array  $mts_to_activate              (optional) An array of message types to activate with this messenger.
-     *                                             If included we do NOT setup the default message types (assuming they
-     *                                             are already setup.)
-     * @return array an array of generated templates or false if nothing generated/activated.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function activate_messenger($messenger_name, $mts_to_activate = [])
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->activate_messenger($messenger_name, $mts_to_activate);
-    }
-
-
-    /**
-     * @param EE_messenger    $messenger    messenger used in trigger
-     * @param EE_message_type $message_type message type used in trigger
-     *
-     * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function is_generating_messenger_and_active(EE_messenger $messenger, EE_message_type $message_type)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->is_generating_messenger_and_active($messenger, $message_type);
-    }
-
-
-    /**
-     * @param string $messenger
-     * @return EE_messenger | null
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_messenger_if_active($messenger)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->get_active_messenger($messenger);
-    }
-
-
-    /**
-     * @param EE_Message $message
-     * @return array  An array with 'messenger' and 'message_type' as the index and the corresponding valid object if
-     *                  available.
-     *                  Eg. Valid Messenger and Message Type:
-     *                  array(
-     *                  'messenger' => new EE_Email_messenger(),
-     *                  'message_type' => new EE_Registration_Approved_message_type()
-     *                  )
-     *                  Valid Messenger and Invalid Message Type:
-     *                  array(
-     *                  'messenger' => new EE_Email_messenger(),
-     *                  'message_type' => null
-     *                  )
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function validate_for_use(EE_Message $message)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return [
-            'messenger'    => $message->messenger_object(),
-            'message_type' => $message->message_type_object(),
-        ];
-    }
-
-
-    /**
-     * @param string $type                  What type of message are we sending (corresponds to message types)
-     * @param mixed  $vars                  Data being sent for parsing in the message
-     * @param string $sending_messenger     if included then we ONLY use the specified messenger for delivery.
-     *                                      Otherwise we cycle through all active messengers.
-     * @param string $generating_messenger  if included then this messenger is used for generating the message
-     *                                      templates (but not for sending).
-     * @param string $context               If included then only a message type for a specific context will be
-     *                                      generated.
-     * @param bool   $send                  Default TRUE.  If false, then this will just return the generated
-     *                                      EE_messages objects which might be used by the trigger to setup a batch
-     *                                      message (typically html messenger uses it).
-     * @return bool|array
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function send_message(
-        $type,
-        $vars,
-        $sending_messenger = '',
-        $generating_messenger = '',
-        $context = '',
-        $send = true
-    ) {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        /** @type EE_Messages_Processor $processor */
-        $processor = EE_Registry::instance()->load_lib('Messages_Processor');
-        $error     = false;
-        // try to intelligently determine what method we'll call based on the incoming data.
-        // if generating and sending are different then generate and send immediately.
-        if (! empty($sending_messenger) && $sending_messenger != $generating_messenger && $send) {
-            // in the legacy system, when generating and sending were different, that means all the
-            // vars are already in the request object.  So let's just use that.
-            try {
-                /** @type EE_Message_To_Generate_From_Request $mtg */
-                $mtg = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
-                $processor->generate_and_send_now($mtg);
-            } catch (EE_Error $e) {
-                $error_msg = esc_html__(
-                    'Please note that a system message failed to send due to a technical issue.',
-                    'event_espresso'
-                );
-                // add specific message for developers if WP_DEBUG in on
-                $error_msg .= '||' . $e->getMessage();
-                EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
-                $error = true;
-            }
-        } else {
-            $processor->generate_for_all_active_messengers($type, $vars, $send);
-            // let's find out if there were any errors and how many successfully were queued.
-            $count_errors = $processor->get_queue()->count_STS_in_queue(
-                [EEM_Message::status_failed, EEM_Message::status_debug_only]
-            );
-            $count_queued = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_incomplete);
-            $count_retry  = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_retry);
-            $count_errors = $count_errors + $count_retry;
-            if ($count_errors > 0) {
-                $error = true;
-                if ($count_errors > 1 && $count_retry > 1 && $count_queued > 1) {
-                    $message = sprintf(
-                        esc_html__(
-                            'There were %1$d errors and %2$d messages successfully queued for generation and sending',
-                            'event_espresso'
-                        ),
-                        $count_errors,
-                        $count_queued
-                    );
-                } elseif ($count_errors > 1 && $count_queued === 1) {
-                    $message = sprintf(
-                        esc_html__(
-                            'There were %1$d errors and %2$d message successfully queued for generation.',
-                            'event_espresso'
-                        ),
-                        $count_errors,
-                        $count_queued
-                    );
-                } elseif ($count_errors === 1 && $count_queued > 1) {
-                    $message = sprintf(
-                        esc_html__(
-                            'There was %1$d error and %2$d messages successfully queued for generation.',
-                            'event_espresso'
-                        ),
-                        $count_errors,
-                        $count_queued
-                    );
-                } else {
-                    $message = sprintf(
-                        esc_html__(
-                            'There was %d message that failed to be queued for generation.',
-                            'event_espresso'
-                        ),
-                        $count_errors
-                    );
-                }
-                EE_Error::add_error($message, __FILE__, __FUNCTION__, __LINE__);
-            } else {
-                if ($count_queued === 1) {
-                    $message = sprintf(
-                        esc_html__(
-                            '%d message successfully queued for generation.',
-                            'event_espresso'
-                        ),
-                        $count_queued
-                    );
-                } else {
-                    $message = sprintf(
-                        esc_html__(
-                            '%d messages were successfully queued for generation.',
-                            'event_espresso'
-                        ),
-                        $count_queued
-                    );
-                }
-                EE_Error::add_success($message);
-            }
-        }
-        // if no error then return the generated message(s).
-        if (! $error && ! $send) {
-            $generated_queue = $processor->generate_queue(false);
-            // get message and return.
-            $generated_queue->get_message_repository()->rewind();
-            $messages = [];
-            while ($generated_queue->get_message_repository()->valid()) {
-                $message = $generated_queue->get_message_repository()->current();
-                if ($message instanceof EE_Message) {
-                    // set properties that might be expected by add-ons (backward compat)
-                    $message->content            = $message->content();
-                    $message->template_pack      = $message->get_template_pack();
-                    $message->template_variation = $message->get_template_pack_variation();
-                    $messages[]                  = $message;
-                }
-                $generated_queue->get_message_repository()->next();
-            }
-            return $messages;
-        }
-        return $error ? false
-            : true; // yeah backwards eh?  Really what we're returning is if there is a total success for all the messages or not.  We'll modify this once we get message recording in place.
-    }
-
-
-    /**
-     * @param string $type       This should correspond with a valid message type
-     * @param string $context    This should correspond with a valid context for the message type
-     * @param string $messenger  This should correspond with a valid messenger.
-     * @param bool   $send       true we will do a test send using the messenger delivery, false we just do a regular
-     *                           preview
-     * @return string          The body of the message.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function preview_message($type, $context, $messenger, $send = false)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return EED_Messages::preview_message($type, $context, $messenger, $send);
-    }
-
-
-    /**
-     * @param string   $messenger    a string matching a valid active messenger in the system
-     * @param string   $message_type Although it seems contrary to the name of the method, a message type name is still
-     *                               required to send along the message type to the messenger because this is used for
-     *                               determining what specific variations might be loaded for the generated message.
-     * @param stdClass $message      a stdClass object in the format expected by the messenger.
-     *
-     * @return bool          success or fail.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since      4.5.0
-     * @deprecated 4.9.0   Moved to EED_Messages Module
-     */
-    public function send_message_with_messenger_only($messenger, $message_type, $message)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        // setup for sending to new method.
-        /** @type EE_Messages_Queue $queue */
-        $queue = EE_Registry::instance()->load_lib('Messages_Queue');
-        // make sure we have a proper message object
-        if (! $message instanceof EE_Message && is_object($message) && isset($message->content)) {
-            $msg = EE_Message_Factory::create(
-                [
-                    'MSG_messenger'    => $messenger,
-                    'MSG_message_type' => $message_type,
-                    'MSG_content'      => $message->content,
-                    'MSG_subject'      => $message->subject,
-                ]
-            );
-        } else {
-            $msg = $message;
-        }
-        if (! $msg instanceof EE_Message) {
-            return false;
-        }
-        // make sure any content in a content property (if not empty) is set on the MSG_content.
-        if (! empty($msg->content)) {
-            $msg->set('MSG_content', $msg->content);
-        }
-        $queue->add($msg);
-        return EED_Messages::send_message_with_messenger_only($messenger, $message_type, $queue);
-    }
-
-
-    /**
-     * @param         $messenger
-     * @param string  $message_type message type that the templates are being created for
-     * @param int     $GRP_ID
-     * @param bool    $is_global
-     * @return array|object if creation is successful then we return an array of info, otherwise an error_object is
-     *                              returned.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function create_new_templates($messenger, $message_type, $GRP_ID = 0, $is_global = false)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        EE_Registry::instance()->load_helper('MSG_Template');
-        return EEH_MSG_Template::create_new_templates($messenger, $message_type, $GRP_ID, $is_global);
-    }
-
-
-    /**
-     * @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
-     * @deprecated 4.9.0
-     */
-    public function get_fields($messenger_name, $message_type_name)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        EE_Registry::instance()->load_helper('MSG_Template');
-        return EEH_MSG_Template::get_fields($messenger_name, $message_type_name);
-    }
-
-
-    /**
-     * @param string $type                we can indicate just returning installed message types
-     *                                    or messengers (or both) via this parameter.
-     * @param bool   $skip_cache          if true then we skip the cache and retrieve via files.
-     * @return array                    multidimensional array of messenger and message_type objects
-     *                                    (messengers index, and message_type index);
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     * @access     public
-     */
-    public function get_installed($type = 'all', $skip_cache = false)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        if ($skip_cache) {
-            $this->_message_resource_manager->reset_active_messengers_and_message_types();
-        }
-        switch ($type) {
-            case 'messengers':
-                return [
-                    'messenger' => $this->_message_resource_manager->installed_messengers(),
-                ];
-                break;
-            case 'message_types':
-                return [
-                    'message_type' => $this->_message_resource_manager->installed_message_types(),
-                ];
-                break;
-            case 'all':
-            default:
-                return [
-                    'messenger'    => $this->_message_resource_manager->installed_messengers(),
-                    'message_type' => $this->_message_resource_manager->installed_message_types(),
-                ];
-                break;
-        }
-    }
-
-
-    /**
-     * @return \EE_messenger[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_active_messengers()
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->active_messengers();
-    }
-
-
-    /**
-     * @return array array of message_type references (string)
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_active_message_types()
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->list_of_active_message_types();
-    }
-
-
-    /**
-     * @return EE_message_type[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_active_message_type_objects()
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->get_active_message_type_objects();
-    }
-
-
-    /**
-     * @param string $messenger The messenger being checked
-     * @return EE_message_type[]    (or empty array if none present)
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     * @since      4.5.0
-     */
-    public function get_active_message_types_per_messenger($messenger)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->get_active_message_types_for_messenger($messenger);
-    }
-
-
-    /**
-     * @param string $messenger    The string should correspond to the messenger (message types are
-     * @param string $message_type The string should correspond to a message type.
-     * @return EE_message_type|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_active_message_type($messenger, $message_type)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->get_active_message_type_for_messenger($messenger, $message_type);
-    }
-
-
-    /**
-     * @return array|\EE_message_type[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_installed_message_types()
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->installed_message_types();
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_installed_messengers()
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->installed_messengers();
-    }
-
-
-    /**
-     * @param bool $slugs_only   Whether to return an array of just slugs and labels (true) or all contexts indexed by
-     *                           message type.
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated 4.9.0
-     */
-    public function get_all_contexts($slugs_only = true)
-    {
-        // EE_messages has been deprecated
-        $this->_class_is_deprecated(__FUNCTION__);
-        return $this->_message_resource_manager->get_all_contexts($slugs_only);
-    }
+	/** @type EE_messenger[] */
+	protected $_active_messengers = [];
+
+	/** @type array */
+	protected $_active_message_types = [];
+
+	/** @type EE_message_type[] */
+	protected $_installed_message_types = [];
+
+	/** @type EE_messenger */
+	protected $_messenger;
+
+	/** @type EE_message_type */
+	protected $_message_type;
+
+	/** @type array */
+	protected $_contexts = [];
+
+	/** @type EE_Message_Resource_Manager $_message_resource_manager */
+	protected $_message_resource_manager;
+
+
+	/**
+	 * EE_messages constructor.
+	 *
+	 * @deprecated 4.9.0
+	 */
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 * @param string $method
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function _class_is_deprecated($method)
+	{
+		EE_Error::doing_it_wrong(
+			'EE_messages::' . $method,
+			esc_html__('EE_messages has been deprecated.  Please use EE_Message_Resource_Manager instead.'),
+			'4.9.0',
+			'4.10.0.p'
+		);
+		// Please use EE_Message_Resource_Manager instead
+		$this->_message_resource_manager = EE_Registry::instance()->load_lib('Message_Resource_Manager');
+	}
+
+
+	/**
+	 * @param string $messenger_name
+	 * @return boolean TRUE if it was PREVIOUSLY active, and FALSE if it was previously inactive
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function ensure_messenger_is_active($messenger_name)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->ensure_messenger_is_active($messenger_name);
+	}
+
+
+	/**
+	 * @param string $message_type message type name
+	 * @param        $messenger
+	 * @return bool true if it got activated (or was active) and false if not.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function ensure_message_type_is_active($message_type, $messenger)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->ensure_message_type_is_active($message_type, $messenger);
+	}
+
+
+	/**
+	 * @param string $messenger_name
+	 * @param array  $mts_to_activate              (optional) An array of message types to activate with this messenger.
+	 *                                             If included we do NOT setup the default message types (assuming they
+	 *                                             are already setup.)
+	 * @return array an array of generated templates or false if nothing generated/activated.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function activate_messenger($messenger_name, $mts_to_activate = [])
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->activate_messenger($messenger_name, $mts_to_activate);
+	}
+
+
+	/**
+	 * @param EE_messenger    $messenger    messenger used in trigger
+	 * @param EE_message_type $message_type message type used in trigger
+	 *
+	 * @return bool true is a generating messenger and can be sent OR FALSE meaning cannot send.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function is_generating_messenger_and_active(EE_messenger $messenger, EE_message_type $message_type)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->is_generating_messenger_and_active($messenger, $message_type);
+	}
+
+
+	/**
+	 * @param string $messenger
+	 * @return EE_messenger | null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_messenger_if_active($messenger)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->get_active_messenger($messenger);
+	}
+
+
+	/**
+	 * @param EE_Message $message
+	 * @return array  An array with 'messenger' and 'message_type' as the index and the corresponding valid object if
+	 *                  available.
+	 *                  Eg. Valid Messenger and Message Type:
+	 *                  array(
+	 *                  'messenger' => new EE_Email_messenger(),
+	 *                  'message_type' => new EE_Registration_Approved_message_type()
+	 *                  )
+	 *                  Valid Messenger and Invalid Message Type:
+	 *                  array(
+	 *                  'messenger' => new EE_Email_messenger(),
+	 *                  'message_type' => null
+	 *                  )
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function validate_for_use(EE_Message $message)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return [
+			'messenger'    => $message->messenger_object(),
+			'message_type' => $message->message_type_object(),
+		];
+	}
+
+
+	/**
+	 * @param string $type                  What type of message are we sending (corresponds to message types)
+	 * @param mixed  $vars                  Data being sent for parsing in the message
+	 * @param string $sending_messenger     if included then we ONLY use the specified messenger for delivery.
+	 *                                      Otherwise we cycle through all active messengers.
+	 * @param string $generating_messenger  if included then this messenger is used for generating the message
+	 *                                      templates (but not for sending).
+	 * @param string $context               If included then only a message type for a specific context will be
+	 *                                      generated.
+	 * @param bool   $send                  Default TRUE.  If false, then this will just return the generated
+	 *                                      EE_messages objects which might be used by the trigger to setup a batch
+	 *                                      message (typically html messenger uses it).
+	 * @return bool|array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function send_message(
+		$type,
+		$vars,
+		$sending_messenger = '',
+		$generating_messenger = '',
+		$context = '',
+		$send = true
+	) {
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		/** @type EE_Messages_Processor $processor */
+		$processor = EE_Registry::instance()->load_lib('Messages_Processor');
+		$error     = false;
+		// try to intelligently determine what method we'll call based on the incoming data.
+		// if generating and sending are different then generate and send immediately.
+		if (! empty($sending_messenger) && $sending_messenger != $generating_messenger && $send) {
+			// in the legacy system, when generating and sending were different, that means all the
+			// vars are already in the request object.  So let's just use that.
+			try {
+				/** @type EE_Message_To_Generate_From_Request $mtg */
+				$mtg = EE_Registry::instance()->load_lib('Message_To_Generate_From_Request');
+				$processor->generate_and_send_now($mtg);
+			} catch (EE_Error $e) {
+				$error_msg = esc_html__(
+					'Please note that a system message failed to send due to a technical issue.',
+					'event_espresso'
+				);
+				// add specific message for developers if WP_DEBUG in on
+				$error_msg .= '||' . $e->getMessage();
+				EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
+				$error = true;
+			}
+		} else {
+			$processor->generate_for_all_active_messengers($type, $vars, $send);
+			// let's find out if there were any errors and how many successfully were queued.
+			$count_errors = $processor->get_queue()->count_STS_in_queue(
+				[EEM_Message::status_failed, EEM_Message::status_debug_only]
+			);
+			$count_queued = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_incomplete);
+			$count_retry  = $processor->get_queue()->count_STS_in_queue(EEM_Message::status_retry);
+			$count_errors = $count_errors + $count_retry;
+			if ($count_errors > 0) {
+				$error = true;
+				if ($count_errors > 1 && $count_retry > 1 && $count_queued > 1) {
+					$message = sprintf(
+						esc_html__(
+							'There were %1$d errors and %2$d messages successfully queued for generation and sending',
+							'event_espresso'
+						),
+						$count_errors,
+						$count_queued
+					);
+				} elseif ($count_errors > 1 && $count_queued === 1) {
+					$message = sprintf(
+						esc_html__(
+							'There were %1$d errors and %2$d message successfully queued for generation.',
+							'event_espresso'
+						),
+						$count_errors,
+						$count_queued
+					);
+				} elseif ($count_errors === 1 && $count_queued > 1) {
+					$message = sprintf(
+						esc_html__(
+							'There was %1$d error and %2$d messages successfully queued for generation.',
+							'event_espresso'
+						),
+						$count_errors,
+						$count_queued
+					);
+				} else {
+					$message = sprintf(
+						esc_html__(
+							'There was %d message that failed to be queued for generation.',
+							'event_espresso'
+						),
+						$count_errors
+					);
+				}
+				EE_Error::add_error($message, __FILE__, __FUNCTION__, __LINE__);
+			} else {
+				if ($count_queued === 1) {
+					$message = sprintf(
+						esc_html__(
+							'%d message successfully queued for generation.',
+							'event_espresso'
+						),
+						$count_queued
+					);
+				} else {
+					$message = sprintf(
+						esc_html__(
+							'%d messages were successfully queued for generation.',
+							'event_espresso'
+						),
+						$count_queued
+					);
+				}
+				EE_Error::add_success($message);
+			}
+		}
+		// if no error then return the generated message(s).
+		if (! $error && ! $send) {
+			$generated_queue = $processor->generate_queue(false);
+			// get message and return.
+			$generated_queue->get_message_repository()->rewind();
+			$messages = [];
+			while ($generated_queue->get_message_repository()->valid()) {
+				$message = $generated_queue->get_message_repository()->current();
+				if ($message instanceof EE_Message) {
+					// set properties that might be expected by add-ons (backward compat)
+					$message->content            = $message->content();
+					$message->template_pack      = $message->get_template_pack();
+					$message->template_variation = $message->get_template_pack_variation();
+					$messages[]                  = $message;
+				}
+				$generated_queue->get_message_repository()->next();
+			}
+			return $messages;
+		}
+		return $error ? false
+			: true; // yeah backwards eh?  Really what we're returning is if there is a total success for all the messages or not.  We'll modify this once we get message recording in place.
+	}
+
+
+	/**
+	 * @param string $type       This should correspond with a valid message type
+	 * @param string $context    This should correspond with a valid context for the message type
+	 * @param string $messenger  This should correspond with a valid messenger.
+	 * @param bool   $send       true we will do a test send using the messenger delivery, false we just do a regular
+	 *                           preview
+	 * @return string          The body of the message.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function preview_message($type, $context, $messenger, $send = false)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return EED_Messages::preview_message($type, $context, $messenger, $send);
+	}
+
+
+	/**
+	 * @param string   $messenger    a string matching a valid active messenger in the system
+	 * @param string   $message_type Although it seems contrary to the name of the method, a message type name is still
+	 *                               required to send along the message type to the messenger because this is used for
+	 *                               determining what specific variations might be loaded for the generated message.
+	 * @param stdClass $message      a stdClass object in the format expected by the messenger.
+	 *
+	 * @return bool          success or fail.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since      4.5.0
+	 * @deprecated 4.9.0   Moved to EED_Messages Module
+	 */
+	public function send_message_with_messenger_only($messenger, $message_type, $message)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		// setup for sending to new method.
+		/** @type EE_Messages_Queue $queue */
+		$queue = EE_Registry::instance()->load_lib('Messages_Queue');
+		// make sure we have a proper message object
+		if (! $message instanceof EE_Message && is_object($message) && isset($message->content)) {
+			$msg = EE_Message_Factory::create(
+				[
+					'MSG_messenger'    => $messenger,
+					'MSG_message_type' => $message_type,
+					'MSG_content'      => $message->content,
+					'MSG_subject'      => $message->subject,
+				]
+			);
+		} else {
+			$msg = $message;
+		}
+		if (! $msg instanceof EE_Message) {
+			return false;
+		}
+		// make sure any content in a content property (if not empty) is set on the MSG_content.
+		if (! empty($msg->content)) {
+			$msg->set('MSG_content', $msg->content);
+		}
+		$queue->add($msg);
+		return EED_Messages::send_message_with_messenger_only($messenger, $message_type, $queue);
+	}
+
+
+	/**
+	 * @param         $messenger
+	 * @param string  $message_type message type that the templates are being created for
+	 * @param int     $GRP_ID
+	 * @param bool    $is_global
+	 * @return array|object if creation is successful then we return an array of info, otherwise an error_object is
+	 *                              returned.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function create_new_templates($messenger, $message_type, $GRP_ID = 0, $is_global = false)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::create_new_templates($messenger, $message_type, $GRP_ID, $is_global);
+	}
+
+
+	/**
+	 * @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
+	 * @deprecated 4.9.0
+	 */
+	public function get_fields($messenger_name, $message_type_name)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		EE_Registry::instance()->load_helper('MSG_Template');
+		return EEH_MSG_Template::get_fields($messenger_name, $message_type_name);
+	}
+
+
+	/**
+	 * @param string $type                we can indicate just returning installed message types
+	 *                                    or messengers (or both) via this parameter.
+	 * @param bool   $skip_cache          if true then we skip the cache and retrieve via files.
+	 * @return array                    multidimensional array of messenger and message_type objects
+	 *                                    (messengers index, and message_type index);
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 * @access     public
+	 */
+	public function get_installed($type = 'all', $skip_cache = false)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		if ($skip_cache) {
+			$this->_message_resource_manager->reset_active_messengers_and_message_types();
+		}
+		switch ($type) {
+			case 'messengers':
+				return [
+					'messenger' => $this->_message_resource_manager->installed_messengers(),
+				];
+				break;
+			case 'message_types':
+				return [
+					'message_type' => $this->_message_resource_manager->installed_message_types(),
+				];
+				break;
+			case 'all':
+			default:
+				return [
+					'messenger'    => $this->_message_resource_manager->installed_messengers(),
+					'message_type' => $this->_message_resource_manager->installed_message_types(),
+				];
+				break;
+		}
+	}
+
+
+	/**
+	 * @return \EE_messenger[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_active_messengers()
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->active_messengers();
+	}
+
+
+	/**
+	 * @return array array of message_type references (string)
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_active_message_types()
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->list_of_active_message_types();
+	}
+
+
+	/**
+	 * @return EE_message_type[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_active_message_type_objects()
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->get_active_message_type_objects();
+	}
+
+
+	/**
+	 * @param string $messenger The messenger being checked
+	 * @return EE_message_type[]    (or empty array if none present)
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 * @since      4.5.0
+	 */
+	public function get_active_message_types_per_messenger($messenger)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->get_active_message_types_for_messenger($messenger);
+	}
+
+
+	/**
+	 * @param string $messenger    The string should correspond to the messenger (message types are
+	 * @param string $message_type The string should correspond to a message type.
+	 * @return EE_message_type|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_active_message_type($messenger, $message_type)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->get_active_message_type_for_messenger($messenger, $message_type);
+	}
+
+
+	/**
+	 * @return array|\EE_message_type[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_installed_message_types()
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->installed_message_types();
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_installed_messengers()
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->installed_messengers();
+	}
+
+
+	/**
+	 * @param bool $slugs_only   Whether to return an array of just slugs and labels (true) or all contexts indexed by
+	 *                           message type.
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated 4.9.0
+	 */
+	public function get_all_contexts($slugs_only = true)
+	{
+		// EE_messages has been deprecated
+		$this->_class_is_deprecated(__FUNCTION__);
+		return $this->_message_resource_manager->get_all_contexts($slugs_only);
+	}
 }
 
 // end EE_messages class
@@ -687,88 +687,88 @@ 
 
 
 add_filter(
-    'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
-    function ($event_list_iframe_css) {
-        if (! has_filter('FHEE__EventsArchiveIframe__event_list_iframe__css')) {
-            return $event_list_iframe_css;
-        }
-        deprecated_espresso_action_or_filter_doing_it_wrong(
-            'FHEE__EventsArchiveIframe__event_list_iframe__css',
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
-            '\EventEspresso\modules\events_archive\EventsArchiveIframe::display()',
-            '4.9.14',
-            '5.1.0',
-            'filter'
-        );
-        return apply_filters(
-            'FHEE__EventsArchiveIframe__event_list_iframe__css',
-            $event_list_iframe_css
-        );
-    }
+	'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
+	function ($event_list_iframe_css) {
+		if (! has_filter('FHEE__EventsArchiveIframe__event_list_iframe__css')) {
+			return $event_list_iframe_css;
+		}
+		deprecated_espresso_action_or_filter_doing_it_wrong(
+			'FHEE__EventsArchiveIframe__event_list_iframe__css',
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__css',
+			'\EventEspresso\modules\events_archive\EventsArchiveIframe::display()',
+			'4.9.14',
+			'5.1.0',
+			'filter'
+		);
+		return apply_filters(
+			'FHEE__EventsArchiveIframe__event_list_iframe__css',
+			$event_list_iframe_css
+		);
+	}
 );
 add_filter(
-    'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
-    function ($event_list_iframe_js) {
-        if (! has_filter('FHEE__EED_Ticket_Selector__ticket_selector_iframe__js')) {
-            return $event_list_iframe_js;
-        }
-        deprecated_espresso_action_or_filter_doing_it_wrong(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
-            '\EventEspresso\modules\events_archive\EventsArchiveIframe::display()',
-            '4.9.14',
-            '5.1.0',
-            'filter'
-        );
-        return apply_filters(
-            'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
-            $event_list_iframe_js
-        );
-    }
+	'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
+	function ($event_list_iframe_js) {
+		if (! has_filter('FHEE__EED_Ticket_Selector__ticket_selector_iframe__js')) {
+			return $event_list_iframe_js;
+		}
+		deprecated_espresso_action_or_filter_doing_it_wrong(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+			'FHEE__EventEspresso_modules_events_archive_EventsArchiveIframe__display__js',
+			'\EventEspresso\modules\events_archive\EventsArchiveIframe::display()',
+			'4.9.14',
+			'5.1.0',
+			'filter'
+		);
+		return apply_filters(
+			'FHEE__EED_Ticket_Selector__ticket_selector_iframe__js',
+			$event_list_iframe_js
+		);
+	}
 );
 add_action(
-    'AHEE__EE_Capabilities__addCaps__complete',
-    function ($capabilities_map) {
-        if (! has_action('AHEE__EE_Capabilities__init_role_caps__complete')) {
-            return;
-        }
-        deprecated_espresso_action_or_filter_doing_it_wrong(
-            'AHEE__EE_Capabilities__init_role_caps__complete',
-            'AHEE__EE_Capabilities__addCaps__complete',
-            '\EE_Capabilities::addCaps()',
-            '4.9.42',
-            '5.1.0',
-        );
-        do_action(
-            'AHEE__EE_Capabilities__init_role_caps__complete',
-            $capabilities_map
-        );
-    }
+	'AHEE__EE_Capabilities__addCaps__complete',
+	function ($capabilities_map) {
+		if (! has_action('AHEE__EE_Capabilities__init_role_caps__complete')) {
+			return;
+		}
+		deprecated_espresso_action_or_filter_doing_it_wrong(
+			'AHEE__EE_Capabilities__init_role_caps__complete',
+			'AHEE__EE_Capabilities__addCaps__complete',
+			'\EE_Capabilities::addCaps()',
+			'4.9.42',
+			'5.1.0',
+		);
+		do_action(
+			'AHEE__EE_Capabilities__init_role_caps__complete',
+			$capabilities_map
+		);
+	}
 );
 
 add_filter(
-    'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
-    function ($existing_attendee, $registration, $attendee_data) {
-        if (! has_filter('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee')) {
-            return $existing_attendee;
-        }
-        deprecated_espresso_action_or_filter_doing_it_wrong(
-            'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee',
-            'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
-            '\EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler::findExistingAttendee()',
-            '4.9.34',
-            '5.1.0',
-            'filter'
-        );
-        return apply_filters(
-            'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee',
-            $existing_attendee,
-            $registration,
-            $attendee_data
-        );
-    },
-    10,
-    3
+	'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
+	function ($existing_attendee, $registration, $attendee_data) {
+		if (! has_filter('FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee')) {
+			return $existing_attendee;
+		}
+		deprecated_espresso_action_or_filter_doing_it_wrong(
+			'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee',
+			'FHEE_EventEspresso_core_domain_services_commands_attendee_CreateAttendeeCommandHandler__findExistingAttendee__existing_attendee',
+			'\EventEspresso\core\domain\services\commands\attendee\CreateAttendeeCommandHandler::findExistingAttendee()',
+			'4.9.34',
+			'5.1.0',
+			'filter'
+		);
+		return apply_filters(
+			'FHEE_EE_Single_Page_Checkout__save_registration_items__find_existing_attendee',
+			$existing_attendee,
+			$registration,
+			$attendee_data
+		);
+	},
+	10,
+	3
 );
 
 /**
@@ -778,89 +778,89 @@ 
  */
 class EE_Event_List_Query extends WP_Query
 {
-    private $title;
-
-    private $css_class;
-
-    private $category_slug;
-
-
-    /**
-     * EE_Event_List_Query constructor.
-     *
-     * @param array $args
-     */
-    public function __construct($args = [])
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__(
-                'Usage is deprecated. Please use \EventEspresso\core\domain\services\wp_queries\EventListQuery instead.',
-                'event_espresso'
-            ),
-            '4.9.27',
-            '5.0.0'
-        );
-        $this->title         = isset($args['title']) ? $args['title'] : '';
-        $this->css_class     = isset($args['css_class']) ? $args['css_class'] : '';
-        $this->category_slug = isset($args['category_slug']) ? $args['category_slug'] : '';
-        $limit               = isset($args['limit']) && absint($args['limit']) ? $args['limit'] : 10;
-        // the current "page" we are viewing
-        $paged = max(1, get_query_var('paged'));
-        // Force these args
-        $args = array_merge(
-            $args,
-            [
-                'post_type'              => EspressoPostType::EVENTS,
-                'posts_per_page'         => $limit,
-                'update_post_term_cache' => false,
-                'update_post_meta_cache' => false,
-                'paged'                  => $paged,
-                'offset'                 => ($paged - 1) * $limit,
-            ]
-        );
-        // run the query
-        parent::__construct($args);
-    }
-
-
-    /**
-     * event_list_title
-     *
-     * @param string $event_list_title
-     * @return string
-     */
-    public function event_list_title($event_list_title = '')
-    {
-        if (! empty($this->title)) {
-            return $this->title;
-        }
-        return $event_list_title;
-    }
-
-
-    /**
-     * event_list_css
-     *
-     * @param string $event_list_css
-     * @return string
-     */
-    public function event_list_css($event_list_css = '')
-    {
-        $event_list_css .= ! empty($event_list_css)
-            ? ' '
-            : '';
-        $event_list_css .= ! empty($this->css_class)
-            ? $this->css_class
-            : '';
-        $event_list_css .= ! empty($event_list_css)
-            ? ' '
-            : '';
-        $event_list_css .= ! empty($this->category_slug)
-            ? $this->category_slug
-            : '';
-        return $event_list_css;
-    }
+	private $title;
+
+	private $css_class;
+
+	private $category_slug;
+
+
+	/**
+	 * EE_Event_List_Query constructor.
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = [])
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__(
+				'Usage is deprecated. Please use \EventEspresso\core\domain\services\wp_queries\EventListQuery instead.',
+				'event_espresso'
+			),
+			'4.9.27',
+			'5.0.0'
+		);
+		$this->title         = isset($args['title']) ? $args['title'] : '';
+		$this->css_class     = isset($args['css_class']) ? $args['css_class'] : '';
+		$this->category_slug = isset($args['category_slug']) ? $args['category_slug'] : '';
+		$limit               = isset($args['limit']) && absint($args['limit']) ? $args['limit'] : 10;
+		// the current "page" we are viewing
+		$paged = max(1, get_query_var('paged'));
+		// Force these args
+		$args = array_merge(
+			$args,
+			[
+				'post_type'              => EspressoPostType::EVENTS,
+				'posts_per_page'         => $limit,
+				'update_post_term_cache' => false,
+				'update_post_meta_cache' => false,
+				'paged'                  => $paged,
+				'offset'                 => ($paged - 1) * $limit,
+			]
+		);
+		// run the query
+		parent::__construct($args);
+	}
+
+
+	/**
+	 * event_list_title
+	 *
+	 * @param string $event_list_title
+	 * @return string
+	 */
+	public function event_list_title($event_list_title = '')
+	{
+		if (! empty($this->title)) {
+			return $this->title;
+		}
+		return $event_list_title;
+	}
+
+
+	/**
+	 * event_list_css
+	 *
+	 * @param string $event_list_css
+	 * @return string
+	 */
+	public function event_list_css($event_list_css = '')
+	{
+		$event_list_css .= ! empty($event_list_css)
+			? ' '
+			: '';
+		$event_list_css .= ! empty($this->css_class)
+			? $this->css_class
+			: '';
+		$event_list_css .= ! empty($event_list_css)
+			? ' '
+			: '';
+		$event_list_css .= ! empty($this->category_slug)
+			? $this->category_slug
+			: '';
+		return $event_list_css;
+	}
 }
 
 
@@ -874,76 +874,76 @@ 
  */
 class EE_PUE implements InterminableInterface
 {
-    /**
-     *    class constructor
-     *
-     * @deprecated 4.9.59.p
-     */
-    public function __construct()
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
-                __CLASS__,
-                'EventEspresso\core\services\licensing\LicenseServices'
-            ),
-            '4.9.59.p'
-        );
-    }
-
-
-    /**
-     * The purpose of this function is to display information about Event Espresso data collection
-     * and a optin selection for extra data collecting by users.
-     *
-     * @param bool $extra
-     * @return string html.
-     * @deprecated 4.9.59.p
-     */
-    public static function espresso_data_collection_optin_text($extra = true)
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
-                __METHOD__,
-                'EventEspresso\core\domain\services\Stats::optinText'
-            ),
-            '4.9.59.p'
-        );
-        Stats::optinText($extra);
-    }
-
-
-    /**
-     * This is a handy helper method for retrieving whether there is an update available for the given plugin.
-     *
-     * @param string $basename  Use the equivalent result from plugin_basename() for this param as WP uses that to
-     *                          identify plugins. Defaults to core update
-     * @return boolean           True if update available, false if not.
-     * @deprecated 4.9.59.p
-     */
-    public static function is_update_available($basename = '')
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            sprintf(
-                esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
-                __METHOD__,
-                'EventEspresso\caffeinated\core\services\licensing\LicenseService::isUpdateAvailable'
-            ),
-            '4.9.59.p'
-        );
-        return LicenseService::isUpdateAvailable($basename);
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @deprecated 4.9.59.p
+	 */
+	public function __construct()
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
+				__CLASS__,
+				'EventEspresso\core\services\licensing\LicenseServices'
+			),
+			'4.9.59.p'
+		);
+	}
+
+
+	/**
+	 * The purpose of this function is to display information about Event Espresso data collection
+	 * and a optin selection for extra data collecting by users.
+	 *
+	 * @param bool $extra
+	 * @return string html.
+	 * @deprecated 4.9.59.p
+	 */
+	public static function espresso_data_collection_optin_text($extra = true)
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
+				__METHOD__,
+				'EventEspresso\core\domain\services\Stats::optinText'
+			),
+			'4.9.59.p'
+		);
+		Stats::optinText($extra);
+	}
+
+
+	/**
+	 * This is a handy helper method for retrieving whether there is an update available for the given plugin.
+	 *
+	 * @param string $basename  Use the equivalent result from plugin_basename() for this param as WP uses that to
+	 *                          identify plugins. Defaults to core update
+	 * @return boolean           True if update available, false if not.
+	 * @deprecated 4.9.59.p
+	 */
+	public static function is_update_available($basename = '')
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			sprintf(
+				esc_html__('%1$s has been replaced by %2$s.', 'event_espresso'),
+				__METHOD__,
+				'EventEspresso\caffeinated\core\services\licensing\LicenseService::isUpdateAvailable'
+			),
+			'4.9.59.p'
+		);
+		return LicenseService::isUpdateAvailable($basename);
+	}
 }
 
 add_filter(
-    'FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array',
-    'ee_deprecated_registrations_report_csv_legacy_fields',
-    10,
-    2
+	'FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array',
+	'ee_deprecated_registrations_report_csv_legacy_fields',
+	10,
+	2
 );
 /**
  * Filters the CSV row to make it appear like the old labels (which were "$pretty_name[$field_name]").
@@ -962,97 +962,97 @@ 
  */
 function ee_deprecated_registrations_report_csv_legacy_fields($csv_row_data, $reg_row)
 {
-    // no need for all this if nobody is using the deprecated filter
-    if (has_filter('FHEE__EE_Export__report_registrations__reg_csv_array')) {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            sprintf(
-            // EE_Error::doing_it_wrong with escape HTML, so don't escape it twice by doing it here too.
-                _x(
-                    'The filter "%1$s" has been deprecated. Please use "%2$s" instead.',
-                    'The filter "FHEE__EE_Export__report_registrations__reg_csv_array" has been deprecated. Please use "FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array" instead.',
-                    'event_espresso'
-                ),
-                'FHEE__EE_Export__report_registrations__reg_csv_array',
-                'FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array'
-            ),
-            '4.9.69.p',
-            '4.9.75.p'
-        );
-        // there's code that expected the old csv column headers/labels. Let's oblige. Put it back in the old format!
-        // first: what model fields might be used as column headers? (whose format we need to change)
-        $model_fields = array_merge(
-            EEM_Registration::instance()->field_settings(),
-            EEM_Attendee::instance()->field_settings()
-        );
-        // create an array that uses the legacy column headers/labels.
-        $new_csv_row = [];
-        foreach ($csv_row_data as $label => $value) {
-            $new_label = $label;
-            foreach ($model_fields as $field) {
-                if ($label === EEH_Export::get_column_name_for_field($field)) {
-                    // re-add the old field name
-                    $new_label = $label . '[' . $field->get_name() . ']';
-                    break;
-                }
-            }
-            $new_csv_row[ $new_label ] = $value;
-        }
-        // before we run it through the deprecated filter, set the method `EEH_Export::get_column_name_for_field()`
-        // to create the old column names, because that's what's in the row temporarily
-        add_filter(
-            'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
-            '__return_true',
-            777
-        );
-        // now, those old filters can be run on this data. Have fun!
-        /**
-         * Deprecated. Use FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array instead.
-         *
-         * Filter to change the contents of each row of the registrations report CSV file.
-         * This can be used to add or remote columns from the CSV file, or change their values.                 *
-         * Note: it has this name because originally that's where this filter resided,
-         * and we've left its name as-is for backward compatibility.
-         * Note when using: all rows in the CSV should have the same columns.
-         *
-         * @param array $reg_csv_array keys are column-header names, and values are that columns' value
-         *                             in this row
-         * @param array $reg_row       is the row from the database's wp_esp_registration table
-         */
-        $updated_row = apply_filters(
-            'FHEE__EE_Export__report_registrations__reg_csv_array',
-            $new_csv_row,
-            $reg_row
-        );
-
-        // ok now we can revert to normal for EEH_Export::get_column_name_for_field().
-        remove_filter(
-            'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
-            '__return_true',
-            777
-        );
-
-        // great. Now that the old filters are done, we can remove the ugly square brackets from column headers/labels.
-        $updated_and_restored_row = [];
-        foreach ($updated_row as $label => $value) {
-            $matches = [];
-            if (
-                preg_match(
-                    '~([^\[]*)\[(.*)\]~',
-                    $label,
-                    $matches
-                )
-                && isset(
-                    $matches[0],
-                    $matches[1],
-                    $matches[2]
-                )
-            ) {
-                $label = $matches[1];
-            }
-            $updated_and_restored_row[ $label ] = $value;
-        }
-        $csv_row_data = $updated_and_restored_row;
-    }
-    return $csv_row_data;
+	// no need for all this if nobody is using the deprecated filter
+	if (has_filter('FHEE__EE_Export__report_registrations__reg_csv_array')) {
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+			// EE_Error::doing_it_wrong with escape HTML, so don't escape it twice by doing it here too.
+				_x(
+					'The filter "%1$s" has been deprecated. Please use "%2$s" instead.',
+					'The filter "FHEE__EE_Export__report_registrations__reg_csv_array" has been deprecated. Please use "FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array" instead.',
+					'event_espresso'
+				),
+				'FHEE__EE_Export__report_registrations__reg_csv_array',
+				'FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array'
+			),
+			'4.9.69.p',
+			'4.9.75.p'
+		);
+		// there's code that expected the old csv column headers/labels. Let's oblige. Put it back in the old format!
+		// first: what model fields might be used as column headers? (whose format we need to change)
+		$model_fields = array_merge(
+			EEM_Registration::instance()->field_settings(),
+			EEM_Attendee::instance()->field_settings()
+		);
+		// create an array that uses the legacy column headers/labels.
+		$new_csv_row = [];
+		foreach ($csv_row_data as $label => $value) {
+			$new_label = $label;
+			foreach ($model_fields as $field) {
+				if ($label === EEH_Export::get_column_name_for_field($field)) {
+					// re-add the old field name
+					$new_label = $label . '[' . $field->get_name() . ']';
+					break;
+				}
+			}
+			$new_csv_row[ $new_label ] = $value;
+		}
+		// before we run it through the deprecated filter, set the method `EEH_Export::get_column_name_for_field()`
+		// to create the old column names, because that's what's in the row temporarily
+		add_filter(
+			'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
+			'__return_true',
+			777
+		);
+		// now, those old filters can be run on this data. Have fun!
+		/**
+		 * Deprecated. Use FHEE__EventEspressoBatchRequest__JobHandlers__RegistrationsReport__reg_csv_array instead.
+		 *
+		 * Filter to change the contents of each row of the registrations report CSV file.
+		 * This can be used to add or remote columns from the CSV file, or change their values.                 *
+		 * Note: it has this name because originally that's where this filter resided,
+		 * and we've left its name as-is for backward compatibility.
+		 * Note when using: all rows in the CSV should have the same columns.
+		 *
+		 * @param array $reg_csv_array keys are column-header names, and values are that columns' value
+		 *                             in this row
+		 * @param array $reg_row       is the row from the database's wp_esp_registration table
+		 */
+		$updated_row = apply_filters(
+			'FHEE__EE_Export__report_registrations__reg_csv_array',
+			$new_csv_row,
+			$reg_row
+		);
+
+		// ok now we can revert to normal for EEH_Export::get_column_name_for_field().
+		remove_filter(
+			'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
+			'__return_true',
+			777
+		);
+
+		// great. Now that the old filters are done, we can remove the ugly square brackets from column headers/labels.
+		$updated_and_restored_row = [];
+		foreach ($updated_row as $label => $value) {
+			$matches = [];
+			if (
+				preg_match(
+					'~([^\[]*)\[(.*)\]~',
+					$label,
+					$matches
+				)
+				&& isset(
+					$matches[0],
+					$matches[1],
+					$matches[2]
+				)
+			) {
+				$label = $matches[1];
+			}
+			$updated_and_restored_row[ $label ] = $value;
+		}
+		$csv_row_data = $updated_and_restored_row;
+	}
+	return $csv_row_data;
 }

core/domain/entities/custom_post_types/CustomPostTypeDefinitions.php

Indentation +274 added lines, -274 removed lines

@@ -16,299 +16,299 @@
  */
 class CustomPostTypeDefinitions
 {
-    /**
-     * @var string $namespace The graphql namespace/prefix.
-     */
-    protected $namespace = 'Espresso';
+	/**
+	 * @var string $namespace The graphql namespace/prefix.
+	 */
+	protected $namespace = 'Espresso';
 
-    /**
-     * @var EE_Core_Config
-     */
-    public $core_config;
+	/**
+	 * @var EE_Core_Config
+	 */
+	public $core_config;
 
-    /**
-     * @var array $custom_post_types
-     */
-    private $custom_post_types;
+	/**
+	 * @var array $custom_post_types
+	 */
+	private $custom_post_types;
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * EspressoCustomPostTypeDefinitions constructor.
-     *
-     * @param EE_Core_Config  $core_config
-     * @param LoaderInterface $loader
-     */
-    public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
-    {
-        $this->core_config = $core_config;
-        $this->loader = $loader;
-        $this->setDefinitions();
-    }
+	/**
+	 * EspressoCustomPostTypeDefinitions constructor.
+	 *
+	 * @param EE_Core_Config  $core_config
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(EE_Core_Config $core_config, LoaderInterface $loader)
+	{
+		$this->core_config = $core_config;
+		$this->loader = $loader;
+		$this->setDefinitions();
+	}
 
 
-    /**
-     * defines Espresso Custom Post Types
-     * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
-     * and not part of the WP custom post type api.
-     *
-     * @return void
-     */
-    private function setDefinitions()
-    {
-        $this->custom_post_types = (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
-            // legacy filter applied for now,
-            // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-            apply_filters(
-                'FHEE__EE_Register_CPTs__get_CPTs__cpts',
-                [
-                    EspressoPostType::EVENTS => [
-                        'singular_name' => esc_html__('Event', 'event_espresso'),
-                        'plural_name'   => esc_html__('Events', 'event_espresso'),
-                        'singular_slug' => esc_html__('event', 'event_espresso'),
-                        'plural_slug'   => $this->core_config->event_cpt_slug,
-                        'class_name'    => 'EE_Event',
-                        'model_name'    => 'EEM_Event',
-                        'args'          => [
-                            'public'              => true,
-                            'show_in_nav_menus'   => true,
-                            'show_in_graphql'     => true,
-                            'graphql_single_name' => $this->namespace . 'Event',
-                            'graphql_plural_name' => $this->namespace . 'Events',
-                            'capability_type'     => 'event',
-                            'capabilities'        => [
-                                'edit_post'              => 'ee_edit_event',
-                                'read_post'              => 'ee_read_event',
-                                'delete_post'            => 'ee_delete_event',
-                                'edit_posts'             => 'ee_edit_events',
-                                'edit_others_posts'      => 'ee_edit_others_events',
-                                'publish_posts'          => 'ee_publish_events',
-                                'read_private_posts'     => 'ee_read_private_events',
-                                'delete_posts'           => 'ee_delete_events',
-                                'delete_private_posts'   => 'ee_delete_private_events',
-                                'delete_published_posts' => 'ee_delete_published_events',
-                                'delete_others_posts'    => 'ee_delete_others_events',
-                                'edit_private_posts'     => 'ee_edit_private_events',
-                                'edit_published_posts'   => 'ee_edit_published_events',
-                            ],
-                            'taxonomies'          => [
-                                'espresso_event_categories',
-                                'espresso_event_type',
-                                'post_tag',
-                            ],
-                            'page_templates'      => true,
-                        ],
-                    ],
-                    EspressoPostType::VENUES => [
-                        'singular_name' => esc_html__('Venue', 'event_espresso'),
-                        'plural_name'   => esc_html__('Venues', 'event_espresso'),
-                        'singular_slug' => esc_html__('venue', 'event_espresso'),
-                        'plural_slug'   => esc_html__('venues', 'event_espresso'),
-                        'class_name'    => 'EE_Venue',
-                        'model_name'    => 'EEM_Venue',
-                        'args'          => [
-                            'public'              => true,
-                            'show_in_nav_menus'   => false, // by default this doesn't show for decaf,
-                            'show_in_graphql'     => true,
-                            'graphql_single_name' => $this->namespace . 'Venue',
-                            'graphql_plural_name' => $this->namespace . 'Venues',
-                            'capability_type'     => 'venue',
-                            'capabilities'        => [
-                                'edit_post'              => 'ee_edit_venue',
-                                'read_post'              => 'ee_read_venue',
-                                'delete_post'            => 'ee_delete_venue',
-                                'edit_posts'             => 'ee_edit_venues',
-                                'edit_others_posts'      => 'ee_edit_others_venues',
-                                'publish_posts'          => 'ee_publish_venues',
-                                'read_private_posts'     => 'ee_read_private_venues',
-                                'delete_posts'           => 'ee_delete_venues',
-                                'delete_private_posts'   => 'ee_delete_private_venues',
-                                'delete_published_posts' => 'ee_delete_published_venues',
-                                'delete_others_posts'    => 'ee_edit_others_venues',
-                                'edit_private_posts'     => 'ee_edit_private_venues',
-                                'edit_published_posts'   => 'ee_edit_published_venues',
-                            ],
-                            'taxonomies'          => [
-                                'espresso_venue_categories',
-                                'post_tag',
-                            ],
-                            'page_templates'      => true,
-                        ],
-                    ],
-                    EspressoPostType::ATTENDEES => [
-                        'singular_name' => esc_html__('Contact', 'event_espresso'),
-                        'plural_name'   => esc_html__('Contacts', 'event_espresso'),
-                        'singular_slug' => esc_html__('contact', 'event_espresso'),
-                        'plural_slug'   => esc_html__('contacts', 'event_espresso'),
-                        'class_name'    => 'EE_Attendee',
-                        'model_name'    => 'EEM_Attendee',
-                        'args'          => [
-                            'public'             => false,
-                            'publicly_queryable' => false,
-                            'hierarchical'       => false,
-                            'has_archive'        => false,
-                            'supports'           => [
-                                'editor',
-                                'thumbnail',
-                                'excerpt',
-                                'custom-fields',
-                                'comments',
-                            ],
-                            'taxonomies'         => ['post_tag'],
-                            'capability_type'    => 'contact',
-                            'capabilities'       => [
-                                'edit_post'              => 'ee_edit_contact',
-                                'read_post'              => 'ee_read_contact',
-                                'delete_post'            => 'ee_delete_contact',
-                                'edit_posts'             => 'ee_edit_contacts',
-                                'edit_others_posts'      => 'ee_edit_contacts',
-                                'publish_posts'          => 'ee_edit_contacts',
-                                'read_private_posts'     => 'ee_edit_contacts',
-                                'delete_posts'           => 'ee_delete_contacts',
-                                'delete_private_posts'   => 'ee_delete_contacts',
-                                'delete_published_posts' => 'ee_delete_contacts',
-                                'delete_others_posts'    => 'ee_delete_contacts',
-                                'edit_private_posts'     => 'ee_edit_contacts',
-                                'edit_published_posts'   => 'ee_edit_contacts',
-                            ],
-                        ],
-                    ],
-                ]
-            )
-        );
-    }
+	/**
+	 * defines Espresso Custom Post Types
+	 * NOTE the ['args']['page_templates'] array index is something specific to our CPTs
+	 * and not part of the WP custom post type api.
+	 *
+	 * @return void
+	 */
+	private function setDefinitions()
+	{
+		$this->custom_post_types = (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_CustomPostTypeDefinitions__getCustomPostTypes',
+			// legacy filter applied for now,
+			// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+			apply_filters(
+				'FHEE__EE_Register_CPTs__get_CPTs__cpts',
+				[
+					EspressoPostType::EVENTS => [
+						'singular_name' => esc_html__('Event', 'event_espresso'),
+						'plural_name'   => esc_html__('Events', 'event_espresso'),
+						'singular_slug' => esc_html__('event', 'event_espresso'),
+						'plural_slug'   => $this->core_config->event_cpt_slug,
+						'class_name'    => 'EE_Event',
+						'model_name'    => 'EEM_Event',
+						'args'          => [
+							'public'              => true,
+							'show_in_nav_menus'   => true,
+							'show_in_graphql'     => true,
+							'graphql_single_name' => $this->namespace . 'Event',
+							'graphql_plural_name' => $this->namespace . 'Events',
+							'capability_type'     => 'event',
+							'capabilities'        => [
+								'edit_post'              => 'ee_edit_event',
+								'read_post'              => 'ee_read_event',
+								'delete_post'            => 'ee_delete_event',
+								'edit_posts'             => 'ee_edit_events',
+								'edit_others_posts'      => 'ee_edit_others_events',
+								'publish_posts'          => 'ee_publish_events',
+								'read_private_posts'     => 'ee_read_private_events',
+								'delete_posts'           => 'ee_delete_events',
+								'delete_private_posts'   => 'ee_delete_private_events',
+								'delete_published_posts' => 'ee_delete_published_events',
+								'delete_others_posts'    => 'ee_delete_others_events',
+								'edit_private_posts'     => 'ee_edit_private_events',
+								'edit_published_posts'   => 'ee_edit_published_events',
+							],
+							'taxonomies'          => [
+								'espresso_event_categories',
+								'espresso_event_type',
+								'post_tag',
+							],
+							'page_templates'      => true,
+						],
+					],
+					EspressoPostType::VENUES => [
+						'singular_name' => esc_html__('Venue', 'event_espresso'),
+						'plural_name'   => esc_html__('Venues', 'event_espresso'),
+						'singular_slug' => esc_html__('venue', 'event_espresso'),
+						'plural_slug'   => esc_html__('venues', 'event_espresso'),
+						'class_name'    => 'EE_Venue',
+						'model_name'    => 'EEM_Venue',
+						'args'          => [
+							'public'              => true,
+							'show_in_nav_menus'   => false, // by default this doesn't show for decaf,
+							'show_in_graphql'     => true,
+							'graphql_single_name' => $this->namespace . 'Venue',
+							'graphql_plural_name' => $this->namespace . 'Venues',
+							'capability_type'     => 'venue',
+							'capabilities'        => [
+								'edit_post'              => 'ee_edit_venue',
+								'read_post'              => 'ee_read_venue',
+								'delete_post'            => 'ee_delete_venue',
+								'edit_posts'             => 'ee_edit_venues',
+								'edit_others_posts'      => 'ee_edit_others_venues',
+								'publish_posts'          => 'ee_publish_venues',
+								'read_private_posts'     => 'ee_read_private_venues',
+								'delete_posts'           => 'ee_delete_venues',
+								'delete_private_posts'   => 'ee_delete_private_venues',
+								'delete_published_posts' => 'ee_delete_published_venues',
+								'delete_others_posts'    => 'ee_edit_others_venues',
+								'edit_private_posts'     => 'ee_edit_private_venues',
+								'edit_published_posts'   => 'ee_edit_published_venues',
+							],
+							'taxonomies'          => [
+								'espresso_venue_categories',
+								'post_tag',
+							],
+							'page_templates'      => true,
+						],
+					],
+					EspressoPostType::ATTENDEES => [
+						'singular_name' => esc_html__('Contact', 'event_espresso'),
+						'plural_name'   => esc_html__('Contacts', 'event_espresso'),
+						'singular_slug' => esc_html__('contact', 'event_espresso'),
+						'plural_slug'   => esc_html__('contacts', 'event_espresso'),
+						'class_name'    => 'EE_Attendee',
+						'model_name'    => 'EEM_Attendee',
+						'args'          => [
+							'public'             => false,
+							'publicly_queryable' => false,
+							'hierarchical'       => false,
+							'has_archive'        => false,
+							'supports'           => [
+								'editor',
+								'thumbnail',
+								'excerpt',
+								'custom-fields',
+								'comments',
+							],
+							'taxonomies'         => ['post_tag'],
+							'capability_type'    => 'contact',
+							'capabilities'       => [
+								'edit_post'              => 'ee_edit_contact',
+								'read_post'              => 'ee_read_contact',
+								'delete_post'            => 'ee_delete_contact',
+								'edit_posts'             => 'ee_edit_contacts',
+								'edit_others_posts'      => 'ee_edit_contacts',
+								'publish_posts'          => 'ee_edit_contacts',
+								'read_private_posts'     => 'ee_edit_contacts',
+								'delete_posts'           => 'ee_delete_contacts',
+								'delete_private_posts'   => 'ee_delete_contacts',
+								'delete_published_posts' => 'ee_delete_contacts',
+								'delete_others_posts'    => 'ee_delete_contacts',
+								'edit_private_posts'     => 'ee_edit_contacts',
+								'edit_published_posts'   => 'ee_edit_contacts',
+							],
+						],
+					],
+				]
+			)
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getDefinitions()
-    {
-        return $this->custom_post_types;
-    }
+	/**
+	 * @return array
+	 */
+	public function getDefinitions()
+	{
+		return $this->custom_post_types;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomPostTypeSlugs()
-    {
-        return array_keys($this->getDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomPostTypeSlugs()
+	{
+		return array_keys($this->getDefinitions());
+	}
 
 
-    /**
-     * This basically goes through the CPT array and returns only CPT's
-     * that have the ['args']['public'] option set as false
-     *
-     * @return array
-     */
-    public function getPrivateCustomPostTypes()
-    {
-        $private_CPTs = [];
-        foreach ($this->getDefinitions() as $CPT => $details) {
-            if (empty($details['args']['public'])) {
-                $private_CPTs[ $CPT ] = $details;
-            }
-        }
-        return $private_CPTs;
-    }
+	/**
+	 * This basically goes through the CPT array and returns only CPT's
+	 * that have the ['args']['public'] option set as false
+	 *
+	 * @return array
+	 */
+	public function getPrivateCustomPostTypes()
+	{
+		$private_CPTs = [];
+		foreach ($this->getDefinitions() as $CPT => $details) {
+			if (empty($details['args']['public'])) {
+				$private_CPTs[ $CPT ] = $details;
+			}
+		}
+		return $private_CPTs;
+	}
 
 
-    /**
-     * This returns the corresponding model name for cpts registered by EE.
-     *
-     * @param string $post_type_slug    If a slug is included, then attempt to retrieve
-     *                                  the model name for the given cpt slug.
-     *                                  Otherwise if empty, then we'll return
-     *                                  all cpt model names for cpts registered in EE.
-     * @return array                    Empty array if no matching model names for the given slug
-     *                                  or an array of model names indexed by post type slug.
-     */
-    public function getCustomPostTypeModelNames($post_type_slug = '')
-    {
-        $cpts = $this->getDefinitions();
-        // first if slug passed in...
-        if (! empty($post_type_slug)) {
-            // check that slug and cpt match
-            if (! isset($cpts[ $post_type_slug ])) {
-                return [];
-            }
-            if (
-                empty($cpts[ $post_type_slug ]['class_name'])
-                && empty($cpts[ $post_type_slug ]['model_name'])
-            ) {
-                return [];
-            }
-            // k let's get the model name for this cpt.
-            return $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
-        }
-        // if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
-        $cpt_models = [];
-        foreach ($cpts as $slug => $args) {
-            $model = $this->getCustomPostTypeModelName($slug, $args);
-            if (! empty($model)) {
-                $cpt_models[ $slug ] = $model;
-            }
-        }
-        return $cpt_models;
-    }
+	/**
+	 * This returns the corresponding model name for cpts registered by EE.
+	 *
+	 * @param string $post_type_slug    If a slug is included, then attempt to retrieve
+	 *                                  the model name for the given cpt slug.
+	 *                                  Otherwise if empty, then we'll return
+	 *                                  all cpt model names for cpts registered in EE.
+	 * @return array                    Empty array if no matching model names for the given slug
+	 *                                  or an array of model names indexed by post type slug.
+	 */
+	public function getCustomPostTypeModelNames($post_type_slug = '')
+	{
+		$cpts = $this->getDefinitions();
+		// first if slug passed in...
+		if (! empty($post_type_slug)) {
+			// check that slug and cpt match
+			if (! isset($cpts[ $post_type_slug ])) {
+				return [];
+			}
+			if (
+				empty($cpts[ $post_type_slug ]['class_name'])
+				&& empty($cpts[ $post_type_slug ]['model_name'])
+			) {
+				return [];
+			}
+			// k let's get the model name for this cpt.
+			return $this->getCustomPostTypeModelName($post_type_slug, $cpts[ $post_type_slug ]);
+		}
+		// if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
+		$cpt_models = [];
+		foreach ($cpts as $slug => $args) {
+			$model = $this->getCustomPostTypeModelName($slug, $args);
+			if (! empty($model)) {
+				$cpt_models[ $slug ] = $model;
+			}
+		}
+		return $cpt_models;
+	}
 
 
-    /**
-     * @param       $post_type_slug
-     * @param array $cpt
-     * @return array
-     */
-    private function getCustomPostTypeModelName($post_type_slug, array $cpt)
-    {
-        if (! empty($cpt['model_name'])) {
-            return [$post_type_slug => $cpt['model_name']];
-        }
-        if (! empty($cpt['class_name'])) {
-            return [
-                $post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
-            ];
-        }
-        return [];
-    }
+	/**
+	 * @param       $post_type_slug
+	 * @param array $cpt
+	 * @return array
+	 */
+	private function getCustomPostTypeModelName($post_type_slug, array $cpt)
+	{
+		if (! empty($cpt['model_name'])) {
+			return [$post_type_slug => $cpt['model_name']];
+		}
+		if (! empty($cpt['class_name'])) {
+			return [
+				$post_type_slug => $this->deriveCptModelNameFromClassName($cpt['class_name']),
+			];
+		}
+		return [];
+	}
 
 
-    /**
-     * @param string $class_name
-     * @return string
-     */
-    private function deriveCptModelNameFromClassName($class_name)
-    {
-        return str_replace('EE', 'EEM', $class_name);
-    }
+	/**
+	 * @param string $class_name
+	 * @return string
+	 */
+	private function deriveCptModelNameFromClassName($class_name)
+	{
+		return str_replace('EE', 'EEM', $class_name);
+	}
 
 
-    /**
-     * This instantiates cpt models related to the cpts registered via EE.
-     *
-     * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
-     *                               the cpt matching the given slug.  Otherwise all cpt models will be
-     *                               instantiated (if possible).
-     * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
-     *                               EEM models indexed by post slug.
-     * @since 4.6.16.rc.000
-     */
-    public function getCustomPostTypeModels($post_type_slug = '')
-    {
-        $cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
-        $instantiated = [];
-        foreach ($cpt_model_names as $slug => $model_name) {
-            $model = $this->loader->getShared($model_name);
-            if ($model instanceof EEM_CPT_Base) {
-                $instantiated[ $slug ] = $model;
-            }
-        }
-        return $instantiated;
-    }
+	/**
+	 * This instantiates cpt models related to the cpts registered via EE.
+	 *
+	 * @param string $post_type_slug If valid slug is provided, then will instantiate the model only for
+	 *                               the cpt matching the given slug.  Otherwise all cpt models will be
+	 *                               instantiated (if possible).
+	 * @return EEM_CPT_Base[]        successful instantiation will return an array of successfully instantiated
+	 *                               EEM models indexed by post slug.
+	 * @since 4.6.16.rc.000
+	 */
+	public function getCustomPostTypeModels($post_type_slug = '')
+	{
+		$cpt_model_names = $this->getCustomPostTypeModelNames($post_type_slug);
+		$instantiated = [];
+		foreach ($cpt_model_names as $slug => $model_name) {
+			$model = $this->loader->getShared($model_name);
+			if ($model instanceof EEM_CPT_Base) {
+				$instantiated[ $slug ] = $model;
+			}
+		}
+		return $instantiated;
+	}
 }

core/domain/entities/custom_post_types/EspressoPostType.php

Indentation +3 added lines, -3 removed lines

@@ -4,10 +4,10 @@
 
 class EspressoPostType
 {
-    public const EVENTS = 'espresso_events';
+	public const EVENTS = 'espresso_events';
 
-    public const VENUES = 'espresso_venues';
+	public const VENUES = 'espresso_venues';
 
-    public const ATTENDEES = 'espresso_attendees';
+	public const ATTENDEES = 'espresso_attendees';
 
 }

core/domain/entities/routing/data_nodes/domains/EventEditor.php

Indentation +41 added lines, -41 removed lines

@@ -20,51 +20,51 @@
  */
 class EventEditor extends JsonDataNode
 {
-    const NODE_NAME = 'eventEditor';
+	const NODE_NAME = 'eventEditor';
 
 
-    /**
-     * @var EventEditorGraphQLData
-     */
-    protected $event_editor_gql_data;
+	/**
+	 * @var EventEditorGraphQLData
+	 */
+	protected $event_editor_gql_data;
 
 
-    /**
-     * EventEditor JsonDataNode constructor.
-     *
-     * @param EventEditorGraphQLData $event_editor_gql_data
-     * @param JsonDataNodeValidator  $validator
-     */
-    public function __construct(
-        EventEditorGraphQLData $event_editor_gql_data,
-        JsonDataNodeValidator $validator
-    ) {
-        parent::__construct($validator);
-        $this->event_editor_gql_data = $event_editor_gql_data;
-        $this->setDomain(EventEditor::NODE_NAME);
-        $this->setNodeName(EventEditor::NODE_NAME);
-    }
+	/**
+	 * EventEditor JsonDataNode constructor.
+	 *
+	 * @param EventEditorGraphQLData $event_editor_gql_data
+	 * @param JsonDataNodeValidator  $validator
+	 */
+	public function __construct(
+		EventEditorGraphQLData $event_editor_gql_data,
+		JsonDataNodeValidator $validator
+	) {
+		parent::__construct($validator);
+		$this->event_editor_gql_data = $event_editor_gql_data;
+		$this->setDomain(EventEditor::NODE_NAME);
+		$this->setNodeName(EventEditor::NODE_NAME);
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function initialize()
-    {
-        global $post;
-        $eventId = isset($_REQUEST['post']) ? absint($_REQUEST['post']) : 0;
-        // if there's no event ID but there IS a WP Post... then use the Post ID
-        $use_post_id = $eventId === 0 && $post instanceof WP_Post && $post->post_type === EspressoPostType::EVENTS;
-        $eventId = $use_post_id ? $post->ID : $eventId;
-        $related_data = apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_routing_data_nodes_domains_EventEditor__initialize__related_data',
-            $this->event_editor_gql_data->getData($eventId),
-            $eventId
-        );
-        foreach ($related_data as $key => $value) {
-            $this->addData($key, $value);
-        }
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function initialize()
+	{
+		global $post;
+		$eventId = isset($_REQUEST['post']) ? absint($_REQUEST['post']) : 0;
+		// if there's no event ID but there IS a WP Post... then use the Post ID
+		$use_post_id = $eventId === 0 && $post instanceof WP_Post && $post->post_type === EspressoPostType::EVENTS;
+		$eventId = $use_post_id ? $post->ID : $eventId;
+		$related_data = apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_routing_data_nodes_domains_EventEditor__initialize__related_data',
+			$this->event_editor_gql_data->getData($eventId),
+			$eventId
+		);
+		foreach ($related_data as $key => $value) {
+			$this->addData($key, $value);
+		}
+	}
 }