eventespresso / event-espresso-core

core/domain/services/capabilities/FeatureFlagsConfig.php

Indentation +174 added lines, -174 removed lines

@@ -17,178 +17,178 @@
  */
 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;
-
-
-    /**
-     * @var array|null
-     * @since 5.0.30.p
-     */
-    private ?array $feature_flags_form_options = 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;
+
+
+	/**
+	 * @var array|null
+	 * @since 5.0.30.p
+	 */
+	private ?array $feature_flags_form_options = 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();
+	}
 }

core/domain/services/admin/registrations/list_table/csv_reports/CheckinsCSV.php

Indentation +49 added lines, -49 removed lines

@@ -16,57 +16,57 @@
  */
 class CheckinsCSV
 {
-    /**
-     * Returns datetime label
-     *
-     * @param EE_Datetime $datetime
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getDatetimeLabel(EE_Datetime $datetime): string
-    {
-        if (trim($datetime->get('DTT_name'))) {
-            /* translators: 1: datetime name, 2: datetime ID */
-            return sprintf(
-                esc_html__('Check-ins for %1$s - ID: %2$s', 'event_espresso'),
-                esc_html($datetime->get('DTT_name')),
-                esc_html($datetime->get('DTT_ID'))
-            );
-        }
+	/**
+	 * Returns datetime label
+	 *
+	 * @param EE_Datetime $datetime
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getDatetimeLabel(EE_Datetime $datetime): string
+	{
+		if (trim($datetime->get('DTT_name'))) {
+			/* translators: 1: datetime name, 2: datetime ID */
+			return sprintf(
+				esc_html__('Check-ins for %1$s - ID: %2$s', 'event_espresso'),
+				esc_html($datetime->get('DTT_name')),
+				esc_html($datetime->get('DTT_ID'))
+			);
+		}
 
-        /* translators: %s: datetime ID */
-        return sprintf(
-            esc_html__('CHK-IN DTT-ID: %1$s', 'event_espresso'),
-            esc_html($datetime->get('DTT_ID'))
-        );
-    }
+		/* translators: %s: datetime ID */
+		return sprintf(
+			esc_html__('CHK-IN DTT-ID: %1$s', 'event_espresso'),
+			esc_html($datetime->get('DTT_ID'))
+		);
+	}
 
 
-    /**
-     * Returns checkin value using checkin status and datetime
-     *
-     * @param EE_Checkin|null $checkin
-     * @return string|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function getCheckinValue(?EE_Checkin $checkin): ?string
-    {
-        if ($checkin instanceof EE_Checkin && $checkin->get('CHK_in') === true) {
-            /* translators: 1: check-in timestamp */
-            return sprintf(
-                esc_html__('IN: %1$s', 'event_espresso'),
-                $checkin->get_datetime('CHK_timestamp', 'Y-m-d', 'g:i a')
-            );
-        } elseif ($checkin instanceof EE_Checkin && $checkin->get('CHK_in') === false) {
-            /* translators: 1: check-in timestamp */
-            return sprintf(
-                esc_html__('OUT: %1$s', 'event_espresso'),
-                $checkin->get_datetime('CHK_timestamp', 'Y-m-d', 'g:i a')
-            );
-        }
+	/**
+	 * Returns checkin value using checkin status and datetime
+	 *
+	 * @param EE_Checkin|null $checkin
+	 * @return string|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function getCheckinValue(?EE_Checkin $checkin): ?string
+	{
+		if ($checkin instanceof EE_Checkin && $checkin->get('CHK_in') === true) {
+			/* translators: 1: check-in timestamp */
+			return sprintf(
+				esc_html__('IN: %1$s', 'event_espresso'),
+				$checkin->get_datetime('CHK_timestamp', 'Y-m-d', 'g:i a')
+			);
+		} elseif ($checkin instanceof EE_Checkin && $checkin->get('CHK_in') === false) {
+			/* translators: 1: check-in timestamp */
+			return sprintf(
+				esc_html__('OUT: %1$s', 'event_espresso'),
+				$checkin->get_datetime('CHK_timestamp', 'Y-m-d', 'g:i a')
+			);
+		}
 
-        return '';
-    }
+		return '';
+	}
 }

core/domain/services/admin/registrations/list_table/csv_reports/AnswersCSV.php

Indentation +58 added lines, -58 removed lines

@@ -18,65 +18,65 @@
  */
 class AnswersCSV
 {
-    /**
-     * Add question / answer columns to the CSV row
-     *
-     * @param array $reg_row
-     * @param array $data
-     * @param array $question_labels
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function addAnswerColumns(array $reg_row, array $data, array $question_labels): array
-    {
-        $answer_model = EEM_Answer::instance();
-        $qst_model = EEM_Question::instance();
-        $state_model = EEM_State::instance();
-        // make sure each registration has the same questions in the same order
-        foreach ($question_labels as $question_label) {
-            if (! isset($data[ $question_label ])) {
-                $data[ $question_label ] = null;
-            }
-        }
-        $answers = $answer_model->get_all_wpdb_results([
-            ['REG_ID' => $reg_row['Registration.REG_ID']],
-            'force_join' => ['Question'],
-        ]);
-        // now fill out the questions THEY answered
-        foreach ($answers as $answer_row) {
-            if ($answer_row['Question.QST_system']) {
-                // it's an answer to a system question. That was already displayed as part of the attendee
-                // fields, so don't write it out again thanks.
-                continue;
-            }
+	/**
+	 * Add question / answer columns to the CSV row
+	 *
+	 * @param array $reg_row
+	 * @param array $data
+	 * @param array $question_labels
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function addAnswerColumns(array $reg_row, array $data, array $question_labels): array
+	{
+		$answer_model = EEM_Answer::instance();
+		$qst_model = EEM_Question::instance();
+		$state_model = EEM_State::instance();
+		// make sure each registration has the same questions in the same order
+		foreach ($question_labels as $question_label) {
+			if (! isset($data[ $question_label ])) {
+				$data[ $question_label ] = null;
+			}
+		}
+		$answers = $answer_model->get_all_wpdb_results([
+			['REG_ID' => $reg_row['Registration.REG_ID']],
+			'force_join' => ['Question'],
+		]);
+		// now fill out the questions THEY answered
+		foreach ($answers as $answer_row) {
+			if ($answer_row['Question.QST_system']) {
+				// it's an answer to a system question. That was already displayed as part of the attendee
+				// fields, so don't write it out again thanks.
+				continue;
+			}
 
-            $question_label = $answer_row['Question.QST_ID']
-                ? EEH_Export::prepare_value_from_db_for_display(
-                    $qst_model,
-                    'QST_admin_label',
-                    $answer_row['Question.QST_admin_label']
-                )
-                : sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
+			$question_label = $answer_row['Question.QST_ID']
+				? EEH_Export::prepare_value_from_db_for_display(
+					$qst_model,
+					'QST_admin_label',
+					$answer_row['Question.QST_admin_label']
+				)
+				: sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 
-            if (! array_key_exists($question_label, $data)) {
-                // We don't need an answer for this specific question in the current dataset
-                // so skip adding this value to $data.
-                continue;
-            }
+			if (! array_key_exists($question_label, $data)) {
+				// We don't need an answer for this specific question in the current dataset
+				// so skip adding this value to $data.
+				continue;
+			}
 
-            $data[ $question_label ] = isset($answer_row['Question.QST_type'])
-                                       && $answer_row['Question.QST_type'] === EEM_Question::QST_type_state
-                ? $state_model->get_state_name_by_ID((int) $answer_row['Answer.ANS_value'])
-                // this isn't for html, so don't show html entities
-                : html_entity_decode(
-                    EEH_Export::prepare_value_from_db_for_display(
-                        $answer_model,
-                        'ANS_value',
-                        $answer_row['Answer.ANS_value']
-                    )
-                );
-        }
-        return $data;
-    }
+			$data[ $question_label ] = isset($answer_row['Question.QST_type'])
+									   && $answer_row['Question.QST_type'] === EEM_Question::QST_type_state
+				? $state_model->get_state_name_by_ID((int) $answer_row['Answer.ANS_value'])
+				// this isn't for html, so don't show html entities
+				: html_entity_decode(
+					EEH_Export::prepare_value_from_db_for_display(
+						$answer_model,
+						'ANS_value',
+						$answer_row['Answer.ANS_value']
+					)
+				);
+		}
+		return $data;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -35,8 +35,8 @@ 
         $state_model = EEM_State::instance();
         // make sure each registration has the same questions in the same order
         foreach ($question_labels as $question_label) {
-            if (! isset($data[ $question_label ])) {
-                $data[ $question_label ] = null;
+            if ( ! isset($data[$question_label])) {
+                $data[$question_label] = null;
             }
         }
         $answers = $answer_model->get_all_wpdb_results([
@@ -59,13 +59,13 @@ 
                 )
                 : sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
 
-            if (! array_key_exists($question_label, $data)) {
+            if ( ! array_key_exists($question_label, $data)) {
                 // We don't need an answer for this specific question in the current dataset
                 // so skip adding this value to $data.
                 continue;
             }
 
-            $data[ $question_label ] = isset($answer_row['Question.QST_type'])
+            $data[$question_label] = isset($answer_row['Question.QST_type'])
                                        && $answer_row['Question.QST_type'] === EEM_Question::QST_type_state
                 ? $state_model->get_state_name_by_ID((int) $answer_row['Answer.ANS_value'])
                 // this isn't for html, so don't show html entities

core/domain/services/assets/JqueryAssetManager.php

Indentation +52 added lines, -52 removed lines

@@ -6,74 +6,74 @@
 
 class JqueryAssetManager extends AssetManager
 {
-    const JS_HANDLE_JQUERY = 'jquery';
+	const JS_HANDLE_JQUERY = 'jquery';
 
-    const JS_HANDLE_JQUERY_COOKIE = 'jquery-cookie';
+	const JS_HANDLE_JQUERY_COOKIE = 'jquery-cookie';
 
-    const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
+	const JS_HANDLE_JQUERY_VALIDATE = 'jquery-validate';
 
-    const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
+	const JS_HANDLE_JQUERY_VALIDATE_EXTRA = 'jquery-validate-extra-methods';
 
-    const JS_HANDLE_JQUERY_UI_CORE = 'jquery-ui-core';
+	const JS_HANDLE_JQUERY_UI_CORE = 'jquery-ui-core';
 
-    const JS_HANDLE_JQUERY_UI_DATEPICKER = 'jquery-ui-datepicker';
+	const JS_HANDLE_JQUERY_UI_DATEPICKER = 'jquery-ui-datepicker';
 
-    const JS_HANDLE_JQUERY_UI_DRAGGABLE = 'jquery-ui-draggable';
+	const JS_HANDLE_JQUERY_UI_DRAGGABLE = 'jquery-ui-draggable';
 
-    const JS_HANDLE_JQUERY_UI_SLIDER = 'jquery-ui-slider';
+	const JS_HANDLE_JQUERY_UI_SLIDER = 'jquery-ui-slider';
 
-    const JS_HANDLE_JQUERY_UI_SORTABLE = 'jquery-ui-sortable';
+	const JS_HANDLE_JQUERY_UI_SORTABLE = 'jquery-ui-sortable';
 
-    const JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON = 'jquery-ui-timepicker-addon';
+	const JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON = 'jquery-ui-timepicker-addon';
 
-    const JS_HANDLE_JQUERY_UI_TOUCH_PUNCH = 'jquery.ui.touch-punch';
+	const JS_HANDLE_JQUERY_UI_TOUCH_PUNCH = 'jquery.ui.touch-punch';
 
 
 
-    /**
+	/**
 	 * @inheritDoc
 	 */
 	public function addAssets()
 	{
-        // register cookie script for future dependencies
-        $this->addJavascript(
-            JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
-            EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js',
-            ['jquery'],
-            true,
-            '2.1'
-        );
-
-        $this->addJavascript(
-            JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
-            array(JqueryAssetManager::JS_HANDLE_JQUERY),
-            true,
-            '1.19.5'
-        )->setEnqueueImmediately();
-
-        $this->addJavascript(
-            JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
-            array(JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE),
-            true,
-            '1.19.5'
-        );
-
-        $this->addJavascript(
-            JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_DATEPICKER,
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_SLIDER
-            ]
-        );
-        $this->addJavascript(
-            JqueryAssetManager::JS_HANDLE_JQUERY_UI_TOUCH_PUNCH,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.ui.touch-punch.min.js',
-            [
-                JqueryAssetManager::JS_HANDLE_JQUERY_UI_CORE
-            ]
-        );
+		// register cookie script for future dependencies
+		$this->addJavascript(
+			JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
+			EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js',
+			['jquery'],
+			true,
+			'2.1'
+		);
+
+		$this->addJavascript(
+			JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
+			array(JqueryAssetManager::JS_HANDLE_JQUERY),
+			true,
+			'1.19.5'
+		)->setEnqueueImmediately();
+
+		$this->addJavascript(
+			JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
+			array(JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE),
+			true,
+			'1.19.5'
+		);
+
+		$this->addJavascript(
+			JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_DATEPICKER,
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_SLIDER
+			]
+		);
+		$this->addJavascript(
+			JqueryAssetManager::JS_HANDLE_JQUERY_UI_TOUCH_PUNCH,
+			EE_GLOBAL_ASSETS_URL . 'scripts/jquery.ui.touch-punch.min.js',
+			[
+				JqueryAssetManager::JS_HANDLE_JQUERY_UI_CORE
+			]
+		);
 	}
 }

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
         // register cookie script for future dependencies
         $this->addJavascript(
             JqueryAssetManager::JS_HANDLE_JQUERY_COOKIE,
-            EE_THIRD_PARTY_URL . 'joyride/jquery.cookie.js',
+            EE_THIRD_PARTY_URL.'joyride/jquery.cookie.js',
             ['jquery'],
             true,
             '2.1'
@@ -46,7 +46,7 @@ 
 
         $this->addJavascript(
             JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.min.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.min.js',
             array(JqueryAssetManager::JS_HANDLE_JQUERY),
             true,
             '1.19.5'
@@ -54,7 +54,7 @@ 
 
         $this->addJavascript(
             JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE_EXTRA,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.validate.additional-methods.min.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery.validate.additional-methods.min.js',
             array(JqueryAssetManager::JS_HANDLE_JQUERY_VALIDATE),
             true,
             '1.19.5'
@@ -62,7 +62,7 @@ 
 
         $this->addJavascript(
             JqueryAssetManager::JS_HANDLE_JQUERY_UI_TIMEPICKER_ADDON,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery-ui-timepicker-addon.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery-ui-timepicker-addon.js',
             [
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_DATEPICKER,
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_SLIDER
@@ -70,7 +70,7 @@ 
         );
         $this->addJavascript(
             JqueryAssetManager::JS_HANDLE_JQUERY_UI_TOUCH_PUNCH,
-            EE_GLOBAL_ASSETS_URL . 'scripts/jquery.ui.touch-punch.min.js',
+            EE_GLOBAL_ASSETS_URL.'scripts/jquery.ui.touch-punch.min.js',
             [
                 JqueryAssetManager::JS_HANDLE_JQUERY_UI_CORE
             ]

core/domain/services/registration/form/v1/RegFormInputHandler.php

Indentation +204 added lines, -204 removed lines

@@ -13,211 +13,211 @@
 
 class RegFormInputHandler
 {
-    private EEM_Attendee $attendee_model;
-
-    private string $checkout_reg_url_link;
-
-    private RegistrantData $registrant_data;
-
-    private array $required_questions;
-
-
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        string $checkout_reg_url_link,
-        array $required_questions,
-        EEM_Attendee $attendee_model,
-        RegistrantData $registrant_data
-    ) {
-        $this->attendee_model        = $attendee_model;
-        $this->checkout_reg_url_link = $checkout_reg_url_link;
-        $this->registrant_data       = $registrant_data;
-        $this->required_questions    = $required_questions;
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function processFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $form_input,
-        $input_value
-    ): bool {
-        // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
-            return false;
-        }
-        $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
-            $reg_url_link,
-            $form_input,
-            $input_value
-        );
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
-            EE_Error::add_error(
-                sprintf(
-                    esc_html_x(
-                        'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
-                        'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
-                        'event_espresso'
-                    ),
-                    $form_input,
-                    $input_value
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        return true;
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function saveRegistrationFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $form_input = '',
-        $input_value = ''
-    ): bool {
-        // If email_confirm is sent it's not saved
-        if ((string) $form_input === 'email_confirm') {
-            return true;
-        }
-        // allow for plugins to hook in and do their own processing of the form input.
-        // For plugins to bypass normal processing here, they just need to return a truthy value.
-        if (
-            apply_filters(
-                'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
-                false,
-                $registration,
-                $form_input,
-                $input_value,
-                $this
-            )
-        ) {
-            return true;
-        }
-        /*
+	private EEM_Attendee $attendee_model;
+
+	private string $checkout_reg_url_link;
+
+	private RegistrantData $registrant_data;
+
+	private array $required_questions;
+
+
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		string $checkout_reg_url_link,
+		array $required_questions,
+		EEM_Attendee $attendee_model,
+		RegistrantData $registrant_data
+	) {
+		$this->attendee_model        = $attendee_model;
+		$this->checkout_reg_url_link = $checkout_reg_url_link;
+		$this->registrant_data       = $registrant_data;
+		$this->required_questions    = $required_questions;
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function processFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$form_input,
+		$input_value
+	): bool {
+		// check for critical inputs
+		if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
+			return false;
+		}
+		$input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
+			$reg_url_link,
+			$form_input,
+			$input_value
+		);
+		if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
+			EE_Error::add_error(
+				sprintf(
+					esc_html_x(
+						'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
+						'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
+						'event_espresso'
+					),
+					$form_input,
+					$input_value
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		return true;
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function saveRegistrationFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$form_input = '',
+		$input_value = ''
+	): bool {
+		// If email_confirm is sent it's not saved
+		if ((string) $form_input === 'email_confirm') {
+			return true;
+		}
+		// allow for plugins to hook in and do their own processing of the form input.
+		// For plugins to bypass normal processing here, they just need to return a truthy value.
+		if (
+			apply_filters(
+				'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
+				false,
+				$registration,
+				$form_input,
+				$input_value,
+				$this
+			)
+		) {
+			return true;
+		}
+		/*
          * $answer_cache_id is the key used to find the EE_Answer we want
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
-        $answer_cache_id   = $this->checkout_reg_url_link
-            ? $form_input . '-' . $reg_url_link
-            : $form_input;
-        $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
-        $answer_is_obj     = $registrant_answer instanceof EE_Answer;
-        // rename form_inputs if they are EE_Attendee properties
-        switch ((string) $form_input) {
-            case 'state':
-            case 'STA_ID':
-                $attendee_property = true;
-                $form_input        = 'STA_ID';
-                break;
-
-            case 'country':
-            case 'CNT_ISO':
-                $attendee_property = true;
-                $form_input        = 'CNT_ISO';
-                break;
-
-            default:
-                $ATT_input         = 'ATT_' . $form_input;
-                $attendee_property = $this->attendee_model->has_field($ATT_input);
-                $form_input        = $attendee_property
-                    ? 'ATT_' . $form_input
-                    : $form_input;
-        }
-
-        // if this form input has a corresponding attendee property
-        if ($attendee_property) {
-            $this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
-            if ($answer_is_obj) {
-                // and delete the corresponding answer since we won't be storing this data in that object
-                $registration->_remove_relation_to($registrant_answer, 'Answer');
-                $registrant_answer->delete_permanently();
-            }
-            return true;
-        }
-        if ($answer_is_obj) {
-            // save this data to the answer object
-            $registrant_answer->set_value($input_value);
-            $result = $registrant_answer->save();
-            return $result !== false;
-        }
-        foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
-            if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
-                $answer->set_value($input_value);
-                $result = $answer->save();
-                return $result !== false;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return boolean
-     */
-    private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
-        $form_input = '',
-        $input_value = ''
-    ): bool {
-        if (empty($input_value)) {
-            // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
-                return true;
-            }
-            switch ($form_input) {
-                case 'fname':
-                    EE_Error::add_error(
-                        esc_html__('First Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'lname':
-                    EE_Error::add_error(
-                        esc_html__('Last Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'email':
-                    EE_Error::add_error(
-                        esc_html__('Please enter a valid email address.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-            }
-        }
-        return true;
-    }
+		$answer_cache_id   = $this->checkout_reg_url_link
+			? $form_input . '-' . $reg_url_link
+			: $form_input;
+		$registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
+		$answer_is_obj     = $registrant_answer instanceof EE_Answer;
+		// rename form_inputs if they are EE_Attendee properties
+		switch ((string) $form_input) {
+			case 'state':
+			case 'STA_ID':
+				$attendee_property = true;
+				$form_input        = 'STA_ID';
+				break;
+
+			case 'country':
+			case 'CNT_ISO':
+				$attendee_property = true;
+				$form_input        = 'CNT_ISO';
+				break;
+
+			default:
+				$ATT_input         = 'ATT_' . $form_input;
+				$attendee_property = $this->attendee_model->has_field($ATT_input);
+				$form_input        = $attendee_property
+					? 'ATT_' . $form_input
+					: $form_input;
+		}
+
+		// if this form input has a corresponding attendee property
+		if ($attendee_property) {
+			$this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
+			if ($answer_is_obj) {
+				// and delete the corresponding answer since we won't be storing this data in that object
+				$registration->_remove_relation_to($registrant_answer, 'Answer');
+				$registrant_answer->delete_permanently();
+			}
+			return true;
+		}
+		if ($answer_is_obj) {
+			// save this data to the answer object
+			$registrant_answer->set_value($input_value);
+			$result = $registrant_answer->save();
+			return $result !== false;
+		}
+		foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
+			if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+				$answer->set_value($input_value);
+				$result = $answer->save();
+				return $result !== false;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return boolean
+	 */
+	private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
+		$form_input = '',
+		$input_value = ''
+	): bool {
+		if (empty($input_value)) {
+			// if the form input isn't marked as being required, then just return
+			if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
+				return true;
+			}
+			switch ($form_input) {
+				case 'fname':
+					EE_Error::add_error(
+						esc_html__('First Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'lname':
+					EE_Error::add_error(
+						esc_html__('Last Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'email':
+					EE_Error::add_error(
+						esc_html__('Please enter a valid email address.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+			}
+		}
+		return true;
+	}
 }

core/domain/services/registration/form/v1/subsections/TicketDetailsTable.php

Indentation +48 added lines, -48 removed lines

@@ -13,58 +13,58 @@
 
 class TicketDetailsTable extends EE_Form_Section_HTML
 {
-    private EE_Line_Item $cart_grand_total;
-    private EE_Line_Item_Display $line_item_display;
+	private EE_Line_Item $cart_grand_total;
+	private EE_Line_Item_Display $line_item_display;
 
-    private static int $prev_ticket_id = 0;
+	private static int $prev_ticket_id = 0;
 
 
-    /**
-     * @param EE_Line_Item $cart_grand_total
-     * @param EE_Line_Item_Display $line_item_display
-     * @param EE_Ticket $ticket
-     * @param bool      $revisit
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Line_Item $cart_grand_total, EE_Line_Item_Display $line_item_display, EE_Ticket $ticket, bool $revisit)
-    {
-        $this->cart_grand_total = $cart_grand_total;
-        $this->line_item_display = $line_item_display;
-        parent::__construct(
-            ! $revisit && $ticket->ID() !== TicketDetailsTable::$prev_ticket_id
-                ? $this->generateTicketDetailsTable($ticket)
-                : ''
-        );
-        TicketDetailsTable::$prev_ticket_id = $ticket->ID();
-    }
+	/**
+	 * @param EE_Line_Item $cart_grand_total
+	 * @param EE_Line_Item_Display $line_item_display
+	 * @param EE_Ticket $ticket
+	 * @param bool      $revisit
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Line_Item $cart_grand_total, EE_Line_Item_Display $line_item_display, EE_Ticket $ticket, bool $revisit)
+	{
+		$this->cart_grand_total = $cart_grand_total;
+		$this->line_item_display = $line_item_display;
+		parent::__construct(
+			! $revisit && $ticket->ID() !== TicketDetailsTable::$prev_ticket_id
+				? $this->generateTicketDetailsTable($ticket)
+				: ''
+		);
+		TicketDetailsTable::$prev_ticket_id = $ticket->ID();
+	}
 
 
-    private function generateTicketDetailsTable(EE_Ticket $ticket): string
-    {
-        $ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs(
-            $this->cart_grand_total,
-            'Ticket',
-            [$ticket->ID()]
-        );
-        $ticket_line_item = ! empty($ticket_line_item) ? reset($ticket_line_item) : $ticket_line_item;
+	private function generateTicketDetailsTable(EE_Ticket $ticket): string
+	{
+		$ticket_line_item = EEH_Line_Item::get_line_items_by_object_type_and_IDs(
+			$this->cart_grand_total,
+			'Ticket',
+			[$ticket->ID()]
+		);
+		$ticket_line_item = ! empty($ticket_line_item) ? reset($ticket_line_item) : $ticket_line_item;
 
-        return EEH_HTML::div(
-            EEH_HTML::table(
-                EEH_HTML::thead(
-                    EEH_HTML::tr(
-                        EEH_HTML::th('', '', 'jst-left')
-                        . EEH_HTML::th(esc_html__('Qty', 'event_espresso'), '', 'jst-rght')
-                        . EEH_HTML::th(esc_html__('Price', 'event_espresso'), '', 'jst-rght')
-                        . EEH_HTML::th(esc_html__('Total', 'event_espresso'), '', 'jst-rght'),
-                    )
-                )
-                . EEH_HTML::tbody($this->line_item_display->display_line_item($ticket_line_item)),
-                '',
-                'spco-ticket-details'
-            ),
-            '',
-            'spco-ticket-info-dv'
-        );
-    }
+		return EEH_HTML::div(
+			EEH_HTML::table(
+				EEH_HTML::thead(
+					EEH_HTML::tr(
+						EEH_HTML::th('', '', 'jst-left')
+						. EEH_HTML::th(esc_html__('Qty', 'event_espresso'), '', 'jst-rght')
+						. EEH_HTML::th(esc_html__('Price', 'event_espresso'), '', 'jst-rght')
+						. EEH_HTML::th(esc_html__('Total', 'event_espresso'), '', 'jst-rght'),
+					)
+				)
+				. EEH_HTML::tbody($this->line_item_display->display_line_item($ticket_line_item)),
+				'',
+				'spco-ticket-details'
+			),
+			'',
+			'spco-ticket-info-dv'
+		);
+	}
 }

core/domain/services/registration/form/v1/subsections/EventHeader.php

Indentation +17 added lines, -17 removed lines

@@ -10,23 +10,23 @@
 
 class EventHeader extends EE_Form_Section_HTML
 {
-    private static int $prev_event_id  = 0;
+	private static int $prev_event_id  = 0;
 
 
-    /**
-     * @param EE_Event $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Event $event)
-    {
-        parent::__construct(
-            // only show event title if not admin and event id is not the same as the previous event id
-            ! is_admin() && $event->ID() !== EventHeader::$prev_event_id
-                ? EEH_HTML::h4(esc_html($event->name()), "event_title-{$event->ID()}", 'big-event-title-hdr')
-                : ''
-        );
-        // update prev event id after generating header html
-        EventHeader::$prev_event_id = $event->ID();
-    }
+	/**
+	 * @param EE_Event $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Event $event)
+	{
+		parent::__construct(
+			// only show event title if not admin and event id is not the same as the previous event id
+			! is_admin() && $event->ID() !== EventHeader::$prev_event_id
+				? EEH_HTML::h4(esc_html($event->name()), "event_title-{$event->ID()}", 'big-event-title-hdr')
+				: ''
+		);
+		// update prev event id after generating header html
+		EventHeader::$prev_event_id = $event->ID();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 class EventHeader extends EE_Form_Section_HTML
 {
-    private static int $prev_event_id  = 0;
+    private static int $prev_event_id = 0;
 
 
     /**

core/domain/services/registration/form/v1/subsections/AttendeeInformationNotice.php

Indentation +20 added lines, -20 removed lines

@@ -7,24 +7,24 @@
 
 class AttendeeInformationNotice extends EE_Form_Section_HTML
 {
-    public function __construct()
-    {
-        parent::__construct(
-            EEH_HTML::p(
-                apply_filters(
-                    'FHEE__registration_page_attendee_information__attendee_information_pg',
-                    sprintf(
-                        esc_html__(
-                            'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
-                            'event_espresso'
-                        ),
-                        '<br />',
-                        '<span class="asterisk">*</span>'
-                    )
-                ),
-                'spco-attendee_information-pg',
-                'spco-steps-pg small-text drk-grey-text'
-            )
-        );
-    }
+	public function __construct()
+	{
+		parent::__construct(
+			EEH_HTML::p(
+				apply_filters(
+					'FHEE__registration_page_attendee_information__attendee_information_pg',
+					sprintf(
+						esc_html__(
+							'In order to process your registration, we ask you to provide the following information.%1$sPlease note that all fields marked with an asterisk (%2$s) are required.',
+							'event_espresso'
+						),
+						'<br />',
+						'<span class="asterisk">*</span>'
+					)
+				),
+				'spco-attendee_information-pg',
+				'spco-steps-pg small-text drk-grey-text'
+			)
+		);
+	}
 }

core/domain/services/registration/form/v1/RegForm.php

Indentation +271 added lines, -271 removed lines

@@ -40,275 +40,275 @@
  */
 class RegForm extends EE_Form_Section_Proper
 {
-    private EE_Line_Item_Display $line_item_display;
-
-    private string $primary_registrant = '';
-
-    private array $required_questions = [];
-
-    private array $subsections = [];
-
-
-    private bool $print_copy_info = false;
-
-    protected int $reg_form_count = 0;
-
-    public EE_Registration_Config $reg_config;
-
-    public EE_SPCO_Reg_Step_Attendee_Information $reg_step;
-
-
-    /**
-     * RegForm constructor.
-     *
-     * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
-     * @param EE_Registration_Config                $reg_config
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct(
-        EE_SPCO_Reg_Step_Attendee_Information $reg_step,
-        EE_Registration_Config $reg_config
-    ) {
-        $this->reg_step   = $reg_step;
-        $this->reg_config = $reg_config;
-        // setup some classes so that they are ready for loading during construction of other classes
-        LoaderFactory::getShared(CountryOptions::class, [$this->reg_step->checkout->action]);
-        LoaderFactory::getShared(StateOptions::class, [$this->reg_step->checkout->action]);
-        LoaderFactory::getShared(RegFormQuestionFactory::class, [[$this, 'addRequiredQuestion']]);
-        parent::__construct(
-            [
-                'name'            => $this->reg_step->reg_form_name(),
-                'html_id'         => $this->reg_step->reg_form_name(),
-                'layout_strategy' => new EE_No_Layout(),
-                'subsections'     => $this->generateSubsections(),
-            ]
-        );
-    }
-
-
-    /**
-     * @return void
-     */
-    public function enablePrintCopyInfo(): void
-    {
-        $this->print_copy_info = true;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function printCopyInfo(): bool
-    {
-        return $this->print_copy_info;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function regFormCount(): int
-    {
-        return $this->reg_form_count;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function requiredQuestions(): array
-    {
-        return $this->required_questions;
-    }
-
-
-    /**
-     * @param string $identifier
-     * @param string $required_question
-     */
-    public function addRequiredQuestion(string $identifier, string $required_question): void
-    {
-        $this->required_questions[ $identifier ] = $required_question;
-    }
-
-
-    /**
-     * @return EE_Form_Section_Proper[]
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function generateSubsections(): array
-    {
-        $this->configureLineItemDisplay();
-        $this->addAttendeeInformationNotice();
-
-        // grab the saved registrations from the transaction
-        $registrations = $this->reg_step->checkout->transaction->registrations(
-            $this->reg_step->checkout->reg_cache_where_params
-        );
-        if ($registrations) {
-            foreach ($registrations as $registration) {
-                if (! $registration instanceof EE_Registration) {
-                    continue;
-                }
-                $this->addAttendeeRegForm($registration);
-            }
-            $this->addCopyAttendeeInfoForm($registrations);
-        }
-        $this->addPrivacyConsentCheckbox();
-        $this->displayEventQuestionsLink();
-        $this->subsections['default_hidden_inputs']  =  $this->reg_step->reg_step_hidden_inputs();
-
-        return (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegForm__generateSubsections__subsections',
-            $this->subsections,
-            $this
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function configureLineItemDisplay()
-    {
-        // autoload Line_Item_Display classes
-        EEH_Autoloader::register_line_item_display_autoloaders();
-        $this->line_item_display = new EE_Line_Item_Display();
-        // calculate taxes
-        $this->line_item_display->display_line_item(
-            $this->reg_step->checkout->cart->get_grand_total(),
-            ['set_tax_rate' => true]
-        );
-    }
-
-
-    private function addAttendeeInformationNotice(): void
-    {
-        if (is_admin()) {
-            return;
-        }
-        $this->subsections['attendee_information_notice'] = new AttendeeInformationNotice();
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function addAttendeeRegForm(EE_Registration $registration): void
-    {
-        // can this registration be processed during this visit ?
-        if (! $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)) {
-            return;
-        }
-        $reg_url_link = $registration->reg_url_link();
-        if ($registration->is_primary_registrant()) {
-            $this->primary_registrant = $reg_url_link;
-        }
-
-        /** @var AttendeeRegForm $registrant_form */
-        $registrant_form = LoaderFactory::getNew(
-            AttendeeRegForm::class,
-            [
-                $registration,
-                $this->reg_config->copyAttendeeInfo(),
-                [$this, 'enablePrintCopyInfo'],
-                $this->reg_step,
-            ]
-        );
-
-        // skip section if there are no questions
-        if (! $registrant_form->hasQuestions()) {
-            return;
-        }
-
-        // but increment the reg form count if form is valid.
-        $this->reg_form_count++;
-        $this->subsections["panel-div-open-$reg_url_link"]  = new EE_Form_Section_HTML(
-            EEH_HTML::div(
-                '',
-                "spco-attendee-panel-dv-$reg_url_link",
-                "spco-attendee-panel-dv spco-attendee-ticket-$reg_url_link"
-            )
-        );
-        $this->subsections["event-header-$reg_url_link"]    = new EventHeader($registration->event());
-        $this->subsections["ticket-details-$reg_url_link"]  = new TicketDetailsTable(
-            $this->reg_step->checkout->cart->get_grand_total(),
-            $this->line_item_display,
-            $registration->ticket(),
-            $this->reg_step->checkout->revisit
-        );
-        $this->subsections[ $reg_url_link ]                 = $registrant_form;
-        $this->subsections["panel-div-close-$reg_url_link"] = new EE_Form_Section_HTML(
-            EEH_HTML::divx("spco-attendee-panel-dv-$reg_url_link")
-        );
-    }
-
-
-    /**
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    private function addCopyAttendeeInfoForm(array $registrations)
-    {
-        if (
-            $this->primary_registrant
-            && count($registrations) > 1
-            && isset($this->subsections[ $this->primary_registrant ])
-            && $this->subsections[ $this->primary_registrant ] instanceof EE_Form_Section_Proper
-        ) {
-            $this->subsections[ $this->primary_registrant ]->add_subsections(
-                [
-                    'spco_copy_attendee_chk' => $this->print_copy_info
-                        ? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
-                        : new AutoCopyAttendeeInfoForm($this->reg_step->slug()),
-                ],
-                'primary_registrant',
-                false
-            );
-        }
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    private function addPrivacyConsentCheckbox(): void
-    {
-        // if this isn't a revisit, and they have the privacy consent box enabled, add it
-        if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
-            $this->subsections['consent_box'] = new PrivacyConsentCheckboxForm(
-                $this->reg_step->slug(),
-                $this->reg_config->getConsentCheckboxLabelText()
-            );
-        }
-    }
-
-
-    private function displayEventQuestionsLink()
-    {
-        $this->subsections['event_questions_link'] = new EE_Form_Section_HTML(
-            EEH_HTML::div(
-                EEH_HTML::link(
-                    '',
-                    esc_html__('show event questions', 'event_espresso'),
-                    esc_html__('show event questions', 'event_espresso'),
-                    'spco-display-event-questions-lnk',
-                    'act-like-link smaller-text hidden hide-if-no-js float-right'
-                ),
-                '',
-                'clearfix'
-            )
-        );
-    }
+	private EE_Line_Item_Display $line_item_display;
+
+	private string $primary_registrant = '';
+
+	private array $required_questions = [];
+
+	private array $subsections = [];
+
+
+	private bool $print_copy_info = false;
+
+	protected int $reg_form_count = 0;
+
+	public EE_Registration_Config $reg_config;
+
+	public EE_SPCO_Reg_Step_Attendee_Information $reg_step;
+
+
+	/**
+	 * RegForm constructor.
+	 *
+	 * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
+	 * @param EE_Registration_Config                $reg_config
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct(
+		EE_SPCO_Reg_Step_Attendee_Information $reg_step,
+		EE_Registration_Config $reg_config
+	) {
+		$this->reg_step   = $reg_step;
+		$this->reg_config = $reg_config;
+		// setup some classes so that they are ready for loading during construction of other classes
+		LoaderFactory::getShared(CountryOptions::class, [$this->reg_step->checkout->action]);
+		LoaderFactory::getShared(StateOptions::class, [$this->reg_step->checkout->action]);
+		LoaderFactory::getShared(RegFormQuestionFactory::class, [[$this, 'addRequiredQuestion']]);
+		parent::__construct(
+			[
+				'name'            => $this->reg_step->reg_form_name(),
+				'html_id'         => $this->reg_step->reg_form_name(),
+				'layout_strategy' => new EE_No_Layout(),
+				'subsections'     => $this->generateSubsections(),
+			]
+		);
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function enablePrintCopyInfo(): void
+	{
+		$this->print_copy_info = true;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function printCopyInfo(): bool
+	{
+		return $this->print_copy_info;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function regFormCount(): int
+	{
+		return $this->reg_form_count;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function requiredQuestions(): array
+	{
+		return $this->required_questions;
+	}
+
+
+	/**
+	 * @param string $identifier
+	 * @param string $required_question
+	 */
+	public function addRequiredQuestion(string $identifier, string $required_question): void
+	{
+		$this->required_questions[ $identifier ] = $required_question;
+	}
+
+
+	/**
+	 * @return EE_Form_Section_Proper[]
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function generateSubsections(): array
+	{
+		$this->configureLineItemDisplay();
+		$this->addAttendeeInformationNotice();
+
+		// grab the saved registrations from the transaction
+		$registrations = $this->reg_step->checkout->transaction->registrations(
+			$this->reg_step->checkout->reg_cache_where_params
+		);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				if (! $registration instanceof EE_Registration) {
+					continue;
+				}
+				$this->addAttendeeRegForm($registration);
+			}
+			$this->addCopyAttendeeInfoForm($registrations);
+		}
+		$this->addPrivacyConsentCheckbox();
+		$this->displayEventQuestionsLink();
+		$this->subsections['default_hidden_inputs']  =  $this->reg_step->reg_step_hidden_inputs();
+
+		return (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegForm__generateSubsections__subsections',
+			$this->subsections,
+			$this
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function configureLineItemDisplay()
+	{
+		// autoload Line_Item_Display classes
+		EEH_Autoloader::register_line_item_display_autoloaders();
+		$this->line_item_display = new EE_Line_Item_Display();
+		// calculate taxes
+		$this->line_item_display->display_line_item(
+			$this->reg_step->checkout->cart->get_grand_total(),
+			['set_tax_rate' => true]
+		);
+	}
+
+
+	private function addAttendeeInformationNotice(): void
+	{
+		if (is_admin()) {
+			return;
+		}
+		$this->subsections['attendee_information_notice'] = new AttendeeInformationNotice();
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function addAttendeeRegForm(EE_Registration $registration): void
+	{
+		// can this registration be processed during this visit ?
+		if (! $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)) {
+			return;
+		}
+		$reg_url_link = $registration->reg_url_link();
+		if ($registration->is_primary_registrant()) {
+			$this->primary_registrant = $reg_url_link;
+		}
+
+		/** @var AttendeeRegForm $registrant_form */
+		$registrant_form = LoaderFactory::getNew(
+			AttendeeRegForm::class,
+			[
+				$registration,
+				$this->reg_config->copyAttendeeInfo(),
+				[$this, 'enablePrintCopyInfo'],
+				$this->reg_step,
+			]
+		);
+
+		// skip section if there are no questions
+		if (! $registrant_form->hasQuestions()) {
+			return;
+		}
+
+		// but increment the reg form count if form is valid.
+		$this->reg_form_count++;
+		$this->subsections["panel-div-open-$reg_url_link"]  = new EE_Form_Section_HTML(
+			EEH_HTML::div(
+				'',
+				"spco-attendee-panel-dv-$reg_url_link",
+				"spco-attendee-panel-dv spco-attendee-ticket-$reg_url_link"
+			)
+		);
+		$this->subsections["event-header-$reg_url_link"]    = new EventHeader($registration->event());
+		$this->subsections["ticket-details-$reg_url_link"]  = new TicketDetailsTable(
+			$this->reg_step->checkout->cart->get_grand_total(),
+			$this->line_item_display,
+			$registration->ticket(),
+			$this->reg_step->checkout->revisit
+		);
+		$this->subsections[ $reg_url_link ]                 = $registrant_form;
+		$this->subsections["panel-div-close-$reg_url_link"] = new EE_Form_Section_HTML(
+			EEH_HTML::divx("spco-attendee-panel-dv-$reg_url_link")
+		);
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	private function addCopyAttendeeInfoForm(array $registrations)
+	{
+		if (
+			$this->primary_registrant
+			&& count($registrations) > 1
+			&& isset($this->subsections[ $this->primary_registrant ])
+			&& $this->subsections[ $this->primary_registrant ] instanceof EE_Form_Section_Proper
+		) {
+			$this->subsections[ $this->primary_registrant ]->add_subsections(
+				[
+					'spco_copy_attendee_chk' => $this->print_copy_info
+						? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
+						: new AutoCopyAttendeeInfoForm($this->reg_step->slug()),
+				],
+				'primary_registrant',
+				false
+			);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	private function addPrivacyConsentCheckbox(): void
+	{
+		// if this isn't a revisit, and they have the privacy consent box enabled, add it
+		if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
+			$this->subsections['consent_box'] = new PrivacyConsentCheckboxForm(
+				$this->reg_step->slug(),
+				$this->reg_config->getConsentCheckboxLabelText()
+			);
+		}
+	}
+
+
+	private function displayEventQuestionsLink()
+	{
+		$this->subsections['event_questions_link'] = new EE_Form_Section_HTML(
+			EEH_HTML::div(
+				EEH_HTML::link(
+					'',
+					esc_html__('show event questions', 'event_espresso'),
+					esc_html__('show event questions', 'event_espresso'),
+					'spco-display-event-questions-lnk',
+					'act-like-link smaller-text hidden hide-if-no-js float-right'
+				),
+				'',
+				'clearfix'
+			)
+		);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -129,7 +129,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, string $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -154,7 +154,7 @@ 
         );
         if ($registrations) {
             foreach ($registrations as $registration) {
-                if (! $registration instanceof EE_Registration) {
+                if ( ! $registration instanceof EE_Registration) {
                     continue;
                 }
                 $this->addAttendeeRegForm($registration);
@@ -163,7 +163,7 @@ 
         }
         $this->addPrivacyConsentCheckbox();
         $this->displayEventQuestionsLink();
-        $this->subsections['default_hidden_inputs']  =  $this->reg_step->reg_step_hidden_inputs();
+        $this->subsections['default_hidden_inputs'] = $this->reg_step->reg_step_hidden_inputs();
 
         return (array) apply_filters(
             'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegForm__generateSubsections__subsections',
@@ -207,7 +207,7 @@ 
     private function addAttendeeRegForm(EE_Registration $registration): void
     {
         // can this registration be processed during this visit ?
-        if (! $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)) {
+        if ( ! $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)) {
             return;
         }
         $reg_url_link = $registration->reg_url_link();
@@ -227,13 +227,13 @@ 
         );
 
         // skip section if there are no questions
-        if (! $registrant_form->hasQuestions()) {
+        if ( ! $registrant_form->hasQuestions()) {
             return;
         }
 
         // but increment the reg form count if form is valid.
         $this->reg_form_count++;
-        $this->subsections["panel-div-open-$reg_url_link"]  = new EE_Form_Section_HTML(
+        $this->subsections["panel-div-open-$reg_url_link"] = new EE_Form_Section_HTML(
             EEH_HTML::div(
                 '',
                 "spco-attendee-panel-dv-$reg_url_link",
@@ -247,7 +247,7 @@ 
             $registration->ticket(),
             $this->reg_step->checkout->revisit
         );
-        $this->subsections[ $reg_url_link ]                 = $registrant_form;
+        $this->subsections[$reg_url_link]                 = $registrant_form;
         $this->subsections["panel-div-close-$reg_url_link"] = new EE_Form_Section_HTML(
             EEH_HTML::divx("spco-attendee-panel-dv-$reg_url_link")
         );
@@ -263,10 +263,10 @@ 
         if (
             $this->primary_registrant
             && count($registrations) > 1
-            && isset($this->subsections[ $this->primary_registrant ])
-            && $this->subsections[ $this->primary_registrant ] instanceof EE_Form_Section_Proper
+            && isset($this->subsections[$this->primary_registrant])
+            && $this->subsections[$this->primary_registrant] instanceof EE_Form_Section_Proper
         ) {
-            $this->subsections[ $this->primary_registrant ]->add_subsections(
+            $this->subsections[$this->primary_registrant]->add_subsections(
                 [
                     'spco_copy_attendee_chk' => $this->print_copy_info
                         ? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
@@ -286,7 +286,7 @@ 
     private function addPrivacyConsentCheckbox(): void
     {
         // if this isn't a revisit, and they have the privacy consent box enabled, add it
-        if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
+        if ( ! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
             $this->subsections['consent_box'] = new PrivacyConsentCheckboxForm(
                 $this->reg_step->slug(),
                 $this->reg_config->getConsentCheckboxLabelText()