eventespresso / event-espresso-core

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

Indentation +100 added lines, -100 removed lines

@@ -16,113 +16,113 @@
 class RegFormAttendeeFactory
 {
 
-    /**
-     * @var CommandBusInterface
-     */
-    public $command_bus;
+	/**
+	 * @var CommandBusInterface
+	 */
+	public $command_bus;
 
-    /**
-     * @var RegistrantData
-     */
-    private $registrant_data;
+	/**
+	 * @var RegistrantData
+	 */
+	private $registrant_data;
 
 
-    /**
-     * RegFormAttendeeFactory constructor.
-     *
-     * @param CommandBusInterface $command_bus
-     * @param RegistrantData      $registrant_data
-     */
-    public function __construct(CommandBusInterface $command_bus, RegistrantData $registrant_data)
-    {
-        $this->command_bus     = $command_bus;
-        $this->registrant_data = $registrant_data;
-    }
+	/**
+	 * RegFormAttendeeFactory constructor.
+	 *
+	 * @param CommandBusInterface $command_bus
+	 * @param RegistrantData      $registrant_data
+	 */
+	public function __construct(CommandBusInterface $command_bus, RegistrantData $registrant_data)
+	{
+		$this->command_bus     = $command_bus;
+		$this->registrant_data = $registrant_data;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function create(EE_Registration $registration, string $reg_url_link): bool
-    {
-        // this registration does not require additional attendee information ?
-        if (
-            $this->registrant_data->copyPrimary()
-            && $this->registrant_data->attendeeCount() > 1
-            && $this->registrant_data->primaryRegistrantIsValid()
-        ) {
-            // just copy the primary registrant
-            $attendee = $this->registrant_data->primaryRegistrant();
-        } else {
-            // ensure critical details are set for additional attendees
-            // raw form data was already set during call to processRegFormData()
-            $this->registrant_data->ensureCriticalRegistrantDataIsSet($reg_url_link);
-            // execute create attendee command (which may return an existing attendee)
-            $attendee = $this->command_bus->execute(
-                new CreateAttendeeCommand(
-                    $this->registrant_data->getRegistrantData($reg_url_link),
-                    $registration
-                )
-            );
-            // who's #1 ?
-            if ($this->registrant_data->currentRegistrantIsPrimary()) {
-                $this->registrant_data->setPrimaryRegistrant($attendee);
-            }
-        }
-        // add relation to registration, set attendee ID, and cache attendee
-        $this->associateAttendeeWithRegistration($registration, $attendee);
-        return $this->isValidAttendee($registration, $reg_url_link);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function create(EE_Registration $registration, string $reg_url_link): bool
+	{
+		// this registration does not require additional attendee information ?
+		if (
+			$this->registrant_data->copyPrimary()
+			&& $this->registrant_data->attendeeCount() > 1
+			&& $this->registrant_data->primaryRegistrantIsValid()
+		) {
+			// just copy the primary registrant
+			$attendee = $this->registrant_data->primaryRegistrant();
+		} else {
+			// ensure critical details are set for additional attendees
+			// raw form data was already set during call to processRegFormData()
+			$this->registrant_data->ensureCriticalRegistrantDataIsSet($reg_url_link);
+			// execute create attendee command (which may return an existing attendee)
+			$attendee = $this->command_bus->execute(
+				new CreateAttendeeCommand(
+					$this->registrant_data->getRegistrantData($reg_url_link),
+					$registration
+				)
+			);
+			// who's #1 ?
+			if ($this->registrant_data->currentRegistrantIsPrimary()) {
+				$this->registrant_data->setPrimaryRegistrant($attendee);
+			}
+		}
+		// add relation to registration, set attendee ID, and cache attendee
+		$this->associateAttendeeWithRegistration($registration, $attendee);
+		return $this->isValidAttendee($registration, $reg_url_link);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @return bool
-     * @throws EE_Error
-     */
-    private function isValidAttendee(EE_Registration $registration, string $reg_url_link): bool
-    {
-        if ($registration->attendee() instanceof EE_Attendee) {
-            return true;
-        }
-        EE_Error::add_error(
-            sprintf(
-                esc_html_x(
-                    'Registration %s has an invalid or missing Attendee object.',
-                    'Registration 123-456-789 has an invalid or missing Attendee object.',
-                    'event_espresso'
-                ),
-                $reg_url_link
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	private function isValidAttendee(EE_Registration $registration, string $reg_url_link): bool
+	{
+		if ($registration->attendee() instanceof EE_Attendee) {
+			return true;
+		}
+		EE_Error::add_error(
+			sprintf(
+				esc_html_x(
+					'Registration %s has an invalid or missing Attendee object.',
+					'Registration 123-456-789 has an invalid or missing Attendee object.',
+					'event_espresso'
+				),
+				$reg_url_link
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Attendee     $attendee
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function associateAttendeeWithRegistration(EE_Registration $registration, EE_Attendee $attendee)
-    {
-        // add relation to attendee
-        $registration->_add_relation_to($attendee, 'Attendee');
-        $registration->set_attendee_id($attendee->ID());
-        $registration->update_cache_after_object_save('Attendee', $attendee);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Attendee     $attendee
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function associateAttendeeWithRegistration(EE_Registration $registration, EE_Attendee $attendee)
+	{
+		// add relation to attendee
+		$registration->_add_relation_to($attendee, 'Attendee');
+		$registration->set_attendee_id($attendee->ID());
+		$registration->update_cache_after_object_save('Attendee', $attendee);
+	}
 }

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

Indentation +57 added lines, -57 removed lines

@@ -7,61 +7,61 @@
 
 class RegFormDependencyHandler extends DependencyHandler
 {
-    /**
-     * @return void
-     */
-    public function registerDependencies()
-    {
-        $reg_form_dependencies = [
-            'EventEspresso\core\domain\services\registration\form\v1\RegForm'                => [
-                null,
-                'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegistrantForm'         => [
-                null,
-                null,
-                null,
-                null,
-                'EEM_Event_Question_Group' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory' => [
-                null,
-                'EEM_Answer' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionGroup'   => [
-                null,
-                null,
-                null,
-                'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\CountryOptions'         => [
-                null,
-                'EEM_Answer'  => EE_Dependency_Map::load_from_cache,
-                'EEM_Country' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\StateOptions'           => [
-                null,
-                'EEM_State' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormHandler'         => [
-                null,
-                'EventEspresso\core\domain\services\registration\form\v1\RegistrantData'         => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\v1\RegFormAttendeeFactory' => EE_Dependency_Map::load_from_cache,
-                'EE_Registration_Processor'                                                      => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormInputHandler'    => [
-                null,
-                null,
-                'EEM_Attendee'                                                           => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\v1\RegistrantData' => EE_Dependency_Map::load_from_cache,
-            ],
-            'EventEspresso\core\domain\services\registration\form\v1\RegFormAttendeeFactory' => [
-                'EventEspresso\core\services\commands\CommandBus'                        => EE_Dependency_Map::load_from_cache,
-                'EventEspresso\core\domain\services\registration\form\v1\RegistrantData' => 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\v1\RegForm'                => [
+				null,
+				'EE_Registration_Config' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegistrantForm'         => [
+				null,
+				null,
+				null,
+				null,
+				'EEM_Event_Question_Group' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory' => [
+				null,
+				'EEM_Answer' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionGroup'   => [
+				null,
+				null,
+				null,
+				'EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\CountryOptions'         => [
+				null,
+				'EEM_Answer'  => EE_Dependency_Map::load_from_cache,
+				'EEM_Country' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\StateOptions'           => [
+				null,
+				'EEM_State' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormHandler'         => [
+				null,
+				'EventEspresso\core\domain\services\registration\form\v1\RegistrantData'         => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\v1\RegFormAttendeeFactory' => EE_Dependency_Map::load_from_cache,
+				'EE_Registration_Processor'                                                      => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormInputHandler'    => [
+				null,
+				null,
+				'EEM_Attendee'                                                           => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\v1\RegistrantData' => EE_Dependency_Map::load_from_cache,
+			],
+			'EventEspresso\core\domain\services\registration\form\v1\RegFormAttendeeFactory' => [
+				'EventEspresso\core\services\commands\CommandBus'                        => EE_Dependency_Map::load_from_cache,
+				'EventEspresso\core\domain\services\registration\form\v1\RegistrantData' => EE_Dependency_Map::load_from_cache,
+			],
+		];
+		foreach ($reg_form_dependencies as $class => $dependencies) {
+			$this->dependency_map->registerDependencies($class, $dependencies);
+		}
+	}
 }

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

Spacing +13 added lines, -13 removed lines

@@ -56,7 +56,7 @@ 
             $registration,
             $question->system_ID()
         );
-        $answer       = $answer_value === null
+        $answer = $answer_value === null
             ? $this->answer_model->get_one(
                 [['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
             )
@@ -75,14 +75,14 @@ 
         }
         // verify instance
         if ($answer instanceof EE_Answer) {
-            if (! empty($answer_value)) {
+            if ( ! empty($answer_value)) {
                 $answer->set('ANS_value', $answer_value);
             }
             $answer->cache('Question', $question);
             // remember system ID had a bug where sometimes it could be null
             $answer_cache_id = $question->is_system_question()
-                ? $question->system_ID() . '-' . $registration->reg_url_link()
-                : $question->ID() . '-' . $registration->reg_url_link();
+                ? $question->system_ID().'-'.$registration->reg_url_link()
+                : $question->ID().'-'.$registration->reg_url_link();
             $registration->cache('Answer', $answer, $answer_cache_id);
         }
         return $this->generateQuestionInput($registration, $question, $answer);
@@ -105,23 +105,23 @@ 
         EE_Question $question,
         $answer
     ): EE_Form_Input_Base {
-        $identifier                              = $question->is_system_question()
+        $identifier = $question->is_system_question()
             ? $question->system_ID()
             : $question->ID();
         $callback = $this->addRequiredQuestion;
         $callback($identifier, $question->required());
-        $input_constructor_args                  = [
-            'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-            'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-            'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+        $input_constructor_args = [
+            'html_name'        => 'ee_reg_qstn['.$registration->ID().']['.$identifier.']',
+            'html_id'          => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
+            'html_class'       => 'ee-reg-qstn ee-reg-qstn-'.$identifier,
+            'html_label_id'    => 'ee_reg_qstn-'.$registration->ID().'-'.$identifier,
             'html_label_class' => 'ee-reg-qstn',
         ];
         $input_constructor_args['html_label_id'] .= '-lbl';
         if ($answer instanceof EE_Answer && $answer->ID()) {
-            $input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
-            $input_constructor_args['html_id']       .= '-' . $answer->ID();
-            $input_constructor_args['html_label_id'] .= '-' . $answer->ID();
+            $input_constructor_args['html_name']     .= '['.$answer->ID().']';
+            $input_constructor_args['html_id']       .= '-'.$answer->ID();
+            $input_constructor_args['html_label_id'] .= '-'.$answer->ID();
         }
         return $question->generate_form_input(
             $registration,

Indentation +107 added lines, -107 removed lines

@@ -16,118 +16,118 @@
 class RegFormQuestionFactory
 {
 
-    /**
-     * @var callable
-     */
-    protected $addRequiredQuestion;
+	/**
+	 * @var callable
+	 */
+	protected $addRequiredQuestion;
 
-    /**
-     * @var EEM_Answer
-     */
-    public $answer_model;
+	/**
+	 * @var EEM_Answer
+	 */
+	public $answer_model;
 
 
-    /**
-     * @param callable   $addRequiredQuestion
-     * @param EEM_Answer $answer_model
-     */
-    public function __construct(callable $addRequiredQuestion, EEM_Answer $answer_model)
-    {
-        $this->addRequiredQuestion = $addRequiredQuestion;
-        $this->answer_model = $answer_model;
-    }
+	/**
+	 * @param callable   $addRequiredQuestion
+	 * @param EEM_Answer $answer_model
+	 */
+	public function __construct(callable $addRequiredQuestion, EEM_Answer $answer_model)
+	{
+		$this->addRequiredQuestion = $addRequiredQuestion;
+		$this->answer_model = $answer_model;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function create(
-        EE_Registration $registration,
-        EE_Question $question
-    ): EE_Form_Input_Base {
-        // if this question was for an attendee detail, then check for that answer
-        $answer_value = $this->answer_model->get_attendee_property_answer_value(
-            $registration,
-            $question->system_ID()
-        );
-        $answer       = $answer_value === null
-            ? $this->answer_model->get_one(
-                [['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
-            )
-            : null;
-        // if NOT returning to edit an existing registration
-        // OR if this question is for an attendee property
-        // OR we still don't have an EE_Answer object
-        if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
-            // create an EE_Answer object for storing everything in
-            $answer = EE_Answer::new_instance(
-                [
-                    'QST_ID' => $question->ID(),
-                    'REG_ID' => $registration->ID(),
-                ]
-            );
-        }
-        // verify instance
-        if ($answer instanceof EE_Answer) {
-            if (! empty($answer_value)) {
-                $answer->set('ANS_value', $answer_value);
-            }
-            $answer->cache('Question', $question);
-            // remember system ID had a bug where sometimes it could be null
-            $answer_cache_id = $question->is_system_question()
-                ? $question->system_ID() . '-' . $registration->reg_url_link()
-                : $question->ID() . '-' . $registration->reg_url_link();
-            $registration->cache('Answer', $answer, $answer_cache_id);
-        }
-        return $this->generateQuestionInput($registration, $question, $answer);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function create(
+		EE_Registration $registration,
+		EE_Question $question
+	): EE_Form_Input_Base {
+		// if this question was for an attendee detail, then check for that answer
+		$answer_value = $this->answer_model->get_attendee_property_answer_value(
+			$registration,
+			$question->system_ID()
+		);
+		$answer       = $answer_value === null
+			? $this->answer_model->get_one(
+				[['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
+			)
+			: null;
+		// if NOT returning to edit an existing registration
+		// OR if this question is for an attendee property
+		// OR we still don't have an EE_Answer object
+		if ($answer_value || ! $answer instanceof EE_Answer || ! $registration->reg_url_link()) {
+			// create an EE_Answer object for storing everything in
+			$answer = EE_Answer::new_instance(
+				[
+					'QST_ID' => $question->ID(),
+					'REG_ID' => $registration->ID(),
+				]
+			);
+		}
+		// verify instance
+		if ($answer instanceof EE_Answer) {
+			if (! empty($answer_value)) {
+				$answer->set('ANS_value', $answer_value);
+			}
+			$answer->cache('Question', $question);
+			// remember system ID had a bug where sometimes it could be null
+			$answer_cache_id = $question->is_system_question()
+				? $question->system_ID() . '-' . $registration->reg_url_link()
+				: $question->ID() . '-' . $registration->reg_url_link();
+			$registration->cache('Answer', $answer, $answer_cache_id);
+		}
+		return $this->generateQuestionInput($registration, $question, $answer);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @param                 $answer
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function generateQuestionInput(
-        EE_Registration $registration,
-        EE_Question $question,
-        $answer
-    ): EE_Form_Input_Base {
-        $identifier                              = $question->is_system_question()
-            ? $question->system_ID()
-            : $question->ID();
-        $callback = $this->addRequiredQuestion;
-        $callback($identifier, $question->required());
-        $input_constructor_args                  = [
-            'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
-            'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
-            'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
-            'html_label_class' => 'ee-reg-qstn',
-        ];
-        $input_constructor_args['html_label_id'] .= '-lbl';
-        if ($answer instanceof EE_Answer && $answer->ID()) {
-            $input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
-            $input_constructor_args['html_id']       .= '-' . $answer->ID();
-            $input_constructor_args['html_label_id'] .= '-' . $answer->ID();
-        }
-        return $question->generate_form_input(
-            $registration,
-            $answer,
-            $input_constructor_args
-        );
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @param                 $answer
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function generateQuestionInput(
+		EE_Registration $registration,
+		EE_Question $question,
+		$answer
+	): EE_Form_Input_Base {
+		$identifier                              = $question->is_system_question()
+			? $question->system_ID()
+			: $question->ID();
+		$callback = $this->addRequiredQuestion;
+		$callback($identifier, $question->required());
+		$input_constructor_args                  = [
+			'html_name'        => 'ee_reg_qstn[' . $registration->ID() . '][' . $identifier . ']',
+			'html_id'          => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_class'       => 'ee-reg-qstn ee-reg-qstn-' . $identifier,
+			'html_label_id'    => 'ee_reg_qstn-' . $registration->ID() . '-' . $identifier,
+			'html_label_class' => 'ee-reg-qstn',
+		];
+		$input_constructor_args['html_label_id'] .= '-lbl';
+		if ($answer instanceof EE_Answer && $answer->ID()) {
+			$input_constructor_args['html_name']     .= '[' . $answer->ID() . ']';
+			$input_constructor_args['html_id']       .= '-' . $answer->ID();
+			$input_constructor_args['html_label_id'] .= '-' . $answer->ID();
+		}
+		return $question->generate_form_input(
+			$registration,
+			$answer,
+			$input_constructor_args
+		);
+	}
 }

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

Indentation +188 added lines, -188 removed lines

@@ -17,192 +17,192 @@
 class RegistrantForm extends EE_Form_Section_Proper
 {
 
-    /**
-     * @var EEM_Event_Question_Group
-     */
-    public $event_question_group_model;
-
-    /**
-     * @var bool
-     */
-    private $has_questions = false;
-
-
-    /**
-     * RegistrantForm constructor.
-     *
-     * @param EE_Registration          $registration
-     * @param bool                     $admin_request
-     * @param bool                     $copy_attendee_info
-     * @param callable                 $enablePrintCopyInfo
-     * @param EEM_Event_Question_Group $event_question_group_model
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo,
-        EEM_Event_Question_Group $event_question_group_model
-    ) {
-        $this->event_question_group_model = $event_question_group_model;
-        parent::__construct(
-            $this->generateFormArgs($registration, $admin_request, $copy_attendee_info, $enablePrintCopyInfo)
-        );
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasQuestions(): bool
-    {
-        return $this->has_questions;
-    }
-
-
-    /**
-     * @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;
-        $form_args = [];
-        // verify that registration has valid event
-        if ($registration->event() instanceof EE_Event) {
-            $field_name      = 'Event_Question_Group.' . $this->event_question_group_model->fieldNameForContext(
-                $registration->is_primary_registrant()
-            );
-            $question_groups = $registration->event()->question_groups(
-                apply_filters(
-                    // @codingStandardsIgnoreStart
-                    'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__question_groups_query_parameters',
-                    // @codingStandardsIgnoreEnd
-                    [
-                        [
-                            'Event.EVT_ID' => $registration->event()->ID(),
-                            $field_name    => true,
-                        ],
-                        'order_by' => ['QSG_order' => 'ASC'],
-                    ],
-                    $registration,
-                    $this
-                )
-            );
-            if ($question_groups) {
-                // array of params to pass to parent constructor
-                $form_args = [
-                    'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
-                    'html_class'      => 'ee-reg-form-attendee-dv',
-                    'html_style'      => $admin_request
-                        ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
-                        : '',
-                    'subsections'     => [],
-                    'layout_strategy' => new EE_Fieldset_Section_Layout(
-                        [
-                            'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
-                            'legend_text'  => sprintf(
-                                esc_html_x(
-                                    'Attendee %d',
-                                    'Attendee 123',
-                                    'event_espresso'
-                                ),
-                                $attendee_nmbr
-                            ),
-                        ]
-                    ),
-                ];
-                foreach ($question_groups as $question_group) {
-                    if ($question_group instanceof EE_Question_Group) {
-                        $question_group_reg_form = LoaderFactory::getNew(
-                            RegFormQuestionGroup::class,
-                            [$registration, $question_group, $admin_request]
-                        );
-                        $form_args['subsections'][ $question_group->identifier() ] = apply_filters(
-                            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
-                            $question_group_reg_form,
-                            $registration,
-                            $question_group,
-                            $this
-                        );
-                    }
-                }
-                // add hidden input
-                $form_args['subsections']['additional_attendee_reg_info'] = $this->additionalAttendeeRegInfoInput(
-                    $registration
-                );
-
-                // If we have question groups for additional attendees, then display the copy options
-                $printCopyInfo = apply_filters(
-                    'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
-                    $attendee_nmbr > 1 && $copy_attendee_info,
-                    $attendee_nmbr
-                );
-                if ($printCopyInfo) {
-                    $enablePrintCopyInfo();
-                }
-
-
-                if ($registration->is_primary_registrant()) {
-                    // generate hidden input
-                    $form_args['subsections']['primary_registrant'] = $this->additionalPrimaryRegistrantInputs(
-                        $registration
-                    );
-                }
-            }
-        }
-        $attendee_nmbr++;
-
-        // Increment the reg forms number if form is valid.
-        if (! empty($form_args)) {
-            $this->has_questions = true;
-        }
-
-        return $form_args;
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     */
-    private function additionalAttendeeRegInfoInput(EE_Registration $registration)
-    {
-        // generate hidden input
-        return new EE_Hidden_Input(
-            [
-                'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
-                'default' => true,
-            ]
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return    EE_Form_Input_Base
-     * @throws EE_Error
-     */
-    private function additionalPrimaryRegistrantInputs(EE_Registration $registration)
-    {
-        // generate hidden input
-        return new EE_Hidden_Input(
-            [
-                'html_id' => 'primary_registrant',
-                'default' => $registration->reg_url_link(),
-            ]
-        );
-    }
+	/**
+	 * @var EEM_Event_Question_Group
+	 */
+	public $event_question_group_model;
+
+	/**
+	 * @var bool
+	 */
+	private $has_questions = false;
+
+
+	/**
+	 * RegistrantForm constructor.
+	 *
+	 * @param EE_Registration          $registration
+	 * @param bool                     $admin_request
+	 * @param bool                     $copy_attendee_info
+	 * @param callable                 $enablePrintCopyInfo
+	 * @param EEM_Event_Question_Group $event_question_group_model
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo,
+		EEM_Event_Question_Group $event_question_group_model
+	) {
+		$this->event_question_group_model = $event_question_group_model;
+		parent::__construct(
+			$this->generateFormArgs($registration, $admin_request, $copy_attendee_info, $enablePrintCopyInfo)
+		);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasQuestions(): bool
+	{
+		return $this->has_questions;
+	}
+
+
+	/**
+	 * @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;
+		$form_args = [];
+		// verify that registration has valid event
+		if ($registration->event() instanceof EE_Event) {
+			$field_name      = 'Event_Question_Group.' . $this->event_question_group_model->fieldNameForContext(
+				$registration->is_primary_registrant()
+			);
+			$question_groups = $registration->event()->question_groups(
+				apply_filters(
+					// @codingStandardsIgnoreStart
+					'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__question_groups_query_parameters',
+					// @codingStandardsIgnoreEnd
+					[
+						[
+							'Event.EVT_ID' => $registration->event()->ID(),
+							$field_name    => true,
+						],
+						'order_by' => ['QSG_order' => 'ASC'],
+					],
+					$registration,
+					$this
+				)
+			);
+			if ($question_groups) {
+				// array of params to pass to parent constructor
+				$form_args = [
+					'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+					'html_class'      => 'ee-reg-form-attendee-dv',
+					'html_style'      => $admin_request
+						? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
+						: '',
+					'subsections'     => [],
+					'layout_strategy' => new EE_Fieldset_Section_Layout(
+						[
+							'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
+							'legend_text'  => sprintf(
+								esc_html_x(
+									'Attendee %d',
+									'Attendee 123',
+									'event_espresso'
+								),
+								$attendee_nmbr
+							),
+						]
+					),
+				];
+				foreach ($question_groups as $question_group) {
+					if ($question_group instanceof EE_Question_Group) {
+						$question_group_reg_form = LoaderFactory::getNew(
+							RegFormQuestionGroup::class,
+							[$registration, $question_group, $admin_request]
+						);
+						$form_args['subsections'][ $question_group->identifier() ] = apply_filters(
+							'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
+							$question_group_reg_form,
+							$registration,
+							$question_group,
+							$this
+						);
+					}
+				}
+				// add hidden input
+				$form_args['subsections']['additional_attendee_reg_info'] = $this->additionalAttendeeRegInfoInput(
+					$registration
+				);
+
+				// If we have question groups for additional attendees, then display the copy options
+				$printCopyInfo = apply_filters(
+					'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
+					$attendee_nmbr > 1 && $copy_attendee_info,
+					$attendee_nmbr
+				);
+				if ($printCopyInfo) {
+					$enablePrintCopyInfo();
+				}
+
+
+				if ($registration->is_primary_registrant()) {
+					// generate hidden input
+					$form_args['subsections']['primary_registrant'] = $this->additionalPrimaryRegistrantInputs(
+						$registration
+					);
+				}
+			}
+		}
+		$attendee_nmbr++;
+
+		// Increment the reg forms number if form is valid.
+		if (! empty($form_args)) {
+			$this->has_questions = true;
+		}
+
+		return $form_args;
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 */
+	private function additionalAttendeeRegInfoInput(EE_Registration $registration)
+	{
+		// generate hidden input
+		return new EE_Hidden_Input(
+			[
+				'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'default' => true,
+			]
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return    EE_Form_Input_Base
+	 * @throws EE_Error
+	 */
+	private function additionalPrimaryRegistrantInputs(EE_Registration $registration)
+	{
+		// generate hidden input
+		return new EE_Hidden_Input(
+			[
+				'html_id' => 'primary_registrant',
+				'default' => $registration->reg_url_link(),
+			]
+		);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
         $form_args = [];
         // verify that registration has valid event
         if ($registration->event() instanceof EE_Event) {
-            $field_name      = 'Event_Question_Group.' . $this->event_question_group_model->fieldNameForContext(
+            $field_name      = 'Event_Question_Group.'.$this->event_question_group_model->fieldNameForContext(
                 $registration->is_primary_registrant()
             );
             $question_groups = $registration->event()->question_groups(
@@ -103,7 +103,7 @@ 
             if ($question_groups) {
                 // array of params to pass to parent constructor
                 $form_args = [
-                    'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+                    'html_id'         => 'ee-registration-'.$registration->reg_url_link(),
                     'html_class'      => 'ee-reg-form-attendee-dv',
                     'html_style'      => $admin_request
                         ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
@@ -129,7 +129,7 @@ 
                             RegFormQuestionGroup::class,
                             [$registration, $question_group, $admin_request]
                         );
-                        $form_args['subsections'][ $question_group->identifier() ] = apply_filters(
+                        $form_args['subsections'][$question_group->identifier()] = apply_filters(
                             'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__question_group_reg_form',
                             $question_group_reg_form,
                             $registration,
@@ -165,7 +165,7 @@ 
         $attendee_nmbr++;
 
         // Increment the reg forms number if form is valid.
-        if (! empty($form_args)) {
+        if ( ! empty($form_args)) {
             $this->has_questions = true;
         }
 
@@ -183,7 +183,7 @@ 
         // generate hidden input
         return new EE_Hidden_Input(
             [
-                'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+                'html_id' => 'additional-attendee-reg-info-'.$registration->reg_url_link(),
                 'default' => true,
             ]
         );

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

Indentation +216 added lines, -216 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -67,7 +67,7 @@ 
         $input_value
     ): bool {
         // check for critical inputs
-        if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
+        if ( ! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
             return false;
         }
         $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
@@ -75,7 +75,7 @@ 
             $form_input,
             $input_value
         );
-        if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
+        if ( ! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
             EE_Error::add_error(
                 sprintf(
                     esc_html_x(
@@ -137,7 +137,7 @@ 
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
         $answer_cache_id   = $this->checkout_reg_url_link
-            ? $form_input . '-' . $reg_url_link
+            ? $form_input.'-'.$reg_url_link
             : $form_input;
         $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
         $answer_is_obj     = $registrant_answer instanceof EE_Answer;
@@ -156,10 +156,10 @@ 
                 break;
 
             default:
-                $ATT_input         = 'ATT_' . $form_input;
+                $ATT_input         = 'ATT_'.$form_input;
                 $attendee_property = $this->attendee_model->has_field($ATT_input);
                 $form_input        = $attendee_property
-                    ? 'ATT_' . $form_input
+                    ? 'ATT_'.$form_input
                     : $form_input;
         }
 
@@ -201,7 +201,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) {

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

Indentation +151 added lines, -151 removed lines

@@ -15,163 +15,163 @@
 
 class RegFormQuestionGroup extends EE_Form_Section_Proper
 {
-    /**
-     * @var RegFormQuestionFactory
-     */
-    public $reg_form_question_factory;
+	/**
+	 * @var RegFormQuestionFactory
+	 */
+	public $reg_form_question_factory;
 
 
-    /**
-     * RegFormQuestionGroup constructor.
-     *
-     * @param EE_Registration        $registration
-     * @param EE_Question_Group      $question_group
-     * @param bool                   $admin_request
-     * @param RegFormQuestionFactory $reg_form_question_factory
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_Registration $registration,
-        EE_Question_Group $question_group,
-        bool $admin_request,
-        RegFormQuestionFactory $reg_form_question_factory
-    ) {
-        $this->reg_form_question_factory = $reg_form_question_factory;
-        parent::__construct($this->generateFormArgs($registration, $question_group, $admin_request));
-    }
+	/**
+	 * RegFormQuestionGroup constructor.
+	 *
+	 * @param EE_Registration        $registration
+	 * @param EE_Question_Group      $question_group
+	 * @param bool                   $admin_request
+	 * @param RegFormQuestionFactory $reg_form_question_factory
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_Registration $registration,
+		EE_Question_Group $question_group,
+		bool $admin_request,
+		RegFormQuestionFactory $reg_form_question_factory
+	) {
+		$this->reg_form_question_factory = $reg_form_question_factory;
+		parent::__construct($this->generateFormArgs($registration, $question_group, $admin_request));
+	}
 
 
-    /**
-     * @param EE_Registration   $registration
-     * @param EE_Question_Group $question_group
-     * @param bool              $admin_request
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function generateFormArgs(
-        EE_Registration $registration,
-        EE_Question_Group $question_group,
-        bool $admin_request
-    ): array {
-        // array of params to pass to parent constructor
-        $form_args = [
-            'html_id'         => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-' . $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-' . $question_group->identifier() . '-'
-                                 . $registration->ID() . '-lbl',
-            'subsections'     => [
-                'reg_form_qstn_grp_hdr' => $this->questionGroupHeader($question_group, $admin_request),
-            ],
-            'layout_strategy' => $admin_request
-                ? new EE_Admin_Two_Column_Layout()
-                : new EE_Div_Per_Section_Layout(),
-        ];
-        // where params
-        $query_params = ['QST_deleted' => 0];
-        // don't load admin only questions on the frontend
-        if (! $admin_request) {
-            $query_params['QST_admin_only'] = ['!=', true];
-        }
-        $questions = $question_group->get_many_related(
-            'Question',
-            apply_filters(
-                'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__related_questions_query_params',
-                [
-                    $query_params,
-                    'order_by' => [
-                        'Question_Group_Question.QGQ_order' => 'ASC',
-                    ],
-                ],
-                $question_group,
-                $registration,
-                $this
-            )
-        );
-        // filter for additional content before questions
-        $form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(
-            apply_filters(
-                'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions',
-                '',
-                $registration,
-                $question_group,
-                $this
-            )
-        );
-        // loop thru questions
-        foreach ($questions as $question) {
-            if ($question instanceof EE_Question) {
-                $identifier = $question->is_system_question()
-                    ? $question->system_ID()
-                    : $question->ID();
+	/**
+	 * @param EE_Registration   $registration
+	 * @param EE_Question_Group $question_group
+	 * @param bool              $admin_request
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function generateFormArgs(
+		EE_Registration $registration,
+		EE_Question_Group $question_group,
+		bool $admin_request
+	): array {
+		// array of params to pass to parent constructor
+		$form_args = [
+			'html_id'         => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-' . $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-' . $question_group->identifier() . '-'
+								 . $registration->ID() . '-lbl',
+			'subsections'     => [
+				'reg_form_qstn_grp_hdr' => $this->questionGroupHeader($question_group, $admin_request),
+			],
+			'layout_strategy' => $admin_request
+				? new EE_Admin_Two_Column_Layout()
+				: new EE_Div_Per_Section_Layout(),
+		];
+		// where params
+		$query_params = ['QST_deleted' => 0];
+		// don't load admin only questions on the frontend
+		if (! $admin_request) {
+			$query_params['QST_admin_only'] = ['!=', true];
+		}
+		$questions = $question_group->get_many_related(
+			'Question',
+			apply_filters(
+				'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__related_questions_query_params',
+				[
+					$query_params,
+					'order_by' => [
+						'Question_Group_Question.QGQ_order' => 'ASC',
+					],
+				],
+				$question_group,
+				$registration,
+				$this
+			)
+		);
+		// filter for additional content before questions
+		$form_args['subsections']['reg_form_questions_before'] = new EE_Form_Section_HTML(
+			apply_filters(
+				'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions',
+				'',
+				$registration,
+				$question_group,
+				$this
+			)
+		);
+		// loop thru questions
+		foreach ($questions as $question) {
+			if ($question instanceof EE_Question) {
+				$identifier = $question->is_system_question()
+					? $question->system_ID()
+					: $question->ID();
 
-                $form_args['subsections'][ $identifier ] = $this->reg_form_question_factory->create(
-                    $registration,
-                    $question
-                );
-            }
-        }
-        $form_args['subsections'] = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array',
-            $form_args['subsections'],
-            $registration,
-            $question_group,
-            $this
-        );
-        // filter for additional content after questions
-        $form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(
-            apply_filters(
-                'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions',
-                '',
-                $registration,
-                $question_group,
-                $this
-            )
-        );
+				$form_args['subsections'][ $identifier ] = $this->reg_form_question_factory->create(
+					$registration,
+					$question
+				);
+			}
+		}
+		$form_args['subsections'] = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array',
+			$form_args['subsections'],
+			$registration,
+			$question_group,
+			$this
+		);
+		// filter for additional content after questions
+		$form_args['subsections']['reg_form_questions_after'] = new EE_Form_Section_HTML(
+			apply_filters(
+				'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions',
+				'',
+				$registration,
+				$question_group,
+				$this
+			)
+		);
 
-        return $form_args;
-    }
+		return $form_args;
+	}
 
 
-    /**
-     * @param EE_Question_Group $question_group
-     * @param bool              $admin_request
-     * @return EE_Form_Section_HTML
-     */
-    private function questionGroupHeader(EE_Question_Group $question_group, bool $admin_request): EE_Form_Section_HTML
-    {
-        $html = '';
-        // group_name
-        if ($question_group->show_group_name() && $question_group->name() !== '') {
-            if ($admin_request) {
-                $html .= EEH_HTML::br();
-                $html .= EEH_HTML::h3(
-                    $question_group->name(),
-                    '',
-                    'ee-reg-form-qstn-grp-title title',
-                    'font-size: 1.3em; padding-left:0;'
-                );
-            } else {
-                $html .= EEH_HTML::h4(
-                    $question_group->name(),
-                    '',
-                    '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_Question_Group $question_group
+	 * @param bool              $admin_request
+	 * @return EE_Form_Section_HTML
+	 */
+	private function questionGroupHeader(EE_Question_Group $question_group, bool $admin_request): EE_Form_Section_HTML
+	{
+		$html = '';
+		// group_name
+		if ($question_group->show_group_name() && $question_group->name() !== '') {
+			if ($admin_request) {
+				$html .= EEH_HTML::br();
+				$html .= EEH_HTML::h3(
+					$question_group->name(),
+					'',
+					'ee-reg-form-qstn-grp-title title',
+					'font-size: 1.3em; padding-left:0;'
+				);
+			} else {
+				$html .= EEH_HTML::h4(
+					$question_group->name(),
+					'',
+					'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);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -57,12 +57,12 @@ 
     ): array {
         // array of params to pass to parent constructor
         $form_args = [
-            'html_id'         => 'ee-reg-form-qstn-grp-' . $question_group->identifier() . '-' . $registration->ID(),
+            'html_id'         => 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-'.$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-' . $question_group->identifier() . '-'
-                                 . $registration->ID() . '-lbl',
+            'html_label_id'   => 'ee-reg-form-qstn-grp-'.$question_group->identifier().'-'
+                                 . $registration->ID().'-lbl',
             'subsections'     => [
                 'reg_form_qstn_grp_hdr' => $this->questionGroupHeader($question_group, $admin_request),
             ],
@@ -73,7 +73,7 @@ 
         // where params
         $query_params = ['QST_deleted' => 0];
         // don't load admin only questions on the frontend
-        if (! $admin_request) {
+        if ( ! $admin_request) {
             $query_params['QST_admin_only'] = ['!=', true];
         }
         $questions = $question_group->get_many_related(
@@ -108,7 +108,7 @@ 
                     ? $question->system_ID()
                     : $question->ID();
 
-                $form_args['subsections'][ $identifier ] = $this->reg_form_question_factory->create(
+                $form_args['subsections'][$identifier] = $this->reg_form_question_factory->create(
                     $registration,
                     $question
                 );

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

Spacing +16 added lines, -16 removed lines

@@ -83,7 +83,7 @@ 
         $required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
         $this->input_handler = LoaderFactory::getShared(
             RegFormInputHandler::class,
-            [ $this->checkout->reg_url_link, $required_questions ]
+            [$this->checkout->reg_url_link, $required_questions]
         );
 
     }
@@ -126,21 +126,21 @@ 
         $this->valid = true;
         foreach ($registrations as $registration) {
             // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
+            if ( ! $this->isValidRegistration($registration)) {
                 return $this->isInvalid();
             }
             $reg_url_link = $registration->reg_url_link();
             // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
+            if ( ! $this->isValidRegUrlLink($reg_url_link)) {
                 return $this->isInvalid();
             }
             // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+            if ( ! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
                 continue;
             }
             // if NOT revisiting, then let's save the registration now,
             // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
+            if ( ! $this->checkout->revisit) {
                 $registration->save();
             }
             /**
@@ -164,7 +164,7 @@ 
             }
 
             // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+            if ( ! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
                 return $this->isInvalid();
             }
         }
@@ -178,7 +178,7 @@ 
      */
     private function isValidRegUrlLink(string $reg_url_link): bool
     {
-        if (! empty($reg_url_link)) {
+        if ( ! empty($reg_url_link)) {
             return true;
         }
         EE_Error::add_error(
@@ -231,11 +231,11 @@ 
         array $reg_form_data
     ): bool {
         $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+        if ( ! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
             return false;
         }
         // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+        if ( ! $this->attendee_factory->create($registration, $reg_url_link)) {
             return false;
         }
         // at this point, we should have enough details about the registrant to consider the registration
@@ -272,15 +272,15 @@ 
      */
     private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
     {
-        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'] ?? '';
@@ -288,7 +288,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;
                 }
@@ -299,7 +299,7 @@ 
                         $form_input,
                         $input_value
                     );
-                    if (! $input_processed) {
+                    if ( ! $input_processed) {
                         return false;
                     }
                 }

Indentation +278 added lines, -278 removed lines

@@ -18,309 +18,309 @@
 class RegFormHandler
 {
 
-    /**
-     * @var EE_Checkout
-     */
-    public $checkout;
+	/**
+	 * @var EE_Checkout
+	 */
+	public $checkout;
 
-    /**
-     * @var RegFormInputHandler
-     */
-    public $input_handler;
+	/**
+	 * @var RegFormInputHandler
+	 */
+	public $input_handler;
 
-    /**
-     * @var array
-     */
-    private $non_input_form_sections;
+	/**
+	 * @var array
+	 */
+	private $non_input_form_sections;
 
-    /**
-     * @var RegFormAttendeeFactory
-     */
-    private $attendee_factory;
+	/**
+	 * @var RegFormAttendeeFactory
+	 */
+	private $attendee_factory;
 
-    /**
-     * @var RegistrantData
-     */
-    private $registrant_data;
+	/**
+	 * @var RegistrantData
+	 */
+	private $registrant_data;
 
-    /**
-     * @var EE_Registration_Processor
-     */
-    private $registration_processor;
+	/**
+	 * @var EE_Registration_Processor
+	 */
+	private $registration_processor;
 
-    /**
-     * @var bool
-     */
-    private $valid;
+	/**
+	 * @var bool
+	 */
+	private $valid;
 
 
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        EE_Checkout $checkout,
-        RegistrantData $registrant_data,
-        RegFormAttendeeFactory $attendee_factory,
-        EE_Registration_Processor $registration_processor
-    ) {
-        $this->checkout                = $checkout;
-        $this->registrant_data         = $registrant_data;
-        $this->attendee_factory        = $attendee_factory;
-        $this->registration_processor  = $registration_processor;
-        // reg form sections that do not contain inputs
-        $this->non_input_form_sections = [
-            'primary_registrant_data',
-            'additional_attendee_reg_info',
-            'spco_copy_attendee_chk',
-        ];
-        $this->initializeInputHandler();
-    }
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		EE_Checkout $checkout,
+		RegistrantData $registrant_data,
+		RegFormAttendeeFactory $attendee_factory,
+		EE_Registration_Processor $registration_processor
+	) {
+		$this->checkout                = $checkout;
+		$this->registrant_data         = $registrant_data;
+		$this->attendee_factory        = $attendee_factory;
+		$this->registration_processor  = $registration_processor;
+		// reg form sections that do not contain inputs
+		$this->non_input_form_sections = [
+			'primary_registrant_data',
+			'additional_attendee_reg_info',
+			'spco_copy_attendee_chk',
+		];
+		$this->initializeInputHandler();
+	}
 
 
-    private function initializeInputHandler()
-    {
-        $reg_form = $this->checkout->current_step->reg_form;
-        $required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
-        $this->input_handler = LoaderFactory::getShared(
-            RegFormInputHandler::class,
-            [ $this->checkout->reg_url_link, $required_questions ]
-        );
-    }
+	private function initializeInputHandler()
+	{
+		$reg_form = $this->checkout->current_step->reg_form;
+		$required_questions = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
+		$this->input_handler = LoaderFactory::getShared(
+			RegFormInputHandler::class,
+			[ $this->checkout->reg_url_link, $required_questions ]
+		);
+	}
 
 
-    /**
-     * @return int
-     */
-    public function attendeeCount(): int
-    {
-        return $this->registrant_data->attendeeCount();
-    }
+	/**
+	 * @return int
+	 */
+	public function attendeeCount(): int
+	{
+		return $this->registrant_data->attendeeCount();
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isInvalid(): bool
-    {
-        $this->valid = false;
-        return $this->valid;
-    }
+	/**
+	 * @return bool
+	 */
+	private function isInvalid(): bool
+	{
+		$this->valid = false;
+		return $this->valid;
+	}
 
 
-    /**
-     * @param EE_Registration[] $registrations
-     * @param array[][]         $reg_form_data
-     * @return bool
-     * @throws EntityNotFoundException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function processRegistrations(array $registrations, array $reg_form_data): bool
-    {
-        // start off optimistic, then trip this to false if anything goes wrong
-        $this->valid = true;
-        foreach ($registrations as $registration) {
-            // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
-                return $this->isInvalid();
-            }
-            $reg_url_link = $registration->reg_url_link();
-            // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
-                return $this->isInvalid();
-            }
-            // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
-                continue;
-            }
-            // if NOT revisiting, then let's save the registration now,
-            // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
-                $registration->save();
-            }
-            /**
-             * This allows plugins to trigger a fail on processing of a
-             * registration for any conditions they may have for it to pass.
-             *
-             * @var bool if true is returned by the plugin then the registration processing is halted.
-             */
-            if (
-                apply_filters(
-                    'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
-                    false,
-                    $this->registrant_data->attendeeCount(),
-                    $registration,
-                    $registrations,
-                    $reg_form_data,
-                    $this
-                )
-            ) {
-                return $this->isInvalid();
-            }
+	/**
+	 * @param EE_Registration[] $registrations
+	 * @param array[][]         $reg_form_data
+	 * @return bool
+	 * @throws EntityNotFoundException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processRegistrations(array $registrations, array $reg_form_data): bool
+	{
+		// start off optimistic, then trip this to false if anything goes wrong
+		$this->valid = true;
+		foreach ($registrations as $registration) {
+			// verify EE_Registration object
+			if (! $this->isValidRegistration($registration)) {
+				return $this->isInvalid();
+			}
+			$reg_url_link = $registration->reg_url_link();
+			// reg_url_link exists ?
+			if (! $this->isValidRegUrlLink($reg_url_link)) {
+				return $this->isInvalid();
+			}
+			// should this registration be processed during this visit ?
+			if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+				continue;
+			}
+			// if NOT revisiting, then let's save the registration now,
+			// so that we have a REG_ID to use when generating other objects
+			if (! $this->checkout->revisit) {
+				$registration->save();
+			}
+			/**
+			 * This allows plugins to trigger a fail on processing of a
+			 * registration for any conditions they may have for it to pass.
+			 *
+			 * @var bool if true is returned by the plugin then the registration processing is halted.
+			 */
+			if (
+				apply_filters(
+					'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
+					false,
+					$this->registrant_data->attendeeCount(),
+					$registration,
+					$registrations,
+					$reg_form_data,
+					$this
+				)
+			) {
+				return $this->isInvalid();
+			}
 
-            // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
-                return $this->isInvalid();
-            }
-        }
-        return $this->valid;
-    }
+			// Houston, we have a registration!
+			if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+				return $this->isInvalid();
+			}
+		}
+		return $this->valid;
+	}
 
 
-    /**
-     * @param string $reg_url_link
-     * @return bool
-     */
-    private function isValidRegUrlLink(string $reg_url_link): bool
-    {
-        if (! empty($reg_url_link)) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid or missing line item ID was encountered while attempting to process the registration form.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param string $reg_url_link
+	 * @return bool
+	 */
+	private function isValidRegUrlLink(string $reg_url_link): bool
+	{
+		if (! empty($reg_url_link)) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid or missing line item ID was encountered while attempting to process the registration form.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @return bool
-     */
-    private function isValidRegistration(EE_Registration $registration): bool
-    {
-        // verify EE_Registration object
-        if ($registration instanceof EE_Registration) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid Registration object was discovered when attempting to process your registration information.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @return bool
+	 */
+	private function isValidRegistration(EE_Registration $registration): bool
+	{
+		// verify EE_Registration object
+		if ($registration instanceof EE_Registration) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid Registration object was discovered when attempting to process your registration information.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array[][]       $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegistration(
-        EE_Registration $registration,
-        string $reg_url_link,
-        array $reg_form_data
-    ): bool {
-        $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
-            return false;
-        }
-        // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
-            return false;
-        }
-        // at this point, we should have enough details about the registrant to consider the registration
-        // NOT incomplete
-        $this->registration_processor->toggle_incomplete_registration_status_to_default(
-            $registration,
-            false,
-            new Context(
-                'spco_reg_step_attendee_information_process_registrations',
-                esc_html__(
-                    'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
-                    'event_espresso'
-                )
-            )
-        );
-        // we can also consider the TXN to not have been failed, so temporarily upgrade it's status to
-        // abandoned
-        $this->checkout->transaction->toggle_failed_transaction_status();
-        // if we've gotten this far, then let's save what we have
-        $registration->save();
-        // add relation between TXN and registration
-        $this->associateRegistrationWithTransaction($registration);
-        return true;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array[][]       $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegistration(
+		EE_Registration $registration,
+		string $reg_url_link,
+		array $reg_form_data
+	): bool {
+		$this->registrant_data->initializeRegistrantData($registration);
+		if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+			return false;
+		}
+		// RegFormAttendeeFactory
+		if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+			return false;
+		}
+		// at this point, we should have enough details about the registrant to consider the registration
+		// NOT incomplete
+		$this->registration_processor->toggle_incomplete_registration_status_to_default(
+			$registration,
+			false,
+			new Context(
+				'spco_reg_step_attendee_information_process_registrations',
+				esc_html__(
+					'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
+					'event_espresso'
+				)
+			)
+		);
+		// we can also consider the TXN to not have been failed, so temporarily upgrade it's status to
+		// abandoned
+		$this->checkout->transaction->toggle_failed_transaction_status();
+		// if we've gotten this far, then let's save what we have
+		$registration->save();
+		// add relation between TXN and registration
+		$this->associateRegistrationWithTransaction($registration);
+		return true;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array           $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
-    {
-        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) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array           $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
+	{
+		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) {
+						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);
-    }
+	/**
+	 * @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);
+	}
 }

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

Indentation +35 added lines, -35 removed lines

@@ -9,39 +9,39 @@
 
 class PrivacyConsentCheckboxForm extends EE_Form_Section_Proper
 {
-    /**
-     * @param string $reg_step_slug
-     * @param string $consent_checkbox_label_text
-     * @throws EE_Error
-     */
-    public function __construct(string $reg_step_slug, string $consent_checkbox_label_text)
-    {
-        parent::__construct(
-            [
-                'layout_strategy' =>
-                    new EE_Template_Layout(
-                        [
-                            'input_template_file' => SPCO_REG_STEPS_PATH
-                                                     . $reg_step_slug
-                                                     . '/privacy_consent.template.php',
-                        ]
-                    ),
-                'subsections'     => [
-                    'consent' => new EE_Checkbox_Multi_Input(
-                        [
-                            'consent' => $consent_checkbox_label_text,
-                        ],
-                        [
-                            'required'                          => true,
-                            'required_validation_error_message' => esc_html__(
-                                'You must consent to these terms in order to register.',
-                                'event_espresso'
-                            ),
-                            'html_label_text'                   => '',
-                        ]
-                    ),
-                ],
-            ]
-        );
-    }
+	/**
+	 * @param string $reg_step_slug
+	 * @param string $consent_checkbox_label_text
+	 * @throws EE_Error
+	 */
+	public function __construct(string $reg_step_slug, string $consent_checkbox_label_text)
+	{
+		parent::__construct(
+			[
+				'layout_strategy' =>
+					new EE_Template_Layout(
+						[
+							'input_template_file' => SPCO_REG_STEPS_PATH
+													 . $reg_step_slug
+													 . '/privacy_consent.template.php',
+						]
+					),
+				'subsections'     => [
+					'consent' => new EE_Checkbox_Multi_Input(
+						[
+							'consent' => $consent_checkbox_label_text,
+						],
+						[
+							'required'                          => true,
+							'required_validation_error_message' => esc_html__(
+								'You must consent to these terms in order to register.',
+								'event_espresso'
+							),
+							'html_label_text'                   => '',
+						]
+					),
+				],
+			]
+		);
+	}
 }

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

Spacing +19 added lines, -19 removed lines

@@ -69,7 +69,7 @@ 
      */
     public function __construct()
     {
-        $this->primary_registrant_data = ['line_item_id' => null,];
+        $this->primary_registrant_data = ['line_item_id' => null, ];
     }
 
 
@@ -80,9 +80,9 @@ 
     public function initializeRegistrantData(EE_Registration $registration): void
     {
         $reg_url_link = $registration->reg_url_link();
-        $this->registrations[ $reg_url_link ] = $registration;
-        $this->registrant_answers[ $reg_url_link ] = $registration->answers();
-        $this->registrant_data[ $reg_url_link ] = [];
+        $this->registrations[$reg_url_link] = $registration;
+        $this->registrant_answers[$reg_url_link] = $registration->answers();
+        $this->registrant_data[$reg_url_link] = [];
         $this->attendee_counter++;
     }
 
@@ -120,7 +120,7 @@ 
      */
     public function getRegistrant(string $reg_url_link): ?EE_Registration
     {
-        return $this->registrations[ $reg_url_link ] ?? null;
+        return $this->registrations[$reg_url_link] ?? null;
     }
 
 
@@ -130,7 +130,7 @@ 
      */
     public function getRegistrantData(string $reg_url_link): ?array
     {
-        return $this->registrant_data[ $reg_url_link ] ?? null;
+        return $this->registrant_data[$reg_url_link] ?? null;
     }
 
 
@@ -141,7 +141,7 @@ 
      */
     public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
     {
-        $this->registrant_data[ $reg_url_link ][ $key ] = $value;
+        $this->registrant_data[$reg_url_link][$key] = $value;
     }
 
 
@@ -177,10 +177,10 @@ 
         }
         foreach ($critical_attendee_details as $critical_attendee_detail) {
             if (
-                ! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-                || empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+                ! isset($this->registrant_data[$reg_url_link][$critical_attendee_detail])
+                || empty($this->registrant_data[$reg_url_link][$critical_attendee_detail])
             ) {
-                $this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
+                $this->registrant_data[$reg_url_link][$critical_attendee_detail] = $this->primary_registrant->get(
                     $critical_attendee_detail
                 );
             }
@@ -194,7 +194,7 @@ 
      */
     public function setRegistrantData(string $reg_url_link, array $registrant_data): void
     {
-        $this->registrant_data[ $reg_url_link ] = $registrant_data;
+        $this->registrant_data[$reg_url_link] = $registrant_data;
     }
 
 
@@ -213,7 +213,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, string $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -222,7 +222,7 @@ 
      */
     public function registrantAnswers(string $reg_url_link): array
     {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
+        return $this->registrant_answers[$reg_url_link] ?? [];
     }
 
 
@@ -233,7 +233,7 @@ 
      */
     public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
     {
-        $this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
+        $this->registrant_answers[$reg_url_link][$identifier] = $answer;
     }
 
 
@@ -244,7 +244,7 @@ 
      */
     public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
     {
-        return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
+        return $this->registrant_answers[$reg_url_link][$identifier] ?? null;
     }
 
 
@@ -276,7 +276,7 @@ 
      */
     public function addPrimaryRegistrantDataValue(string $key, $value): void
     {
-        $this->primary_registrant_data[ $key ] = $value;
+        $this->primary_registrant_data[$key] = $value;
     }
 
 
@@ -286,7 +286,7 @@ 
      */
     public function getPrimaryRegistrantDataValue(string $key)
     {
-        return $this->primary_registrant_data[ $key ] ?? null;
+        return $this->primary_registrant_data[$key] ?? null;
     }
 
 
@@ -359,8 +359,8 @@ 
     public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
     {
         // store a bit of data about the primary attendee
-        if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
-            $this->primary_registrant_data[ $form_input ] = $input_value;
+        if ( ! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
+            $this->primary_registrant_data[$form_input] = $input_value;
             return $input_value;
         }
         // or copy value from primary if incoming value is not set

Indentation +351 added lines, -351 removed lines

@@ -19,355 +19,355 @@
 class RegistrantData
 {
 
-    /**
-     * @var int
-     */
-    private $attendee_counter = 0;
-
-    /**
-     * @var array
-     */
-    private $registrant_data = [];
-
-    /**
-     * @var bool
-     */
-    private $copy_primary = false;
-
-    /**
-     * @var array
-     */
-    private $required_questions = [];
-
-    /**
-     * @var EE_Registration[]
-     */
-    private $registrations = [];
-
-    /**
-     * @var EE_Answer[][]
-     */
-    private $registrant_answers = [];
-
-    /**
-     * array for tracking reg form data for the primary registrant
-     *
-     * @var array
-     */
-    private $primary_registrant_data;
-
-    /**
-     * the attendee object created for the primary registrant
-     *
-     * @var EE_Attendee
-     */
-    private $primary_registrant;
-
-
-    /**
-     * RegistrantData constructor.
-     */
-    public function __construct()
-    {
-        $this->primary_registrant_data = ['line_item_id' => null,];
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @throws EE_Error
-     */
-    public function initializeRegistrantData(EE_Registration $registration): void
-    {
-        $reg_url_link = $registration->reg_url_link();
-        $this->registrations[ $reg_url_link ] = $registration;
-        $this->registrant_answers[ $reg_url_link ] = $registration->answers();
-        $this->registrant_data[ $reg_url_link ] = [];
-        $this->attendee_counter++;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function attendeeCount(): int
-    {
-        return $this->attendee_counter;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function copyPrimary(): bool
-    {
-        return $this->copy_primary;
-    }
-
-
-    /**
-     * @param bool $copy_primary
-     */
-    public function setCopyPrimary(bool $copy_primary): void
-    {
-        $this->copy_primary = filter_var($copy_primary, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return array|null
-     */
-    public function getRegistrant(string $reg_url_link): ?EE_Registration
-    {
-        return $this->registrations[ $reg_url_link ] ?? null;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return array|null
-     */
-    public function getRegistrantData(string $reg_url_link): ?array
-    {
-        return $this->registrant_data[ $reg_url_link ] ?? null;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $key
-     * @param mixed $value
-     */
-    public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
-    {
-        $this->registrant_data[ $reg_url_link ][ $key ] = $value;
-    }
-
-
-    /**
-     * ensures that all attendees at least have data for first name, last name, and email address
-     *
-     * @param string $reg_url_link
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function ensureCriticalRegistrantDataIsSet(string $reg_url_link): void
-    {
-        if ($this->currentRegistrantIsPrimary()) {
-            return;
-        }
-        // bare minimum critical details include first name, last name, email address
-        $critical_attendee_details = ['ATT_fname', 'ATT_lname', 'ATT_email'];
-        // add address info to critical details?
-        if (
-            apply_filters(
-                'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
-                false
-            )
-        ) {
-            $critical_attendee_details += [
-                'ATT_address',
-                'ATT_address2',
-                'ATT_city',
-                'STA_ID',
-                'CNT_ISO',
-                'ATT_zip',
-                'ATT_phone',
-            ];
-        }
-        foreach ($critical_attendee_details as $critical_attendee_detail) {
-            if (
-                ! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-                || empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-            ) {
-                $this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
-                    $critical_attendee_detail
-                );
-            }
-        }
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param array $registrant_data
-     */
-    public function setRegistrantData(string $reg_url_link, array $registrant_data): void
-    {
-        $this->registrant_data[ $reg_url_link ] = $registrant_data;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getRequiredQuestions(): array
-    {
-        return $this->required_questions;
-    }
-
-
-    /**
-     * @param string $identifier
-     * @param string $required_question
-     */
-    public function addRequiredQuestion(string $identifier, string $required_question): void
-    {
-        $this->required_questions[ $identifier ] = $required_question;
-    }
-
-
-    /**
-     * @return EE_Answer[]
-     */
-    public function registrantAnswers(string $reg_url_link): array
-    {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier  the answer cache ID
-     * @param EE_Answer $answer
-     */
-    public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
-    {
-        $this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier
-     * @return EE_Answer|null
-     */
-    public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
-    {
-        return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
-    }
-
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $identifier
-     * @return bool
-     */
-    public function registrantAnswerIsObject(string $reg_url_link, string $identifier): bool
-    {
-        $registrant_answer = $this->getRegistrantAnswer($reg_url_link, $identifier);
-        return $registrant_answer instanceof EE_Answer;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function primaryRegistrantData(): array
-    {
-        return $this->primary_registrant_data;
-    }
-
-
-    /**
-     * @param string $key
-     * @param mixed  $value
-     */
-    public function addPrimaryRegistrantDataValue(string $key, $value): void
-    {
-        $this->primary_registrant_data[ $key ] = $value;
-    }
-
-
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public function getPrimaryRegistrantDataValue(string $key)
-    {
-        return $this->primary_registrant_data[ $key ] ?? null;
-    }
-
-
-    /**
-     * @param array $primary_registrant_data
-     */
-    public function setPrimaryRegistrantData(array $primary_registrant_data): void
-    {
-        $this->primary_registrant_data = $primary_registrant_data;
-    }
-
-
-    /**
-     * @return EE_Attendee
-     */
-    public function primaryRegistrant(): EE_Attendee
-    {
-        return $this->primary_registrant;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function primaryRegistrantIsValid(): bool
-    {
-        return $this->primary_registrant instanceof EE_Attendee;
-    }
-
-
-    /**
-     * @param EE_Attendee $primary_registrant
-     */
-    public function setPrimaryRegistrant(EE_Attendee $primary_registrant): void
-    {
-        $this->primary_registrant = $primary_registrant;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @return bool
-     */
-    public function currentRegistrantIsPrimary(string $reg_url_link = ''): bool
-    {
-        return $this->attendeeCount() === 1
-            || (
-                $this->attendeeCount() === 1
-                && $reg_url_link !== ''
-                && $this->getPrimaryRegistrantDataValue('reg_url_link') === $reg_url_link
-            );
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function currentRegistrantIsNotPrimary(): bool
-    {
-        return $this->attendeeCount() > 1;
-    }
-
-
-    /**
-     * @param string $reg_url_link
-     * @param string $form_input
-     * @param mixed  $input_value
-     * @return mixed|null
-     */
-    public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
-    {
-        // store a bit of data about the primary attendee
-        if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
-            $this->primary_registrant_data[ $form_input ] = $input_value;
-            return $input_value;
-        }
-        // or copy value from primary if incoming value is not set
-        if ($input_value === null && $this->copyPrimary()) {
-            $input_value = $this->getPrimaryRegistrantDataValue($form_input);
-        }
-        return $input_value;
-    }
+	/**
+	 * @var int
+	 */
+	private $attendee_counter = 0;
+
+	/**
+	 * @var array
+	 */
+	private $registrant_data = [];
+
+	/**
+	 * @var bool
+	 */
+	private $copy_primary = false;
+
+	/**
+	 * @var array
+	 */
+	private $required_questions = [];
+
+	/**
+	 * @var EE_Registration[]
+	 */
+	private $registrations = [];
+
+	/**
+	 * @var EE_Answer[][]
+	 */
+	private $registrant_answers = [];
+
+	/**
+	 * array for tracking reg form data for the primary registrant
+	 *
+	 * @var array
+	 */
+	private $primary_registrant_data;
+
+	/**
+	 * the attendee object created for the primary registrant
+	 *
+	 * @var EE_Attendee
+	 */
+	private $primary_registrant;
+
+
+	/**
+	 * RegistrantData constructor.
+	 */
+	public function __construct()
+	{
+		$this->primary_registrant_data = ['line_item_id' => null,];
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @throws EE_Error
+	 */
+	public function initializeRegistrantData(EE_Registration $registration): void
+	{
+		$reg_url_link = $registration->reg_url_link();
+		$this->registrations[ $reg_url_link ] = $registration;
+		$this->registrant_answers[ $reg_url_link ] = $registration->answers();
+		$this->registrant_data[ $reg_url_link ] = [];
+		$this->attendee_counter++;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function attendeeCount(): int
+	{
+		return $this->attendee_counter;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function copyPrimary(): bool
+	{
+		return $this->copy_primary;
+	}
+
+
+	/**
+	 * @param bool $copy_primary
+	 */
+	public function setCopyPrimary(bool $copy_primary): void
+	{
+		$this->copy_primary = filter_var($copy_primary, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return array|null
+	 */
+	public function getRegistrant(string $reg_url_link): ?EE_Registration
+	{
+		return $this->registrations[ $reg_url_link ] ?? null;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return array|null
+	 */
+	public function getRegistrantData(string $reg_url_link): ?array
+	{
+		return $this->registrant_data[ $reg_url_link ] ?? null;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
+	{
+		$this->registrant_data[ $reg_url_link ][ $key ] = $value;
+	}
+
+
+	/**
+	 * ensures that all attendees at least have data for first name, last name, and email address
+	 *
+	 * @param string $reg_url_link
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function ensureCriticalRegistrantDataIsSet(string $reg_url_link): void
+	{
+		if ($this->currentRegistrantIsPrimary()) {
+			return;
+		}
+		// bare minimum critical details include first name, last name, email address
+		$critical_attendee_details = ['ATT_fname', 'ATT_lname', 'ATT_email'];
+		// add address info to critical details?
+		if (
+			apply_filters(
+				'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
+				false
+			)
+		) {
+			$critical_attendee_details += [
+				'ATT_address',
+				'ATT_address2',
+				'ATT_city',
+				'STA_ID',
+				'CNT_ISO',
+				'ATT_zip',
+				'ATT_phone',
+			];
+		}
+		foreach ($critical_attendee_details as $critical_attendee_detail) {
+			if (
+				! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+				|| empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+			) {
+				$this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
+					$critical_attendee_detail
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param array $registrant_data
+	 */
+	public function setRegistrantData(string $reg_url_link, array $registrant_data): void
+	{
+		$this->registrant_data[ $reg_url_link ] = $registrant_data;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getRequiredQuestions(): array
+	{
+		return $this->required_questions;
+	}
+
+
+	/**
+	 * @param string $identifier
+	 * @param string $required_question
+	 */
+	public function addRequiredQuestion(string $identifier, string $required_question): void
+	{
+		$this->required_questions[ $identifier ] = $required_question;
+	}
+
+
+	/**
+	 * @return EE_Answer[]
+	 */
+	public function registrantAnswers(string $reg_url_link): array
+	{
+		return $this->registrant_answers[ $reg_url_link ] ?? [];
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier  the answer cache ID
+	 * @param EE_Answer $answer
+	 */
+	public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
+	{
+		$this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier
+	 * @return EE_Answer|null
+	 */
+	public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
+	{
+		return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
+	}
+
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $identifier
+	 * @return bool
+	 */
+	public function registrantAnswerIsObject(string $reg_url_link, string $identifier): bool
+	{
+		$registrant_answer = $this->getRegistrantAnswer($reg_url_link, $identifier);
+		return $registrant_answer instanceof EE_Answer;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function primaryRegistrantData(): array
+	{
+		return $this->primary_registrant_data;
+	}
+
+
+	/**
+	 * @param string $key
+	 * @param mixed  $value
+	 */
+	public function addPrimaryRegistrantDataValue(string $key, $value): void
+	{
+		$this->primary_registrant_data[ $key ] = $value;
+	}
+
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function getPrimaryRegistrantDataValue(string $key)
+	{
+		return $this->primary_registrant_data[ $key ] ?? null;
+	}
+
+
+	/**
+	 * @param array $primary_registrant_data
+	 */
+	public function setPrimaryRegistrantData(array $primary_registrant_data): void
+	{
+		$this->primary_registrant_data = $primary_registrant_data;
+	}
+
+
+	/**
+	 * @return EE_Attendee
+	 */
+	public function primaryRegistrant(): EE_Attendee
+	{
+		return $this->primary_registrant;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function primaryRegistrantIsValid(): bool
+	{
+		return $this->primary_registrant instanceof EE_Attendee;
+	}
+
+
+	/**
+	 * @param EE_Attendee $primary_registrant
+	 */
+	public function setPrimaryRegistrant(EE_Attendee $primary_registrant): void
+	{
+		$this->primary_registrant = $primary_registrant;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @return bool
+	 */
+	public function currentRegistrantIsPrimary(string $reg_url_link = ''): bool
+	{
+		return $this->attendeeCount() === 1
+			|| (
+				$this->attendeeCount() === 1
+				&& $reg_url_link !== ''
+				&& $this->getPrimaryRegistrantDataValue('reg_url_link') === $reg_url_link
+			);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function currentRegistrantIsNotPrimary(): bool
+	{
+		return $this->attendeeCount() > 1;
+	}
+
+
+	/**
+	 * @param string $reg_url_link
+	 * @param string $form_input
+	 * @param mixed  $input_value
+	 * @return mixed|null
+	 */
+	public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
+	{
+		// store a bit of data about the primary attendee
+		if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
+			$this->primary_registrant_data[ $form_input ] = $input_value;
+			return $input_value;
+		}
+		// or copy value from primary if incoming value is not set
+		if ($input_value === null && $this->copyPrimary()) {
+			$input_value = $this->getPrimaryRegistrantDataValue($form_input);
+		}
+		return $input_value;
+	}
 }