eventespresso / event-espresso-core

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);
+		}
+	}
 }

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

Indentation +146 added lines, -146 removed lines

@@ -25,150 +25,150 @@
 class RegFormHandler extends RegFormHandlerBase
 {
 
-    /**
-     * @var RegFormInputHandler
-     */
-    public $input_handler;
-
-    /**
-     * @var EE_Form_Submission
-     */
-    private $form_submission;
-
-
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        EE_Checkout $checkout,
-        RegistrantData $registrant_data,
-        EE_Form_Section_Proper $reg_form,
-        RegFormAttendeeFactory $attendee_factory,
-        EE_Registration_Processor $registration_processor
-    ) {
-        parent::__construct($checkout, $registrant_data, $reg_form, $attendee_factory, $registration_processor);
-    }
-
-
-    // /**
-    //  * @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 = EEM_Form_Submission::instance()->getFormSubmissionForTransaction(
-    //             $this->checkout->transaction
-    //         );
-    //         if (! $form_submission instanceof EE_Form_Submission) {
-    //             $TXN_ID = $this->checkout->transaction->ID();
-    //             $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' => $this->checkout->current_step->valid_data(),
-    //                     'TXN_ID'   => $TXN_ID,
-    //                 ]
-    //             );
-    //             $form_submission->save();
-    //         }
-    //         $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_Form_Submission $form_submission
-     */
-    public function setFormSubmission(EE_Form_Submission $form_submission): void
-    {
-        $this->form_submission = $form_submission;
-    }
-
-
-    public function initializeInputHandler()
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $reg_form            = $this->checkout->current_step->reg_form;
-        $required_questions  = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
-        $this->input_handler = LoaderFactory::getShared(
-            'EventEspresso\core\domain\services\registration\form\v2\RegFormInputHandler',
-            [$this->checkout->reg_url_link, $required_questions]
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array           $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function processRegFormData(
-        EE_Registration $registration,
-        string $reg_url_link,
-        array $reg_form_data
-    ): bool {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        \EEH_Debug_Tools::printr($reg_form_data, '$reg_form_data', __FILE__, __LINE__);
-        \EEH_Debug_Tools::printr($this->form_submission->data(), '$this->form_submission->data()', __FILE__, __LINE__);
-        if (isset($reg_form_data[ $reg_url_link ])) {
-            // do we need to copy basic info from primary attendee ?
-            $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-                            && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
-            $this->registrant_data->setCopyPrimary($copy_primary);
-            // filter form input data for this registration
-            $reg_form_data[ $reg_url_link ] = (array) apply_filters(
-                'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-                $reg_form_data[ $reg_url_link ]
-            );
-            if (isset($reg_form_data['primary_attendee'])) {
-                $primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
-                $this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
-                unset($reg_form_data['primary_attendee']);
-            }
-            // now loop through our array of valid post data && process attendee reg forms
-            foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
-                if (in_array($form_section, $this->non_input_form_sections, true)) {
-                    continue;
-                }
-                foreach ($form_inputs as $form_input => $input_value) {
-                    $input_processed = $this->input_handler->processFormInput(
-                        $registration,
-                        $reg_url_link,
-                        $form_input,
-                        $input_value
-                    );
-                    if (! $input_processed) {
-                        echo "\n############### ! input_processed #########################\n";
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-
-    // /**
-    //  * @param EE_Registration $registration
-    //  * @return void
-    //  * @throws EE_Error
-    //  * @throws InvalidArgumentException
-    //  * @throws ReflectionException
-    //  * @throws InvalidDataTypeException
-    //  * @throws InvalidInterfaceException
-    //  */
-    // private function associateRegistrationWithTransaction(EE_Registration $registration)
-    // {
-    //     // add relation to registration
-    //     $this->checkout->transaction->_add_relation_to($registration, 'Registration');
-    //     $this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
-    // }
+	/**
+	 * @var RegFormInputHandler
+	 */
+	public $input_handler;
+
+	/**
+	 * @var EE_Form_Submission
+	 */
+	private $form_submission;
+
+
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		EE_Checkout $checkout,
+		RegistrantData $registrant_data,
+		EE_Form_Section_Proper $reg_form,
+		RegFormAttendeeFactory $attendee_factory,
+		EE_Registration_Processor $registration_processor
+	) {
+		parent::__construct($checkout, $registrant_data, $reg_form, $attendee_factory, $registration_processor);
+	}
+
+
+	// /**
+	//  * @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 = EEM_Form_Submission::instance()->getFormSubmissionForTransaction(
+	//             $this->checkout->transaction
+	//         );
+	//         if (! $form_submission instanceof EE_Form_Submission) {
+	//             $TXN_ID = $this->checkout->transaction->ID();
+	//             $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' => $this->checkout->current_step->valid_data(),
+	//                     'TXN_ID'   => $TXN_ID,
+	//                 ]
+	//             );
+	//             $form_submission->save();
+	//         }
+	//         $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_Form_Submission $form_submission
+	 */
+	public function setFormSubmission(EE_Form_Submission $form_submission): void
+	{
+		$this->form_submission = $form_submission;
+	}
+
+
+	public function initializeInputHandler()
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$reg_form            = $this->checkout->current_step->reg_form;
+		$required_questions  = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
+		$this->input_handler = LoaderFactory::getShared(
+			'EventEspresso\core\domain\services\registration\form\v2\RegFormInputHandler',
+			[$this->checkout->reg_url_link, $required_questions]
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array           $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function processRegFormData(
+		EE_Registration $registration,
+		string $reg_url_link,
+		array $reg_form_data
+	): bool {
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		\EEH_Debug_Tools::printr($reg_form_data, '$reg_form_data', __FILE__, __LINE__);
+		\EEH_Debug_Tools::printr($this->form_submission->data(), '$this->form_submission->data()', __FILE__, __LINE__);
+		if (isset($reg_form_data[ $reg_url_link ])) {
+			// do we need to copy basic info from primary attendee ?
+			$copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
+							&& absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+			$this->registrant_data->setCopyPrimary($copy_primary);
+			// filter form input data for this registration
+			$reg_form_data[ $reg_url_link ] = (array) apply_filters(
+				'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
+				$reg_form_data[ $reg_url_link ]
+			);
+			if (isset($reg_form_data['primary_attendee'])) {
+				$primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
+				$this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
+				unset($reg_form_data['primary_attendee']);
+			}
+			// now loop through our array of valid post data && process attendee reg forms
+			foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+				if (in_array($form_section, $this->non_input_form_sections, true)) {
+					continue;
+				}
+				foreach ($form_inputs as $form_input => $input_value) {
+					$input_processed = $this->input_handler->processFormInput(
+						$registration,
+						$reg_url_link,
+						$form_input,
+						$input_value
+					);
+					if (! $input_processed) {
+						echo "\n############### ! input_processed #########################\n";
+						return false;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+
+	// /**
+	//  * @param EE_Registration $registration
+	//  * @return void
+	//  * @throws EE_Error
+	//  * @throws InvalidArgumentException
+	//  * @throws ReflectionException
+	//  * @throws InvalidDataTypeException
+	//  * @throws InvalidInterfaceException
+	//  */
+	// private function associateRegistrationWithTransaction(EE_Registration $registration)
+	// {
+	//     // add relation to registration
+	//     $this->checkout->transaction->_add_relation_to($registration, 'Registration');
+	//     $this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
+	// }
 }

Spacing +7 added lines, -7 removed lines

@@ -118,15 +118,15 @@ 
         \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
         \EEH_Debug_Tools::printr($reg_form_data, '$reg_form_data', __FILE__, __LINE__);
         \EEH_Debug_Tools::printr($this->form_submission->data(), '$this->form_submission->data()', __FILE__, __LINE__);
-        if (isset($reg_form_data[ $reg_url_link ])) {
+        if (isset($reg_form_data[$reg_url_link])) {
             // do we need to copy basic info from primary attendee ?
-            $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-                            && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+            $copy_primary = isset($reg_form_data[$reg_url_link]['additional_attendee_reg_info'])
+                            && absint($reg_form_data[$reg_url_link]['additional_attendee_reg_info']) === 0;
             $this->registrant_data->setCopyPrimary($copy_primary);
             // filter form input data for this registration
-            $reg_form_data[ $reg_url_link ] = (array) apply_filters(
+            $reg_form_data[$reg_url_link] = (array) apply_filters(
                 'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-                $reg_form_data[ $reg_url_link ]
+                $reg_form_data[$reg_url_link]
             );
             if (isset($reg_form_data['primary_attendee'])) {
                 $primary_reg_url_link = $reg_form_data['primary_attendee'] ?? '';
@@ -134,7 +134,7 @@ 
                 unset($reg_form_data['primary_attendee']);
             }
             // now loop through our array of valid post data && process attendee reg forms
-            foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+            foreach ($reg_form_data[$reg_url_link] as $form_section => $form_inputs) {
                 if (in_array($form_section, $this->non_input_form_sections, true)) {
                     continue;
                 }
@@ -145,7 +145,7 @@ 
                         $form_input,
                         $input_value
                     );
-                    if (! $input_processed) {
+                    if ( ! $input_processed) {
                         echo "\n############### ! input_processed #########################\n";
                         return false;
                     }

core/domain/services/registration/form/SystemInputFieldNamesInterface.php

Indentation +16 added lines, -16 removed lines

@@ -4,32 +4,32 @@
 
 interface SystemInputFieldNamesInterface
 {
-    const FIRST_NAME    = 'first-name';
+	const FIRST_NAME    = 'first-name';
 
-    const LAST_NAME     = 'last-name';
+	const LAST_NAME     = 'last-name';
 
-    const EMAIL         = 'email';
+	const EMAIL         = 'email';
 
-    const EMAIL_CONFIRM = 'email-confirmation';
+	const EMAIL_CONFIRM = 'email-confirmation';
 
-    const ADDRESS       = 'address';
+	const ADDRESS       = 'address';
 
-    const ADDRESS_2     = 'address-2';
+	const ADDRESS_2     = 'address-2';
 
-    const CITY          = 'city';
+	const CITY          = 'city';
 
-    const STATE         = 'state';
+	const STATE         = 'state';
 
-    const COUNTRY       = 'country';
+	const COUNTRY       = 'country';
 
-    const POSTAL_CODE   = 'postal-code';
+	const POSTAL_CODE   = 'postal-code';
 
-    const PHONE         = 'phone';
+	const PHONE         = 'phone';
 
 
-    /**
-     * @param string $field
-     * @return string
-     */
-    public function getInputName(string $field): string;
+	/**
+	 * @param string $field
+	 * @return string
+	 */
+	public function getInputName(string $field): string;
 }

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

Indentation +38 added lines, -38 removed lines

@@ -21,44 +21,44 @@
 class RegForm extends RegFormBase
 {
 
-    /**
-     * 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
-    ) {
-        LoaderFactory::getShared(RegFormQuestionFactory::class, [[$this, 'addRequiredQuestion']]);
-        parent::__construct($reg_step, $reg_config);
-    }
+	/**
+	 * 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
+	) {
+		LoaderFactory::getShared(RegFormQuestionFactory::class, [[$this, 'addRequiredQuestion']]);
+		parent::__construct($reg_step, $reg_config);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $admin_request
-     * @param bool            $copy_attendee_info
-     * @param callable        $enablePrintCopyInfo
-     * @return RegistrantFormInterface
-     */
-    protected function getRegistrantForm(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo
-    ): RegistrantFormInterface {
-        return LoaderFactory::getNew(
-            RegistrantForm::class,
-            [
-                $registration,
-                $admin_request,
-                $copy_attendee_info,
-                $enablePrintCopyInfo,
-            ]
-        );
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $admin_request
+	 * @param bool            $copy_attendee_info
+	 * @param callable        $enablePrintCopyInfo
+	 * @return RegistrantFormInterface
+	 */
+	protected function getRegistrantForm(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo
+	): RegistrantFormInterface {
+		return LoaderFactory::getNew(
+			RegistrantForm::class,
+			[
+				$registration,
+				$admin_request,
+				$copy_attendee_info,
+				$enablePrintCopyInfo,
+			]
+		);
+	}
 }

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

Indentation +265 added lines, -265 removed lines

@@ -16,295 +16,295 @@
 class RegFormInputHandler
 {
 
-    /**
-     * @var EEM_Attendee
-     */
-    protected $attendee_model;
+	/**
+	 * @var EEM_Attendee
+	 */
+	protected $attendee_model;
 
-    /**
-     * @var string
-     */
-    protected $checkout_reg_url_link;
+	/**
+	 * @var string
+	 */
+	protected $checkout_reg_url_link;
 
-    /**
-     * @var array
-     */
-    protected $non_persistable_fields = [SystemInputFieldNamesInterface::EMAIL_CONFIRM];
+	/**
+	 * @var array
+	 */
+	protected $non_persistable_fields = [SystemInputFieldNamesInterface::EMAIL_CONFIRM];
 
-    /**
-     * @var RegistrantData
-     */
-    protected $registrant_data;
+	/**
+	 * @var RegistrantData
+	 */
+	protected $registrant_data;
 
-    /**
-     * @var array
-     */
-    protected $required_questions;
+	/**
+	 * @var array
+	 */
+	protected $required_questions;
 
-    /**
-     * @var SystemInputFieldNamesInterface
-     */
-    protected $system_input_field_names;
+	/**
+	 * @var SystemInputFieldNamesInterface
+	 */
+	protected $system_input_field_names;
 
 
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        string $checkout_reg_url_link,
-        array $required_questions,
-        EEM_Attendee $attendee_model,
-        RegistrantData $registrant_data,
-        SystemInputFieldNamesInterface $system_input_field_names
-    ) {
-        $this->attendee_model           = $attendee_model;
-        $this->checkout_reg_url_link    = $checkout_reg_url_link;
-        $this->registrant_data          = $registrant_data;
-        $this->required_questions       = $required_questions;
-        $this->system_input_field_names = $system_input_field_names;
-    }
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		string $checkout_reg_url_link,
+		array $required_questions,
+		EEM_Attendee $attendee_model,
+		RegistrantData $registrant_data,
+		SystemInputFieldNamesInterface $system_input_field_names
+	) {
+		$this->attendee_model           = $attendee_model;
+		$this->checkout_reg_url_link    = $checkout_reg_url_link;
+		$this->registrant_data          = $registrant_data;
+		$this->required_questions       = $required_questions;
+		$this->system_input_field_names = $system_input_field_names;
+	}
 
 
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $field
-     * @param float|int|string $value
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function processFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $field,
-        $value
-    ): bool {
-        // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($field, $value)) {
-            echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
-            return false;
-        }
-        $value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
-            $reg_url_link,
-            $field,
-            $value
-        );
-        \EEH_Debug_Tools::printr($value, ' value >>====> ', __FILE__, __LINE__);
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $field, $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'
-                    ),
-                    $field,
-                    $value
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $field
+	 * @param float|int|string $value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function processFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$field,
+		$value
+	): bool {
+		// check for critical inputs
+		if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($field, $value)) {
+			echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
+			return false;
+		}
+		$value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
+			$reg_url_link,
+			$field,
+			$value
+		);
+		\EEH_Debug_Tools::printr($value, ' value >>====> ', __FILE__, __LINE__);
+		if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $field, $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'
+					),
+					$field,
+					$value
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		return true;
+	}
 
 
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $field the form input name
-     * @param float|int|string $value the input value
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function saveRegistrationFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $field = '',
-        $value = ''
-    ): bool {
-        if ($this->bypassSaveRegFormInputValue($registration, $field, $value)) {
-            echo "\n#############################################################\n";
-            return true;
-        }
-        /*
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $field the form input name
+	 * @param float|int|string $value the input value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function saveRegistrationFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$field = '',
+		$value = ''
+	): bool {
+		if ($this->bypassSaveRegFormInputValue($registration, $field, $value)) {
+			echo "\n#############################################################\n";
+			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
-            ? $field . '-' . $reg_url_link
-            : $field;
-        $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
-        $answer_is_obj     = $registrant_answer instanceof EE_Answer;
-        // if this form input has a corresponding attendee property
-        if ($this->isAttendeeProperty($field)) {
-            $this->saveAttendeeProperty($registration, $reg_url_link, $field, $value, $registrant_answer);
-            return true;
-        }
-        if ($answer_is_obj) {
-            // save this data to the answer object
-            $registrant_answer->set_value($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($value);
-                $result = $answer->save();
-                return $result !== false;
-            }
-        }
-        return false;
-    }
+		$answer_cache_id   = $this->checkout_reg_url_link
+			? $field . '-' . $reg_url_link
+			: $field;
+		$registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
+		$answer_is_obj     = $registrant_answer instanceof EE_Answer;
+		// if this form input has a corresponding attendee property
+		if ($this->isAttendeeProperty($field)) {
+			$this->saveAttendeeProperty($registration, $reg_url_link, $field, $value, $registrant_answer);
+			return true;
+		}
+		if ($answer_is_obj) {
+			// save this data to the answer object
+			$registrant_answer->set_value($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($value);
+				$result = $answer->save();
+				return $result !== false;
+			}
+		}
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $field
-     * @param mixed           $value
-     * @return bool
-     */
-    protected function bypassSaveRegFormInputValue(EE_Registration $registration, string $field, $value): bool
-    {
-        // fields like the "email confirmation" input are sent, but not saved
-        if (in_array($field, $this->non_persistable_fields, true)) {
-            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.
-        // NOTE: this hook does the opposite of what its name implies...
-        // ie: returning true does NOT save the input here, meaning it needs to be saved externally.
-        // This should have been named something like  "bypass_save_registration_form_input"
-        return filter_var(
-            apply_filters(
-                'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
-                false,
-                $registration,
-                $field,
-                $value,
-                $this
-            ),
-            FILTER_VALIDATE_BOOLEAN
-        );
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $field
+	 * @param mixed           $value
+	 * @return bool
+	 */
+	protected function bypassSaveRegFormInputValue(EE_Registration $registration, string $field, $value): bool
+	{
+		// fields like the "email confirmation" input are sent, but not saved
+		if (in_array($field, $this->non_persistable_fields, true)) {
+			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.
+		// NOTE: this hook does the opposite of what its name implies...
+		// ie: returning true does NOT save the input here, meaning it needs to be saved externally.
+		// This should have been named something like  "bypass_save_registration_form_input"
+		return filter_var(
+			apply_filters(
+				'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
+				false,
+				$registration,
+				$field,
+				$value,
+				$this
+			),
+			FILTER_VALIDATE_BOOLEAN
+		);
+	}
 
 
-    /**
-     * @param string $field
-     * @return bool
-     */
-    private function isAttendeeProperty(string $field): bool
-    {
-        // \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        // \EEH_Debug_Tools::printr($field, '$field', __FILE__, __LINE__);
-        switch ($field) {
-            case 'state':
-            case 'STA_ID':
-            case 'country':
-            case 'CNT_ISO':
-                return true;
-            default:
-                return $this->attendee_model->has_field("ATT_$field");
-        }
-    }
+	/**
+	 * @param string $field
+	 * @return bool
+	 */
+	private function isAttendeeProperty(string $field): bool
+	{
+		// \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		// \EEH_Debug_Tools::printr($field, '$field', __FILE__, __LINE__);
+		switch ($field) {
+			case 'state':
+			case 'STA_ID':
+			case 'country':
+			case 'CNT_ISO':
+				return true;
+			default:
+				return $this->attendee_model->has_field("ATT_$field");
+		}
+	}
 
 
-    /**
-     * @param string $field
-     * @return string
-     */
-    protected function renameFormInput(string $field): string
-    {
-        switch ($field) {
-            case 'state':
-            case 'STA_ID':
-                return 'STA_ID';
+	/**
+	 * @param string $field
+	 * @return string
+	 */
+	protected function renameFormInput(string $field): string
+	{
+		switch ($field) {
+			case 'state':
+			case 'STA_ID':
+				return 'STA_ID';
 
-            case 'country':
-            case 'CNT_ISO':
-                return 'CNT_ISO';
+			case 'country':
+			case 'CNT_ISO':
+				return 'CNT_ISO';
 
-            default:
-                return "ATT_$field";
-        }
-    }
+			default:
+				return "ATT_$field";
+		}
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param string          $field
-     * @param                 $value
-     * @param                 $registrant_answer
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function saveAttendeeProperty(
-        EE_Registration $registration,
-        string $reg_url_link,
-        string $field,
-        $value,
-        $registrant_answer
-    ) {
-        // rename form_inputs if they are EE_Attendee properties
-        $field = $this->renameFormInput($field);
-        $this->registrant_data->addRegistrantDataValue($reg_url_link, $field, $value);
-        if ($registrant_answer instanceof EE_Answer) {
-            // 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();
-        }
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param string          $field
+	 * @param                 $value
+	 * @param                 $registrant_answer
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function saveAttendeeProperty(
+		EE_Registration $registration,
+		string $reg_url_link,
+		string $field,
+		$value,
+		$registrant_answer
+	) {
+		// rename form_inputs if they are EE_Attendee properties
+		$field = $this->renameFormInput($field);
+		$this->registrant_data->addRegistrantDataValue($reg_url_link, $field, $value);
+		if ($registrant_answer instanceof EE_Answer) {
+			// 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();
+		}
+	}
 
 
-    /**
-     * @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;
-    }
+	/**
+	 * @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;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -81,7 +81,7 @@ 
         $value
     ): bool {
         // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($field, $value)) {
+        if ( ! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($field, $value)) {
             echo "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n";
             return false;
         }
@@ -91,7 +91,7 @@ 
             $value
         );
         \EEH_Debug_Tools::printr($value, ' value >>====> ', __FILE__, __LINE__);
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $field, $value)) {
+        if ( ! $this->saveRegistrationFormInput($registration, $reg_url_link, $field, $value)) {
             EE_Error::add_error(
                 sprintf(
                     esc_html_x(
@@ -139,7 +139,7 @@ 
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
         $answer_cache_id   = $this->checkout_reg_url_link
-            ? $field . '-' . $reg_url_link
+            ? $field.'-'.$reg_url_link
             : $field;
         $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
         $answer_is_obj     = $registrant_answer instanceof EE_Answer;
@@ -275,7 +275,7 @@ 
     ): 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 ]) {
+            if ( ! isset($this->required_questions[$form_input]) || ! $this->required_questions[$form_input]) {
                 return true;
             }
             switch ($form_input) {