eventespresso / event-espresso-core

core/domain/services/cron/jobs/ExpiredTransactionCheck.php

Indentation +219 added lines, -219 removed lines

@@ -17,251 +17,251 @@
 
 class ExpiredTransactionCheck extends CronJob
 {
-    private ?PaymentProcessor $payment_processor = null;
+	private ?PaymentProcessor $payment_processor = null;
 
-    private ?EE_Transaction_Processor $transaction_processor = null;
+	private ?EE_Transaction_Processor $transaction_processor = null;
 
-    /**
-     * array of TXN IDs
-     *
-     * @var array
-     */
-    protected array $expired_transactions = [];
+	/**
+	 * array of TXN IDs
+	 *
+	 * @var array
+	 */
+	protected array $expired_transactions = [];
 
 
-    private function loadTransactionProcessor()
-    {
-        $this->transaction_processor = $this->loader->getShared(EE_Transaction_Processor::class);
-    }
+	private function loadTransactionProcessor()
+	{
+		$this->transaction_processor = $this->loader->getShared(EE_Transaction_Processor::class);
+	}
 
 
-    private function loadPaymentProcessor()
-    {
-        $this->payment_processor = $this->loader->getShared(PaymentProcessor::class);
-    }
+	private function loadPaymentProcessor()
+	{
+		$this->payment_processor = $this->loader->getShared(PaymentProcessor::class);
+	}
 
 
-    public function setHooks(): void
-    {
-        add_action(
-            'AHEE__EE_Cron_Tasks__expired_transaction_check',
-            [$this, 'expiredTransactionCheck']
-        );
-    }
+	public function setHooks(): void
+	{
+		add_action(
+			'AHEE__EE_Cron_Tasks__expired_transaction_check',
+			[$this, 'expiredTransactionCheck']
+		);
+	}
 
 
-    /**
-     * schedule_expired_transaction_check
-     * sets a wp_schedule_single_event() for following up on TXNs after their session has expired
-     *
-     * @param int $timestamp
-     * @param int $TXN_ID
-     */
-    public static function scheduleExpiredTransactionCheck(
-        int $timestamp,
-        int $TXN_ID
-    ): void {
-        // validate $TXN_ID and $timestamp
-        $TXN_ID    = absint($TXN_ID);
-        $timestamp = absint($timestamp);
-        if ($TXN_ID && $timestamp) {
-            wp_schedule_single_event(
-                $timestamp,
-                'AHEE__EE_Cron_Tasks__expired_transaction_check',
-                [$TXN_ID]
-            );
-        }
-    }
+	/**
+	 * schedule_expired_transaction_check
+	 * sets a wp_schedule_single_event() for following up on TXNs after their session has expired
+	 *
+	 * @param int $timestamp
+	 * @param int $TXN_ID
+	 */
+	public static function scheduleExpiredTransactionCheck(
+		int $timestamp,
+		int $TXN_ID
+	): void {
+		// validate $TXN_ID and $timestamp
+		$TXN_ID    = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
+			wp_schedule_single_event(
+				$timestamp,
+				'AHEE__EE_Cron_Tasks__expired_transaction_check',
+				[$TXN_ID]
+			);
+		}
+	}
 
 
-    /**
-     * this is the callback for the action hook:
-     * 'AHEE__EE_Cron_Tasks__transaction_session_expiration_check'
-     * which is utilized by wp_schedule_single_event()
-     * in \EED_Single_Page_Checkout::_initialize_transaction().
-     * The passed TXN_ID gets added to an array, and then the
-     * process_expired_transactions() function is hooked into
-     * 'AHEE__EE_System__core_loaded_and_ready' which will actually handle the
-     * processing of any failed transactions, because doing so now would be
-     * too early and the required resources may not be available
-     *
-     * @param int $TXN_ID
-     */
-    public function expiredTransactionCheck(int $TXN_ID = 0): void
-    {
-        if (absint($TXN_ID)) {
-            $this->expired_transactions[ $TXN_ID ] = $TXN_ID;
-            add_action(
-                'shutdown',
-                [$this, 'processExpiredTransactions'],
-                5
-            );
-        }
-    }
+	/**
+	 * this is the callback for the action hook:
+	 * 'AHEE__EE_Cron_Tasks__transaction_session_expiration_check'
+	 * which is utilized by wp_schedule_single_event()
+	 * in \EED_Single_Page_Checkout::_initialize_transaction().
+	 * The passed TXN_ID gets added to an array, and then the
+	 * process_expired_transactions() function is hooked into
+	 * 'AHEE__EE_System__core_loaded_and_ready' which will actually handle the
+	 * processing of any failed transactions, because doing so now would be
+	 * too early and the required resources may not be available
+	 *
+	 * @param int $TXN_ID
+	 */
+	public function expiredTransactionCheck(int $TXN_ID = 0): void
+	{
+		if (absint($TXN_ID)) {
+			$this->expired_transactions[ $TXN_ID ] = $TXN_ID;
+			add_action(
+				'shutdown',
+				[$this, 'processExpiredTransactions'],
+				5
+			);
+		}
+	}
 
 
-    /**
-     * loops through the $this->expired_transactions array and processes any failed TXNs
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @throws DomainException
-     * @throws RuntimeException
-     */
-    public function processExpiredTransactions(): void
-    {
-        if (
-            // are there any TXNs that need cleaning up ?
-            empty($this->expired_transactions)
-            // reschedule the cron if we can't hit the db right now
-            || CronUtilities::rescheduleCronForTransactions(
-                [ExpiredTransactionCheck::class, 'scheduleExpiredTransactionCheck'],
-                $this->expired_transactions
-            )
-        ) {
-            return;
-        }
-        $this->loadTransactionProcessor();
-        // set revisit flag for txn processor
-        $this->transaction_processor->set_revisit();
-        foreach ($this->expired_transactions as $TXN_ID) {
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
-            // verify transaction and whether it is failed or not
-            if ($transaction instanceof EE_Transaction) {
-                switch ($transaction->status_ID()) {
-                    case EEM_Transaction::complete_status_code:
-                        $this->processCompletedTransaction($transaction);
-                        break;
+	/**
+	 * loops through the $this->expired_transactions array and processes any failed TXNs
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @throws DomainException
+	 * @throws RuntimeException
+	 */
+	public function processExpiredTransactions(): void
+	{
+		if (
+			// are there any TXNs that need cleaning up ?
+			empty($this->expired_transactions)
+			// reschedule the cron if we can't hit the db right now
+			|| CronUtilities::rescheduleCronForTransactions(
+				[ExpiredTransactionCheck::class, 'scheduleExpiredTransactionCheck'],
+				$this->expired_transactions
+			)
+		) {
+			return;
+		}
+		$this->loadTransactionProcessor();
+		// set revisit flag for txn processor
+		$this->transaction_processor->set_revisit();
+		foreach ($this->expired_transactions as $TXN_ID) {
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+			// verify transaction and whether it is failed or not
+			if ($transaction instanceof EE_Transaction) {
+				switch ($transaction->status_ID()) {
+					case EEM_Transaction::complete_status_code:
+						$this->processCompletedTransaction($transaction);
+						break;
 
-                    case EEM_Transaction::overpaid_status_code:
-                        $this->processOverpaidTransaction($transaction);
-                        break;
+					case EEM_Transaction::overpaid_status_code:
+						$this->processOverpaidTransaction($transaction);
+						break;
 
-                    case EEM_Transaction::incomplete_status_code:
-                        $this->processIncompletedTransaction($transaction);
-                        break;
+					case EEM_Transaction::incomplete_status_code:
+						$this->processIncompletedTransaction($transaction);
+						break;
 
-                    case EEM_Transaction::abandoned_status_code:
-                        $this->processAbandonedTransaction($transaction);
-                        break;
+					case EEM_Transaction::abandoned_status_code:
+						$this->processAbandonedTransaction($transaction);
+						break;
 
-                    case EEM_Transaction::failed_status_code:
-                        $this->processFailedTransaction($transaction);
-                        break;
-                }
-            }
-            unset($this->expired_transactions[ $TXN_ID ]);
-        }
-    }
+					case EEM_Transaction::failed_status_code:
+						$this->processFailedTransaction($transaction);
+						break;
+				}
+			}
+			unset($this->expired_transactions[ $TXN_ID ]);
+		}
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processCompletedTransaction(EE_Transaction $transaction)
-    {
-        // Don't update the transaction/registrations if the Primary Registration is Not Approved.
-        $primary_registration = $transaction->primary_registration();
-        if (
-            $primary_registration instanceof EE_Registration
-            && $primary_registration->status_ID() !== RegStatus::AWAITING_REVIEW
-        ) {
-            $this->transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
-                $transaction,
-                $transaction->last_payment()
-            );
-            do_action(
-                'AHEE__EE_Cron_Tasks__process_expired_transactions__completed_transaction',
-                $transaction
-            );
-        }
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processCompletedTransaction(EE_Transaction $transaction)
+	{
+		// Don't update the transaction/registrations if the Primary Registration is Not Approved.
+		$primary_registration = $transaction->primary_registration();
+		if (
+			$primary_registration instanceof EE_Registration
+			&& $primary_registration->status_ID() !== RegStatus::AWAITING_REVIEW
+		) {
+			$this->transaction_processor->update_transaction_and_registrations_after_checkout_or_payment(
+				$transaction,
+				$transaction->last_payment()
+			);
+			do_action(
+				'AHEE__EE_Cron_Tasks__process_expired_transactions__completed_transaction',
+				$transaction
+			);
+		}
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return void
-     */
-    private function processOverpaidTransaction(EE_Transaction $transaction)
-    {
-        do_action(
-            'AHEE__EE_Cron_Tasks__process_expired_transactions__overpaid_transaction',
-            $transaction
-        );
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return void
+	 */
+	private function processOverpaidTransaction(EE_Transaction $transaction)
+	{
+		do_action(
+			'AHEE__EE_Cron_Tasks__process_expired_transactions__overpaid_transaction',
+			$transaction
+		);
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return void
-     */
-    private function processIncompletedTransaction(EE_Transaction $transaction)
-    {
-        do_action(
-            'AHEE__EE_Cron_Tasks__process_expired_transactions__incomplete_transaction',
-            $transaction
-        );
-        // todo : move business logic into EE_Transaction_Processor for finalizing abandoned transactions
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return void
+	 */
+	private function processIncompletedTransaction(EE_Transaction $transaction)
+	{
+		do_action(
+			'AHEE__EE_Cron_Tasks__process_expired_transactions__incomplete_transaction',
+			$transaction
+		);
+		// todo : move business logic into EE_Transaction_Processor for finalizing abandoned transactions
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processAbandonedTransaction(EE_Transaction $transaction)
-    {
-        // run hook before updating transaction, primarily so
-        // EED_Ticket_Sales_Monitor::process_abandoned_transactions() can release reserved tickets
-        do_action(
-            'AHEE__EE_Cron_Tasks__process_expired_transactions__abandoned_transaction',
-            $transaction
-        );
-        // don't finalize the TXN if it has already been completed
-        if ($transaction->all_reg_steps_completed() !== true) {
-            $this->loadPaymentProcessor();
-            // let's simulate an IPN here which will trigger any notifications that need to go out
-            $this->payment_processor->updateTransactionBasedOnPayment(
-                $transaction,
-                $transaction->last_payment(),
-                true,
-                true
-            );
-        }
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processAbandonedTransaction(EE_Transaction $transaction)
+	{
+		// run hook before updating transaction, primarily so
+		// EED_Ticket_Sales_Monitor::process_abandoned_transactions() can release reserved tickets
+		do_action(
+			'AHEE__EE_Cron_Tasks__process_expired_transactions__abandoned_transaction',
+			$transaction
+		);
+		// don't finalize the TXN if it has already been completed
+		if ($transaction->all_reg_steps_completed() !== true) {
+			$this->loadPaymentProcessor();
+			// let's simulate an IPN here which will trigger any notifications that need to go out
+			$this->payment_processor->updateTransactionBasedOnPayment(
+				$transaction,
+				$transaction->last_payment(),
+				true,
+				true
+			);
+		}
+	}
 
 
-    /**
-     * @param EE_Transaction $transaction
-     * @return void
-     */
-    private function processFailedTransaction(EE_Transaction $transaction)
-    {
-        do_action(
-            'AHEE__EE_Cron_Tasks__process_expired_transactions__failed_transaction',
-            $transaction
-        );
-        // todo :
-        // perform garbage collection here and remove clean_out_junk_transactions()
-        // $registrations = $transaction->registrations();
-        // if (! empty($registrations)) {
-        //     foreach ($registrations as $registration) {
-        //         if ($registration instanceof EE_Registration) {
-        //             $delete_registration = true;
-        //             if ($registration->attendee() instanceof EE_Attendee) {
-        //                 $delete_registration = false;
-        //             }
-        //             if ($delete_registration) {
-        //                 $registration->delete_permanently();
-        //                 $registration->delete_related_permanently();
-        //             }
-        //         }
-        //     }
-        // }
-    }
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return void
+	 */
+	private function processFailedTransaction(EE_Transaction $transaction)
+	{
+		do_action(
+			'AHEE__EE_Cron_Tasks__process_expired_transactions__failed_transaction',
+			$transaction
+		);
+		// todo :
+		// perform garbage collection here and remove clean_out_junk_transactions()
+		// $registrations = $transaction->registrations();
+		// if (! empty($registrations)) {
+		//     foreach ($registrations as $registration) {
+		//         if ($registration instanceof EE_Registration) {
+		//             $delete_registration = true;
+		//             if ($registration->attendee() instanceof EE_Attendee) {
+		//                 $delete_registration = false;
+		//             }
+		//             if ($delete_registration) {
+		//                 $registration->delete_permanently();
+		//                 $registration->delete_related_permanently();
+		//             }
+		//         }
+		//     }
+		// }
+	}
 }

core/domain/services/capabilities/FeatureFlagsConfig.php

Indentation +167 added lines, -167 removed lines

@@ -17,171 +17,171 @@
  */
 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;
-
-    private static array $removed = [
-        FeatureFlag::USE_ADVANCED_EVENT_EDITOR,
-    ];
-
-
-
-    protected Domain $domain;
-
-    private ?stdClass $feature_flags = null;
-
-
-    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_DATETIME_STATUS_CONTROLS  => false,
-            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_PAYMENT_PROCESSOR_FEES    => true,
-            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,
-        ];
-    }
-
-
-    /**
-     * feature flags that absolutely must be enabled/disabled based on hard-coded conditions
-     *
-     * @return stdClass
-     * @since 5.0.20.p
-     */
-    public function getOverrides(): stdClass
-    {
-        $overrides = [];
-        if (defined('EE_USE_EDD_PLUGIN_LICENSING')) {
-            $overrides[ FeatureFlag::USE_EDD_PLUGIN_LICENSING ] = EE_USE_EDD_PLUGIN_LICENSING;
-        }
-        return (object) $overrides;
-    }
-
-
-    /**
-     * @return stdClass
-     */
-    public function getFeatureFlags(): stdClass
-    {
-        if ($this->feature_flags) {
-            return $this->feature_flags;
-        }
-        $default_options     = $this->getDefaultFeatureFlagOptions();
-        $this->feature_flags = $this->getAll();
-        $overrides           = $this->getOverrides();
-        // 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($this->feature_flags->$key)) {
-                $this->feature_flags->$key = $value;
-            }
-            // ensure that all overrides are set
-            if (isset($overrides->$key)) {
-                $this->feature_flags->$key = $overrides->$key;
-            }
-        }
-        return $this->feature_flags;
-    }
-
-
-    public function saveFeatureFlagsConfig(?stdClass $feature_flags = null): int
-    {
-        $feature_flags = $feature_flags ?? $this->feature_flags;
-        foreach (FeatureFlagsConfig::$removed as $feature_flag) {
-            unset($feature_flags->{$feature_flag});
-        }
-        $this->feature_flags = $feature_flags;
-        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
-     * @param bool   $save
-     * @return int
-     */
-    public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false, bool $save = true): int
-    {
-        if (! $this->feature_flags) {
-            $this->getFeatureFlags();
-        }
-        if (! property_exists($this->feature_flags, $feature_flag) && ! $add_if_missing) {
-            return WordPressOption::UPDATE_ERROR;
-        }
-        $this->feature_flags->{$feature_flag} = true;
-        // if feature flag is the advanced event editor bulk edit options
-        // then only enabled if the site is Caffeinated and not MultiSite
-        if ($feature_flag === FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT) {
-            $this->feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
-        }
-        if ($save) {
-            return $this->saveFeatureFlagsConfig($this->feature_flags);
-        }
-        return WordPressOption::UPDATE_NONE;
-    }
-
-
-    /**
-     * 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
-     * @param bool   $save
-     * @return int
-     */
-    public function disableFeatureFlag(string $feature_flag, bool $save = true): int
-    {
-        if (! $this->feature_flags) {
-            $this->getFeatureFlags();
-        }
-        if (! property_exists($this->feature_flags, $feature_flag)) {
-            return WordPressOption::UPDATE_ERROR;
-        }
-        $this->feature_flags->{$feature_flag} = false;
-        if ($save) {
-            return $this->saveFeatureFlagsConfig($this->feature_flags);
-        }
-        return WordPressOption::UPDATE_NONE;
-    }
-
-
-    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;
+
+	private static array $removed = [
+		FeatureFlag::USE_ADVANCED_EVENT_EDITOR,
+	];
+
+
+
+	protected Domain $domain;
+
+	private ?stdClass $feature_flags = null;
+
+
+	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_DATETIME_STATUS_CONTROLS  => false,
+			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_PAYMENT_PROCESSOR_FEES    => true,
+			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,
+		];
+	}
+
+
+	/**
+	 * feature flags that absolutely must be enabled/disabled based on hard-coded conditions
+	 *
+	 * @return stdClass
+	 * @since 5.0.20.p
+	 */
+	public function getOverrides(): stdClass
+	{
+		$overrides = [];
+		if (defined('EE_USE_EDD_PLUGIN_LICENSING')) {
+			$overrides[ FeatureFlag::USE_EDD_PLUGIN_LICENSING ] = EE_USE_EDD_PLUGIN_LICENSING;
+		}
+		return (object) $overrides;
+	}
+
+
+	/**
+	 * @return stdClass
+	 */
+	public function getFeatureFlags(): stdClass
+	{
+		if ($this->feature_flags) {
+			return $this->feature_flags;
+		}
+		$default_options     = $this->getDefaultFeatureFlagOptions();
+		$this->feature_flags = $this->getAll();
+		$overrides           = $this->getOverrides();
+		// 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($this->feature_flags->$key)) {
+				$this->feature_flags->$key = $value;
+			}
+			// ensure that all overrides are set
+			if (isset($overrides->$key)) {
+				$this->feature_flags->$key = $overrides->$key;
+			}
+		}
+		return $this->feature_flags;
+	}
+
+
+	public function saveFeatureFlagsConfig(?stdClass $feature_flags = null): int
+	{
+		$feature_flags = $feature_flags ?? $this->feature_flags;
+		foreach (FeatureFlagsConfig::$removed as $feature_flag) {
+			unset($feature_flags->{$feature_flag});
+		}
+		$this->feature_flags = $feature_flags;
+		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
+	 * @param bool   $save
+	 * @return int
+	 */
+	public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false, bool $save = true): int
+	{
+		if (! $this->feature_flags) {
+			$this->getFeatureFlags();
+		}
+		if (! property_exists($this->feature_flags, $feature_flag) && ! $add_if_missing) {
+			return WordPressOption::UPDATE_ERROR;
+		}
+		$this->feature_flags->{$feature_flag} = true;
+		// if feature flag is the advanced event editor bulk edit options
+		// then only enabled if the site is Caffeinated and not MultiSite
+		if ($feature_flag === FeatureFlag::USE_EVENT_EDITOR_BULK_EDIT) {
+			$this->feature_flags->{$feature_flag} = $this->domain->isCaffeinated() && ! $this->domain->isMultiSite();
+		}
+		if ($save) {
+			return $this->saveFeatureFlagsConfig($this->feature_flags);
+		}
+		return WordPressOption::UPDATE_NONE;
+	}
+
+
+	/**
+	 * 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
+	 * @param bool   $save
+	 * @return int
+	 */
+	public function disableFeatureFlag(string $feature_flag, bool $save = true): int
+	{
+		if (! $this->feature_flags) {
+			$this->getFeatureFlags();
+		}
+		if (! property_exists($this->feature_flags, $feature_flag)) {
+			return WordPressOption::UPDATE_ERROR;
+		}
+		$this->feature_flags->{$feature_flag} = false;
+		if ($save) {
+			return $this->saveFeatureFlagsConfig($this->feature_flags);
+		}
+		return WordPressOption::UPDATE_NONE;
+	}
+
+
+	public function getFeatureFlagsFormOptions(): ?array
+	{
+		return FeatureFlag::getFormOptions();
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -83,7 +83,7 @@ 
     {
         $overrides = [];
         if (defined('EE_USE_EDD_PLUGIN_LICENSING')) {
-            $overrides[ FeatureFlag::USE_EDD_PLUGIN_LICENSING ] = EE_USE_EDD_PLUGIN_LICENSING;
+            $overrides[FeatureFlag::USE_EDD_PLUGIN_LICENSING] = EE_USE_EDD_PLUGIN_LICENSING;
         }
         return (object) $overrides;
     }
@@ -103,7 +103,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($this->feature_flags->$key)) {
+            if ( ! isset($this->feature_flags->$key)) {
                 $this->feature_flags->$key = $value;
             }
             // ensure that all overrides are set
@@ -137,10 +137,10 @@ 
      */
     public function enableFeatureFlag(string $feature_flag, bool $add_if_missing = false, bool $save = true): int
     {
-        if (! $this->feature_flags) {
+        if ( ! $this->feature_flags) {
             $this->getFeatureFlags();
         }
-        if (! property_exists($this->feature_flags, $feature_flag) && ! $add_if_missing) {
+        if ( ! property_exists($this->feature_flags, $feature_flag) && ! $add_if_missing) {
             return WordPressOption::UPDATE_ERROR;
         }
         $this->feature_flags->{$feature_flag} = true;
@@ -166,10 +166,10 @@ 
      */
     public function disableFeatureFlag(string $feature_flag, bool $save = true): int
     {
-        if (! $this->feature_flags) {
+        if ( ! $this->feature_flags) {
             $this->getFeatureFlags();
         }
-        if (! property_exists($this->feature_flags, $feature_flag)) {
+        if ( ! property_exists($this->feature_flags, $feature_flag)) {
             return WordPressOption::UPDATE_ERROR;
         }
         $this->feature_flags->{$feature_flag} = false;

core/domain/services/capabilities/FeatureFlags.php

Indentation +54 added lines, -54 removed lines

@@ -13,66 +13,66 @@
  */
 class FeatureFlags
 {
-    private CapabilitiesChecker $capabilities_checker;
+	private CapabilitiesChecker $capabilities_checker;
 
-    protected FeatureFlagsConfig $option;
+	protected FeatureFlagsConfig $option;
 
-    /**
-     * array of key value pairs where the key is the feature flag in question
-     * and the value is either a boolean or a CapCheck object defining the required permissions
-     * example:
-     *       [
-     *          'use_bulk_edit' => true,
-     *          'use_death_ray' => new CapCheck( 'ee-death-ray-cap', 'context-desc' )
-     *      ]
-     * array is filterable via FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags
-     *
-     * @var boolean[]|CapCheck[]
-     */
-    private $feature_flags;
+	/**
+	 * array of key value pairs where the key is the feature flag in question
+	 * and the value is either a boolean or a CapCheck object defining the required permissions
+	 * example:
+	 *       [
+	 *          'use_bulk_edit' => true,
+	 *          'use_death_ray' => new CapCheck( 'ee-death-ray-cap', 'context-desc' )
+	 *      ]
+	 * array is filterable via FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags
+	 *
+	 * @var boolean[]|CapCheck[]
+	 */
+	private $feature_flags;
 
 
-    /**
-     * FeatureFlags constructor.
-     *
-     * @param CapabilitiesChecker $capabilities_checker
-     * @param FeatureFlagsConfig  $option
-     */
-    public function __construct(CapabilitiesChecker $capabilities_checker, FeatureFlagsConfig $option)
-    {
-        $this->capabilities_checker = $capabilities_checker;
-        $this->option = $option;
-        $this->feature_flags = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags',
-            $this->option->getFeatureFlags()
-        );
-    }
+	/**
+	 * FeatureFlags constructor.
+	 *
+	 * @param CapabilitiesChecker $capabilities_checker
+	 * @param FeatureFlagsConfig  $option
+	 */
+	public function __construct(CapabilitiesChecker $capabilities_checker, FeatureFlagsConfig $option)
+	{
+		$this->capabilities_checker = $capabilities_checker;
+		$this->option = $option;
+		$this->feature_flags = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_capabilities_FeatureFlags',
+			$this->option->getFeatureFlags()
+		);
+	}
 
 
-    /**
-     * @param string $feature
-     * @return bool
-     */
-    public function allowed(string $feature): bool
-    {
-        $flag = $this->feature_flags->{$feature} ?? false;
-        try {
-            return $flag instanceof CapCheck
-                ? $this->capabilities_checker->processCapCheck($flag)
-                : filter_var($flag, FILTER_VALIDATE_BOOLEAN);
-        } catch (InsufficientPermissionsException $e) {
-            // eat the exception
-        }
-        return false;
-    }
+	/**
+	 * @param string $feature
+	 * @return bool
+	 */
+	public function allowed(string $feature): bool
+	{
+		$flag = $this->feature_flags->{$feature} ?? false;
+		try {
+			return $flag instanceof CapCheck
+				? $this->capabilities_checker->processCapCheck($flag)
+				: filter_var($flag, FILTER_VALIDATE_BOOLEAN);
+		} catch (InsufficientPermissionsException $e) {
+			// eat the exception
+		}
+		return false;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getAllowedFeatures(): array
-    {
-        $allowed = array_filter((array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
-        return array_keys($allowed);
-    }
+	/**
+	 * @return array
+	 */
+	public function getAllowedFeatures(): array
+	{
+		$allowed = array_filter((array) $this->feature_flags, [$this, 'allowed'], ARRAY_FILTER_USE_KEY);
+		return array_keys($allowed);
+	}
 }

core/domain/services/capabilities/FeatureFlag.php

Indentation +194 added lines, -194 removed lines

@@ -10,211 +10,211 @@
  */
 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 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 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 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 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 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 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 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 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 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 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';
+	/**
+	 * Whether to use the new Datetime Status Controls in the EDTR
+	 * default: Disabled
+	 */
+	public const USE_DATETIME_STATUS_CONTROLS = 'use_datetime_status_controls';
 
-    /**
-     * Whether to apply Gateway Partner fees to transactions
-     * default: Disabled
-     */
-    public const USE_PAYMENT_PROCESSOR_FEES = 'use_payment_processor_fees';
+	/**
+	 * Whether to apply Gateway Partner fees to transactions
+	 * default: Disabled
+	 */
+	public const USE_PAYMENT_PROCESSOR_FEES = 'use_payment_processor_fees';
 
 
-    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>'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            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'
-                ),
-                'overridden'      => defined('EE_USE_EDD_PLUGIN_LICENSING'),
-                'overridden_by'   => defined('EE_USE_EDD_PLUGIN_LICENSING')
-                    ? sprintf(
-                        esc_html__(
-                            '%1$sCurrently overriden by the %2$s constant in wp-config.php%3$s',
-                            'event_espresso'
-                        ),
-                        '<br><span class="ee-status--warning">',
-                        'EE_USE_EDD_PLUGIN_LICENSING',
-                        '</span>'
-                    )
-                    : '',
-            ],
-            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'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-            FeatureFlag::USE_PAYMENT_PROCESSOR_FEES    => [
-                'name'            => esc_html__('Gateway Partner Fees', 'event_espresso'),
-                'html_label_text' => esc_html__('Apply Payment Processor Fees', 'event_espresso'),
-                'help_text'       => esc_html__(
-                    'Whether to apply Gateway Partner fees to transactions. default: Disabled',
-                    'event_espresso'
-                ),
-                'overridden'      => false,
-                'overridden_by'   => '',
-            ],
-        ];
-    }
+	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>'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			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'
+				),
+				'overridden'      => defined('EE_USE_EDD_PLUGIN_LICENSING'),
+				'overridden_by'   => defined('EE_USE_EDD_PLUGIN_LICENSING')
+					? sprintf(
+						esc_html__(
+							'%1$sCurrently overriden by the %2$s constant in wp-config.php%3$s',
+							'event_espresso'
+						),
+						'<br><span class="ee-status--warning">',
+						'EE_USE_EDD_PLUGIN_LICENSING',
+						'</span>'
+					)
+					: '',
+			],
+			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'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+			FeatureFlag::USE_PAYMENT_PROCESSOR_FEES    => [
+				'name'            => esc_html__('Gateway Partner Fees', 'event_espresso'),
+				'html_label_text' => esc_html__('Apply Payment Processor Fees', 'event_espresso'),
+				'help_text'       => esc_html__(
+					'Whether to apply Gateway Partner fees to transactions. default: Disabled',
+					'event_espresso'
+				),
+				'overridden'      => false,
+				'overridden_by'   => '',
+			],
+		];
+	}
 }

core/domain/services/graphql/resolvers/FieldResolverV2.php

Indentation +84 added lines, -84 removed lines

@@ -10,88 +10,88 @@
 
 class FieldResolverV2 extends ResolverBase
 {
-    /**
-     * @var GraphQLFieldInterface[]
-     */
-    protected array $fields;
-
-    use StatelessResolver;
-
-    /**
-     * @param GraphQLFieldInterface[] $fields
-     */
-    public function __construct(array $fields)
-    {
-        $this->fields = $this->fieldsToArray($fields);
-    }
-
-    /**
-     * @param GraphQLFieldInterface[] $fields
-     */
-    protected function fieldsToArray(array $fields): array
-    {
-        $array = [];
-        foreach ($fields as $f) {
-            $array[ $f->name() ] = $f;
-        }
-        return $array;
-    }
-
-    public function resolve(
-        $source,
-        array $args,
-        AppContext $context,
-        ResolveInfo $info
-    ) {
-        $field = $this->findField($info);
-
-        if (! $field || ! $field->shouldResolve()) {
-            return null;
-        }
-
-        if ($field->hasInternalResolver()) {
-            return $field->resolve($source, $args, $context, $info);
-        }
-
-        if (! ($source instanceof EE_Base_Class)) {
-            return null;
-        }
-
-        if (! is_null($field->key())) {
-            return $field->mayBeFormatValue($source->{$field->key()}(), $source);
-        }
-
-        switch ($field->name()) {
-            case 'id':
-                return $this->resolveId($source);
-            case 'cacheId':
-                return $this->resolveCacheId($source);
-            case 'parent':
-                return $this->resolveParent($source);
-            case 'event':
-                return $this->resolveEvent($source, $context);
-            case 'wpUser':
-            case 'manager':
-                return $this->resolveWpUser($source, $context);
-            case 'userId';
-                return $this->resolveUserId($source);
-            case 'state':
-                return $this->resolveState($source);
-            case 'country':
-                return $this->resolveCountry($source);
-        }
-
-        return null;
-    }
-
-    protected function findField(ResolveInfo $info)
-    {
-        $key = $info->fieldName;
-
-        if (! isset($this->fields[ $key ])) {
-            return false;
-        }
-
-        return $this->fields[ $key ];
-    }
+	/**
+	 * @var GraphQLFieldInterface[]
+	 */
+	protected array $fields;
+
+	use StatelessResolver;
+
+	/**
+	 * @param GraphQLFieldInterface[] $fields
+	 */
+	public function __construct(array $fields)
+	{
+		$this->fields = $this->fieldsToArray($fields);
+	}
+
+	/**
+	 * @param GraphQLFieldInterface[] $fields
+	 */
+	protected function fieldsToArray(array $fields): array
+	{
+		$array = [];
+		foreach ($fields as $f) {
+			$array[ $f->name() ] = $f;
+		}
+		return $array;
+	}
+
+	public function resolve(
+		$source,
+		array $args,
+		AppContext $context,
+		ResolveInfo $info
+	) {
+		$field = $this->findField($info);
+
+		if (! $field || ! $field->shouldResolve()) {
+			return null;
+		}
+
+		if ($field->hasInternalResolver()) {
+			return $field->resolve($source, $args, $context, $info);
+		}
+
+		if (! ($source instanceof EE_Base_Class)) {
+			return null;
+		}
+
+		if (! is_null($field->key())) {
+			return $field->mayBeFormatValue($source->{$field->key()}(), $source);
+		}
+
+		switch ($field->name()) {
+			case 'id':
+				return $this->resolveId($source);
+			case 'cacheId':
+				return $this->resolveCacheId($source);
+			case 'parent':
+				return $this->resolveParent($source);
+			case 'event':
+				return $this->resolveEvent($source, $context);
+			case 'wpUser':
+			case 'manager':
+				return $this->resolveWpUser($source, $context);
+			case 'userId';
+				return $this->resolveUserId($source);
+			case 'state':
+				return $this->resolveState($source);
+			case 'country':
+				return $this->resolveCountry($source);
+		}
+
+		return null;
+	}
+
+	protected function findField(ResolveInfo $info)
+	{
+		$key = $info->fieldName;
+
+		if (! isset($this->fields[ $key ])) {
+			return false;
+		}
+
+		return $this->fields[ $key ];
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
     {
         $array = [];
         foreach ($fields as $f) {
-            $array[ $f->name() ] = $f;
+            $array[$f->name()] = $f;
         }
         return $array;
     }
@@ -45,7 +45,7 @@ 
     ) {
         $field = $this->findField($info);
 
-        if (! $field || ! $field->shouldResolve()) {
+        if ( ! $field || ! $field->shouldResolve()) {
             return null;
         }
 
@@ -53,11 +53,11 @@ 
             return $field->resolve($source, $args, $context, $info);
         }
 
-        if (! ($source instanceof EE_Base_Class)) {
+        if ( ! ($source instanceof EE_Base_Class)) {
             return null;
         }
 
-        if (! is_null($field->key())) {
+        if ( ! is_null($field->key())) {
             return $field->mayBeFormatValue($source->{$field->key()}(), $source);
         }
 
@@ -88,10 +88,10 @@ 
     {
         $key = $info->fieldName;
 
-        if (! isset($this->fields[ $key ])) {
+        if ( ! isset($this->fields[$key])) {
             return false;
         }
 
-        return $this->fields[ $key ];
+        return $this->fields[$key];
     }
 }

core/domain/services/graphql/resolvers/StatelessResolver.php

Indentation +87 added lines, -87 removed lines

@@ -17,107 +17,107 @@
 
 trait StatelessResolver
 {
-    protected function resolveId(EE_Base_Class $source): string
-    {
-        if (method_exists($source, 'UUID') && is_callable([$source, 'UUID'])) {
-            return $source->UUID();
-        }
-
-        return Relay::toGlobalId($source->get_model()->item_name(), $source->ID());
-    }
-
-    protected function resolveCacheId(EE_Base_Class $source): string
-    {
-        $item_name = $source->get_model()->item_name();
-        $id = $source->ID();
-        // Since cacheId does not need to be globally unique
-        // $uniqid is sufficient, still adding the model name and ID
-        // may be we need/use them in future.
-        return uniqid("{$item_name}:{$id}:", true);
-    }
-
-    protected function resolveParent(EE_Base_Class $source): ?EE_Base_Class
-    {
-        return $source->get_model()->get_one_by_ID($source->parent());
-    }
-
-    protected function resolveEvent(EE_Base_Class $source, AppContext $context): ?Deferred
-    {
-        switch (true) {
-            case $source instanceof EE_Datetime:
-                $event = $source->event();
-                break;
-            case $source instanceof EE_Venue:
-            case $source instanceof EE_Ticket:
-                $event = $source->get_related_event();
-                break;
-            default:
-                $event = null;
-                break;
-        }
-
-        if (! ($event instanceof EE_Event)) {
+	protected function resolveId(EE_Base_Class $source): string
+	{
+		if (method_exists($source, 'UUID') && is_callable([$source, 'UUID'])) {
+			return $source->UUID();
+		}
+
+		return Relay::toGlobalId($source->get_model()->item_name(), $source->ID());
+	}
+
+	protected function resolveCacheId(EE_Base_Class $source): string
+	{
+		$item_name = $source->get_model()->item_name();
+		$id = $source->ID();
+		// Since cacheId does not need to be globally unique
+		// $uniqid is sufficient, still adding the model name and ID
+		// may be we need/use them in future.
+		return uniqid("{$item_name}:{$id}:", true);
+	}
+
+	protected function resolveParent(EE_Base_Class $source): ?EE_Base_Class
+	{
+		return $source->get_model()->get_one_by_ID($source->parent());
+	}
+
+	protected function resolveEvent(EE_Base_Class $source, AppContext $context): ?Deferred
+	{
+		switch (true) {
+			case $source instanceof EE_Datetime:
+				$event = $source->event();
+				break;
+			case $source instanceof EE_Venue:
+			case $source instanceof EE_Ticket:
+				$event = $source->get_related_event();
+				break;
+			default:
+				$event = null;
+				break;
+		}
+
+		if (! ($event instanceof EE_Event)) {
 return null;
-        }
+		}
 
-        return $context->get_loader('post')->load_deferred($event->ID());
-    }
+		return $context->get_loader('post')->load_deferred($event->ID());
+	}
 
-    protected function resolveWpUser(EE_Base_Class $source, AppContext $context): ?Deferred
-    {
-        $user_id = $source->wp_user();
+	protected function resolveWpUser(EE_Base_Class $source, AppContext $context): ?Deferred
+	{
+		$user_id = $source->wp_user();
 
-        if (! $user_id) {
-            return null;
-        }
+		if (! $user_id) {
+			return null;
+		}
 
-        return $context->get_loader('user')->load_deferred($user_id);
-    }
+		return $context->get_loader('user')->load_deferred($user_id);
+	}
 
-    protected function resolveUserId($source): ?string
-    {
-        $user_id = $source->wp_user();
+	protected function resolveUserId($source): ?string
+	{
+		$user_id = $source->wp_user();
 
-        if (! $user_id) {
-            return null;
-        }
+		if (! $user_id) {
+			return null;
+		}
 
-        return Relay::toGlobalId('user', $user_id);
-    }
+		return Relay::toGlobalId('user', $user_id);
+	}
 
-    protected function resolveState($source): ?EE_Base_Class
-    {
-        $state_id = null;
+	protected function resolveState($source): ?EE_Base_Class
+	{
+		$state_id = null;
 
-        if ($source instanceof EE_Attendee || $source instanceof EE_Venue) {
-            $state_id = $source->state_ID();
-        }
+		if ($source instanceof EE_Attendee || $source instanceof EE_Venue) {
+			$state_id = $source->state_ID();
+		}
 
-        if (! $state_id) {
-            return null;
-        }
+		if (! $state_id) {
+			return null;
+		}
 
-        return EEM_State::instance()->get_one_by_ID($state_id);
-    }
+		return EEM_State::instance()->get_one_by_ID($state_id);
+	}
 
-    protected function resolveCountry(EE_Base_Class $source): ?EE_Base_Class
-    {
-        $country_iso = null;
+	protected function resolveCountry(EE_Base_Class $source): ?EE_Base_Class
+	{
+		$country_iso = null;
 
-        switch (true) {
-            case $source instanceof EE_State:
-                $country_iso = $source->country_iso();
-                break;
-            case $source instanceof EE_Attendee:
-            case $source instanceof EE_Venue:
-                $country_iso = $source->country_ID();
-                break;
-        }
+		switch (true) {
+			case $source instanceof EE_State:
+				$country_iso = $source->country_iso();
+				break;
+			case $source instanceof EE_Attendee:
+			case $source instanceof EE_Venue:
+				$country_iso = $source->country_ID();
+				break;
+		}
 
-        if (! $country_iso) {
-            return null;
-        }
+		if (! $country_iso) {
+			return null;
+		}
 
-        return EEM_Country::instance()->get_one_by_ID($country_iso);
-    }
+		return EEM_Country::instance()->get_one_by_ID($country_iso);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
                 break;
         }
 
-        if (! ($event instanceof EE_Event)) {
+        if ( ! ($event instanceof EE_Event)) {
 return null;
         }
 
@@ -67,7 +67,7 @@ 
     {
         $user_id = $source->wp_user();
 
-        if (! $user_id) {
+        if ( ! $user_id) {
             return null;
         }
 
@@ -78,7 +78,7 @@ 
     {
         $user_id = $source->wp_user();
 
-        if (! $user_id) {
+        if ( ! $user_id) {
             return null;
         }
 
@@ -93,7 +93,7 @@ 
             $state_id = $source->state_ID();
         }
 
-        if (! $state_id) {
+        if ( ! $state_id) {
             return null;
         }
 
@@ -114,7 +114,7 @@ 
                 break;
         }
 
-        if (! $country_iso) {
+        if ( ! $country_iso) {
             return null;
         }
 

core/domain/services/wp_queries/EventListQuery.php

Indentation +179 added lines, -179 removed lines

@@ -16,183 +16,183 @@
  */
 class EventListQuery extends WP_Query
 {
-    private ?string $title = '';
-
-    private int $limit = 10;
-
-    private ?string $css_class = '';
-
-    private bool $show_expired = false;
-
-    private ?string $month = '';
-
-    private ?string $category_slug = '';
-
-    /**
-     * @var array|string|null
-     */
-    private $order_by = [];
-
-    private ?string $sort = '';
-
-    private bool $show_title = true;
-
-
-    /**
-     * EE_Event_List_Query Constructor     *
-     *
-     * @param array $args
-     */
-    public function __construct($args = [])
-    {
-        $args = $this->parseArgs((array) $args);
-        $this->setupEventQueryHelper();
-        $this->setupFilters();
-        $args = $this->getQueryArgs($args);
-        // run the query
-        parent::__construct($args);
-    }
-
-
-    /**
-     * @param array $args
-     * @return array
-     */
-    private function parseArgs(array $args): array
-    {
-        // incoming args could be a mix of WP query args + EE shortcode args
-        foreach ($args as $property => $value) {
-            // if the arg is a property of this class, then it's an EE shortcode arg
-            if (property_exists($this, $property) && ! property_exists('WP_Query', $property)) {
-                // get the property type
-                $type = gettype($this->{$property});
-                // set the property value
-                switch ($type) {
-                    case 'integer':
-                        $this->{$property} = absint($value);
-                        break;
-                    case 'boolean':
-                        $this->{$property} = filter_var($value, FILTER_VALIDATE_BOOLEAN);
-                        break;
-                    case 'string':
-                        $this->{$property} = sanitize_text_field($value);
-                        break;
-                    default:
-                        $this->{$property} = $value;
-                        break;
-                }
-                // then remove it from the array of args that will later be passed to WP_Query()
-                unset($args[ $property ]);
-            }
-        }
-        return $args;
-    }
-
-
-    private function setupEventQueryHelper()
-    {
-        // add query filters
-        EEH_Event_Query::add_query_filters();
-        // set params that will get used by the filters
-        EEH_Event_Query::set_query_params(
-            $this->month,
-            $this->category_slug,
-            $this->show_expired,
-            $this->order_by,
-            $this->sort
-        );
-    }
-
-
-    private function setupFilters()
-    {
-        // first off, let's remove any filters from previous queries
-        remove_filter(
-            'FHEE__archive_espresso_events_template__show_header',
-            [$this, 'show_event_list_title']
-        );
-        remove_filter(
-            'FHEE__archive_espresso_events_template__upcoming_events_h1',
-            [$this, 'event_list_title']
-        );
-        remove_all_filters('FHEE__content_espresso_events__event_class');
-        // Event List Title ?
-        add_filter(
-            'FHEE__archive_espresso_events_template__show_header',
-            [$this, 'show_event_list_title']
-        );
-        add_filter(
-            'FHEE__archive_espresso_events_template__upcoming_events_h1',
-            [$this, 'event_list_title']
-        );
-        // add the css class
-        add_filter(
-            'FHEE__content_espresso_events__event_class',
-            [$this, 'event_list_css']
-        );
-    }
-
-
-    private function getQueryArgs(array $args): array
-    {
-        // the current "page" we are viewing
-        $paged = max(1, get_query_var('paged'));
-        // Force these args
-        return array_merge(
-            $args,
-            [
-                'post_type'              => EspressoPostType::EVENTS,
-                'posts_per_page'         => $this->limit,
-                'update_post_term_cache' => false,
-                'update_post_meta_cache' => false,
-                'paged'                  => $paged,
-                'offset'                 => ($paged - 1) * $this->limit,
-            ]
-        );
-    }
-
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-
-
-    /**
-     * show_event_list_title
-     *
-     * @return boolean
-     */
-    public function show_event_list_title(): bool
-    {
-        return filter_var($this->show_title, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * callback for FHEE__archive_espresso_events_template__upcoming_events_h1 filter
-     *
-     * @param string $event_list_title
-     * @return    string
-     */
-    public function event_list_title(string $event_list_title = ''): string
-    {
-        if (! empty($this->title)) {
-            return $this->title;
-        }
-        return $event_list_title;
-    }
-
-
-    /**
-     * callback for FHEE__content_espresso_events__event_class filter
-     *
-     * @param string $event_list_css
-     * @return string
-     */
-    public function event_list_css(string $event_list_css = ''): string
-    {
-        $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;
-    }
-    // phpcs:enable
+	private ?string $title = '';
+
+	private int $limit = 10;
+
+	private ?string $css_class = '';
+
+	private bool $show_expired = false;
+
+	private ?string $month = '';
+
+	private ?string $category_slug = '';
+
+	/**
+	 * @var array|string|null
+	 */
+	private $order_by = [];
+
+	private ?string $sort = '';
+
+	private bool $show_title = true;
+
+
+	/**
+	 * EE_Event_List_Query Constructor     *
+	 *
+	 * @param array $args
+	 */
+	public function __construct($args = [])
+	{
+		$args = $this->parseArgs((array) $args);
+		$this->setupEventQueryHelper();
+		$this->setupFilters();
+		$args = $this->getQueryArgs($args);
+		// run the query
+		parent::__construct($args);
+	}
+
+
+	/**
+	 * @param array $args
+	 * @return array
+	 */
+	private function parseArgs(array $args): array
+	{
+		// incoming args could be a mix of WP query args + EE shortcode args
+		foreach ($args as $property => $value) {
+			// if the arg is a property of this class, then it's an EE shortcode arg
+			if (property_exists($this, $property) && ! property_exists('WP_Query', $property)) {
+				// get the property type
+				$type = gettype($this->{$property});
+				// set the property value
+				switch ($type) {
+					case 'integer':
+						$this->{$property} = absint($value);
+						break;
+					case 'boolean':
+						$this->{$property} = filter_var($value, FILTER_VALIDATE_BOOLEAN);
+						break;
+					case 'string':
+						$this->{$property} = sanitize_text_field($value);
+						break;
+					default:
+						$this->{$property} = $value;
+						break;
+				}
+				// then remove it from the array of args that will later be passed to WP_Query()
+				unset($args[ $property ]);
+			}
+		}
+		return $args;
+	}
+
+
+	private function setupEventQueryHelper()
+	{
+		// add query filters
+		EEH_Event_Query::add_query_filters();
+		// set params that will get used by the filters
+		EEH_Event_Query::set_query_params(
+			$this->month,
+			$this->category_slug,
+			$this->show_expired,
+			$this->order_by,
+			$this->sort
+		);
+	}
+
+
+	private function setupFilters()
+	{
+		// first off, let's remove any filters from previous queries
+		remove_filter(
+			'FHEE__archive_espresso_events_template__show_header',
+			[$this, 'show_event_list_title']
+		);
+		remove_filter(
+			'FHEE__archive_espresso_events_template__upcoming_events_h1',
+			[$this, 'event_list_title']
+		);
+		remove_all_filters('FHEE__content_espresso_events__event_class');
+		// Event List Title ?
+		add_filter(
+			'FHEE__archive_espresso_events_template__show_header',
+			[$this, 'show_event_list_title']
+		);
+		add_filter(
+			'FHEE__archive_espresso_events_template__upcoming_events_h1',
+			[$this, 'event_list_title']
+		);
+		// add the css class
+		add_filter(
+			'FHEE__content_espresso_events__event_class',
+			[$this, 'event_list_css']
+		);
+	}
+
+
+	private function getQueryArgs(array $args): array
+	{
+		// the current "page" we are viewing
+		$paged = max(1, get_query_var('paged'));
+		// Force these args
+		return array_merge(
+			$args,
+			[
+				'post_type'              => EspressoPostType::EVENTS,
+				'posts_per_page'         => $this->limit,
+				'update_post_term_cache' => false,
+				'update_post_meta_cache' => false,
+				'paged'                  => $paged,
+				'offset'                 => ($paged - 1) * $this->limit,
+			]
+		);
+	}
+
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+
+
+	/**
+	 * show_event_list_title
+	 *
+	 * @return boolean
+	 */
+	public function show_event_list_title(): bool
+	{
+		return filter_var($this->show_title, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * callback for FHEE__archive_espresso_events_template__upcoming_events_h1 filter
+	 *
+	 * @param string $event_list_title
+	 * @return    string
+	 */
+	public function event_list_title(string $event_list_title = ''): string
+	{
+		if (! empty($this->title)) {
+			return $this->title;
+		}
+		return $event_list_title;
+	}
+
+
+	/**
+	 * callback for FHEE__content_espresso_events__event_class filter
+	 *
+	 * @param string $event_list_css
+	 * @return string
+	 */
+	public function event_list_css(string $event_list_css = ''): string
+	{
+		$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;
+	}
+	// phpcs:enable
 }

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
                         break;
                 }
                 // then remove it from the array of args that will later be passed to WP_Query()
-                unset($args[ $property ]);
+                unset($args[$property]);
             }
         }
         return $args;
@@ -173,7 +173,7 @@ 
      */
     public function event_list_title(string $event_list_title = ''): string
     {
-        if (! empty($this->title)) {
+        if ( ! empty($this->title)) {
             return $this->title;
         }
         return $event_list_title;

core/domain/services/validation/email/EmailValidationService.php

Indentation +50 added lines, -50 removed lines

@@ -15,59 +15,59 @@
  */
 class EmailValidationService implements EmailValidatorInterface
 {
-    protected EE_Registration_Config $registration_config;
+	protected EE_Registration_Config $registration_config;
 
-    protected LoaderInterface $loader;
+	protected LoaderInterface $loader;
 
 
-    /**
-     * EmailValidationService constructor.
-     * Accepts an \EE_Config as an argument.
-     *
-     * @param EE_Registration_Config $config
-     * @param LoaderInterface        $loader
-     */
-    public function __construct(EE_Registration_Config $config, LoaderInterface $loader)
-    {
-        $this->registration_config = $config;
-        $this->loader              = $loader;
-    }
+	/**
+	 * EmailValidationService constructor.
+	 * Accepts an \EE_Config as an argument.
+	 *
+	 * @param EE_Registration_Config $config
+	 * @param LoaderInterface        $loader
+	 */
+	public function __construct(EE_Registration_Config $config, LoaderInterface $loader)
+	{
+		$this->registration_config = $config;
+		$this->loader              = $loader;
+	}
 
 
-    /**
-     * Validates the email address. If it's invalid, an EmailValidationException
-     * is thrown that describes why its invalid.
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate(string $email_address): bool
-    {
-        // pick the correct validator according to the config
-        switch ($this->registration_config->email_validation_level) {
-            case 'basic':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\Basic'
-                );
-                break;
-            case 'i18n':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\International'
-                );
-                break;
-            case 'i18n_dns':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
-                );
-                break;
-            case 'wp_default':
-            default:
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
-                );
-                break;
-        }
-        return $validator->validate($email_address);
-    }
+	/**
+	 * Validates the email address. If it's invalid, an EmailValidationException
+	 * is thrown that describes why its invalid.
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate(string $email_address): bool
+	{
+		// pick the correct validator according to the config
+		switch ($this->registration_config->email_validation_level) {
+			case 'basic':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\Basic'
+				);
+				break;
+			case 'i18n':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\International'
+				);
+				break;
+			case 'i18n_dns':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
+				);
+				break;
+			case 'wp_default':
+			default:
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
+				);
+				break;
+		}
+		return $validator->validate($email_address);
+	}
 }

core/domain/services/admin/AdminToolBar.php

Indentation +821 added lines, -821 removed lines

@@ -20,825 +20,825 @@
  */
 class AdminToolBar
 {
-    private ?WP_Admin_Bar $admin_bar        = null;
-
-    private EE_Capabilities $capabilities;
-
-    private string $events_admin_url = '';
-
-    private string $menu_class       = 'espresso_menu_item_class';
-
-    private string $reg_admin_url    = '';
-
-
-    /**
-     * AdminToolBar constructor.
-     *
-     * @param EE_Capabilities $capabilities
-     */
-    public function __construct(EE_Capabilities $capabilities)
-    {
-        $this->capabilities = $capabilities;
-        add_action('admin_bar_menu', [$this, 'espressoToolbarItems'], 100);
-        $this->enqueueAssets();
-    }
-
-
-    /**
-     *    espresso_toolbar_items
-     *
-     * @access public
-     * @param WP_Admin_Bar $admin_bar
-     * @return void
-     */
-    public function espressoToolbarItems(WP_Admin_Bar $admin_bar)
-    {
-        // if it's an AJAX request, or user is NOT an admin, or in full M-Mode
-        if (
-            (defined('DOING_AJAX') && DOING_AJAX)
-            || ! $this->capabilities->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')
-            || MaintenanceStatus::isFullSite()
-        ) {
-            return;
-        }
-        $this->admin_bar = $admin_bar;
-        // we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
-        // because they're only defined in each of their respective constructors
-        // and this might be a frontend request, in which case they aren't available
-        $this->events_admin_url = admin_url('admin.php?page=espresso_events');
-        $this->reg_admin_url    = admin_url('admin.php?page=espresso_registrations');
-        // now let's add all the menu items
-        $this->addTopLevelMenu();
-        $this->addEventsSubMenu();
-        $this->addEventsAddEditHeader();
-        $this->addEventsAddNew();
-        $this->addEventsEditCurrentEvent();
-        $this->addEventsViewHeader();
-        $this->addEventsViewAll();
-        $this->addEventsViewToday();
-        $this->addEventsViewThisMonth();
-        $this->addRegistrationSubMenu();
-        $this->addRegistrationOverviewToday();
-        $this->addRegistrationOverviewTodayApproved();
-        $this->addRegistrationOverviewTodayPendingPayment();
-        $this->addRegistrationOverviewTodayNotApproved();
-        $this->addRegistrationOverviewTodayCancelled();
-        $this->addRegistrationOverviewThisMonth();
-        $this->addRegistrationOverviewThisMonthApproved();
-        $this->addRegistrationOverviewThisMonthPending();
-        $this->addRegistrationOverviewThisMonthNotApproved();
-        $this->addRegistrationOverviewThisMonthCancelled();
-        $this->addExtensionsAndServices();
-        $this->addFontSizeSubMenu();
-    }
-
-
-    /**
-     * @return void
-     */
-    private function enqueueAssets()
-    {
-        wp_register_style(
-            'espresso-admin-toolbar',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
-            ['dashicons'],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso-admin-toolbar');
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addTopLevelMenu()
-    {
-        $this->admin_bar->add_menu(
-            [
-                'id'    => 'espresso-toolbar',
-                'title' => '<span class="ab-icon ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'
-                           . esc_html_x('Event Espresso', 'admin bar menu group label', 'event_espresso')
-                           . '</span>',
-                'href'  => $this->events_admin_url,
-                'meta'  => [
-                    'title' => esc_html__('Event Espresso', 'event_espresso'),
-                    'class' => $this->menu_class . 'first',
-                ],
-            ]
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsSubMenu()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Events', 'event_espresso'),
-                    'href'   => $this->events_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('Events', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsAddEditHeader()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-view'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-add-edit',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => esc_html__('Add / Edit', 'event_espresso'),
-                    'href'   => '',
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsAddNew()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_edit_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-new'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-new',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Add New', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        ['action' => 'create_new'],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Add New', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsEditCurrentEvent()
-    {
-        if (is_single() && (get_post_type() === EspressoPostType::EVENTS)) {
-            // Current post
-            global $post;
-            if (
-                $this->capabilities->current_user_can(
-                    'ee_edit_event',
-                    'ee_admin_bar_menu_espresso-toolbar-events-edit',
-                    $post->ID
-                )
-            ) {
-                $this->admin_bar->add_menu(
-                    [
-                        'id'     => 'espresso-toolbar-events-edit',
-                        'parent' => 'espresso-toolbar-events',
-                        'title'  => '<span class="ee-toolbar-icon"></span>'
-                                    . esc_html__('Edit Event', 'event_espresso'),
-                        'href'   => EEH_URL::add_query_args_and_nonce(
-                            [
-                                'action' => 'edit',
-                                'post'   => $post->ID,
-                            ],
-                            $this->events_admin_url
-                        ),
-                        'meta'   => [
-                            'title'  => esc_html__('Edit Event', 'event_espresso'),
-                            'target' => '',
-                            'class'  => $this->menu_class,
-                        ],
-                    ]
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewHeader()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-view'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-view',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => esc_html__('View', 'event_espresso'),
-                    'href'   => '',
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewAll()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-all'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-all',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('All', 'event_espresso'),
-                    'href'   => $this->events_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('All', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewToday()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-today'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-today',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Today', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action' => 'default',
-                            'status' => 'today',
-                        ],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Today', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addEventsViewThisMonth()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_events',
-                'ee_admin_bar_menu_espresso-toolbar-events-month'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-events-month',
-                    'parent' => 'espresso-toolbar-events',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('This Month', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action' => 'default',
-                            'status' => 'month',
-                        ],
-                        $this->events_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('This Month', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationSubMenu()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Registrations', 'event_espresso'),
-                    'href'   => $this->reg_admin_url,
-                    'meta'   => [
-                        'title'  => esc_html__('Registrations', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewToday()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => esc_html__('Today', 'event_espresso'),
-                    'href'   => '',
-                    'meta'   => [
-                        'title'  => esc_html__('Today', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => RegStatus::APPROVED,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayPendingPayment()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-pending',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Pending', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => RegStatus::PENDING_PAYMENT,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Pending Payment', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayNotApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-not-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => RegStatus::AWAITING_REVIEW,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewTodayCancelled()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-today-cancelled',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Cancelled', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'today',
-                            '_reg_status' => RegStatus::CANCELLED,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Cancelled', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonth()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => esc_html__('This Month', 'event_espresso'),
-                    'href'   => '', // EEH_URL::add_query_args_and_nonce(
-                    //     array(
-                    //         'action' => 'default',
-                    //         'status' => 'month'
-                    //     ),
-                    //     $this->reg_admin_url
-                    // ),
-                    'meta'   => [
-                        'title'  => esc_html__('This Month', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Approved', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => RegStatus::APPROVED,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Approved', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthPending()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-pending',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Pending', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => RegStatus::PENDING_PAYMENT,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Pending', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthNotApproved()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-not-approved',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => RegStatus::AWAITING_REVIEW,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addRegistrationOverviewThisMonthCancelled()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_registrations',
-                'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-registrations-month-cancelled',
-                    'parent' => 'espresso-toolbar-registrations',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Cancelled', 'event_espresso'),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        [
-                            'action'      => 'default',
-                            'status'      => 'month',
-                            '_reg_status' => RegStatus::CANCELLED,
-                        ],
-                        $this->reg_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('Cancelled', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addExtensionsAndServices()
-    {
-        if (
-            $this->capabilities->current_user_can(
-                'ee_read_ee',
-                'ee_admin_bar_menu_espresso-toolbar-extensions-and-services'
-            )
-        ) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => 'espresso-toolbar-extensions-and-services',
-                    'parent' => 'espresso-toolbar',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . esc_html__('Extensions & Services', 'event_espresso'),
-                    'href'   => admin_url('admin.php?page=espresso_packages'),
-                    'meta'   => [
-                        'title'  => esc_html__('Extensions & Services', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     */
-    private function addFontSizeSubMenu()
-    {
-        if (! is_admin()) {
-            return;
-        }
-        $this->admin_bar->add_menu(
-            [
-                'id'     => 'espresso-toolbar-font-size',
-                'parent' => 'espresso-toolbar',
-                'title'  => '<span class="ee-toolbar-icon"></span>'
-                            . esc_html__('Set Font Size', 'event_espresso'),
-                'href'   => '',
-                'meta'   => [
-                    'title'  => esc_html__('Set Font Size', 'event_espresso'),
-                    'target' => '',
-                    'class'  => $this->menu_class,
-                ],
-            ]
-        );
-
-        $settings_admin_url = admin_url('admin.php?page=espresso_general_settings');
-
-        $font_sizes = [
-            'tiny'    => AdminFontSize::FONT_SIZE_TINY,
-            'smaller' => AdminFontSize::FONT_SIZE_SMALLER,
-            'small'   => AdminFontSize::FONT_SIZE_SMALL,
-            'default' => AdminFontSize::FONT_SIZE_DEFAULT,
-            'big'     => AdminFontSize::FONT_SIZE_BIG,
-            'bigger'  => AdminFontSize::FONT_SIZE_BIGGER,
-        ];
-
-        foreach ($font_sizes as $font_size => $value) {
-            $this->admin_bar->add_menu(
-                [
-                    'id'     => "espresso-toolbar-set-font-size-$font_size",
-                    'parent' => 'espresso-toolbar-font-size',
-                    'title'  => '<span class="ee-toolbar-icon"></span>'
-                                . sprintf(
-                                    /* translators: Font Size Small */
-                                    esc_html__('Font Size %1$s', 'event_espresso'),
-                                    ucwords($font_size)
-                                ),
-                    'href'   => EEH_URL::add_query_args_and_nonce(
-                        ['action' => 'set_font_size', 'font_size' => $value],
-                        $settings_admin_url
-                    ),
-                    'meta'   => [
-                        'title'  => esc_html__('increases or decreases the Event Espresso admin font size', 'event_espresso'),
-                        'target' => '',
-                        'class'  => $this->menu_class,
-                    ],
-                ]
-            );
-        }
-    }
+	private ?WP_Admin_Bar $admin_bar        = null;
+
+	private EE_Capabilities $capabilities;
+
+	private string $events_admin_url = '';
+
+	private string $menu_class       = 'espresso_menu_item_class';
+
+	private string $reg_admin_url    = '';
+
+
+	/**
+	 * AdminToolBar constructor.
+	 *
+	 * @param EE_Capabilities $capabilities
+	 */
+	public function __construct(EE_Capabilities $capabilities)
+	{
+		$this->capabilities = $capabilities;
+		add_action('admin_bar_menu', [$this, 'espressoToolbarItems'], 100);
+		$this->enqueueAssets();
+	}
+
+
+	/**
+	 *    espresso_toolbar_items
+	 *
+	 * @access public
+	 * @param WP_Admin_Bar $admin_bar
+	 * @return void
+	 */
+	public function espressoToolbarItems(WP_Admin_Bar $admin_bar)
+	{
+		// if it's an AJAX request, or user is NOT an admin, or in full M-Mode
+		if (
+			(defined('DOING_AJAX') && DOING_AJAX)
+			|| ! $this->capabilities->current_user_can('ee_read_ee', 'ee_admin_bar_menu_top_level')
+			|| MaintenanceStatus::isFullSite()
+		) {
+			return;
+		}
+		$this->admin_bar = $admin_bar;
+		// we don't use the constants EVENTS_ADMIN_URL or REG_ADMIN_URL
+		// because they're only defined in each of their respective constructors
+		// and this might be a frontend request, in which case they aren't available
+		$this->events_admin_url = admin_url('admin.php?page=espresso_events');
+		$this->reg_admin_url    = admin_url('admin.php?page=espresso_registrations');
+		// now let's add all the menu items
+		$this->addTopLevelMenu();
+		$this->addEventsSubMenu();
+		$this->addEventsAddEditHeader();
+		$this->addEventsAddNew();
+		$this->addEventsEditCurrentEvent();
+		$this->addEventsViewHeader();
+		$this->addEventsViewAll();
+		$this->addEventsViewToday();
+		$this->addEventsViewThisMonth();
+		$this->addRegistrationSubMenu();
+		$this->addRegistrationOverviewToday();
+		$this->addRegistrationOverviewTodayApproved();
+		$this->addRegistrationOverviewTodayPendingPayment();
+		$this->addRegistrationOverviewTodayNotApproved();
+		$this->addRegistrationOverviewTodayCancelled();
+		$this->addRegistrationOverviewThisMonth();
+		$this->addRegistrationOverviewThisMonthApproved();
+		$this->addRegistrationOverviewThisMonthPending();
+		$this->addRegistrationOverviewThisMonthNotApproved();
+		$this->addRegistrationOverviewThisMonthCancelled();
+		$this->addExtensionsAndServices();
+		$this->addFontSizeSubMenu();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function enqueueAssets()
+	{
+		wp_register_style(
+			'espresso-admin-toolbar',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
+			['dashicons'],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso-admin-toolbar');
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addTopLevelMenu()
+	{
+		$this->admin_bar->add_menu(
+			[
+				'id'    => 'espresso-toolbar',
+				'title' => '<span class="ab-icon ee-icon ee-icon-ee-cup-thick ee-icon-size-20"></span><span class="ab-label">'
+						   . esc_html_x('Event Espresso', 'admin bar menu group label', 'event_espresso')
+						   . '</span>',
+				'href'  => $this->events_admin_url,
+				'meta'  => [
+					'title' => esc_html__('Event Espresso', 'event_espresso'),
+					'class' => $this->menu_class . 'first',
+				],
+			]
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsSubMenu()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Events', 'event_espresso'),
+					'href'   => $this->events_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('Events', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsAddEditHeader()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-view'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-add-edit',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => esc_html__('Add / Edit', 'event_espresso'),
+					'href'   => '',
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsAddNew()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_edit_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-new'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-new',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Add New', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						['action' => 'create_new'],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Add New', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsEditCurrentEvent()
+	{
+		if (is_single() && (get_post_type() === EspressoPostType::EVENTS)) {
+			// Current post
+			global $post;
+			if (
+				$this->capabilities->current_user_can(
+					'ee_edit_event',
+					'ee_admin_bar_menu_espresso-toolbar-events-edit',
+					$post->ID
+				)
+			) {
+				$this->admin_bar->add_menu(
+					[
+						'id'     => 'espresso-toolbar-events-edit',
+						'parent' => 'espresso-toolbar-events',
+						'title'  => '<span class="ee-toolbar-icon"></span>'
+									. esc_html__('Edit Event', 'event_espresso'),
+						'href'   => EEH_URL::add_query_args_and_nonce(
+							[
+								'action' => 'edit',
+								'post'   => $post->ID,
+							],
+							$this->events_admin_url
+						),
+						'meta'   => [
+							'title'  => esc_html__('Edit Event', 'event_espresso'),
+							'target' => '',
+							'class'  => $this->menu_class,
+						],
+					]
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewHeader()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-view'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-view',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => esc_html__('View', 'event_espresso'),
+					'href'   => '',
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewAll()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-all'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-all',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('All', 'event_espresso'),
+					'href'   => $this->events_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('All', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewToday()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-today'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-today',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Today', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action' => 'default',
+							'status' => 'today',
+						],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Today', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addEventsViewThisMonth()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_events',
+				'ee_admin_bar_menu_espresso-toolbar-events-month'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-events-month',
+					'parent' => 'espresso-toolbar-events',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('This Month', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action' => 'default',
+							'status' => 'month',
+						],
+						$this->events_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('This Month', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationSubMenu()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Registrations', 'event_espresso'),
+					'href'   => $this->reg_admin_url,
+					'meta'   => [
+						'title'  => esc_html__('Registrations', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewToday()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => esc_html__('Today', 'event_espresso'),
+					'href'   => '',
+					'meta'   => [
+						'title'  => esc_html__('Today', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => RegStatus::APPROVED,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayPendingPayment()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-pending'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-pending',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Pending', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => RegStatus::PENDING_PAYMENT,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Pending Payment', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayNotApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-not-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-not-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => RegStatus::AWAITING_REVIEW,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewTodayCancelled()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-today-cancelled'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-today-cancelled',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Cancelled', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'today',
+							'_reg_status' => RegStatus::CANCELLED,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Cancelled', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonth()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => esc_html__('This Month', 'event_espresso'),
+					'href'   => '', // EEH_URL::add_query_args_and_nonce(
+					//     array(
+					//         'action' => 'default',
+					//         'status' => 'month'
+					//     ),
+					//     $this->reg_admin_url
+					// ),
+					'meta'   => [
+						'title'  => esc_html__('This Month', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Approved', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => RegStatus::APPROVED,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Approved', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthPending()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-pending'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-pending',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Pending', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => RegStatus::PENDING_PAYMENT,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Pending', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthNotApproved()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-not-approved'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-not-approved',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => RegStatus::AWAITING_REVIEW,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addRegistrationOverviewThisMonthCancelled()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_registrations',
+				'ee_admin_bar_menu_espresso-toolbar-registrations-month-cancelled'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-registrations-month-cancelled',
+					'parent' => 'espresso-toolbar-registrations',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Cancelled', 'event_espresso'),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						[
+							'action'      => 'default',
+							'status'      => 'month',
+							'_reg_status' => RegStatus::CANCELLED,
+						],
+						$this->reg_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('Cancelled', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addExtensionsAndServices()
+	{
+		if (
+			$this->capabilities->current_user_can(
+				'ee_read_ee',
+				'ee_admin_bar_menu_espresso-toolbar-extensions-and-services'
+			)
+		) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => 'espresso-toolbar-extensions-and-services',
+					'parent' => 'espresso-toolbar',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. esc_html__('Extensions & Services', 'event_espresso'),
+					'href'   => admin_url('admin.php?page=espresso_packages'),
+					'meta'   => [
+						'title'  => esc_html__('Extensions & Services', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function addFontSizeSubMenu()
+	{
+		if (! is_admin()) {
+			return;
+		}
+		$this->admin_bar->add_menu(
+			[
+				'id'     => 'espresso-toolbar-font-size',
+				'parent' => 'espresso-toolbar',
+				'title'  => '<span class="ee-toolbar-icon"></span>'
+							. esc_html__('Set Font Size', 'event_espresso'),
+				'href'   => '',
+				'meta'   => [
+					'title'  => esc_html__('Set Font Size', 'event_espresso'),
+					'target' => '',
+					'class'  => $this->menu_class,
+				],
+			]
+		);
+
+		$settings_admin_url = admin_url('admin.php?page=espresso_general_settings');
+
+		$font_sizes = [
+			'tiny'    => AdminFontSize::FONT_SIZE_TINY,
+			'smaller' => AdminFontSize::FONT_SIZE_SMALLER,
+			'small'   => AdminFontSize::FONT_SIZE_SMALL,
+			'default' => AdminFontSize::FONT_SIZE_DEFAULT,
+			'big'     => AdminFontSize::FONT_SIZE_BIG,
+			'bigger'  => AdminFontSize::FONT_SIZE_BIGGER,
+		];
+
+		foreach ($font_sizes as $font_size => $value) {
+			$this->admin_bar->add_menu(
+				[
+					'id'     => "espresso-toolbar-set-font-size-$font_size",
+					'parent' => 'espresso-toolbar-font-size',
+					'title'  => '<span class="ee-toolbar-icon"></span>'
+								. sprintf(
+									/* translators: Font Size Small */
+									esc_html__('Font Size %1$s', 'event_espresso'),
+									ucwords($font_size)
+								),
+					'href'   => EEH_URL::add_query_args_and_nonce(
+						['action' => 'set_font_size', 'font_size' => $value],
+						$settings_admin_url
+					),
+					'meta'   => [
+						'title'  => esc_html__('increases or decreases the Event Espresso admin font size', 'event_espresso'),
+						'target' => '',
+						'class'  => $this->menu_class,
+					],
+				]
+			);
+		}
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -20,7 +20,7 @@ 
  */
 class AdminToolBar
 {
-    private ?WP_Admin_Bar $admin_bar        = null;
+    private ?WP_Admin_Bar $admin_bar = null;
 
     private EE_Capabilities $capabilities;
 
@@ -100,7 +100,7 @@ 
     {
         wp_register_style(
             'espresso-admin-toolbar',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-admin-toolbar.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso-admin-toolbar.css',
             ['dashicons'],
             EVENT_ESPRESSO_VERSION
         );
@@ -122,7 +122,7 @@ 
                 'href'  => $this->events_admin_url,
                 'meta'  => [
                     'title' => esc_html__('Event Espresso', 'event_espresso'),
-                    'class' => $this->menu_class . 'first',
+                    'class' => $this->menu_class.'first',
                 ],
             ]
         );
@@ -460,7 +460,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-approved',
                     ],
                 ]
             );
@@ -496,7 +496,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Pending Payment', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-pending',
                     ],
                 ]
             );
@@ -532,7 +532,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-not-approved',
                     ],
                 ]
             );
@@ -568,7 +568,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Cancelled', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-cancelled',
                     ],
                 ]
             );
@@ -638,7 +638,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Approved', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-approved',
                     ],
                 ]
             );
@@ -674,7 +674,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Pending', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-pending',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-pending',
                     ],
                 ]
             );
@@ -710,7 +710,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Not Approved / Awaiting Review', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-not-approved',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-not-approved',
                     ],
                 ]
             );
@@ -746,7 +746,7 @@ 
                     'meta'   => [
                         'title'  => esc_html__('Cancelled', 'event_espresso'),
                         'target' => '',
-                        'class'  => $this->menu_class . ' ee-toolbar-icon-cancelled',
+                        'class'  => $this->menu_class.' ee-toolbar-icon-cancelled',
                     ],
                 ]
             );
@@ -788,7 +788,7 @@ 
      */
     private function addFontSizeSubMenu()
     {
-        if (! is_admin()) {
+        if ( ! is_admin()) {
             return;
         }
         $this->admin_bar->add_menu(