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/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/RegFormInputHandler.php

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) {

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__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
-                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__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
+				false,
+				$registration,
+				$form_input,
+				$input_value,
+				$this
+			)
+		) {
+			return true;
+		}
+		/*
          * $answer_cache_id is the key used to find the EE_Answer we want
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
-        $answer_cache_id   = $this->checkout_reg_url_link
-            ? $form_input . '-' . $reg_url_link
-            : $form_input;
-        $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
-        $answer_is_obj     = $registrant_answer instanceof EE_Answer;
-        // rename form_inputs if they are EE_Attendee properties
-        switch ((string) $form_input) {
-            case 'state':
-            case 'STA_ID':
-                $attendee_property = true;
-                $form_input        = 'STA_ID';
-                break;
-
-            case 'country':
-            case 'CNT_ISO':
-                $attendee_property = true;
-                $form_input        = 'CNT_ISO';
-                break;
-
-            default:
-                $ATT_input         = 'ATT_' . $form_input;
-                $attendee_property = $this->attendee_model->has_field($ATT_input);
-                $form_input        = $attendee_property
-                    ? 'ATT_' . $form_input
-                    : $form_input;
-        }
-
-        // if this form input has a corresponding attendee property
-        if ($attendee_property) {
-            $this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
-            if ($answer_is_obj) {
-                // and delete the corresponding answer since we won't be storing this data in that object
-                $registration->_remove_relation_to($registrant_answer, 'Answer');
-                $registrant_answer->delete_permanently();
-            }
-            return true;
-        }
-        if ($answer_is_obj) {
-            // save this data to the answer object
-            $registrant_answer->set_value($input_value);
-            $result = $registrant_answer->save();
-            return $result !== false;
-        }
-        foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
-            if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
-                $answer->set_value($input_value);
-                $result = $answer->save();
-                return $result !== false;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * @param int|string       $form_input
-     * @param float|int|string $input_value
-     * @return boolean
-     */
-    private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
-        $form_input = '',
-        $input_value = ''
-    ): bool {
-        if (empty($input_value)) {
-            // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
-                return true;
-            }
-            switch ($form_input) {
-                case 'fname':
-                    EE_Error::add_error(
-                        esc_html__('First Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'lname':
-                    EE_Error::add_error(
-                        esc_html__('Last Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case 'email':
-                    EE_Error::add_error(
-                        esc_html__('Please enter a valid email address.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-            }
-        }
-        return true;
-    }
+		$answer_cache_id   = $this->checkout_reg_url_link
+			? $form_input . '-' . $reg_url_link
+			: $form_input;
+		$registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
+		$answer_is_obj     = $registrant_answer instanceof EE_Answer;
+		// rename form_inputs if they are EE_Attendee properties
+		switch ((string) $form_input) {
+			case 'state':
+			case 'STA_ID':
+				$attendee_property = true;
+				$form_input        = 'STA_ID';
+				break;
+
+			case 'country':
+			case 'CNT_ISO':
+				$attendee_property = true;
+				$form_input        = 'CNT_ISO';
+				break;
+
+			default:
+				$ATT_input         = 'ATT_' . $form_input;
+				$attendee_property = $this->attendee_model->has_field($ATT_input);
+				$form_input        = $attendee_property
+					? 'ATT_' . $form_input
+					: $form_input;
+		}
+
+		// if this form input has a corresponding attendee property
+		if ($attendee_property) {
+			$this->registrant_data->addRegistrantDataValue($reg_url_link, $form_input, $input_value);
+			if ($answer_is_obj) {
+				// and delete the corresponding answer since we won't be storing this data in that object
+				$registration->_remove_relation_to($registrant_answer, 'Answer');
+				$registrant_answer->delete_permanently();
+			}
+			return true;
+		}
+		if ($answer_is_obj) {
+			// save this data to the answer object
+			$registrant_answer->set_value($input_value);
+			$result = $registrant_answer->save();
+			return $result !== false;
+		}
+		foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
+			if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+				$answer->set_value($input_value);
+				$result = $answer->save();
+				return $result !== false;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * @param int|string       $form_input
+	 * @param float|int|string $input_value
+	 * @return boolean
+	 */
+	private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
+		$form_input = '',
+		$input_value = ''
+	): bool {
+		if (empty($input_value)) {
+			// if the form input isn't marked as being required, then just return
+			if (! isset($this->required_questions[ $form_input ]) || ! $this->required_questions[ $form_input ]) {
+				return true;
+			}
+			switch ($form_input) {
+				case 'fname':
+					EE_Error::add_error(
+						esc_html__('First Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'lname':
+					EE_Error::add_error(
+						esc_html__('Last Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case 'email':
+					EE_Error::add_error(
+						esc_html__('Please enter a valid email address.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+			}
+		}
+		return true;
+	}
 }

core/domain/services/registration/form/v1/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

@@ -18,355 +18,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__EventEspresso_core_domain_services_registration_form_v1_RegistrantData__ensureCriticalRegistrantDataIsSet',
-                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__EventEspresso_core_domain_services_registration_form_v1_RegistrantData__ensureCriticalRegistrantDataIsSet',
+				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;
+	}
 }

modules/single_page_checkout/reg_steps/attendee_information/EE_SPCO_Reg_Step_Attendee_Information.class.php

Spacing +9 added lines, -9 removed lines

@@ -53,11 +53,11 @@ 
 
     public function translate_js_strings()
     {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+        EE_Registry::$i18n_js_strings['required_field'] = esc_html__(
             ' is a required question.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+        EE_Registry::$i18n_js_strings['required_multi_field'] = esc_html__(
             ' is a required question. Please enter a value for at least one of the options.',
             'event_espresso'
         );
@@ -65,7 +65,7 @@ 
             'Please answer all required questions correctly before proceeding.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+        EE_Registry::$i18n_js_strings['attendee_info_copied'] = sprintf(
             esc_html_x(
                 'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
                 'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
@@ -73,11 +73,11 @@ 
             ),
             '<br/>'
         );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+        EE_Registry::$i18n_js_strings['attendee_info_copy_error'] = esc_html__(
             'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
             'event_espresso'
         );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+        EE_Registry::$i18n_js_strings['enter_valid_email'] = esc_html__(
             'You must enter a valid email address.',
             'event_espresso'
         );
@@ -322,7 +322,7 @@ 
         if (empty($valid_data)) {
             return $this->inValidDataError();
         }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+        if ( ! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
             return $this->inValidTransactionError();
         }
         // get cached registrations
@@ -334,14 +334,14 @@ 
         /** @var RegFormHandler $reg_form_handler */
         $reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
         // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+        if ( ! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
             // return immediately if the previous step exited early due to errors
             return false;
         }
         // if first pass thru SPCO,
         // then let's check processed registrations against the total number of tickets in the cart
         $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+        if ( ! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
             return $this->registrationProcessingError($registrations_processed);
         }
         // mark this reg step as completed
@@ -408,7 +408,7 @@ 
                 '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
                 'event_espresso'
             ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+            '<a href="'.get_post_type_archive_link('espresso_events').'" >',
             '</a>',
             '<br />'
         );

Indentation +858 added lines, -858 removed lines

@@ -22,862 +22,862 @@
  */
 class EE_SPCO_Reg_Step_Attendee_Information extends EE_SPCO_Reg_Step
 {
-    /**
-     * @var RegForm
-     */
-    public $reg_form;
-
-    /**
-     * @var int
-     */
-    protected $reg_form_count = 0;
-
-
-    /**
-     *    class constructor
-     *
-     * @access    public
-     * @param EE_Checkout $checkout
-     */
-    public function __construct(EE_Checkout $checkout)
-    {
-        $this->_slug    = 'attendee_information';
-        $this->_name    = esc_html__('Attendee Information', 'event_espresso');
-        $this->checkout = $checkout;
-        $this->_reset_success_message();
-        $this->set_instructions(
-            esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
-        );
-    }
-
-
-    public function translate_js_strings()
-    {
-        EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
-            ' is a required question.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
-            ' is a required question. Please enter a value for at least one of the options.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
-            'Please answer all required questions correctly before proceeding.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
-            esc_html_x(
-                'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
-                'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
-                'event_espresso'
-            ),
-            '<br/>'
-        );
-        EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
-            'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
-            'You must enter a valid email address.',
-            'event_espresso'
-        );
-        EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
-            'You must enter a valid email address and answer all other required questions before you can proceed.',
-            'event_espresso'
-        );
-    }
-
-
-    public function enqueue_styles_and_scripts()
-    {
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function initialize_reg_step(): bool
-    {
-        return true;
-    }
-
-
-    /**
-     * @return RegForm
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function generate_reg_form(): RegForm
-    {
-        $this->setLegacyFiltersForRegFormGeneration();
-        /** @var RegFormDependencyHandler $dependency_handler */
-        $dependency_handler = LoaderFactory::getShared(RegFormDependencyHandler::class);
-        $dependency_handler->registerDependencies();
-        // TODO detect if event has a reg form UUID and swap this out for form generated by new reg form builder
-        return LoaderFactory::getShared(RegForm::class, [$this]);
-    }
-
-
-    /**
-     * @since   5.0.0.p
-     */
-    private function setLegacyFiltersForRegFormGeneration()
-    {
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__question_groups_query_parameters',
-            [$this, 'registrationQuestionGroupsQueryParameters'],
-            1,
-            2
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__question_group_reg_form',
-            [$this, 'registrationQuestionGroupsRegForm'],
-            1,
-            3
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__printCopyInfo',
-            [$this, 'registrationRegFormPrintCopyInfo'],
-            1,
-            2
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__related_questions_query_params',
-            [$this, 'registrationRegFormRelatedQuestionsQueryParams'],
-            1,
-            3
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__before_question_group_questions',
-            [$this, 'registrationRegFormBeforeQuestionGroupQuestions'],
-            1,
-            3
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__subsections_array',
-            [$this, 'registrationRegFormSubsections'],
-            1,
-            3
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__after_question_group_questions',
-            [$this, 'registrationRegFormAfterQuestionGroupQuestions'],
-            1,
-            3
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_AutoCopyAttendeeInfoForm__construct__template_args',
-            [$this, 'autoCopyAttendeeInfoTemplateArgs'],
-            1
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_CountryOptions__generateLegacyCountryOptions__country_options',
-            [$this, 'generateQuestionInputCountryOptions'],
-            1,
-            4
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_StateOptions__generateLegacyStateOptions__state_options',
-            [$this, 'generateQuestionInputStateOptions'],
-            1,
-            4
-        );
-    }
-
-
-    /**
-     * @param array           $query_params
-     * @param EE_Registration $registration
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationQuestionGroupsQueryParameters(
-        array $query_params,
-        EE_Registration $registration
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__question_groups_query_parameters',
-            $query_params,
-            $registration,
-            $this
-        );
-    }
-
-
-    /**
-     * @param RegFormQuestionGroup $question_group_reg_form
-     * @param EE_Registration      $registration
-     * @param EE_Question_Group    $question_group
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationQuestionGroupsRegForm(
-        RegFormQuestionGroup $question_group_reg_form,
-        EE_Registration $registration,
-        EE_Question_Group $question_group
-    ) {
-        return 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
-        );
-    }
-
-
-    /**
-     * @param int $print_copy_info
-     * @param int $attendee_nmbr
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationRegFormPrintCopyInfo(
-        int $print_copy_info,
-        int $attendee_nmbr
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
-            $print_copy_info,
-            $attendee_nmbr
-        );
-    }
-
-
-    /**
-     * @param array             $query_params
-     * @param EE_Question_Group $question_group
-     * @param EE_Registration   $registration
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationRegFormRelatedQuestionsQueryParams(
-        array $query_params,
-        EE_Question_Group $question_group,
-        EE_Registration $registration
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__related_questions_query_params',
-            $query_params,
-            $question_group,
-            $registration,
-            $this
-        );
-    }
-
-
-    /**
-     * @param                   $html
-     * @param EE_Registration   $registration
-     * @param EE_Question_Group $question_group
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationRegFormBeforeQuestionGroupQuestions(
-        $html,
-        EE_Registration $registration,
-        EE_Question_Group $question_group
-    ) {
-        return apply_filters(
-            'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions',
-            $html,
-            $registration,
-            $question_group,
-            $this
-        );
-    }
-
-
-    /**
-     * @param array             $form_subsections
-     * @param EE_Registration   $registration
-     * @param EE_Question_Group $question_group
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationRegFormSubsections(
-        array $form_subsections,
-        EE_Registration $registration,
-        EE_Question_Group $question_group
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array',
-            $form_subsections,
-            $registration,
-            $question_group,
-            $this
-        );
-    }
-
-
-    /**
-     * @param                   $html
-     * @param EE_Registration   $registration
-     * @param EE_Question_Group $question_group
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function registrationRegFormAfterQuestionGroupQuestions(
-        $html,
-        EE_Registration $registration,
-        EE_Question_Group $question_group
-    ) {
-        return apply_filters(
-            'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions',
-            $html,
-            $registration,
-            $question_group,
-            $this
-        );
-    }
-
-
-    /**
-     * @param array $template_args
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function autoCopyAttendeeInfoTemplateArgs(array $template_args = [])
-    {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args',
-            $template_args
-        );
-    }
-
-
-    /**
-     * @param array           $country_options
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @param EE_Answer|null  $answer
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function generateQuestionInputCountryOptions(
-        array $country_options,
-        EE_Registration $registration,
-        EE_Question $question,
-        ?EE_Answer $answer
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
-            $country_options,
-            $this,
-            $registration,
-            $question,
-            $answer
-        );
-    }
-
-
-    /**
-     * @param array           $state_options
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @param EE_Answer|null  $answer
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function generateQuestionInputStateOptions(
-        array $state_options,
-        EE_Registration $registration,
-        EE_Question $question,
-        ?EE_Answer $answer
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
-            $state_options,
-            $this,
-            $registration,
-            $question,
-            $answer
-        );
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _registrations_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _additional_attendee_reg_info_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _question_group_reg_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _question_group_header()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _copy_attendee_info_form()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _auto_copy_attendee_info()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _copy_attendee_info_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _additional_primary_registrant_inputs()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
-     *
-     * @param EE_Registration $registration
-     * @param EE_Question     $question
-     * @return EE_Form_Input_Base
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   5.0.0.p
-     */
-    public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
-    {
-        /** @var RegFormQuestionFactory $reg_form_question_factory */
-        $reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
-        return $reg_form_question_factory->create($registration, $question);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
-     *
-     * @deprecated   5.0.0.p
-     */
-    private function _generate_question_input()
-    {
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
-     *
-     * @param array|null           $countries_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are country IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   5.0.0.p
-     */
-    public function use_cached_countries_for_form_input(
-        array $countries_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var CountryOptions $country_options */
-        $country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
-        return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
-    }
-
-
-    /**
-     * looking for hooks?
-     * this method has been replaced by:
-     * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
-     *
-     * @param array|null           $states_list
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer
-     * @return array 2d keys are state IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @deprecated   5.0.0.p
-     */
-    public function use_cached_states_for_form_input(
-        array $states_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        /** @var StateOptions $state_options */
-        $state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
-        return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
-    }
-
-
-    /********************************************************************************************************/
-    /****************************************  PROCESS REG STEP  ****************************************/
-    /********************************************************************************************************/
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function process_reg_step(): bool
-    {
-        $this->setLegacyFiltersForRegFormProcessing();
-        // grab validated data from form
-        $valid_data = $this->checkout->current_step->valid_data();
-        // if we don't have any $valid_data then something went TERRIBLY WRONG !!!
-        if (empty($valid_data)) {
-            return $this->inValidDataError();
-        }
-        if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
-            return $this->inValidTransactionError();
-        }
-        // get cached registrations
-        $registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
-        // verify we got the goods
-        if (empty($registrations)) {
-            return $this->noRegistrationsError();
-        }
-        /** @var RegFormHandler $reg_form_handler */
-        $reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
-        // extract attendee info from form data and save to model objects
-        if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
-            // return immediately if the previous step exited early due to errors
-            return false;
-        }
-        // if first pass thru SPCO,
-        // then let's check processed registrations against the total number of tickets in the cart
-        $registrations_processed = $reg_form_handler->attendeeCount();
-        if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
-            return $this->registrationProcessingError($registrations_processed);
-        }
-        // mark this reg step as completed
-        $this->set_completed();
-        $this->_set_success_message(
-            esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
-        );
-        // do action in case a plugin wants to do something with the data submitted in step 1.
-        // passes EE_Single_Page_Checkout, and it's posted data
-        do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
-        return true;
-    }
-
-
-    /**
-     * @since   5.0.0.p
-     */
-    private function setLegacyFiltersForRegFormProcessing()
-    {
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegistrations__bypass',
-            [$this, 'preRegistrationProcess'],
-            1,
-            5
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegFormData__registrant_form_data',
-            [$this, 'validDataLineItem'],
-            1,
-            2
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
-            [$this, 'saveRegistrationFormInput'],
-            1,
-            4
-        );
-        add_filter(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantData__ensureCriticalRegistrantDataIsSet',
-            [$this, 'mergeAddressDetailsWithCriticalAttendeeDetails'],
-            1
-        );
-    }
-
-
-    /**
-     * @param bool            $bypass
-     * @param int             $attendee_count
-     * @param EE_Registration $registration
-     * @param array           $registrations
-     * @param array           $reg_form_data
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function preRegistrationProcess(
-        bool $bypass,
-        int $attendee_count,
-        EE_Registration $registration,
-        array $registrations,
-        array $reg_form_data
-    ) {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
-            $bypass,
-            $attendee_count,
-            $registration,
-            $registrations,
-            $reg_form_data,
-            $this
-        );
-    }
-
-
-    /**
-     * @param array           $reg_form_data
-     * @param EE_Registration $registration
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function validDataLineItem(array $reg_form_data, EE_Registration $registration)
-    {
-        return apply_filters(
-            'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
-            $reg_form_data,
-            $registration
-        );
-    }
-
-
-    /**
-     * @param bool            $save
-     * @param EE_Registration $registration
-     * @param                 $form_input
-     * @param                 $input_value
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function saveRegistrationFormInput(bool $save, EE_Registration $registration, $form_input, $input_value)
-    {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
-            $save,
-            $registration,
-            $form_input,
-            $input_value,
-            $this
-        );
-    }
-
-
-    /**
-     * @param bool $merge_data
-     * @return mixed|void
-     * @since   5.0.0.p
-     */
-    public function mergeAddressDetailsWithCriticalAttendeeDetails(bool $merge_data)
-    {
-        return apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
-            $merge_data
-        );
-    }
-
-
-    /**
-     * @return bool
-     * @since   5.0.0.p
-     */
-    private function inValidDataError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__('No valid question responses were received.', 'event_espresso'),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   5.0.0.p
-     */
-    private function inValidTransactionError(): bool
-    {
-        EE_Error::add_error(
-            esc_html__(
-                'A valid transaction could not be initiated for processing your registrations.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
-
-
-    /**
-     * @return bool
-     * @since   5.0.0.p
-     */
-    private function noRegistrationsError(): bool
-    {
-        // combine the old translated string with a new one, in order to not break translations
-        $error_message = esc_html__(
-            'Your form data could not be applied to any valid registrations.',
-            'event_espresso'
-        );
-        $error_message .= sprintf(
-            esc_html_x(
-                '%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
-                '(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
-                'event_espresso'
-            ),
-            '<a href="' . get_post_type_archive_link('espresso_events') . '" >',
-            '</a>',
-            '<br />'
-        );
-        EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     * @param int $registrations_processed
-     * @return bool
-     * @since   5.0.0.p
-     */
-    private function registrationProcessingError(int $registrations_processed): bool
-    {
-        // generate a correctly translated string for all possible singular/plural combinations
-        if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
-                    'There was 1 ticket in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
-            $error_msg = sprintf(
-                esc_html_x(
-                    'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
-                    'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        } else {
-            $error_msg = sprintf(
-                esc_html__(
-                    'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
-                    'event_espresso'
-                ),
-                $this->checkout->total_ticket_count,
-                $registrations_processed
-            );
-        }
-        EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
-        return false;
-    }
-
-
-    /**
-     *    update_reg_step
-     *    this is the final step after a user  revisits the site to edit their attendee information
-     *    this gets called AFTER the process_reg_step() method above
-     *
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function update_reg_step(): bool
-    {
-        // save everything
-        if ($this->process_reg_step()) {
-            $this->checkout->redirect     = true;
-            $this->checkout->redirect_url = add_query_arg(
-                [
-                    'e_reg_url_link' => $this->checkout->reg_url_link,
-                    'revisit'        => true,
-                ],
-                $this->checkout->thank_you_page_url
-            );
-            $this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * @var RegForm
+	 */
+	public $reg_form;
+
+	/**
+	 * @var int
+	 */
+	protected $reg_form_count = 0;
+
+
+	/**
+	 *    class constructor
+	 *
+	 * @access    public
+	 * @param EE_Checkout $checkout
+	 */
+	public function __construct(EE_Checkout $checkout)
+	{
+		$this->_slug    = 'attendee_information';
+		$this->_name    = esc_html__('Attendee Information', 'event_espresso');
+		$this->checkout = $checkout;
+		$this->_reset_success_message();
+		$this->set_instructions(
+			esc_html__('Please answer the following registration questions before proceeding.', 'event_espresso')
+		);
+	}
+
+
+	public function translate_js_strings()
+	{
+		EE_Registry::$i18n_js_strings['required_field']            = esc_html__(
+			' is a required question.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['required_multi_field']      = esc_html__(
+			' is a required question. Please enter a value for at least one of the options.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['answer_required_questions'] = esc_html__(
+			'Please answer all required questions correctly before proceeding.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copied']      = sprintf(
+			esc_html_x(
+				'The attendee information was successfully copied.%sPlease ensure the rest of the registration form is completed before proceeding.',
+				'The attendee information was successfully copied.(line break)Please ensure the rest of the registration form is completed before proceeding.',
+				'event_espresso'
+			),
+			'<br/>'
+		);
+		EE_Registry::$i18n_js_strings['attendee_info_copy_error']  = esc_html__(
+			'An unknown error occurred on the server while attempting to copy the attendee information. Please refresh the page and try again.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['enter_valid_email']         = esc_html__(
+			'You must enter a valid email address.',
+			'event_espresso'
+		);
+		EE_Registry::$i18n_js_strings['valid_email_and_questions'] = esc_html__(
+			'You must enter a valid email address and answer all other required questions before you can proceed.',
+			'event_espresso'
+		);
+	}
+
+
+	public function enqueue_styles_and_scripts()
+	{
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function initialize_reg_step(): bool
+	{
+		return true;
+	}
+
+
+	/**
+	 * @return RegForm
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function generate_reg_form(): RegForm
+	{
+		$this->setLegacyFiltersForRegFormGeneration();
+		/** @var RegFormDependencyHandler $dependency_handler */
+		$dependency_handler = LoaderFactory::getShared(RegFormDependencyHandler::class);
+		$dependency_handler->registerDependencies();
+		// TODO detect if event has a reg form UUID and swap this out for form generated by new reg form builder
+		return LoaderFactory::getShared(RegForm::class, [$this]);
+	}
+
+
+	/**
+	 * @since   5.0.0.p
+	 */
+	private function setLegacyFiltersForRegFormGeneration()
+	{
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__question_groups_query_parameters',
+			[$this, 'registrationQuestionGroupsQueryParameters'],
+			1,
+			2
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__question_group_reg_form',
+			[$this, 'registrationQuestionGroupsRegForm'],
+			1,
+			3
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantForm__generateFormArgs__printCopyInfo',
+			[$this, 'registrationRegFormPrintCopyInfo'],
+			1,
+			2
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__related_questions_query_params',
+			[$this, 'registrationRegFormRelatedQuestionsQueryParams'],
+			1,
+			3
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__before_question_group_questions',
+			[$this, 'registrationRegFormBeforeQuestionGroupQuestions'],
+			1,
+			3
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__subsections_array',
+			[$this, 'registrationRegFormSubsections'],
+			1,
+			3
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormQuestionGroup__generateFormArgs__after_question_group_questions',
+			[$this, 'registrationRegFormAfterQuestionGroupQuestions'],
+			1,
+			3
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_AutoCopyAttendeeInfoForm__construct__template_args',
+			[$this, 'autoCopyAttendeeInfoTemplateArgs'],
+			1
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_CountryOptions__generateLegacyCountryOptions__country_options',
+			[$this, 'generateQuestionInputCountryOptions'],
+			1,
+			4
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_StateOptions__generateLegacyStateOptions__state_options',
+			[$this, 'generateQuestionInputStateOptions'],
+			1,
+			4
+		);
+	}
+
+
+	/**
+	 * @param array           $query_params
+	 * @param EE_Registration $registration
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationQuestionGroupsQueryParameters(
+		array $query_params,
+		EE_Registration $registration
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form__question_groups_query_parameters',
+			$query_params,
+			$registration,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param RegFormQuestionGroup $question_group_reg_form
+	 * @param EE_Registration      $registration
+	 * @param EE_Question_Group    $question_group
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationQuestionGroupsRegForm(
+		RegFormQuestionGroup $question_group_reg_form,
+		EE_Registration $registration,
+		EE_Question_Group $question_group
+	) {
+		return 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
+		);
+	}
+
+
+	/**
+	 * @param int $print_copy_info
+	 * @param int $attendee_nmbr
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationRegFormPrintCopyInfo(
+		int $print_copy_info,
+		int $attendee_nmbr
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
+			$print_copy_info,
+			$attendee_nmbr
+		);
+	}
+
+
+	/**
+	 * @param array             $query_params
+	 * @param EE_Question_Group $question_group
+	 * @param EE_Registration   $registration
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationRegFormRelatedQuestionsQueryParams(
+		array $query_params,
+		EE_Question_Group $question_group,
+		EE_Registration $registration
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___question_group_reg_form__related_questions_query_params',
+			$query_params,
+			$question_group,
+			$registration,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param                   $html
+	 * @param EE_Registration   $registration
+	 * @param EE_Question_Group $question_group
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationRegFormBeforeQuestionGroupQuestions(
+		$html,
+		EE_Registration $registration,
+		EE_Question_Group $question_group
+	) {
+		return apply_filters(
+			'FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions',
+			$html,
+			$registration,
+			$question_group,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param array             $form_subsections
+	 * @param EE_Registration   $registration
+	 * @param EE_Question_Group $question_group
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationRegFormSubsections(
+		array $form_subsections,
+		EE_Registration $registration,
+		EE_Question_Group $question_group
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__question_group_reg_form__subsections_array',
+			$form_subsections,
+			$registration,
+			$question_group,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param                   $html
+	 * @param EE_Registration   $registration
+	 * @param EE_Question_Group $question_group
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function registrationRegFormAfterQuestionGroupQuestions(
+		$html,
+		EE_Registration $registration,
+		EE_Question_Group $question_group
+	) {
+		return apply_filters(
+			'FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions',
+			$html,
+			$registration,
+			$question_group,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param array $template_args
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function autoCopyAttendeeInfoTemplateArgs(array $template_args = [])
+	{
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__auto_copy_attendee_info__template_args',
+			$template_args
+		);
+	}
+
+
+	/**
+	 * @param array           $country_options
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @param EE_Answer|null  $answer
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function generateQuestionInputCountryOptions(
+		array $country_options,
+		EE_Registration $registration,
+		EE_Question $question,
+		?EE_Answer $answer
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
+			$country_options,
+			$this,
+			$registration,
+			$question,
+			$answer
+		);
+	}
+
+
+	/**
+	 * @param array           $state_options
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @param EE_Answer|null  $answer
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function generateQuestionInputStateOptions(
+		array $state_options,
+		EE_Registration $registration,
+		EE_Question $question,
+		?EE_Answer $answer
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__state_options',
+			$state_options,
+			$this,
+			$registration,
+			$question,
+			$answer
+		);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::getRegForm()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _registrations_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalAttendeeRegInfoInput()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _additional_attendee_reg_info_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupRegForm()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _question_group_reg_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::questionGroupHeader()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _question_group_header()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _copy_attendee_info_form()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\AutoCopyAttendeeInfoForm
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _auto_copy_attendee_info()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CopyAttendeeInfoForm
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _copy_attendee_info_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::additionalPrimaryRegistrantInputs()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _additional_primary_registrant_inputs()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegFormQuestionFactory::create()
+	 *
+	 * @param EE_Registration $registration
+	 * @param EE_Question     $question
+	 * @return EE_Form_Input_Base
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   5.0.0.p
+	 */
+	public function reg_form_question(EE_Registration $registration, EE_Question $question): EE_Form_Input_Base
+	{
+		/** @var RegFormQuestionFactory $reg_form_question_factory */
+		$reg_form_question_factory = LoaderFactory::getShared(RegFormQuestionFactory::class);
+		return $reg_form_question_factory->create($registration, $question);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\RegForm::generateQuestionInput()
+	 *
+	 * @deprecated   5.0.0.p
+	 */
+	private function _generate_question_input()
+	{
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\CountryOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $countries_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are country IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   5.0.0.p
+	 */
+	public function use_cached_countries_for_form_input(
+		array $countries_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var CountryOptions $country_options */
+		$country_options = LoaderFactory::getShared(CountryOptions::class, [$this->checkout->action]);
+		return $country_options->forLegacyFormInput($countries_list, $question, $registration, $answer);
+	}
+
+
+	/**
+	 * looking for hooks?
+	 * this method has been replaced by:
+	 * EventEspresso\core\domain\services\registration\form\v1\StateOptions::forLegacyFormInput()
+	 *
+	 * @param array|null           $states_list
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer
+	 * @return array 2d keys are state IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @deprecated   5.0.0.p
+	 */
+	public function use_cached_states_for_form_input(
+		array $states_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		/** @var StateOptions $state_options */
+		$state_options = LoaderFactory::getShared(StateOptions::class, [$this->checkout->action]);
+		return $state_options->forLegacyFormInput($states_list, $question, $registration, $answer);
+	}
+
+
+	/********************************************************************************************************/
+	/****************************************  PROCESS REG STEP  ****************************************/
+	/********************************************************************************************************/
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function process_reg_step(): bool
+	{
+		$this->setLegacyFiltersForRegFormProcessing();
+		// grab validated data from form
+		$valid_data = $this->checkout->current_step->valid_data();
+		// if we don't have any $valid_data then something went TERRIBLY WRONG !!!
+		if (empty($valid_data)) {
+			return $this->inValidDataError();
+		}
+		if (! $this->checkout->transaction instanceof EE_Transaction || ! $this->checkout->continue_reg) {
+			return $this->inValidTransactionError();
+		}
+		// get cached registrations
+		$registrations = $this->checkout->transaction->registrations($this->checkout->reg_cache_where_params);
+		// verify we got the goods
+		if (empty($registrations)) {
+			return $this->noRegistrationsError();
+		}
+		/** @var RegFormHandler $reg_form_handler */
+		$reg_form_handler = LoaderFactory::getNew(RegFormHandler::class, [$this->checkout]);
+		// extract attendee info from form data and save to model objects
+		if (! $reg_form_handler->processRegistrations($registrations, $valid_data)) {
+			// return immediately if the previous step exited early due to errors
+			return false;
+		}
+		// if first pass thru SPCO,
+		// then let's check processed registrations against the total number of tickets in the cart
+		$registrations_processed = $reg_form_handler->attendeeCount();
+		if (! $this->checkout->revisit && $registrations_processed !== $this->checkout->total_ticket_count) {
+			return $this->registrationProcessingError($registrations_processed);
+		}
+		// mark this reg step as completed
+		$this->set_completed();
+		$this->_set_success_message(
+			esc_html__('The Attendee Information Step has been successfully completed.', 'event_espresso')
+		);
+		// do action in case a plugin wants to do something with the data submitted in step 1.
+		// passes EE_Single_Page_Checkout, and it's posted data
+		do_action('AHEE__EE_Single_Page_Checkout__process_attendee_information__end', $this, $valid_data);
+		return true;
+	}
+
+
+	/**
+	 * @since   5.0.0.p
+	 */
+	private function setLegacyFiltersForRegFormProcessing()
+	{
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegistrations__bypass',
+			[$this, 'preRegistrationProcess'],
+			1,
+			5
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegFormData__registrant_form_data',
+			[$this, 'validDataLineItem'],
+			1,
+			2
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormInputHandler__saveRegistrationFormInput',
+			[$this, 'saveRegistrationFormInput'],
+			1,
+			4
+		);
+		add_filter(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegistrantData__ensureCriticalRegistrantDataIsSet',
+			[$this, 'mergeAddressDetailsWithCriticalAttendeeDetails'],
+			1
+		);
+	}
+
+
+	/**
+	 * @param bool            $bypass
+	 * @param int             $attendee_count
+	 * @param EE_Registration $registration
+	 * @param array           $registrations
+	 * @param array           $reg_form_data
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function preRegistrationProcess(
+		bool $bypass,
+		int $attendee_count,
+		EE_Registration $registration,
+		array $registrations,
+		array $reg_form_data
+	) {
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___process_registrations__pre_registration_process',
+			$bypass,
+			$attendee_count,
+			$registration,
+			$registrations,
+			$reg_form_data,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param array           $reg_form_data
+	 * @param EE_Registration $registration
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function validDataLineItem(array $reg_form_data, EE_Registration $registration)
+	{
+		return apply_filters(
+			'FHEE__EE_Single_Page_Checkout__process_attendee_information__valid_data_line_item',
+			$reg_form_data,
+			$registration
+		);
+	}
+
+
+	/**
+	 * @param bool            $save
+	 * @param EE_Registration $registration
+	 * @param                 $form_input
+	 * @param                 $input_value
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function saveRegistrationFormInput(bool $save, EE_Registration $registration, $form_input, $input_value)
+	{
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
+			$save,
+			$registration,
+			$form_input,
+			$input_value,
+			$this
+		);
+	}
+
+
+	/**
+	 * @param bool $merge_data
+	 * @return mixed|void
+	 * @since   5.0.0.p
+	 */
+	public function mergeAddressDetailsWithCriticalAttendeeDetails(bool $merge_data)
+	{
+		return apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information__merge_address_details_with_critical_attendee_details',
+			$merge_data
+		);
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	private function inValidDataError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__('No valid question responses were received.', 'event_espresso'),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	private function inValidTransactionError(): bool
+	{
+		EE_Error::add_error(
+			esc_html__(
+				'A valid transaction could not be initiated for processing your registrations.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
+
+
+	/**
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	private function noRegistrationsError(): bool
+	{
+		// combine the old translated string with a new one, in order to not break translations
+		$error_message = esc_html__(
+			'Your form data could not be applied to any valid registrations.',
+			'event_espresso'
+		);
+		$error_message .= sprintf(
+			esc_html_x(
+				'%3$sThis can sometimes happen if too much time has been taken to complete the registration process.%3$sPlease return to the %1$sEvent List%2$s and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'(line break)This can sometimes happen if too much time has been taken to complete the registration process.(line break)Please return to the (link)Event List(end link) and reselect your tickets. If the problem continues, please contact the site administrator.',
+				'event_espresso'
+			),
+			'<a href="' . get_post_type_archive_link('espresso_events') . '" >',
+			'</a>',
+			'<br />'
+		);
+		EE_Error::add_error($error_message, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 * @param int $registrations_processed
+	 * @return bool
+	 * @since   5.0.0.p
+	 */
+	private function registrationProcessingError(int $registrations_processed): bool
+	{
+		// generate a correctly translated string for all possible singular/plural combinations
+		if ($this->checkout->total_ticket_count === 1 && $registrations_processed !== 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was %1$d ticket in the Event Queue, but %2$ds registrations were processed',
+					'There was 1 ticket in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} elseif ($this->checkout->total_ticket_count !== 1 && $registrations_processed === 1) {
+			$error_msg = sprintf(
+				esc_html_x(
+					'There was a total of %1$d tickets in the Event Queue, but only %2$ds registration was processed',
+					'There was a total of 2 tickets in the Event Queue, but only 1 registration was processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		} else {
+			$error_msg = sprintf(
+				esc_html__(
+					'There was a total of 2 tickets in the Event Queue, but 2 registrations were processed',
+					'event_espresso'
+				),
+				$this->checkout->total_ticket_count,
+				$registrations_processed
+			);
+		}
+		EE_Error::add_error($error_msg, __FILE__, __FUNCTION__, __LINE__);
+		return false;
+	}
+
+
+	/**
+	 *    update_reg_step
+	 *    this is the final step after a user  revisits the site to edit their attendee information
+	 *    this gets called AFTER the process_reg_step() method above
+	 *
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function update_reg_step(): bool
+	{
+		// save everything
+		if ($this->process_reg_step()) {
+			$this->checkout->redirect     = true;
+			$this->checkout->redirect_url = add_query_arg(
+				[
+					'e_reg_url_link' => $this->checkout->reg_url_link,
+					'revisit'        => true,
+				],
+				$this->checkout->thank_you_page_url
+			);
+			$this->checkout->json_response->set_redirect_url($this->checkout->redirect_url);
+			return true;
+		}
+		return false;
+	}
 }

core/domain/services/graphql/mutators/TicketUpdate.php

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
          * @throws EE_Error
          * @throws ReflectionException
          */
-        return static function (array $input, AppContext $context, ResolveInfo $info) use ($model, $type): array {
+        return static function(array $input, AppContext $context, ResolveInfo $info) use ($model, $type): array {
             try {
                 /** @var EE_Ticket $entity */
                 $entity = EntityMutator::getEntityFromInputData($model, $input);
@@ -55,7 +55,7 @@ 
 
                 $entity->save($args);
 
-                if (! empty($datetimes)) {
+                if ( ! empty($datetimes)) {
                     TicketMutation::setRelatedDatetimes($entity, $datetimes);
                 }
                 // if prices array is passed.

Indentation +57 added lines, -57 removed lines

@@ -14,68 +14,68 @@
 
 class TicketUpdate extends EntityMutator
 {
-    /**
-     * Defines the mutation data modification closure.
-     *
-     * @param EEM_Ticket $model
-     * @param Ticket     $type
-     * @return callable
-     */
-    public static function mutateAndGetPayload(EEM_Ticket $model, Ticket $type)
-    {
-        /**
-         * Updates an entity.
-         *
-         * @param array       $input   The input for the mutation
-         * @param AppContext  $context The AppContext passed down to all resolvers
-         * @param ResolveInfo $info    The ResolveInfo passed down to all resolvers
-         * @return array
-         * @throws EE_Error
-         * @throws ReflectionException
-         */
-        return static function (array $input, AppContext $context, ResolveInfo $info) use ($model, $type): array {
-            try {
-                /** @var EE_Ticket $entity */
-                $entity = EntityMutator::getEntityFromInputData($model, $input);
+	/**
+	 * Defines the mutation data modification closure.
+	 *
+	 * @param EEM_Ticket $model
+	 * @param Ticket     $type
+	 * @return callable
+	 */
+	public static function mutateAndGetPayload(EEM_Ticket $model, Ticket $type)
+	{
+		/**
+		 * Updates an entity.
+		 *
+		 * @param array       $input   The input for the mutation
+		 * @param AppContext  $context The AppContext passed down to all resolvers
+		 * @param ResolveInfo $info    The ResolveInfo passed down to all resolvers
+		 * @return array
+		 * @throws EE_Error
+		 * @throws ReflectionException
+		 */
+		return static function (array $input, AppContext $context, ResolveInfo $info) use ($model, $type): array {
+			try {
+				/** @var EE_Ticket $entity */
+				$entity = EntityMutator::getEntityFromInputData($model, $input);
 
-                $datetimes = [];
-                $prices = null;
+				$datetimes = [];
+				$prices = null;
 
-                $args = TicketMutation::prepareFields($input);
+				$args = TicketMutation::prepareFields($input);
 
-                if (isset($args['datetimes'])) {
-                    $datetimes = $args['datetimes'];
-                    unset($args['datetimes']);
-                }
-                if (array_key_exists('prices', $args)) {
-                    $prices = $args['prices'];
-                    unset($args['prices']);
-                }
+				if (isset($args['datetimes'])) {
+					$datetimes = $args['datetimes'];
+					unset($args['datetimes']);
+				}
+				if (array_key_exists('prices', $args)) {
+					$prices = $args['prices'];
+					unset($args['prices']);
+				}
 
-                $entity->save($args);
+				$entity->save($args);
 
-                if (! empty($datetimes)) {
-                    TicketMutation::setRelatedDatetimes($entity, $datetimes);
-                }
-                // if prices array is passed.
-                if (is_array($prices)) {
-                    TicketMutation::setRelatedPrices($entity, $prices);
-                }
+				if (! empty($datetimes)) {
+					TicketMutation::setRelatedDatetimes($entity, $datetimes);
+				}
+				// if prices array is passed.
+				if (is_array($prices)) {
+					TicketMutation::setRelatedPrices($entity, $prices);
+				}
 
-                do_action('AHEE__EventEspresso_core_domain_services_graphql_mutators_ticket_update', $entity, $input);
-            } catch (Exception $exception) {
-                EntityMutator::handleExceptions(
-                    $exception,
-                    esc_html__(
-                        'The ticket could not be updated because of the following error(s)',
-                        'event_espresso'
-                    )
-                );
-            }
+				do_action('AHEE__EventEspresso_core_domain_services_graphql_mutators_ticket_update', $entity, $input);
+			} catch (Exception $exception) {
+				EntityMutator::handleExceptions(
+					$exception,
+					esc_html__(
+						'The ticket could not be updated because of the following error(s)',
+						'event_espresso'
+					)
+				);
+			}
 
-            return [
-                'id' => $entity->ID(),
-            ];
-        };
-    }
+			return [
+				'id' => $entity->ID(),
+			];
+		};
+	}
 }

core/domain/services/graphql/mutators/DatetimeBulkUpdate.php

Indentation +13 added lines, -13 removed lines

@@ -8,17 +8,17 @@
 class DatetimeBulkUpdate extends EntityMutator
 {
 
-    /**
-     * Defines the mutation data modification closure.
-     *
-     * @param EEM_Datetime $model
-     * @param Datetime     $type
-     * @return callable
-     */
-    public static function mutateAndGetPayload(EEM_Datetime $model, Datetime $type): callable
-    {
-        $entityMutator = DatetimeUpdate::mutateAndGetPayload($model, $type);
-        $bulkMutator = new BulkEntityMutator($entityMutator);
-        return array($bulkMutator, 'updateEntities');
-    }
+	/**
+	 * Defines the mutation data modification closure.
+	 *
+	 * @param EEM_Datetime $model
+	 * @param Datetime     $type
+	 * @return callable
+	 */
+	public static function mutateAndGetPayload(EEM_Datetime $model, Datetime $type): callable
+	{
+		$entityMutator = DatetimeUpdate::mutateAndGetPayload($model, $type);
+		$bulkMutator = new BulkEntityMutator($entityMutator);
+		return array($bulkMutator, 'updateEntities');
+	}
 }

core/domain/services/graphql/mutators/EventUpdate.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
          * @param ResolveInfo  $info             The ResolveInfo passed down to all resolvers
          * @return void
          */
-        return static function (
+        return static function(
             int $id,
             array $input,
             WP_Post_Type $post_type_object,

Indentation +64 added lines, -64 removed lines

@@ -14,73 +14,73 @@
 class EventUpdate extends EntityMutator
 {
 
-    /**
-     * Defines the mutation data modification closure.
-     *
-     * @param EEM_Event $model
-     * @param Event     $type
-     * @return callable
-     */
-    public static function mutateFields(EEM_Event $model, Event $type)
-    {
-        /**
-         * Update additional data related to the entity.
-         *
-         * @param int          $id               The ID of the postObject being mutated
-         * @param array        $input            The input for the mutation
-         * @param WP_Post_Type $post_type_object The Post Type Object for the type of post being mutated
-         * @param string       $mutation_name    The name of the mutation (ex: create, update, delete)
-         * @param AppContext   $context          The AppContext passed down to all resolvers
-         * @param ResolveInfo  $info             The ResolveInfo passed down to all resolvers
-         * @return void
-         */
-        return static function (
-            int $id,
-            array $input,
-            WP_Post_Type $post_type_object,
-            string $mutation_name,
-            AppContext $context,
-            ResolveInfo $info
-        ) use (
-            $model,
-            $type
-        ) {
-            try {
-                // Make sure we are dealing with the right entity.
-                if (
-                    ! property_exists($post_type_object, 'graphql_single_name')
-                    || $post_type_object->graphql_single_name !== $type->name()
-                ) {
-                    return;
-                }
+	/**
+	 * Defines the mutation data modification closure.
+	 *
+	 * @param EEM_Event $model
+	 * @param Event     $type
+	 * @return callable
+	 */
+	public static function mutateFields(EEM_Event $model, Event $type)
+	{
+		/**
+		 * Update additional data related to the entity.
+		 *
+		 * @param int          $id               The ID of the postObject being mutated
+		 * @param array        $input            The input for the mutation
+		 * @param WP_Post_Type $post_type_object The Post Type Object for the type of post being mutated
+		 * @param string       $mutation_name    The name of the mutation (ex: create, update, delete)
+		 * @param AppContext   $context          The AppContext passed down to all resolvers
+		 * @param ResolveInfo  $info             The ResolveInfo passed down to all resolvers
+		 * @return void
+		 */
+		return static function (
+			int $id,
+			array $input,
+			WP_Post_Type $post_type_object,
+			string $mutation_name,
+			AppContext $context,
+			ResolveInfo $info
+		) use (
+			$model,
+			$type
+		) {
+			try {
+				// Make sure we are dealing with the right entity.
+				if (
+					! property_exists($post_type_object, 'graphql_single_name')
+					|| $post_type_object->graphql_single_name !== $type->name()
+				) {
+					return;
+				}
 
-                /** @var EE_Event $entity */
-                $entity = EntityMutator::getEntityFromID($model, $id);
-                $args = EventMutation::prepareFields($input);
+				/** @var EE_Event $entity */
+				$entity = EntityMutator::getEntityFromID($model, $id);
+				$args = EventMutation::prepareFields($input);
 
-                $venue = 'NO_VENUE_SET';
-                if (array_key_exists('venue', $args)) {
-                    $venue = $args['venue'];
-                    unset($args['venue']);
-                }
+				$venue = 'NO_VENUE_SET';
+				if (array_key_exists('venue', $args)) {
+					$venue = $args['venue'];
+					unset($args['venue']);
+				}
 
-                // Update the entity
-                $entity->save($args);
+				// Update the entity
+				$entity->save($args);
 
-                if ($venue !== 'NO_VENUE_SET') {
-                    EventMutation::setEventVenue($entity, $venue);
-                }
+				if ($venue !== 'NO_VENUE_SET') {
+					EventMutation::setEventVenue($entity, $venue);
+				}
 
-                do_action('AHEE__EventEspresso_core_domain_services_graphql_mutators_event_update', $entity, $input);
-            } catch (Exception $exception) {
-                EntityMutator::handleExceptions(
-                    $exception,
-                    esc_html__(
-                        'The event could not be updated because of the following error(s)',
-                        'event_espresso'
-                    )
-                );
-            }
-        };
-    }
+				do_action('AHEE__EventEspresso_core_domain_services_graphql_mutators_event_update', $entity, $input);
+			} catch (Exception $exception) {
+				EntityMutator::handleExceptions(
+					$exception,
+					esc_html__(
+						'The event could not be updated because of the following error(s)',
+						'event_espresso'
+					)
+				);
+			}
+		};
+	}
 }