eventespresso / event-espresso-core

core/domain/services/registration/form/v2/FormInputValidationStrategies.php

Indentation +51 added lines, -51 removed lines

@@ -16,62 +16,62 @@
 
 class FormInputValidationStrategies
 {
-    /**
-     * @var FieldLengthCalculator
-     */
-    public $field_length_calculator;
+	/**
+	 * @var FieldLengthCalculator
+	 */
+	public $field_length_calculator;
 
 
-    /**
-     * FormInputFactory constructor.
-     *
-     * @param FieldLengthCalculator $field_length_calculator
-     */
-    public function __construct(FieldLengthCalculator $field_length_calculator)
-    {
-        $this->field_length_calculator = $field_length_calculator;
-    }
+	/**
+	 * FormInputFactory constructor.
+	 *
+	 * @param FieldLengthCalculator $field_length_calculator
+	 */
+	public function __construct(FieldLengthCalculator $field_length_calculator)
+	{
+		$this->field_length_calculator = $field_length_calculator;
+	}
 
 
-    /**
-     * @param EE_Form_Element $form_input
-     * @param array           $input_args
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function applyValidationStrategies(EE_Form_Element $form_input, array $input_args): array
-    {
-        if ($form_input->getAttribute('max') !== EE_INF || $form_input->mapsTo()) {
-            $max_field_length = $this->field_length_calculator->getMaxFieldLengthForInput($form_input);
-            if ($max_field_length !== EE_INF) {
-                $input_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
-                    null,
-                    $max_field_length
-                );
-            }
-        }
-        if ($form_input->getAttribute('min') > 0 || $form_input->mapsTo()) {
-            $min_field_length = $this->field_length_calculator->getMinFieldLengthForInput($form_input);
-            if ($min_field_length !== EE_INF) {
-                $input_args['validation_strategies'][] = new EE_Min_Length_Validation_Strategy(
-                    null,
-                    $min_field_length
-                );
-            }
-        }
+	/**
+	 * @param EE_Form_Element $form_input
+	 * @param array           $input_args
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function applyValidationStrategies(EE_Form_Element $form_input, array $input_args): array
+	{
+		if ($form_input->getAttribute('max') !== EE_INF || $form_input->mapsTo()) {
+			$max_field_length = $this->field_length_calculator->getMaxFieldLengthForInput($form_input);
+			if ($max_field_length !== EE_INF) {
+				$input_args['validation_strategies'][] = new EE_Max_Length_Validation_Strategy(
+					null,
+					$max_field_length
+				);
+			}
+		}
+		if ($form_input->getAttribute('min') > 0 || $form_input->mapsTo()) {
+			$min_field_length = $this->field_length_calculator->getMinFieldLengthForInput($form_input);
+			if ($min_field_length !== EE_INF) {
+				$input_args['validation_strategies'][] = new EE_Min_Length_Validation_Strategy(
+					null,
+					$min_field_length
+				);
+			}
+		}
 
-        if ($form_input->type() === Text::TYPE_TEXTAREA) {
-            $input_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
-        }
+		if ($form_input->type() === Text::TYPE_TEXTAREA) {
+			$input_args['validation_strategies'][] = new EE_Simple_HTML_Validation_Strategy();
+		}
 
-        if ($form_input->type() === Text::TYPE_TEXTAREA_HTML) {
-            $input_args['validation_strategies'][] = new EE_Full_HTML_Validation_Strategy();
-        }
+		if ($form_input->type() === Text::TYPE_TEXTAREA_HTML) {
+			$input_args['validation_strategies'][] = new EE_Full_HTML_Validation_Strategy();
+		}
 
-        if ($form_input->type() === Input::TYPE_URL) {
-            $input_args['validation_strategies'][] = LoaderFactory::getNew(EE_URL_Validation_Strategy::class);
-        }
-        return $input_args;
-    }
+		if ($form_input->type() === Input::TYPE_URL) {
+			$input_args['validation_strategies'][] = LoaderFactory::getNew(EE_URL_Validation_Strategy::class);
+		}
+		return $input_args;
+	}
 }

core/domain/services/registration/form/v2/FormInputFactory.php

Indentation +218 added lines, -218 removed lines

@@ -34,225 +34,225 @@
 
 class FormInputFactory
 {
-    /**
-     * @var stdClass
-     */
-    private $config;
-
-    /**
-     * @var FormInputValidationStrategies
-     */
-    public $validation_strategies;
-
-
-    /**
-     * FormInputFactory constructor.
-     *
-     * @param FormInputValidationStrategies $validation_strategies
-     */
-    public function __construct(FormInputValidationStrategies $validation_strategies)
-    {
-        $this->validation_strategies           = $validation_strategies;
-        $this->config                          = new stdClass();
-        $days                                  = range(1, 31);
-        $months                                = range(1, 12);
-        $this->config->days                    = array_combine($days, $days);
-        $this->config->months                  = array_combine($months, $months);
-        $this->config->year_input              = new stdClass();
-        $this->config->year_input->four_digit  = (bool) apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit',
-            true,
-            $this
-        );
-        $this->config->year_input->early_range = (int) apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range',
-            100,
-            $this
-        );
-        $this->config->year_input->end_range   = (int) apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range',
-            100,
-            $this
-        );
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param EE_Form_Element  $form_input
-     * @param int|float|string $answer
-     * @return EE_Form_Input_Base|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function create(
-        EE_Registration $registration,
-        EE_Form_Element $form_input,
-        $answer
-    ): ?EE_Form_Input_Base {
-        $input_args = (array) apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args',
-            $this->generateInputArgs($registration, $form_input, $answer),
-            $registration,
-            $this,
-            $answer
-        );
-        return $this->getInput($form_input, $input_args);
-    }
-
-
-    /**
-     * @param EE_Registration  $registration
-     * @param EE_Form_Element  $form_input
-     * @param int|float|string $answer
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function generateInputArgs(EE_Registration $registration, EE_Form_Element $form_input, $answer): array
-    {
-        $identifier = $form_input->slug();
-        $reg_id     = $registration->ID();
-        $label      = $form_input->label();
-        $required   = $form_input->required();
-        // group_name
-        $input_args = [
-            'default'                           => $answer,
-            'html_name'                         => "ee_reg_qstn[$reg_id][$identifier]",
-            'html_id'                           => "ee_reg_qstn-$reg_id-$identifier",
-            'html_class'                        => "ee-reg-qstn ee-reg-qstn-$identifier",
-            'html_label_id'                     => "ee_reg_qstn-$reg_id-$identifier-lbl",
-            'html_label_class'                  => 'ee-reg-qstn',
-            'html_label_text'                   => $label instanceof FormLabel ? $label->publicLabel() : '',
-            'required'                          => $required instanceof Required ? $required->isRequired() : false,
-            'required_validation_error_message' => $required instanceof Required ? $required->validationText() : '',
-        ];
-        return $this->validation_strategies->applyValidationStrategies($form_input, $input_args);
-    }
-
-
-    /**
-     * @param EE_Form_Element $form_input
-     * @param array           $input_args
-     * @return EE_Form_Input_Base|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function getInput(EE_Form_Element $form_input, array $input_args): ?EE_Form_Input_Base
-    {
-        $input_options = $form_input->options();
-        $options       = $input_options instanceof InputOptions ? $input_options->options() : [];
-        switch ($form_input->type()) {
-
-            // date type inputs
-            case DateTime::TYPE_DATE:
-                return new EE_Datepicker_Input($input_args);
-
-            case DateTime::TYPE_DATETIME_LOCAL:
-                $input_args['type'] = 'datetime-local';
-                return new EE_Text_Input($input_args);
-
-            case DateTime::TYPE_MONTH:
-                $input_args['type'] = 'month';
-                return new EE_Text_Input($input_args);
-
-            case DateTime::TYPE_TIME:
-                $input_args['type'] = 'time';
-                return new EE_Text_Input($input_args);
-
-            case DateTime::TYPE_WEEK:
-                $input_args['type'] = 'week';
-                return new EE_Text_Input($input_args);
-
-            case DateTime::TYPE_SELECT_DAY:
-                return new EE_Select_Input($this->config->days, $input_args);
-
-            case DateTime::TYPE_SELECT_MONTH:
-                return new EE_Select_Input($this->config->months, $input_args);
-
-            case DateTime::TYPE_SELECT_YEAR:
-                return new EE_Year_Input(
-                    $input_args,
-                    $this->config->year_input->four_digit,
-                    $this->config->year_input->early_range,
-                    $this->config->year_input->end_range
-                );
-
-            // input type inputs (???)
-            case Input::TYPE_CHECKBOX:
-                return new EE_Checkbox_Multi_Input($options, $input_args);
-
-            case Input::TYPE_COLOR:
-                $input_args['type'] = 'color';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_FILE:
-                $input_args['type'] = 'file';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_HIDDEN:
-                $input_args['type'] = 'hidden';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_IMAGE:
-                $input_args['type'] = 'image';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_PASSWORD:
-                $input_args['type'] = 'password';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_URL:
-                $input_args['type'] = 'url';
-                return new EE_Text_Input($input_args);
-
-            case Input::TYPE_RADIO:
-                return new EE_Radio_Button_Input($options, $input_args);
-
-            // numeric type inputs
-            case Number::TYPE_FLOAT:
-                return new EE_Float_Input($input_args);
-
-            case Number::TYPE_INT:
-                return new EE_Integer_Input($input_args);
-
-            case Number::TYPE_RANGE:
-                $input_args['type'] = 'range';
-                return new EE_Text_Input($input_args);
-
-            // phone type inputs
-            case Phone::INPUT_TYPE:
-                $input_args['type'] = 'tel';
-                return new EE_Text_Input($input_args);
-            // return new EE_Phone_Input($input_args);
-
-            // select type inputs
-            case Select::TYPE_SELECT:
-                return new EE_Select_Input($options, $input_args);
-
-            case Select::TYPE_SELECT_COUNTRY:
-                return new EE_Country_Select_Input([], $input_args);
-
-            case Select::TYPE_SELECT_STATE:
-                return new EE_State_Select_Input([], $input_args);
-
-            case Select::TYPE_SELECT_MULTI:
-                return new EE_Select_Multiple_Input($options, $input_args);
-
-            // text type inputs
-            case Text::TYPE_TEXTAREA:
-            case Text::TYPE_TEXTAREA_HTML:
-                return new EE_Text_Area_Input($input_args);
+	/**
+	 * @var stdClass
+	 */
+	private $config;
+
+	/**
+	 * @var FormInputValidationStrategies
+	 */
+	public $validation_strategies;
+
+
+	/**
+	 * FormInputFactory constructor.
+	 *
+	 * @param FormInputValidationStrategies $validation_strategies
+	 */
+	public function __construct(FormInputValidationStrategies $validation_strategies)
+	{
+		$this->validation_strategies           = $validation_strategies;
+		$this->config                          = new stdClass();
+		$days                                  = range(1, 31);
+		$months                                = range(1, 12);
+		$this->config->days                    = array_combine($days, $days);
+		$this->config->months                  = array_combine($months, $months);
+		$this->config->year_input              = new stdClass();
+		$this->config->year_input->four_digit  = (bool) apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__four_digit',
+			true,
+			$this
+		);
+		$this->config->year_input->early_range = (int) apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__early_range',
+			100,
+			$this
+		);
+		$this->config->year_input->end_range   = (int) apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range',
+			100,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param EE_Form_Element  $form_input
+	 * @param int|float|string $answer
+	 * @return EE_Form_Input_Base|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function create(
+		EE_Registration $registration,
+		EE_Form_Element $form_input,
+		$answer
+	): ?EE_Form_Input_Base {
+		$input_args = (array) apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__input_constructor_args',
+			$this->generateInputArgs($registration, $form_input, $answer),
+			$registration,
+			$this,
+			$answer
+		);
+		return $this->getInput($form_input, $input_args);
+	}
+
+
+	/**
+	 * @param EE_Registration  $registration
+	 * @param EE_Form_Element  $form_input
+	 * @param int|float|string $answer
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function generateInputArgs(EE_Registration $registration, EE_Form_Element $form_input, $answer): array
+	{
+		$identifier = $form_input->slug();
+		$reg_id     = $registration->ID();
+		$label      = $form_input->label();
+		$required   = $form_input->required();
+		// group_name
+		$input_args = [
+			'default'                           => $answer,
+			'html_name'                         => "ee_reg_qstn[$reg_id][$identifier]",
+			'html_id'                           => "ee_reg_qstn-$reg_id-$identifier",
+			'html_class'                        => "ee-reg-qstn ee-reg-qstn-$identifier",
+			'html_label_id'                     => "ee_reg_qstn-$reg_id-$identifier-lbl",
+			'html_label_class'                  => 'ee-reg-qstn',
+			'html_label_text'                   => $label instanceof FormLabel ? $label->publicLabel() : '',
+			'required'                          => $required instanceof Required ? $required->isRequired() : false,
+			'required_validation_error_message' => $required instanceof Required ? $required->validationText() : '',
+		];
+		return $this->validation_strategies->applyValidationStrategies($form_input, $input_args);
+	}
+
+
+	/**
+	 * @param EE_Form_Element $form_input
+	 * @param array           $input_args
+	 * @return EE_Form_Input_Base|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function getInput(EE_Form_Element $form_input, array $input_args): ?EE_Form_Input_Base
+	{
+		$input_options = $form_input->options();
+		$options       = $input_options instanceof InputOptions ? $input_options->options() : [];
+		switch ($form_input->type()) {
+
+			// date type inputs
+			case DateTime::TYPE_DATE:
+				return new EE_Datepicker_Input($input_args);
+
+			case DateTime::TYPE_DATETIME_LOCAL:
+				$input_args['type'] = 'datetime-local';
+				return new EE_Text_Input($input_args);
+
+			case DateTime::TYPE_MONTH:
+				$input_args['type'] = 'month';
+				return new EE_Text_Input($input_args);
+
+			case DateTime::TYPE_TIME:
+				$input_args['type'] = 'time';
+				return new EE_Text_Input($input_args);
+
+			case DateTime::TYPE_WEEK:
+				$input_args['type'] = 'week';
+				return new EE_Text_Input($input_args);
+
+			case DateTime::TYPE_SELECT_DAY:
+				return new EE_Select_Input($this->config->days, $input_args);
+
+			case DateTime::TYPE_SELECT_MONTH:
+				return new EE_Select_Input($this->config->months, $input_args);
+
+			case DateTime::TYPE_SELECT_YEAR:
+				return new EE_Year_Input(
+					$input_args,
+					$this->config->year_input->four_digit,
+					$this->config->year_input->early_range,
+					$this->config->year_input->end_range
+				);
+
+			// input type inputs (???)
+			case Input::TYPE_CHECKBOX:
+				return new EE_Checkbox_Multi_Input($options, $input_args);
+
+			case Input::TYPE_COLOR:
+				$input_args['type'] = 'color';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_FILE:
+				$input_args['type'] = 'file';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_HIDDEN:
+				$input_args['type'] = 'hidden';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_IMAGE:
+				$input_args['type'] = 'image';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_PASSWORD:
+				$input_args['type'] = 'password';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_URL:
+				$input_args['type'] = 'url';
+				return new EE_Text_Input($input_args);
+
+			case Input::TYPE_RADIO:
+				return new EE_Radio_Button_Input($options, $input_args);
+
+			// numeric type inputs
+			case Number::TYPE_FLOAT:
+				return new EE_Float_Input($input_args);
+
+			case Number::TYPE_INT:
+				return new EE_Integer_Input($input_args);
+
+			case Number::TYPE_RANGE:
+				$input_args['type'] = 'range';
+				return new EE_Text_Input($input_args);
+
+			// phone type inputs
+			case Phone::INPUT_TYPE:
+				$input_args['type'] = 'tel';
+				return new EE_Text_Input($input_args);
+			// return new EE_Phone_Input($input_args);
+
+			// select type inputs
+			case Select::TYPE_SELECT:
+				return new EE_Select_Input($options, $input_args);
+
+			case Select::TYPE_SELECT_COUNTRY:
+				return new EE_Country_Select_Input([], $input_args);
+
+			case Select::TYPE_SELECT_STATE:
+				return new EE_State_Select_Input([], $input_args);
+
+			case Select::TYPE_SELECT_MULTI:
+				return new EE_Select_Multiple_Input($options, $input_args);
+
+			// text type inputs
+			case Text::TYPE_TEXTAREA:
+			case Text::TYPE_TEXTAREA_HTML:
+				return new EE_Text_Area_Input($input_args);
 
-            case Text::TYPE_EMAIL:
-                return new EE_Email_Input($input_args);
+			case Text::TYPE_EMAIL:
+				return new EE_Email_Input($input_args);
 
-            case Text::TYPE_EMAIL_CONFIRMATION:
-                return new EE_Email_Confirm_Input($input_args);
+			case Text::TYPE_EMAIL_CONFIRMATION:
+				return new EE_Email_Confirm_Input($input_args);
 
-            case Text::TYPE_TEXT:
-            default:
-                return new EE_Text_Input($input_args);
-        }
-    }
+			case Text::TYPE_TEXT:
+			default:
+				return new EE_Text_Input($input_args);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
             100,
             $this
         );
-        $this->config->year_input->end_range   = (int) apply_filters(
+        $this->config->year_input->end_range = (int) apply_filters(
             'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__year_question__end_range',
             100,
             $this

core/domain/services/registration/form/v2/RegistrantFormSection.php

Indentation +160 added lines, -160 removed lines

@@ -18,175 +18,175 @@
 class RegistrantFormSection extends EE_Form_Section_Proper
 {
 
-    /**
-     * @var RegistrantFormInput
-     */
-    public $reg_form_input;
+	/**
+	 * @var RegistrantFormInput
+	 */
+	public $reg_form_input;
 
 
-    /**
-     * RegistrantFormSection constructor.
-     *
-     * @param EE_Registration     $registration
-     * @param EE_Form_Section     $form_section
-     * @param bool                $admin_request
-     * @param RegistrantFormInput $reg_form_input
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        bool $admin_request,
-        RegistrantFormInput $reg_form_input
-    ) {
-        $this->reg_form_input = $reg_form_input;
-        parent::__construct($this->generateFormArgs($registration, $form_section, $admin_request));
-    }
+	/**
+	 * RegistrantFormSection constructor.
+	 *
+	 * @param EE_Registration     $registration
+	 * @param EE_Form_Section     $form_section
+	 * @param bool                $admin_request
+	 * @param RegistrantFormInput $reg_form_input
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		bool $admin_request,
+		RegistrantFormInput $reg_form_input
+	) {
+		$this->reg_form_input = $reg_form_input;
+		parent::__construct($this->generateFormArgs($registration, $form_section, $admin_request));
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Form_Section $form_section
-     * @param bool            $admin_request
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function generateFormArgs(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        bool $admin_request
-    ): array {
-        $form_args   = $this->generateTopLevelFormArgs($registration, $form_section, $admin_request);
-        $form_inputs = $form_section->formElements();
-        // loop thru questions
-        foreach ($form_inputs as $form_input) {
-            if ($form_input instanceof EE_Form_Element) {
-                $form_args['subsections'][ $form_input->slug() ] = $this->reg_form_input->generateFormInput(
-                    $registration,
-                    $form_section,
-                    $form_input
-                );
-            }
-        }
-        $form_args['subsections'] = $this->filterFormSectionContent(
-            $registration,
-            $form_section,
-            $form_args['subsections']
-        );
-        return $form_args;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Form_Section $form_section
+	 * @param bool            $admin_request
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function generateFormArgs(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		bool $admin_request
+	): array {
+		$form_args   = $this->generateTopLevelFormArgs($registration, $form_section, $admin_request);
+		$form_inputs = $form_section->formElements();
+		// loop thru questions
+		foreach ($form_inputs as $form_input) {
+			if ($form_input instanceof EE_Form_Element) {
+				$form_args['subsections'][ $form_input->slug() ] = $this->reg_form_input->generateFormInput(
+					$registration,
+					$form_section,
+					$form_input
+				);
+			}
+		}
+		$form_args['subsections'] = $this->filterFormSectionContent(
+			$registration,
+			$form_section,
+			$form_args['subsections']
+		);
+		return $form_args;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Form_Section $form_section
-     * @param bool            $admin_request
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function generateTopLevelFormArgs(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        bool $admin_request
-    ): array {
-        return [
-            'html_id'         => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID(),
-            'html_class'      => $admin_request
-                ? 'form-table ee-reg-form-qstn-grp-dv'
-                : 'ee-reg-form-qstn-grp-dv',
-            'html_label_id'   => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID() . '-lbl',
-            'subsections'     => [
-                'reg_form_qstn_grp_hdr' => $this->formSectionHeader($form_section, $admin_request),
-            ],
-            'layout_strategy' => $admin_request
-                ? new EE_Admin_Two_Column_Layout()
-                : new EE_Div_Per_Section_Layout(),
-        ];
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Form_Section $form_section
+	 * @param bool            $admin_request
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function generateTopLevelFormArgs(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		bool $admin_request
+	): array {
+		return [
+			'html_id'         => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID(),
+			'html_class'      => $admin_request
+				? 'form-table ee-reg-form-qstn-grp-dv'
+				: 'ee-reg-form-qstn-grp-dv',
+			'html_label_id'   => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID() . '-lbl',
+			'subsections'     => [
+				'reg_form_qstn_grp_hdr' => $this->formSectionHeader($form_section, $admin_request),
+			],
+			'layout_strategy' => $admin_request
+				? new EE_Admin_Two_Column_Layout()
+				: new EE_Div_Per_Section_Layout(),
+		];
+	}
 
 
-    /**
-     * @param EE_Form_Section $form_section
-     * @param bool            $admin_request
-     * @return EE_Form_Section_HTML
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function formSectionHeader(EE_Form_Section $form_section, bool $admin_request): EE_Form_Section_HTML
-    {
-        $html  = '';
-        $label = $form_section->label();
-        // group_name
-        if ($label instanceof FormLabel && $label->showLabel()) {
-            if ($admin_request && $label->adminLabel() !== '') {
-                $html .= EEH_HTML::br();
-                $html .= EEH_HTML::h3(
-                    $label->adminLabel(),
-                    '',
-                    'ee-reg-form-qstn-grp-title title',
-                    'font-size: 1.3em; padding-left:0;'
-                );
-            } elseif (! $admin_request && $label->publicLabel() !== '') {
-                $html .= EEH_HTML::h4(
-                    $label->publicLabel(),
-                    '',
-                    'ee-reg-form-qstn-grp-title section-title'
-                );
-            }
-        }
-        // group_desc
-        // if ($question_group->show_group_desc() && $question_group->desc() !== '') {
-        //     $html .= EEH_HTML::p(
-        //         $question_group->desc(),
-        //         '',
-        //         $admin_request
-        //             ? 'ee-reg-form-qstn-grp-desc-pg'
-        //             : 'ee-reg-form-qstn-grp-desc-pg small-text lt-grey-text'
-        //     );
-        // }
-        return new EE_Form_Section_HTML($html);
-    }
+	/**
+	 * @param EE_Form_Section $form_section
+	 * @param bool            $admin_request
+	 * @return EE_Form_Section_HTML
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function formSectionHeader(EE_Form_Section $form_section, bool $admin_request): EE_Form_Section_HTML
+	{
+		$html  = '';
+		$label = $form_section->label();
+		// group_name
+		if ($label instanceof FormLabel && $label->showLabel()) {
+			if ($admin_request && $label->adminLabel() !== '') {
+				$html .= EEH_HTML::br();
+				$html .= EEH_HTML::h3(
+					$label->adminLabel(),
+					'',
+					'ee-reg-form-qstn-grp-title title',
+					'font-size: 1.3em; padding-left:0;'
+				);
+			} elseif (! $admin_request && $label->publicLabel() !== '') {
+				$html .= EEH_HTML::h4(
+					$label->publicLabel(),
+					'',
+					'ee-reg-form-qstn-grp-title section-title'
+				);
+			}
+		}
+		// group_desc
+		// if ($question_group->show_group_desc() && $question_group->desc() !== '') {
+		//     $html .= EEH_HTML::p(
+		//         $question_group->desc(),
+		//         '',
+		//         $admin_request
+		//             ? 'ee-reg-form-qstn-grp-desc-pg'
+		//             : 'ee-reg-form-qstn-grp-desc-pg small-text lt-grey-text'
+		//     );
+		// }
+		return new EE_Form_Section_HTML($html);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Form_Section $form_section
-     * @param array           $subsections
-     * @return array
-     */
-    private function filterFormSectionContent(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        array $subsections
-    ): array {
-        // filter for additional content before questions
-        $filtered = (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v2_RegistrantFormSection__filterFormSectionContent',
-            [
-                'before_inputs' => '',
-                'form_section'  => $subsections,
-                'after_inputs'  => '',
-            ],
-            $registration,
-            $form_section,
-            $this
-        );
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Form_Section $form_section
+	 * @param array           $subsections
+	 * @return array
+	 */
+	private function filterFormSectionContent(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		array $subsections
+	): array {
+		// filter for additional content before questions
+		$filtered = (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v2_RegistrantFormSection__filterFormSectionContent',
+			[
+				'before_inputs' => '',
+				'form_section'  => $subsections,
+				'after_inputs'  => '',
+			],
+			$registration,
+			$form_section,
+			$this
+		);
 
-        if (! isset($filtered['form_section'])) {
-            throw new RuntimeException(
-                esc_html__('Form Section arguments can not be removed.', 'event_espresso')
-            );
-        }
-        $form_args = $filtered['form_section'];
-        if (! empty($filtered['before_inputs'])) {
-            $form_args['reg_form_questions_before'] = new EE_Form_Section_HTML($filtered['before_inputs']);
-        }
-        if (! empty($filtered['after_inputs'])) {
-            $form_args['reg_form_questions_after'] = new EE_Form_Section_HTML($filtered['after_inputs']);
-        }
-        return $form_args;
-    }
+		if (! isset($filtered['form_section'])) {
+			throw new RuntimeException(
+				esc_html__('Form Section arguments can not be removed.', 'event_espresso')
+			);
+		}
+		$form_args = $filtered['form_section'];
+		if (! empty($filtered['before_inputs'])) {
+			$form_args['reg_form_questions_before'] = new EE_Form_Section_HTML($filtered['before_inputs']);
+		}
+		if (! empty($filtered['after_inputs'])) {
+			$form_args['reg_form_questions_after'] = new EE_Form_Section_HTML($filtered['after_inputs']);
+		}
+		return $form_args;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
         // loop thru questions
         foreach ($form_inputs as $form_input) {
             if ($form_input instanceof EE_Form_Element) {
-                $form_args['subsections'][ $form_input->slug() ] = $this->reg_form_input->generateFormInput(
+                $form_args['subsections'][$form_input->slug()] = $this->reg_form_input->generateFormInput(
                     $registration,
                     $form_section,
                     $form_input
@@ -93,11 +93,11 @@ 
         bool $admin_request
     ): array {
         return [
-            'html_id'         => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID(),
+            'html_id'         => 'ee-reg-form-qstn-grp-'.$form_section->slug().'-'.$registration->ID(),
             'html_class'      => $admin_request
                 ? 'form-table ee-reg-form-qstn-grp-dv'
                 : 'ee-reg-form-qstn-grp-dv',
-            'html_label_id'   => 'ee-reg-form-qstn-grp-' . $form_section->slug() . '-' . $registration->ID() . '-lbl',
+            'html_label_id'   => 'ee-reg-form-qstn-grp-'.$form_section->slug().'-'.$registration->ID().'-lbl',
             'subsections'     => [
                 'reg_form_qstn_grp_hdr' => $this->formSectionHeader($form_section, $admin_request),
             ],
@@ -129,7 +129,7 @@ 
                     'ee-reg-form-qstn-grp-title title',
                     'font-size: 1.3em; padding-left:0;'
                 );
-            } elseif (! $admin_request && $label->publicLabel() !== '') {
+            } elseif ( ! $admin_request && $label->publicLabel() !== '') {
                 $html .= EEH_HTML::h4(
                     $label->publicLabel(),
                     '',
@@ -175,16 +175,16 @@ 
             $this
         );
 
-        if (! isset($filtered['form_section'])) {
+        if ( ! isset($filtered['form_section'])) {
             throw new RuntimeException(
                 esc_html__('Form Section arguments can not be removed.', 'event_espresso')
             );
         }
         $form_args = $filtered['form_section'];
-        if (! empty($filtered['before_inputs'])) {
+        if ( ! empty($filtered['before_inputs'])) {
             $form_args['reg_form_questions_before'] = new EE_Form_Section_HTML($filtered['before_inputs']);
         }
-        if (! empty($filtered['after_inputs'])) {
+        if ( ! empty($filtered['after_inputs'])) {
             $form_args['reg_form_questions_after'] = new EE_Form_Section_HTML($filtered['after_inputs']);
         }
         return $form_args;

core/domain/services/registration/form/v2/RegistrantFormInput.php

Indentation +103 added lines, -103 removed lines

@@ -15,118 +15,118 @@
 class RegistrantFormInput
 {
 
-    /**
-     * @var callable
-     */
-    protected $addRequiredQuestion;
+	/**
+	 * @var callable
+	 */
+	protected $addRequiredQuestion;
 
-    /**
-     * @var JsonDataAPI
-     */
-    public $form_data_api;
+	/**
+	 * @var JsonDataAPI
+	 */
+	public $form_data_api;
 
-    /**
-     * @var FormInputFactory
-     */
-    public $form_input_factory;
+	/**
+	 * @var FormInputFactory
+	 */
+	public $form_input_factory;
 
-    /**
-     * @var   SystemInputFieldNames
-     * @since $VID:$
-     */
-    protected $system_input_field_names;
+	/**
+	 * @var   SystemInputFieldNames
+	 * @since $VID:$
+	 */
+	protected $system_input_field_names;
 
 
-    /**
-     * @param callable              $addRequiredQuestion
-     * @param JsonDataAPI           $form_data_api
-     * @param SystemInputFieldNames $system_input_field_names
-     */
-    public function __construct(
-        callable $addRequiredQuestion,
-        JsonDataAPI $form_data_api,
-        SystemInputFieldNames $system_input_field_names
-    ) {
-        $this->addRequiredQuestion      = $addRequiredQuestion;
-        $this->form_data_api            = $form_data_api;
-        $this->system_input_field_names = $system_input_field_names;
-        $this->form_input_factory       = new FormInputFactory(
-            new FormInputValidationStrategies(
-                new FieldLengthCalculator()
-            )
-        );
-    }
+	/**
+	 * @param callable              $addRequiredQuestion
+	 * @param JsonDataAPI           $form_data_api
+	 * @param SystemInputFieldNames $system_input_field_names
+	 */
+	public function __construct(
+		callable $addRequiredQuestion,
+		JsonDataAPI $form_data_api,
+		SystemInputFieldNames $system_input_field_names
+	) {
+		$this->addRequiredQuestion      = $addRequiredQuestion;
+		$this->form_data_api            = $form_data_api;
+		$this->system_input_field_names = $system_input_field_names;
+		$this->form_input_factory       = new FormInputFactory(
+			new FormInputValidationStrategies(
+				new FieldLengthCalculator()
+			)
+		);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Form_Section $form_section
-     * @param EE_Form_Element $form_input
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generateFormInput(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        EE_Form_Element $form_input
-    ): EE_Form_Input_Base {
-        $callback    = $this->addRequiredQuestion;
-        $required    = $form_input->required();
-        $is_required = $required instanceof Required ? $required->isRequired() : false;
-        $callback($form_input->slug(), $is_required);
-        $answer = $this->getAnswer($registration, $form_section, $form_input);
-        return $this->form_input_factory->create($registration, $form_input, $answer);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Form_Section $form_section
+	 * @param EE_Form_Element $form_input
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generateFormInput(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		EE_Form_Element $form_input
+	): EE_Form_Input_Base {
+		$callback    = $this->addRequiredQuestion;
+		$required    = $form_input->required();
+		$is_required = $required instanceof Required ? $required->isRequired() : false;
+		$callback($form_input->slug(), $is_required);
+		$answer = $this->getAnswer($registration, $form_section, $form_input);
+		return $this->form_input_factory->create($registration, $form_input, $answer);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Form_Section $form_section
-     * @param EE_Form_Element $form_input
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getAnswer(
-        EE_Registration $registration,
-        EE_Form_Section $form_section,
-        EE_Form_Element $form_input
-    ): string {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        // $input_name = $form_input->slug();
-        $path = "{$registration->reg_url_link()}.{$form_section->slug()}.{$form_input->slug()}";
-        \EEH_Debug_Tools::printr($path, '$path', __FILE__, __LINE__);
-        $answer = $this->form_data_api->get($path);
-        \EEH_Debug_Tools::printr($form_input->slug(), '$input_name', __FILE__, __LINE__);
-        \EEH_Debug_Tools::printr($answer, '$answer', __FILE__, __LINE__);
-        // \EEH_Debug_Tools::printr($this->form_data_api->jsonData(), '$this->form_data_api->jsonData()', __FILE__, __LINE__);
-        // if ($this->isAttendeeProperty($form_input) && empty($answer)) {
-        //     // if this question was for an attendee detail, then check for that answer
-        //     $answer = EEM_Answer::instance()->get_attendee_property_answer_value(
-        //         $registration,
-        //         $this->system_input_field_names->getInputName($input_name)
-        //     );
-        // }
-        // \EEH_Debug_Tools::printr($answer, '$answer', __FILE__, __LINE__);
-        return $answer ?: '';
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Form_Section $form_section
+	 * @param EE_Form_Element $form_input
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getAnswer(
+		EE_Registration $registration,
+		EE_Form_Section $form_section,
+		EE_Form_Element $form_input
+	): string {
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		// $input_name = $form_input->slug();
+		$path = "{$registration->reg_url_link()}.{$form_section->slug()}.{$form_input->slug()}";
+		\EEH_Debug_Tools::printr($path, '$path', __FILE__, __LINE__);
+		$answer = $this->form_data_api->get($path);
+		\EEH_Debug_Tools::printr($form_input->slug(), '$input_name', __FILE__, __LINE__);
+		\EEH_Debug_Tools::printr($answer, '$answer', __FILE__, __LINE__);
+		// \EEH_Debug_Tools::printr($this->form_data_api->jsonData(), '$this->form_data_api->jsonData()', __FILE__, __LINE__);
+		// if ($this->isAttendeeProperty($form_input) && empty($answer)) {
+		//     // if this question was for an attendee detail, then check for that answer
+		//     $answer = EEM_Answer::instance()->get_attendee_property_answer_value(
+		//         $registration,
+		//         $this->system_input_field_names->getInputName($input_name)
+		//     );
+		// }
+		// \EEH_Debug_Tools::printr($answer, '$answer', __FILE__, __LINE__);
+		return $answer ?: '';
+	}
 
 
-    /**
-     * @param EE_Form_Element $form_input
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function isAttendeeProperty(EE_Form_Element $form_input): bool
-    {
-        $maps_to = $form_input->mapsTo();
-        if ($maps_to && strpos($maps_to, 'Attendee.') === 0) {
-            $model_and_field = explode('.', $maps_to);
-            $field           = array_pop($model_and_field);
-            return $this->system_input_field_names->setAttendeeField($field, $form_input->slug());
-        }
-        return false;
-    }
+	/**
+	 * @param EE_Form_Element $form_input
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function isAttendeeProperty(EE_Form_Element $form_input): bool
+	{
+		$maps_to = $form_input->mapsTo();
+		if ($maps_to && strpos($maps_to, 'Attendee.') === 0) {
+			$model_and_field = explode('.', $maps_to);
+			$field           = array_pop($model_and_field);
+			return $this->system_input_field_names->setAttendeeField($field, $form_input->slug());
+		}
+		return false;
+	}
 }

core/domain/services/registration/form/v2/RegistrantForm.php

Indentation +95 added lines, -95 removed lines

@@ -15,105 +15,105 @@
 class RegistrantForm extends BaseRegistrantForm
 {
 
-    /**
-     * @var EEM_Form_Element
-     */
-    protected $form_input_model;
+	/**
+	 * @var EEM_Form_Element
+	 */
+	protected $form_input_model;
 
-    /**
-     * @var EEM_Form_Section
-     */
-    public $form_section_model;
+	/**
+	 * @var EEM_Form_Section
+	 */
+	public $form_section_model;
 
-    /**
-     * @var RegistrantFormInput
-     */
-    public $reg_form_input_factory;
+	/**
+	 * @var RegistrantFormInput
+	 */
+	public $reg_form_input_factory;
 
 
-    /**
-     * RegistrantForm constructor.
-     *
-     * @param EE_Registration     $registration
-     * @param bool                $admin_request
-     * @param bool                $copy_attendee_info
-     * @param callable            $enablePrintCopyInfo
-     * @param RegistrantFormInput $reg_form_input_factory
-     * @param EEM_Form_Element    $form_input_model
-     * @param EEM_Form_Section    $form_section_model
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo,
-        RegistrantFormInput $reg_form_input_factory,
-        EEM_Form_Element $form_input_model,
-        EEM_Form_Section $form_section_model
-    ) {
-        $this->reg_form_input_factory = $reg_form_input_factory;
-        $this->form_input_model       = $form_input_model;
-        $this->form_section_model     = $form_section_model;
-        parent::__construct(
-            $this->generateFormArgs($registration, $admin_request, $copy_attendee_info, $enablePrintCopyInfo)
-        );
-    }
+	/**
+	 * RegistrantForm constructor.
+	 *
+	 * @param EE_Registration     $registration
+	 * @param bool                $admin_request
+	 * @param bool                $copy_attendee_info
+	 * @param callable            $enablePrintCopyInfo
+	 * @param RegistrantFormInput $reg_form_input_factory
+	 * @param EEM_Form_Element    $form_input_model
+	 * @param EEM_Form_Section    $form_section_model
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo,
+		RegistrantFormInput $reg_form_input_factory,
+		EEM_Form_Element $form_input_model,
+		EEM_Form_Section $form_section_model
+	) {
+		$this->reg_form_input_factory = $reg_form_input_factory;
+		$this->form_input_model       = $form_input_model;
+		$this->form_section_model     = $form_section_model;
+		parent::__construct(
+			$this->generateFormArgs($registration, $admin_request, $copy_attendee_info, $enablePrintCopyInfo)
+		);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $admin_request
-     * @param bool            $copy_attendee_info
-     * @param callable        $enablePrintCopyInfo
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function generateFormArgs(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo
-    ): array {
-        static $attendee_nmbr = 1;
-        $this->form_args = [];
-        // verify that registration has valid event
-        if ($registration->event() instanceof EE_Event) {
-            $form_sections = $this->form_section_model->getFormSectionsForEvent($registration->event());
-            if ($form_sections) {
-                $all_form_inputs = $this->form_input_model->getAllFormElementsForFormSections($form_sections);
-                // array of params to pass to parent constructor
-                $this->form_args = $this->generateTopLevelFormArgs($registration, $admin_request, $attendee_nmbr);
-                foreach ($form_sections as $form_section) {
-                    if ($form_section instanceof EE_Form_Section) {
-                        // \EEH_Debug_Tools::printr($form_section->slug(), '$form_section->slug()', __FILE__, __LINE__);
-                        $form_inputs = $form_section->filterFormElements($all_form_inputs);
-                        if (empty($form_inputs)) {
-                            continue;
-                        }
-                        $form_section->setFormElements($form_inputs);
-                        $registrant_form_section                                 = LoaderFactory::getNew(
-                            RegistrantFormSection::class,
-                            [$registration, $form_section, $admin_request, $this->reg_form_input_factory]
-                        );
-                        $this->form_args['subsections'][ $form_section->slug() ] = apply_filters(
-                            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
-                            $registrant_form_section,
-                            $registration,
-                            $form_section,
-                            $this
-                        );
-                    }
-                }
-                $this->addAdditionalAttendeeRegInfoInput($registration);
-                $this->enablePrintCopyInfo($attendee_nmbr, $copy_attendee_info, $enablePrintCopyInfo);
-                $this->addAdditionalPrimaryRegistrantInputs($registration);
-            }
-        }
-        $attendee_nmbr++;
-        $this->setHasQuestions();
-        return $this->form_args;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $admin_request
+	 * @param bool            $copy_attendee_info
+	 * @param callable        $enablePrintCopyInfo
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function generateFormArgs(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo
+	): array {
+		static $attendee_nmbr = 1;
+		$this->form_args = [];
+		// verify that registration has valid event
+		if ($registration->event() instanceof EE_Event) {
+			$form_sections = $this->form_section_model->getFormSectionsForEvent($registration->event());
+			if ($form_sections) {
+				$all_form_inputs = $this->form_input_model->getAllFormElementsForFormSections($form_sections);
+				// array of params to pass to parent constructor
+				$this->form_args = $this->generateTopLevelFormArgs($registration, $admin_request, $attendee_nmbr);
+				foreach ($form_sections as $form_section) {
+					if ($form_section instanceof EE_Form_Section) {
+						// \EEH_Debug_Tools::printr($form_section->slug(), '$form_section->slug()', __FILE__, __LINE__);
+						$form_inputs = $form_section->filterFormElements($all_form_inputs);
+						if (empty($form_inputs)) {
+							continue;
+						}
+						$form_section->setFormElements($form_inputs);
+						$registrant_form_section                                 = LoaderFactory::getNew(
+							RegistrantFormSection::class,
+							[$registration, $form_section, $admin_request, $this->reg_form_input_factory]
+						);
+						$this->form_args['subsections'][ $form_section->slug() ] = apply_filters(
+							'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
+							$registrant_form_section,
+							$registration,
+							$form_section,
+							$this
+						);
+					}
+				}
+				$this->addAdditionalAttendeeRegInfoInput($registration);
+				$this->enablePrintCopyInfo($attendee_nmbr, $copy_attendee_info, $enablePrintCopyInfo);
+				$this->addAdditionalPrimaryRegistrantInputs($registration);
+			}
+		}
+		$attendee_nmbr++;
+		$this->setHasQuestions();
+		return $this->form_args;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -94,11 +94,11 @@
                             continue;
                         }
                         $form_section->setFormElements($form_inputs);
-                        $registrant_form_section                                 = LoaderFactory::getNew(
+                        $registrant_form_section = LoaderFactory::getNew(
                             RegistrantFormSection::class,
                             [$registration, $form_section, $admin_request, $this->reg_form_input_factory]
                         );
-                        $this->form_args['subsections'][ $form_section->slug() ] = apply_filters(
+                        $this->form_args['subsections'][$form_section->slug()] = apply_filters(
                             'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
                             $registrant_form_section,
                             $registration,

core/domain/services/registration/form/v2/FieldLengthCalculator.php

Indentation +99 added lines, -99 removed lines

@@ -17,103 +17,103 @@
 class FieldLengthCalculator
 {
 
-    /**
-     * @var array
-     */
-    private $max_field_lengths
-        = [
-            'Attendee.fname'         => 45,
-            'Attendee.lname'         => 45,
-            'Attendee.email'         => 255,
-            'Attendee.email_confirm' => 255,
-            'Attendee.address'       => 255,
-            'Attendee.address2'      => 255,
-            'Attendee.city'          => 45,
-            'Attendee.zip'           => 12,
-            'Attendee.phone'         => 45,
-        ];
-
-    /**
-     * @var array
-     */
-    private $min_field_lengths
-        = [
-            'Attendee.fname'         => 2,
-            'Attendee.lname'         => 2,
-            'Attendee.email'         => 8,
-            'Attendee.email_confirm' => 8,
-            'Attendee.zip'           => 4,
-            'Attendee.phone'         => 4,
-        ];
-
-
-    /**
-     * Returns an array where keys are Model + Field names in dot notation; ex: Attendee.email,
-     * and values are the highest question max the admin can set on the question
-     * (aka the "max max"; eg, a site admin can change the zip question to have a max
-     * of 5, but no larger than 12)
-     *
-     * @return array
-     */
-    public function maxFieldLengths(): array
-    {
-        return $this->max_field_lengths;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function minFieldLengths(): array
-    {
-        return $this->min_field_lengths;
-    }
-
-
-    /**
-     * @param string|null $model_field_name
-     * @return int|float
-     */
-    public function getMaxFieldLength(?string $model_field_name)
-    {
-        return $this->max_field_lengths[ $model_field_name ] ?? EE_INF;
-    }
-
-
-    /**
-     * @param string|null $model_field_name
-     * @return int|float
-     */
-    public function getMinFieldLength(?string $model_field_name)
-    {
-        return $this->min_field_lengths[ $model_field_name ] ?? 0;
-    }
-
-
-    /**
-     * @param EE_Form_Element $form_input
-     * @return int|float
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getMaxFieldLengthForInput(EE_Form_Element $form_input)
-    {
-        $max_field_length = $this->getMaxFieldLength($form_input->mapsTo());
-        $max_input_length = $form_input->getAttribute('max') ?: EE_INF;
-        return min($max_field_length, $max_input_length);
-    }
-
-
-    /**
-     * @param EE_Form_Element $form_input
-     * @return int|float
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getMinFieldLengthForInput(EE_Form_Element $form_input)
-    {
-        $min_field_length = $this->getMinFieldLength($form_input->mapsTo());
-        $min_input_length = $form_input->getAttribute('min') ?: 0;
-        return max($min_field_length, $min_input_length);
-    }
+	/**
+	 * @var array
+	 */
+	private $max_field_lengths
+		= [
+			'Attendee.fname'         => 45,
+			'Attendee.lname'         => 45,
+			'Attendee.email'         => 255,
+			'Attendee.email_confirm' => 255,
+			'Attendee.address'       => 255,
+			'Attendee.address2'      => 255,
+			'Attendee.city'          => 45,
+			'Attendee.zip'           => 12,
+			'Attendee.phone'         => 45,
+		];
+
+	/**
+	 * @var array
+	 */
+	private $min_field_lengths
+		= [
+			'Attendee.fname'         => 2,
+			'Attendee.lname'         => 2,
+			'Attendee.email'         => 8,
+			'Attendee.email_confirm' => 8,
+			'Attendee.zip'           => 4,
+			'Attendee.phone'         => 4,
+		];
+
+
+	/**
+	 * Returns an array where keys are Model + Field names in dot notation; ex: Attendee.email,
+	 * and values are the highest question max the admin can set on the question
+	 * (aka the "max max"; eg, a site admin can change the zip question to have a max
+	 * of 5, but no larger than 12)
+	 *
+	 * @return array
+	 */
+	public function maxFieldLengths(): array
+	{
+		return $this->max_field_lengths;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function minFieldLengths(): array
+	{
+		return $this->min_field_lengths;
+	}
+
+
+	/**
+	 * @param string|null $model_field_name
+	 * @return int|float
+	 */
+	public function getMaxFieldLength(?string $model_field_name)
+	{
+		return $this->max_field_lengths[ $model_field_name ] ?? EE_INF;
+	}
+
+
+	/**
+	 * @param string|null $model_field_name
+	 * @return int|float
+	 */
+	public function getMinFieldLength(?string $model_field_name)
+	{
+		return $this->min_field_lengths[ $model_field_name ] ?? 0;
+	}
+
+
+	/**
+	 * @param EE_Form_Element $form_input
+	 * @return int|float
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getMaxFieldLengthForInput(EE_Form_Element $form_input)
+	{
+		$max_field_length = $this->getMaxFieldLength($form_input->mapsTo());
+		$max_input_length = $form_input->getAttribute('max') ?: EE_INF;
+		return min($max_field_length, $max_input_length);
+	}
+
+
+	/**
+	 * @param EE_Form_Element $form_input
+	 * @return int|float
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getMinFieldLengthForInput(EE_Form_Element $form_input)
+	{
+		$min_field_length = $this->getMinFieldLength($form_input->mapsTo());
+		$min_input_length = $form_input->getAttribute('min') ?: 0;
+		return max($min_field_length, $min_input_length);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
      */
     public function getMaxFieldLength(?string $model_field_name)
     {
-        return $this->max_field_lengths[ $model_field_name ] ?? EE_INF;
+        return $this->max_field_lengths[$model_field_name] ?? EE_INF;
     }
 
 
@@ -86,7 +86,7 @@ 
      */
     public function getMinFieldLength(?string $model_field_name)
     {
-        return $this->min_field_lengths[ $model_field_name ] ?? 0;
+        return $this->min_field_lengths[$model_field_name] ?? 0;
     }
 
 

core/domain/services/registration/form/v2/SystemInputFieldNames.php

Indentation +92 added lines, -92 removed lines

@@ -14,106 +14,106 @@
 class SystemInputFieldNames implements SystemInputFieldNamesInterface
 {
 
-    /**
-     * ATTENDEE_FIELD_* constants are a 'balanced ternary' to simultaneously represent
-     * whether the requested field is a property and whether or not it has been set:
-     *
-     *  ATTENDEE_FIELD_SET (1)      indicates that the field IS an attendee field AND has been set
-     *  ATTENDEE_FIELD_NOT_SET (0)  indicates that the field IS an attendee field but has not yet been set
-     *  ATTENDEE_FIELD_UNKNOWN (-1) indicates that the field is NOT a known attendee field
-     */
-    const ATTENDEE_FIELD_SET     = 1;
+	/**
+	 * ATTENDEE_FIELD_* constants are a 'balanced ternary' to simultaneously represent
+	 * whether the requested field is a property and whether or not it has been set:
+	 *
+	 *  ATTENDEE_FIELD_SET (1)      indicates that the field IS an attendee field AND has been set
+	 *  ATTENDEE_FIELD_NOT_SET (0)  indicates that the field IS an attendee field but has not yet been set
+	 *  ATTENDEE_FIELD_UNKNOWN (-1) indicates that the field is NOT a known attendee field
+	 */
+	const ATTENDEE_FIELD_SET     = 1;
 
-    const ATTENDEE_FIELD_NOT_SET = 0;
+	const ATTENDEE_FIELD_NOT_SET = 0;
 
-    const ATTENDEE_FIELD_UNKNOWN = -1;
+	const ATTENDEE_FIELD_UNKNOWN = -1;
 
 
-    /**
-     * @var array
-     */
-    private $attendee_fields = [
-        'ATT_fname'     => null,
-        'ATT_lname'     => null,
-        'ATT_email'     => null,
-        'email_confirm' => null,
-        'ATT_address'   => null,
-        'ATT_address2'  => null,
-        'ATT_city'      => null,
-        'STA_ID'        => null,
-        'CNT_ISO'       => null,
-        'ATT_zip'       => null,
-        'ATT_phone'     => null,
-    ];
+	/**
+	 * @var array
+	 */
+	private $attendee_fields = [
+		'ATT_fname'     => null,
+		'ATT_lname'     => null,
+		'ATT_email'     => null,
+		'email_confirm' => null,
+		'ATT_address'   => null,
+		'ATT_address2'  => null,
+		'ATT_city'      => null,
+		'STA_ID'        => null,
+		'CNT_ISO'       => null,
+		'ATT_zip'       => null,
+		'ATT_phone'     => null,
+	];
 
 
-    /**
-     * @param string $field
-     * @return string
-     */
-    public function getInputName(string $field): string
-    {
-        switch ($field) {
-            case SystemInputFieldNamesInterface::FIRST_NAME && $this->attendeeFieldIsSet('ATT_fname'):
-                return $this->attendee_fields['ATT_fname'];
-            case SystemInputFieldNamesInterface::LAST_NAME && $this->attendeeFieldIsSet('ATT_lname'):
-                return $this->attendee_fields['ATT_lname'];
-            case SystemInputFieldNamesInterface::EMAIL && $this->attendeeFieldIsSet('ATT_email'):
-                return $this->attendee_fields['ATT_email'];
-            case SystemInputFieldNamesInterface::EMAIL_CONFIRM && $this->attendeeFieldIsSet('email_confirm'):
-                return $this->attendee_fields['email_confirm'];
-            case SystemInputFieldNamesInterface::ADDRESS && $this->attendeeFieldIsSet('ATT_address'):
-                return $this->attendee_fields['ATT_address'];
-            case SystemInputFieldNamesInterface::ADDRESS_2 && $this->attendeeFieldIsSet('ATT_address2'):
-                return $this->attendee_fields['ATT_address2'];
-            case SystemInputFieldNamesInterface::CITY && $this->attendeeFieldIsSet('ATT_city'):
-                return $this->attendee_fields['ATT_city'];
-            case SystemInputFieldNamesInterface::STATE && $this->attendeeFieldIsSet('STA_ID'):
-                return $this->attendee_fields['STA_ID'];
-            case SystemInputFieldNamesInterface::COUNTRY && $this->attendeeFieldIsSet('CNT_ISO'):
-                return $this->attendee_fields['CNT_ISO'];
-            case SystemInputFieldNamesInterface::POSTAL_CODE && $this->attendeeFieldIsSet('ATT_zip'):
-                return $this->attendee_fields['ATT_zip'];
-            case SystemInputFieldNamesInterface::PHONE && $this->attendeeFieldIsSet('ATT_phone'):
-                return $this->attendee_fields['ATT_phone'];
-        }
-        return $field;
-    }
+	/**
+	 * @param string $field
+	 * @return string
+	 */
+	public function getInputName(string $field): string
+	{
+		switch ($field) {
+			case SystemInputFieldNamesInterface::FIRST_NAME && $this->attendeeFieldIsSet('ATT_fname'):
+				return $this->attendee_fields['ATT_fname'];
+			case SystemInputFieldNamesInterface::LAST_NAME && $this->attendeeFieldIsSet('ATT_lname'):
+				return $this->attendee_fields['ATT_lname'];
+			case SystemInputFieldNamesInterface::EMAIL && $this->attendeeFieldIsSet('ATT_email'):
+				return $this->attendee_fields['ATT_email'];
+			case SystemInputFieldNamesInterface::EMAIL_CONFIRM && $this->attendeeFieldIsSet('email_confirm'):
+				return $this->attendee_fields['email_confirm'];
+			case SystemInputFieldNamesInterface::ADDRESS && $this->attendeeFieldIsSet('ATT_address'):
+				return $this->attendee_fields['ATT_address'];
+			case SystemInputFieldNamesInterface::ADDRESS_2 && $this->attendeeFieldIsSet('ATT_address2'):
+				return $this->attendee_fields['ATT_address2'];
+			case SystemInputFieldNamesInterface::CITY && $this->attendeeFieldIsSet('ATT_city'):
+				return $this->attendee_fields['ATT_city'];
+			case SystemInputFieldNamesInterface::STATE && $this->attendeeFieldIsSet('STA_ID'):
+				return $this->attendee_fields['STA_ID'];
+			case SystemInputFieldNamesInterface::COUNTRY && $this->attendeeFieldIsSet('CNT_ISO'):
+				return $this->attendee_fields['CNT_ISO'];
+			case SystemInputFieldNamesInterface::POSTAL_CODE && $this->attendeeFieldIsSet('ATT_zip'):
+				return $this->attendee_fields['ATT_zip'];
+			case SystemInputFieldNamesInterface::PHONE && $this->attendeeFieldIsSet('ATT_phone'):
+				return $this->attendee_fields['ATT_phone'];
+		}
+		return $field;
+	}
 
 
-    /**
-     * uses a "balanced ternary" to simultaneously represent
-     * whether the requested field is a property and whether or not it has been set:
-     *
-     *   1 indicates that the field IS an attendee field AND has been set
-     *   0 indicates that the field IS an attendee field but has not yet been set
-     *  -1 indicates that the field is NOT a known attendee field
-     *
-     * @param string $field
-     * @return int
-     */
-    public function attendeeFieldIsSet(string $field): int
-    {
-        if (! array_key_exists($field, $this->attendee_fields)) {
-            return self::ATTENDEE_FIELD_UNKNOWN;
-        }
-        return $this->attendee_fields[ $field ] !== null
-            ? self::ATTENDEE_FIELD_SET
-            : self::ATTENDEE_FIELD_NOT_SET;
-    }
+	/**
+	 * uses a "balanced ternary" to simultaneously represent
+	 * whether the requested field is a property and whether or not it has been set:
+	 *
+	 *   1 indicates that the field IS an attendee field AND has been set
+	 *   0 indicates that the field IS an attendee field but has not yet been set
+	 *  -1 indicates that the field is NOT a known attendee field
+	 *
+	 * @param string $field
+	 * @return int
+	 */
+	public function attendeeFieldIsSet(string $field): int
+	{
+		if (! array_key_exists($field, $this->attendee_fields)) {
+			return self::ATTENDEE_FIELD_UNKNOWN;
+		}
+		return $this->attendee_fields[ $field ] !== null
+			? self::ATTENDEE_FIELD_SET
+			: self::ATTENDEE_FIELD_NOT_SET;
+	}
 
 
-    /**
-     * @param string $field
-     * @param string $input_name
-     * @return bool
-     */
-    public function setAttendeeField(string $field, string $input_name): bool
-    {
-        if ($this->attendeeFieldIsSet($field) === self::ATTENDEE_FIELD_NOT_SET) {
-            $this->attendee_fields[ $field ] = $input_name;
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @param string $field
+	 * @param string $input_name
+	 * @return bool
+	 */
+	public function setAttendeeField(string $field, string $input_name): bool
+	{
+		if ($this->attendeeFieldIsSet($field) === self::ATTENDEE_FIELD_NOT_SET) {
+			$this->attendee_fields[ $field ] = $input_name;
+			return true;
+		}
+		return false;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -94,10 +94,10 @@ 
      */
     public function attendeeFieldIsSet(string $field): int
     {
-        if (! array_key_exists($field, $this->attendee_fields)) {
+        if ( ! array_key_exists($field, $this->attendee_fields)) {
             return self::ATTENDEE_FIELD_UNKNOWN;
         }
-        return $this->attendee_fields[ $field ] !== null
+        return $this->attendee_fields[$field] !== null
             ? self::ATTENDEE_FIELD_SET
             : self::ATTENDEE_FIELD_NOT_SET;
     }
@@ -111,7 +111,7 @@ 
     public function setAttendeeField(string $field, string $input_name): bool
     {
         if ($this->attendeeFieldIsSet($field) === self::ATTENDEE_FIELD_NOT_SET) {
-            $this->attendee_fields[ $field ] = $input_name;
+            $this->attendee_fields[$field] = $input_name;
             return true;
         }
         return false;

core/domain/services/registration/form/v2/FormSubmissionHandler.php

Indentation +106 added lines, -106 removed lines

@@ -14,114 +14,114 @@
 class FormSubmissionHandler
 {
 
-    /**
-     * @var EE_Form_Submission
-     */
-    private $form_submission;
-
-    /**
-     * @var EE_Checkout
-     */
-    private $checkout;
-
-
-    /**
-     * @param EE_Checkout $checkout
-     */
-    public function __construct(EE_Checkout $checkout)
-    {
-        $this->checkout = $checkout;
-
-        add_action(
-            'AHEE__EE_Form_Section_Proper__receive_form_submission__end',
-            [$this]
-        );
-        /*
+	/**
+	 * @var EE_Form_Submission
+	 */
+	private $form_submission;
+
+	/**
+	 * @var EE_Checkout
+	 */
+	private $checkout;
+
+
+	/**
+	 * @param EE_Checkout $checkout
+	 */
+	public function __construct(EE_Checkout $checkout)
+	{
+		$this->checkout = $checkout;
+
+		add_action(
+			'AHEE__EE_Form_Section_Proper__receive_form_submission__end',
+			[$this]
+		);
+		/*
             $req_data,
             $this,
             $validate
         */
-    }
-
-
-    /**
-     * @return JsonDataAPI
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getFormDataAPI(): JsonDataAPI
-    {
-        $this->getFormSubmission();
-        $form_data = $this->form_submission instanceof EE_Form_Submission ? $this->form_submission->data() : '{}';
-        return new JsonDataAPI($form_data);
-    }
-
-
-    /**
-     * @return EE_Form_Submission
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getFormSubmission(): EE_Form_Submission
-    {
-        if (! $this->form_submission instanceof EE_Form_Submission) {
-            $form_submission = $this->getFormSubmissionForTransaction($this->checkout->transaction);
-            if ($form_submission instanceof EE_Form_Submission) {
-                $this->setFormSubmission($form_submission);
-            }
-        }
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        \EEH_Debug_Tools::printr($this->form_submission->data(), '$this->form_submission->data()', __FILE__, __LINE__);
-        return $this->form_submission;
-    }
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @return EE_Form_Submission|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getFormSubmissionForTransaction(EE_Transaction $transaction): ?EE_Form_Submission
-    {
-        $form_submission = EEM_Form_Submission::instance()->getFormSubmissionForTransaction($transaction);
-        return $form_submission instanceof EE_Form_Submission ? $form_submission : null;
-        // if () {
-        // }
-        // return $this->generateFormSubmission($transaction);
-    }
-
-
-    /**
-     * @return EE_Form_Submission
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function generateFormSubmission(): EE_Form_Submission
-    {
-        $TXN_ID = $this->checkout->transaction->ID();
-        $form_data = $this->checkout->registration_form->valid_data();
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        \EEH_Debug_Tools::printr($TXN_ID, '$TXN_ID', __FILE__, __LINE__);
-        \EEH_Debug_Tools::printr($form_data, 'form data', __FILE__, __LINE__);
-        $form_submission = EE_Form_Submission::new_instance(
-            [
-                'FSB_UUID' => md5(uniqid($TXN_ID . time(), true)),
-                'FSC_UUID' => md5(uniqid($TXN_ID . time(), true)),
-                'FSB_data' => $form_data,
-                'TXN_ID'   => $TXN_ID,
-            ]
-        );
-        $form_submission->save();
-        return $form_submission;
-    }
-
-
-    /**
-     * @param EE_Form_Submission $form_submission
-     */
-    private function setFormSubmission(EE_Form_Submission $form_submission): void
-    {
-        $this->form_submission = $form_submission;
-    }
+	}
+
+
+	/**
+	 * @return JsonDataAPI
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getFormDataAPI(): JsonDataAPI
+	{
+		$this->getFormSubmission();
+		$form_data = $this->form_submission instanceof EE_Form_Submission ? $this->form_submission->data() : '{}';
+		return new JsonDataAPI($form_data);
+	}
+
+
+	/**
+	 * @return EE_Form_Submission
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getFormSubmission(): EE_Form_Submission
+	{
+		if (! $this->form_submission instanceof EE_Form_Submission) {
+			$form_submission = $this->getFormSubmissionForTransaction($this->checkout->transaction);
+			if ($form_submission instanceof EE_Form_Submission) {
+				$this->setFormSubmission($form_submission);
+			}
+		}
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		\EEH_Debug_Tools::printr($this->form_submission->data(), '$this->form_submission->data()', __FILE__, __LINE__);
+		return $this->form_submission;
+	}
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return EE_Form_Submission|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getFormSubmissionForTransaction(EE_Transaction $transaction): ?EE_Form_Submission
+	{
+		$form_submission = EEM_Form_Submission::instance()->getFormSubmissionForTransaction($transaction);
+		return $form_submission instanceof EE_Form_Submission ? $form_submission : null;
+		// if () {
+		// }
+		// return $this->generateFormSubmission($transaction);
+	}
+
+
+	/**
+	 * @return EE_Form_Submission
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function generateFormSubmission(): EE_Form_Submission
+	{
+		$TXN_ID = $this->checkout->transaction->ID();
+		$form_data = $this->checkout->registration_form->valid_data();
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		\EEH_Debug_Tools::printr($TXN_ID, '$TXN_ID', __FILE__, __LINE__);
+		\EEH_Debug_Tools::printr($form_data, 'form data', __FILE__, __LINE__);
+		$form_submission = EE_Form_Submission::new_instance(
+			[
+				'FSB_UUID' => md5(uniqid($TXN_ID . time(), true)),
+				'FSC_UUID' => md5(uniqid($TXN_ID . time(), true)),
+				'FSB_data' => $form_data,
+				'TXN_ID'   => $TXN_ID,
+			]
+		);
+		$form_submission->save();
+		return $form_submission;
+	}
+
+
+	/**
+	 * @param EE_Form_Submission $form_submission
+	 */
+	private function setFormSubmission(EE_Form_Submission $form_submission): void
+	{
+		$this->form_submission = $form_submission;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function getFormSubmission(): EE_Form_Submission
     {
-        if (! $this->form_submission instanceof EE_Form_Submission) {
+        if ( ! $this->form_submission instanceof EE_Form_Submission) {
             $form_submission = $this->getFormSubmissionForTransaction($this->checkout->transaction);
             if ($form_submission instanceof EE_Form_Submission) {
                 $this->setFormSubmission($form_submission);
@@ -106,8 +106,8 @@ 
         \EEH_Debug_Tools::printr($form_data, 'form data', __FILE__, __LINE__);
         $form_submission = EE_Form_Submission::new_instance(
             [
-                'FSB_UUID' => md5(uniqid($TXN_ID . time(), true)),
-                'FSC_UUID' => md5(uniqid($TXN_ID . time(), true)),
+                'FSB_UUID' => md5(uniqid($TXN_ID.time(), true)),
+                'FSC_UUID' => md5(uniqid($TXN_ID.time(), true)),
                 'FSB_data' => $form_data,
                 'TXN_ID'   => $TXN_ID,
             ]

core/domain/services/registration/form/v2/RegFormDependencyHandler.php

Indentation +65 added lines, -65 removed lines

@@ -7,69 +7,69 @@
 
 class RegFormDependencyHandler extends DependencyHandler
 {
-    /**
-     * @return void
-     */
-    public function registerDependencies()
-    {
-        $reg_form_dependencies = [
-            'EventEspresso\core\domain\services\registration\form\v2\RegForm'                  => [
-                null,
-                'FormSubmissionHandler'  => EE_Dependency_Map::load_from_cache,
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\RegistrantForm'           => [
-                null,
-                null,
-                null,
-                null,
-                'EEM_Form_Element' => EE_Dependency_Map::load_from_cache,
-                'EEM_Form_Section' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormSection'    => [
-                null,
-                null,
-                null,
-                'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormInput' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\base\CountryOptions'         => [
-                null,
-                'EEM_Answer'  => EE_Dependency_Map::load_from_cache,
-                'EEM_Country' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\base\StateOptions'           => [
-                null,
-                'EEM_State' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\RegFormHandler'           => [
-                null,
-                'EventEspresso\core\domain\services\registration\form\base\RegistrantData'         => EE_Dependency_Map::load_from_cache,
-                'EE_Form_Section_Proper'                                                           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\base\RegFormAttendeeFactory' => EE_Dependency_Map::load_from_cache,
-                'EE_Registration_Processor'                                                        => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\RegFormInputHandler'      => [
-                null,
-                null,
-                'EEM_Attendee'                                                                  => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\base\RegistrantData'      => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\v2\SystemInputFieldNames' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\base\RegFormAttendeeFactory' => [
-                'EventEspresso\core\services\commands\CommandBus'                          => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\base\RegistrantData' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormInput'      => [
-                null,
-                null,
-                'EventEspresso\core\domain\services\registration\form\v2\SystemInputFieldNames' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v2\FormSubmissionHandler'    => [
-                'EventEspresso\core\services\request\RequestInterface' => EE_Dependency_Map::load_from_cache,
-            ],
-        ];
-        foreach ($reg_form_dependencies as $class => $dependencies) {
-            $this->dependency_map->registerDependencies($class, $dependencies);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function registerDependencies()
+	{
+		$reg_form_dependencies = [
+			'EventEspresso\core\domain\services\registration\form\v2\RegForm'                  => [
+				null,
+				'FormSubmissionHandler'  => EE_Dependency_Map::load_from_cache,
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\RegistrantForm'           => [
+				null,
+				null,
+				null,
+				null,
+				'EEM_Form_Element' => EE_Dependency_Map::load_from_cache,
+				'EEM_Form_Section' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormSection'    => [
+				null,
+				null,
+				null,
+				'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormInput' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\base\CountryOptions'         => [
+				null,
+				'EEM_Answer'  => EE_Dependency_Map::load_from_cache,
+				'EEM_Country' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\base\StateOptions'           => [
+				null,
+				'EEM_State' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\RegFormHandler'           => [
+				null,
+				'EventEspresso\core\domain\services\registration\form\base\RegistrantData'         => EE_Dependency_Map::load_from_cache,
+				'EE_Form_Section_Proper'                                                           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\base\RegFormAttendeeFactory' => EE_Dependency_Map::load_from_cache,
+				'EE_Registration_Processor'                                                        => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\RegFormInputHandler'      => [
+				null,
+				null,
+				'EEM_Attendee'                                                                  => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\base\RegistrantData'      => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\v2\SystemInputFieldNames' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\base\RegFormAttendeeFactory' => [
+				'EventEspresso\core\services\commands\CommandBus'                          => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\base\RegistrantData' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\RegistrantFormInput'      => [
+				null,
+				null,
+				'EventEspresso\core\domain\services\registration\form\v2\SystemInputFieldNames' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v2\FormSubmissionHandler'    => [
+				'EventEspresso\core\services\request\RequestInterface' => EE_Dependency_Map::load_from_cache,
+			],
+		];
+		foreach ($reg_form_dependencies as $class => $dependencies) {
+			$this->dependency_map->registerDependencies($class, $dependencies);
+		}
+	}
 }