eventespresso / event-espresso-core

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

Indentation +107 added lines, -107 removed lines

@@ -29,121 +29,121 @@
 class RegFormFactory
 {
 
-    /**
-     * legacy SPCO reg form
-     */
-    const VERSION_1 = 'v1';
+	/**
+	 * legacy SPCO reg form
+	 */
+	const VERSION_1 = 'v1';
 
-    /**
-     * Form Sections and Form Elements generated using Barista Form Builder
-     */
-    const VERSION_2 = 'v2';
+	/**
+	 * Form Sections and Form Elements generated using Barista Form Builder
+	 */
+	const VERSION_2 = 'v2';
 
-    /**
-     * @var string
-     */
-    private $reg_form_version;
+	/**
+	 * @var string
+	 */
+	private $reg_form_version;
 
 
-    /**
-     * RegFormFactory constructor.
-     *
-     * @param string $reg_form_version
-     */
-    public function __construct(string $reg_form_version = RegFormFactory::VERSION_1)
-    {
-        $this->reg_form_version = $reg_form_version;
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 1);
-        \EEH_Debug_Tools::printr($this->reg_form_version, '$this->reg_form_version', __FILE__, __LINE__);
-    }
+	/**
+	 * RegFormFactory constructor.
+	 *
+	 * @param string $reg_form_version
+	 */
+	public function __construct(string $reg_form_version = RegFormFactory::VERSION_1)
+	{
+		$this->reg_form_version = $reg_form_version;
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 1);
+		\EEH_Debug_Tools::printr($this->reg_form_version, '$this->reg_form_version', __FILE__, __LINE__);
+	}
 
 
-    /**
-     * @param array $dependencies
-     * @return FormSectionProperInterface
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getRegForm(array $dependencies): FormSectionProperInterface
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->registerDependencies();
-        switch ($this->reg_form_version) {
-            case RegFormFactory::VERSION_2:
-                $reg_step = $dependencies[0];
-                if (! $reg_step instanceof EE_SPCO_Reg_Step) {
-                    throw new DomainException(
-                        esc_html__('Invalid or missing SPCO Registration Step', 'event_espresso')
-                    );
-                }
-                /** @var FormSubmissionHandler $form_submission_handler */
-                $form_submission_handler = LoaderFactory::getNew(
-                    FormSubmissionHandler::class,
-                    [$reg_step->checkout->transaction]
-                );
-                $form_data_api           = $form_submission_handler->getFormDataAPI();
-                return LoaderFactory::getShared(RegFormV2::class, [$reg_step, $form_data_api]);
-            case RegFormFactory::VERSION_1:
-            default:
-                return LoaderFactory::getShared(RegFormV1::class, $dependencies);
-        }
-    }
+	/**
+	 * @param array $dependencies
+	 * @return FormSectionProperInterface
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getRegForm(array $dependencies): FormSectionProperInterface
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->registerDependencies();
+		switch ($this->reg_form_version) {
+			case RegFormFactory::VERSION_2:
+				$reg_step = $dependencies[0];
+				if (! $reg_step instanceof EE_SPCO_Reg_Step) {
+					throw new DomainException(
+						esc_html__('Invalid or missing SPCO Registration Step', 'event_espresso')
+					);
+				}
+				/** @var FormSubmissionHandler $form_submission_handler */
+				$form_submission_handler = LoaderFactory::getNew(
+					FormSubmissionHandler::class,
+					[$reg_step->checkout->transaction]
+				);
+				$form_data_api           = $form_submission_handler->getFormDataAPI();
+				return LoaderFactory::getShared(RegFormV2::class, [$reg_step, $form_data_api]);
+			case RegFormFactory::VERSION_1:
+			default:
+				return LoaderFactory::getShared(RegFormV1::class, $dependencies);
+		}
+	}
 
 
-    /**
-     * @return void
-     * @throws InvalidArgumentException
-     */
-    private function registerDependencies()
-    {
-        switch ($this->reg_form_version) {
-            case RegFormFactory::VERSION_1:
-                /** @var RegFormDepHandlerV1 $dependency_handler */
-                $dependency_handler = LoaderFactory::getShared(RegFormDepHandlerV1::class);
-                break;
-            case RegFormFactory::VERSION_2:
-                /** @var RegFormDepHandlerV2 $dependency_handler */
-                $dependency_handler = LoaderFactory::getShared(RegFormDepHandlerV2::class);
-                break;
-            default:
-                throw new InvalidArgumentException(
-                    esc_html__(
-                        'Invalid registration form version requested. Version number must match one of the RegFormFactory::VERSION_* constants.',
-                        'event_espresso'
-                    )
-                );
-        }
-        if (! $dependency_handler instanceof DependencyHandler) {
-            throw new DomainException(
-                esc_html__('Invalid Registration Form DependencyHandler.', 'event_espresso')
-            );
-        }
-        $dependency_handler->registerDependencies();
-    }
+	/**
+	 * @return void
+	 * @throws InvalidArgumentException
+	 */
+	private function registerDependencies()
+	{
+		switch ($this->reg_form_version) {
+			case RegFormFactory::VERSION_1:
+				/** @var RegFormDepHandlerV1 $dependency_handler */
+				$dependency_handler = LoaderFactory::getShared(RegFormDepHandlerV1::class);
+				break;
+			case RegFormFactory::VERSION_2:
+				/** @var RegFormDepHandlerV2 $dependency_handler */
+				$dependency_handler = LoaderFactory::getShared(RegFormDepHandlerV2::class);
+				break;
+			default:
+				throw new InvalidArgumentException(
+					esc_html__(
+						'Invalid registration form version requested. Version number must match one of the RegFormFactory::VERSION_* constants.',
+						'event_espresso'
+					)
+				);
+		}
+		if (! $dependency_handler instanceof DependencyHandler) {
+			throw new DomainException(
+				esc_html__('Invalid Registration Form DependencyHandler.', 'event_espresso')
+			);
+		}
+		$dependency_handler->registerDependencies();
+	}
 
 
-    /**
-     * @param EE_Checkout $checkout
-     * @return RegFormHandlerInterface
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getRegFormHandler(EE_Checkout $checkout): RegFormHandlerInterface
-    {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        switch ($this->reg_form_version) {
-            case RegFormFactory::VERSION_2:
-                /** @var RegFormHandlerV2 $handler */
-                $handler = LoaderFactory::getNew(RegFormHandlerV2::class, [$checkout]);
-                $handler->getFormSubmission();
-                $handler->initializeInputHandler();
-                return $handler;
-            case RegFormFactory::VERSION_1:
-            default:
-                /** @var RegFormHandlerV1 $handler */
-                $handler = LoaderFactory::getNew(RegFormHandlerV1::class, [$checkout]);
-                $handler->initializeInputHandler();
-                return $handler;
-        }
-    }
+	/**
+	 * @param EE_Checkout $checkout
+	 * @return RegFormHandlerInterface
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getRegFormHandler(EE_Checkout $checkout): RegFormHandlerInterface
+	{
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		switch ($this->reg_form_version) {
+			case RegFormFactory::VERSION_2:
+				/** @var RegFormHandlerV2 $handler */
+				$handler = LoaderFactory::getNew(RegFormHandlerV2::class, [$checkout]);
+				$handler->getFormSubmission();
+				$handler->initializeInputHandler();
+				return $handler;
+			case RegFormFactory::VERSION_1:
+			default:
+				/** @var RegFormHandlerV1 $handler */
+				$handler = LoaderFactory::getNew(RegFormHandlerV1::class, [$checkout]);
+				$handler->initializeInputHandler();
+				return $handler;
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
         switch ($this->reg_form_version) {
             case RegFormFactory::VERSION_2:
                 $reg_step = $dependencies[0];
-                if (! $reg_step instanceof EE_SPCO_Reg_Step) {
+                if ( ! $reg_step instanceof EE_SPCO_Reg_Step) {
                     throw new DomainException(
                         esc_html__('Invalid or missing SPCO Registration Step', 'event_espresso')
                     );
@@ -81,7 +81,7 @@ 
                     FormSubmissionHandler::class,
                     [$reg_step->checkout->transaction]
                 );
-                $form_data_api           = $form_submission_handler->getFormDataAPI();
+                $form_data_api = $form_submission_handler->getFormDataAPI();
                 return LoaderFactory::getShared(RegFormV2::class, [$reg_step, $form_data_api]);
             case RegFormFactory::VERSION_1:
             default:
@@ -113,7 +113,7 @@ 
                     )
                 );
         }
-        if (! $dependency_handler instanceof DependencyHandler) {
+        if ( ! $dependency_handler instanceof DependencyHandler) {
             throw new DomainException(
                 esc_html__('Invalid Registration Form DependencyHandler.', 'event_espresso')
             );

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

Indentation +259 added lines, -259 removed lines

@@ -32,263 +32,263 @@
 abstract class RegForm extends EE_Form_Section_Proper implements FormSectionProperInterface
 {
 
-    /**
-     * @var bool
-     */
-    protected $print_copy_info = false;
-
-    /**
-     * @var EE_Registration_Config
-     */
-    public $reg_config;
-
-    /**
-     * @var int
-     */
-    protected $reg_form_count = 0;
-
-    /**
-     * @var EE_SPCO_Reg_Step_Attendee_Information
-     */
-    public $reg_step;
-
-    /**
-     * @var array
-     */
-    protected $required_questions = [];
-
-    /**
-     * @var array
-     */
-    protected $template_args = [];
-
-
-    /**
-     * RegForm constructor.
-     *
-     * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
-     * @param EE_Registration_Config                $reg_config
-     * @throws ReflectionException
-     * @throws EE_Error
-     */
-    public function __construct(
-        EE_SPCO_Reg_Step_Attendee_Information $reg_step,
-        EE_Registration_Config $reg_config
-    ) {
-        $this->reg_step   = $reg_step;
-        $this->reg_config = $reg_config;
-        // setup some classes so that they are ready for loading during construction of other classes
-        LoaderFactory::getShared(CountryOptions::class, [$this->reg_step->checkout->action]);
-        LoaderFactory::getShared(StateOptions::class, [$this->reg_step->checkout->action]);
-        parent::__construct(
-            [
-                'name'            => $this->reg_step->reg_form_name(),
-                'html_id'         => $this->reg_step->reg_form_name(),
-                'subsections'     => $this->generateSubsections(),
-                'layout_strategy' => new EE_Template_Layout(
-                    [
-                        'layout_template_file' => $this->reg_step->template(), // layout_template
-                        'template_args'        => $this->template_args,
-                    ]
-                ),
-            ]
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $admin_request
-     * @param bool            $copy_attendee_info
-     * @param callable        $enablePrintCopyInfo
-     * @return RegistrantFormInterface
-     */
-    abstract protected function getRegistrantForm(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo
-    ): RegistrantFormInterface;
-
-
-    /**
-     * @return void
-     */
-    public function enablePrintCopyInfo(): void
-    {
-        $this->print_copy_info = true;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function printCopyInfo(): bool
-    {
-        return $this->print_copy_info;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function regFormCount(): int
-    {
-        return $this->reg_form_count;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function requiredQuestions(): array
-    {
-        return $this->required_questions;
-    }
-
-
-    /**
-     * @param string $identifier
-     * @param bool   $required_question
-     */
-    public function addRequiredQuestion(string $identifier, bool $required_question): void
-    {
-        $this->required_questions[ $identifier ] = $required_question;
-    }
-
-
-    /**
-     * @return EE_Form_Section_Proper[]
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws EntityNotFoundException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function generateSubsections(): array
-    {
-        // Init reg forms count.
-        $this->reg_form_count = 0;
-
-        $primary_registrant = null;
-        // autoload Line_Item_Display classes
-        EEH_Autoloader::register_line_item_display_autoloaders();
-        $Line_Item_Display = new EE_Line_Item_Display();
-        // calculate taxes
-        $Line_Item_Display->display_line_item(
-            $this->reg_step->checkout->cart->get_grand_total(),
-            ['set_tax_rate' => true]
-        );
-        $extra_inputs_section = $this->reg_step->reg_step_hidden_inputs();
-        $this->addPrivacyConsentCheckbox($extra_inputs_section);
-        $subsections = [
-            'default_hidden_inputs' => $extra_inputs_section,
-        ];
-
-        $this->template_args = [
-            'revisit'       => $this->reg_step->checkout->revisit,
-            'registrations' => [],
-            'ticket_count'  => [],
-        ];
-        // grab the saved registrations from the transaction
-        $registrations = $this->reg_step->checkout->transaction->registrations(
-            $this->reg_step->checkout->reg_cache_where_params
-        );
-        if ($registrations) {
-            foreach ($registrations as $registration) {
-                // can this registration be processed during this visit ?
-                if (
-                    $registration instanceof EE_Registration
-                    && $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)
-                ) {
-                    $reg_url_link    = $registration->reg_url_link();
-                    $registrant_form = $this->getRegistrantForm(
-                        $registration,
-                        $this->reg_step->checkout->admin_request,
-                        $this->reg_config->copyAttendeeInfo(),
-                        [$this, 'enablePrintCopyInfo']
-                    );
-                    // Increment the reg forms number if form is valid.
-                    if ($registrant_form->hasQuestions()) {
-                        $this->reg_form_count++;
-                        $subsections[ $reg_url_link ] = $registrant_form;
-                    } else {
-                        // or just add a blank section if there are no questions
-                        $subsections[ $reg_url_link ] = new EE_Form_Section_HTML();
-                    }
-
-                    $this->template_args['registrations'][ $reg_url_link ]                    = $registration;
-                    $this->template_args['ticket_count'][ $registration->ticket()->ID() ]     = isset(
-                        $this->template_args['ticket_count'][ $registration->ticket()->ID() ]
-                    )
-                        ? $this->template_args['ticket_count'][ $registration->ticket()->ID() ] + 1
-                        : 1;
-                    $ticket_line_item                                                         =
-                        EEH_Line_Item::get_line_items_by_object_type_and_IDs(
-                            $this->reg_step->checkout->cart->get_grand_total(),
-                            'Ticket',
-                            [$registration->ticket()->ID()]
-                        );
-                    $ticket_line_item                                                         =
-                        is_array($ticket_line_item)
-                            ? reset($ticket_line_item)
-                            : $ticket_line_item;
-                    $this->template_args['ticket_line_item'][ $registration->ticket()->ID() ] =
-                        $Line_Item_Display->display_line_item($ticket_line_item);
-                    if ($registration->is_primary_registrant()) {
-                        $primary_registrant = $reg_url_link;
-                    }
-                }
-            }
-
-            if ($primary_registrant && count($registrations) > 1) {
-                if (
-                    isset($subsections[ $primary_registrant ])
-                    && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
-                ) {
-                    $copy_options['spco_copy_attendee_chk'] = $this->print_copy_info
-                        ? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
-                        : new AutoCopyAttendeeInfoForm($this->reg_step->slug());
-                    $subsections[ $primary_registrant ]->add_subsections(
-                        $copy_options,
-                        'primary_registrant',
-                        false
-                    );
-                }
-            }
-        }
-
-        // Set the registration form template (default: one form per ticket details table).
-        // We decide the template to used based on the number of forms.
-        $template = $this->reg_form_count > 1
-            ? SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_main.template.php'
-            : SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_single.template.php';
-        $this->reg_step->setTemplate($template);
-
-        return $subsections;
-    }
-
-
-    /**
-     * @param EE_Form_Section_Proper $extra_inputs_section
-     * @throws EE_Error
-     */
-    private function addPrivacyConsentCheckbox(EE_Form_Section_Proper $extra_inputs_section)
-    {
-        // if this isn't a revisit, and they have the privacy consent box enabled, add it
-        if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
-            $extra_inputs_section->add_subsections(
-                [
-                    'consent_box' => new PrivacyConsentCheckboxForm(
-                        $this->reg_step->slug(),
-                        $this->reg_config->getConsentCheckboxLabelText()
-                    )
-                ],
-                null,
-                false
-            );
-        }
-    }
+	/**
+	 * @var bool
+	 */
+	protected $print_copy_info = false;
+
+	/**
+	 * @var EE_Registration_Config
+	 */
+	public $reg_config;
+
+	/**
+	 * @var int
+	 */
+	protected $reg_form_count = 0;
+
+	/**
+	 * @var EE_SPCO_Reg_Step_Attendee_Information
+	 */
+	public $reg_step;
+
+	/**
+	 * @var array
+	 */
+	protected $required_questions = [];
+
+	/**
+	 * @var array
+	 */
+	protected $template_args = [];
+
+
+	/**
+	 * RegForm constructor.
+	 *
+	 * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
+	 * @param EE_Registration_Config                $reg_config
+	 * @throws ReflectionException
+	 * @throws EE_Error
+	 */
+	public function __construct(
+		EE_SPCO_Reg_Step_Attendee_Information $reg_step,
+		EE_Registration_Config $reg_config
+	) {
+		$this->reg_step   = $reg_step;
+		$this->reg_config = $reg_config;
+		// setup some classes so that they are ready for loading during construction of other classes
+		LoaderFactory::getShared(CountryOptions::class, [$this->reg_step->checkout->action]);
+		LoaderFactory::getShared(StateOptions::class, [$this->reg_step->checkout->action]);
+		parent::__construct(
+			[
+				'name'            => $this->reg_step->reg_form_name(),
+				'html_id'         => $this->reg_step->reg_form_name(),
+				'subsections'     => $this->generateSubsections(),
+				'layout_strategy' => new EE_Template_Layout(
+					[
+						'layout_template_file' => $this->reg_step->template(), // layout_template
+						'template_args'        => $this->template_args,
+					]
+				),
+			]
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $admin_request
+	 * @param bool            $copy_attendee_info
+	 * @param callable        $enablePrintCopyInfo
+	 * @return RegistrantFormInterface
+	 */
+	abstract protected function getRegistrantForm(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo
+	): RegistrantFormInterface;
+
+
+	/**
+	 * @return void
+	 */
+	public function enablePrintCopyInfo(): void
+	{
+		$this->print_copy_info = true;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function printCopyInfo(): bool
+	{
+		return $this->print_copy_info;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function regFormCount(): int
+	{
+		return $this->reg_form_count;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function requiredQuestions(): array
+	{
+		return $this->required_questions;
+	}
+
+
+	/**
+	 * @param string $identifier
+	 * @param bool   $required_question
+	 */
+	public function addRequiredQuestion(string $identifier, bool $required_question): void
+	{
+		$this->required_questions[ $identifier ] = $required_question;
+	}
+
+
+	/**
+	 * @return EE_Form_Section_Proper[]
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws EntityNotFoundException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function generateSubsections(): array
+	{
+		// Init reg forms count.
+		$this->reg_form_count = 0;
+
+		$primary_registrant = null;
+		// autoload Line_Item_Display classes
+		EEH_Autoloader::register_line_item_display_autoloaders();
+		$Line_Item_Display = new EE_Line_Item_Display();
+		// calculate taxes
+		$Line_Item_Display->display_line_item(
+			$this->reg_step->checkout->cart->get_grand_total(),
+			['set_tax_rate' => true]
+		);
+		$extra_inputs_section = $this->reg_step->reg_step_hidden_inputs();
+		$this->addPrivacyConsentCheckbox($extra_inputs_section);
+		$subsections = [
+			'default_hidden_inputs' => $extra_inputs_section,
+		];
+
+		$this->template_args = [
+			'revisit'       => $this->reg_step->checkout->revisit,
+			'registrations' => [],
+			'ticket_count'  => [],
+		];
+		// grab the saved registrations from the transaction
+		$registrations = $this->reg_step->checkout->transaction->registrations(
+			$this->reg_step->checkout->reg_cache_where_params
+		);
+		if ($registrations) {
+			foreach ($registrations as $registration) {
+				// can this registration be processed during this visit ?
+				if (
+					$registration instanceof EE_Registration
+					&& $this->reg_step->checkout->visit_allows_processing_of_this_registration($registration)
+				) {
+					$reg_url_link    = $registration->reg_url_link();
+					$registrant_form = $this->getRegistrantForm(
+						$registration,
+						$this->reg_step->checkout->admin_request,
+						$this->reg_config->copyAttendeeInfo(),
+						[$this, 'enablePrintCopyInfo']
+					);
+					// Increment the reg forms number if form is valid.
+					if ($registrant_form->hasQuestions()) {
+						$this->reg_form_count++;
+						$subsections[ $reg_url_link ] = $registrant_form;
+					} else {
+						// or just add a blank section if there are no questions
+						$subsections[ $reg_url_link ] = new EE_Form_Section_HTML();
+					}
+
+					$this->template_args['registrations'][ $reg_url_link ]                    = $registration;
+					$this->template_args['ticket_count'][ $registration->ticket()->ID() ]     = isset(
+						$this->template_args['ticket_count'][ $registration->ticket()->ID() ]
+					)
+						? $this->template_args['ticket_count'][ $registration->ticket()->ID() ] + 1
+						: 1;
+					$ticket_line_item                                                         =
+						EEH_Line_Item::get_line_items_by_object_type_and_IDs(
+							$this->reg_step->checkout->cart->get_grand_total(),
+							'Ticket',
+							[$registration->ticket()->ID()]
+						);
+					$ticket_line_item                                                         =
+						is_array($ticket_line_item)
+							? reset($ticket_line_item)
+							: $ticket_line_item;
+					$this->template_args['ticket_line_item'][ $registration->ticket()->ID() ] =
+						$Line_Item_Display->display_line_item($ticket_line_item);
+					if ($registration->is_primary_registrant()) {
+						$primary_registrant = $reg_url_link;
+					}
+				}
+			}
+
+			if ($primary_registrant && count($registrations) > 1) {
+				if (
+					isset($subsections[ $primary_registrant ])
+					&& $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
+				) {
+					$copy_options['spco_copy_attendee_chk'] = $this->print_copy_info
+						? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
+						: new AutoCopyAttendeeInfoForm($this->reg_step->slug());
+					$subsections[ $primary_registrant ]->add_subsections(
+						$copy_options,
+						'primary_registrant',
+						false
+					);
+				}
+			}
+		}
+
+		// Set the registration form template (default: one form per ticket details table).
+		// We decide the template to used based on the number of forms.
+		$template = $this->reg_form_count > 1
+			? SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_main.template.php'
+			: SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_single.template.php';
+		$this->reg_step->setTemplate($template);
+
+		return $subsections;
+	}
+
+
+	/**
+	 * @param EE_Form_Section_Proper $extra_inputs_section
+	 * @throws EE_Error
+	 */
+	private function addPrivacyConsentCheckbox(EE_Form_Section_Proper $extra_inputs_section)
+	{
+		// if this isn't a revisit, and they have the privacy consent box enabled, add it
+		if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
+			$extra_inputs_section->add_subsections(
+				[
+					'consent_box' => new PrivacyConsentCheckboxForm(
+						$this->reg_step->slug(),
+						$this->reg_config->getConsentCheckboxLabelText()
+					)
+				],
+				null,
+				false
+			);
+		}
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -153,7 +153,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, bool $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -213,29 +213,29 @@ 
                     // Increment the reg forms number if form is valid.
                     if ($registrant_form->hasQuestions()) {
                         $this->reg_form_count++;
-                        $subsections[ $reg_url_link ] = $registrant_form;
+                        $subsections[$reg_url_link] = $registrant_form;
                     } else {
                         // or just add a blank section if there are no questions
-                        $subsections[ $reg_url_link ] = new EE_Form_Section_HTML();
+                        $subsections[$reg_url_link] = new EE_Form_Section_HTML();
                     }
 
-                    $this->template_args['registrations'][ $reg_url_link ]                    = $registration;
-                    $this->template_args['ticket_count'][ $registration->ticket()->ID() ]     = isset(
-                        $this->template_args['ticket_count'][ $registration->ticket()->ID() ]
+                    $this->template_args['registrations'][$reg_url_link]                    = $registration;
+                    $this->template_args['ticket_count'][$registration->ticket()->ID()]     = isset(
+                        $this->template_args['ticket_count'][$registration->ticket()->ID()]
                     )
-                        ? $this->template_args['ticket_count'][ $registration->ticket()->ID() ] + 1
+                        ? $this->template_args['ticket_count'][$registration->ticket()->ID()] + 1
                         : 1;
-                    $ticket_line_item                                                         =
+                    $ticket_line_item =
                         EEH_Line_Item::get_line_items_by_object_type_and_IDs(
                             $this->reg_step->checkout->cart->get_grand_total(),
                             'Ticket',
                             [$registration->ticket()->ID()]
                         );
-                    $ticket_line_item                                                         =
+                    $ticket_line_item =
                         is_array($ticket_line_item)
                             ? reset($ticket_line_item)
                             : $ticket_line_item;
-                    $this->template_args['ticket_line_item'][ $registration->ticket()->ID() ] =
+                    $this->template_args['ticket_line_item'][$registration->ticket()->ID()] =
                         $Line_Item_Display->display_line_item($ticket_line_item);
                     if ($registration->is_primary_registrant()) {
                         $primary_registrant = $reg_url_link;
@@ -245,13 +245,13 @@ 
 
             if ($primary_registrant && count($registrations) > 1) {
                 if (
-                    isset($subsections[ $primary_registrant ])
-                    && $subsections[ $primary_registrant ] instanceof EE_Form_Section_Proper
+                    isset($subsections[$primary_registrant])
+                    && $subsections[$primary_registrant] instanceof EE_Form_Section_Proper
                 ) {
                     $copy_options['spco_copy_attendee_chk'] = $this->print_copy_info
                         ? new CopyAttendeeInfoForm($registrations, $this->reg_step->slug())
                         : new AutoCopyAttendeeInfoForm($this->reg_step->slug());
-                    $subsections[ $primary_registrant ]->add_subsections(
+                    $subsections[$primary_registrant]->add_subsections(
                         $copy_options,
                         'primary_registrant',
                         false
@@ -263,8 +263,8 @@ 
         // Set the registration form template (default: one form per ticket details table).
         // We decide the template to used based on the number of forms.
         $template = $this->reg_form_count > 1
-            ? SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_main.template.php'
-            : SPCO_REG_STEPS_PATH . $this->reg_step->slug() . '/attendee_info_single.template.php';
+            ? SPCO_REG_STEPS_PATH . $this->reg_step->slug().'/attendee_info_main.template.php'
+            : SPCO_REG_STEPS_PATH.$this->reg_step->slug().'/attendee_info_single.template.php';
         $this->reg_step->setTemplate($template);
 
         return $subsections;
@@ -278,7 +278,7 @@ 
     private function addPrivacyConsentCheckbox(EE_Form_Section_Proper $extra_inputs_section)
     {
         // if this isn't a revisit, and they have the privacy consent box enabled, add it
-        if (! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
+        if ( ! $this->reg_step->checkout->revisit && $this->reg_config->isConsentCheckboxEnabled()) {
             $extra_inputs_section->add_subsections(
                 [
                     'consent_box' => new PrivacyConsentCheckboxForm(

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

Indentation +133 added lines, -133 removed lines

@@ -11,137 +11,137 @@
 
 abstract class RegistrantForm extends EE_Form_Section_Proper implements RegistrantFormInterface
 {
-    /**
-     * @var array
-     */
-    protected $form_args = [];
-
-    /**
-     * @var bool
-     */
-    private $has_questions = false;
-
-
-    /**
-     * RegistrantForm constructor.
-     *
-     * @param array $form_args
-     * @throws EE_Error
-     */
-    public function __construct(array $form_args)
-    {
-        parent::__construct($form_args);
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return void
-     * @throws EE_Error
-     */
-    protected function addAdditionalAttendeeRegInfoInput(EE_Registration $registration)
-    {
-        // generate hidden input
-        $this->form_args['subsections']['additional_attendee_reg_info'] = new EE_Hidden_Input(
-            [
-                'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
-                'default' => true,
-            ]
-        );
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @return void
-     * @throws EE_Error
-     */
-    protected function addAdditionalPrimaryRegistrantInputs(EE_Registration $registration)
-    {
-        if ($registration->is_primary_registrant()) {
-            // generate hidden input
-            $this->form_args['subsections']['primary_registrant'] = new EE_Hidden_Input(
-                [
-                    'html_id' => 'primary_registrant',
-                    'default' => $registration->reg_url_link(),
-                ]
-            );
-        }
-    }
-
-
-    /**
-     * @param int      $attendee_nmbr
-     * @param bool     $copy_attendee_info
-     * @param callable $enablePrintCopyInfo
-     */
-    protected function enablePrintCopyInfo(
-        int $attendee_nmbr,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo
-    ) {
-        // If we have question groups for additional attendees, then display the copy options
-        $printCopyInfo = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
-            $attendee_nmbr > 1 && $copy_attendee_info,
-            $attendee_nmbr
-        );
-        if ($printCopyInfo) {
-            $enablePrintCopyInfo();
-        }
-    }
-
-
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $admin_request
-     * @param int             $attendee_nmbr
-     * @return array
-     * @throws EE_Error
-     */
-    protected function generateTopLevelFormArgs(
-        EE_Registration $registration,
-        bool $admin_request,
-        int $attendee_nmbr
-    ): array {
-        return [
-            'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
-            'html_class'      => 'ee-reg-form-attendee-dv',
-            'html_style'      => $admin_request
-                ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
-                : '',
-            'subsections'     => [],
-            'layout_strategy' => new EE_Fieldset_Section_Layout(
-                [
-                    'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
-                    'legend_text'  => sprintf(
-                        esc_html_x(
-                            'Attendee %d',
-                            'Attendee 123',
-                            'event_espresso'
-                        ),
-                        $attendee_nmbr
-                    ),
-                ]
-            ),
-        ];
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function hasQuestions(): bool
-    {
-        return $this->has_questions;
-    }
-
-
-    /**
-     * @return void
-     */
-    protected function setHasQuestions(): void
-    {
-        $this->has_questions = ! empty($this->form_args);
-    }
+	/**
+	 * @var array
+	 */
+	protected $form_args = [];
+
+	/**
+	 * @var bool
+	 */
+	private $has_questions = false;
+
+
+	/**
+	 * RegistrantForm constructor.
+	 *
+	 * @param array $form_args
+	 * @throws EE_Error
+	 */
+	public function __construct(array $form_args)
+	{
+		parent::__construct($form_args);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function addAdditionalAttendeeRegInfoInput(EE_Registration $registration)
+	{
+		// generate hidden input
+		$this->form_args['subsections']['additional_attendee_reg_info'] = new EE_Hidden_Input(
+			[
+				'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+				'default' => true,
+			]
+		);
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @return void
+	 * @throws EE_Error
+	 */
+	protected function addAdditionalPrimaryRegistrantInputs(EE_Registration $registration)
+	{
+		if ($registration->is_primary_registrant()) {
+			// generate hidden input
+			$this->form_args['subsections']['primary_registrant'] = new EE_Hidden_Input(
+				[
+					'html_id' => 'primary_registrant',
+					'default' => $registration->reg_url_link(),
+				]
+			);
+		}
+	}
+
+
+	/**
+	 * @param int      $attendee_nmbr
+	 * @param bool     $copy_attendee_info
+	 * @param callable $enablePrintCopyInfo
+	 */
+	protected function enablePrintCopyInfo(
+		int $attendee_nmbr,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo
+	) {
+		// If we have question groups for additional attendees, then display the copy options
+		$printCopyInfo = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___registrations_reg_form___printCopyInfo',
+			$attendee_nmbr > 1 && $copy_attendee_info,
+			$attendee_nmbr
+		);
+		if ($printCopyInfo) {
+			$enablePrintCopyInfo();
+		}
+	}
+
+
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $admin_request
+	 * @param int             $attendee_nmbr
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function generateTopLevelFormArgs(
+		EE_Registration $registration,
+		bool $admin_request,
+		int $attendee_nmbr
+	): array {
+		return [
+			'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+			'html_class'      => 'ee-reg-form-attendee-dv',
+			'html_style'      => $admin_request
+				? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'
+				: '',
+			'subsections'     => [],
+			'layout_strategy' => new EE_Fieldset_Section_Layout(
+				[
+					'legend_class' => 'spco-attendee-lgnd smaller-text lt-grey-text',
+					'legend_text'  => sprintf(
+						esc_html_x(
+							'Attendee %d',
+							'Attendee 123',
+							'event_espresso'
+						),
+						$attendee_nmbr
+					),
+				]
+			),
+		];
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function hasQuestions(): bool
+	{
+		return $this->has_questions;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	protected function setHasQuestions(): void
+	{
+		$this->has_questions = ! empty($this->form_args);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
         // generate hidden input
         $this->form_args['subsections']['additional_attendee_reg_info'] = new EE_Hidden_Input(
             [
-                'html_id' => 'additional-attendee-reg-info-' . $registration->reg_url_link(),
+                'html_id' => 'additional-attendee-reg-info-'.$registration->reg_url_link(),
                 'default' => true,
             ]
         );
@@ -105,7 +105,7 @@ 
         int $attendee_nmbr
     ): array {
         return [
-            'html_id'         => 'ee-registration-' . $registration->reg_url_link(),
+            'html_id'         => 'ee-registration-'.$registration->reg_url_link(),
             'html_class'      => 'ee-reg-form-attendee-dv',
             'html_style'      => $admin_request
                 ? 'padding:0em 2em 1em; margin:3em 0 0; border:1px solid #ddd;'

core/domain/services/registration/form/base/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/base/CopyAttendeeInfoForm.php

Indentation +70 added lines, -70 removed lines

@@ -12,77 +12,77 @@
 
 class CopyAttendeeInfoForm extends EE_Form_Section_Proper
 {
-    /**
-     * CopyAttendeeInfoForm constructor.
-     *
-     * @param EE_Registration[] $registrations
-     * @param string            $slug
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(array $registrations, string $slug)
-    {
-        parent::__construct(
-            [
-                'subsections'     => $this->copyAttendeeInfoInputs($registrations),
-                'layout_strategy' => new EE_Template_Layout(
-                    [
-                        'layout_template_file'     => SPCO_REG_STEPS_PATH
-                                                      . $slug
-                                                      . '/copy_attendee_info.template.php',
-                        'begin_template_file'      => null,
-                        'input_template_file'      => null,
-                        'subsection_template_file' => null,
-                        'end_template_file'        => null,
-                    ]
-                ),
-            ]
-        );
-    }
+	/**
+	 * CopyAttendeeInfoForm constructor.
+	 *
+	 * @param EE_Registration[] $registrations
+	 * @param string            $slug
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(array $registrations, string $slug)
+	{
+		parent::__construct(
+			[
+				'subsections'     => $this->copyAttendeeInfoInputs($registrations),
+				'layout_strategy' => new EE_Template_Layout(
+					[
+						'layout_template_file'     => SPCO_REG_STEPS_PATH
+													  . $slug
+													  . '/copy_attendee_info.template.php',
+						'begin_template_file'      => null,
+						'input_template_file'      => null,
+						'subsection_template_file' => null,
+						'end_template_file'        => null,
+					]
+				),
+			]
+		);
+	}
 
 
-    /**
-     * @param array $registrations
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function copyAttendeeInfoInputs(array $registrations): array
-    {
-        $copy_attendee_info_inputs = [];
-        $prev_ticket               = null;
-        foreach ($registrations as $registration) {
-            // for all  attendees other than the primary attendee
-            if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
-                // if this is a new ticket OR if this is the very first additional attendee after the primary attendee
-                if ($registration->ticket()->ID() !== $prev_ticket) {
-                    $item_name   = $registration->ticket()->name();
-                    $item_name   .= $registration->ticket()->description() !== ''
-                        ? ' - ' . $registration->ticket()->description()
-                        : '';
-                    $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ]
-                                 = new EE_Form_Section_HTML(
-                        '<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
-                    );
-                    $prev_ticket = $registration->ticket()->ID();
-                }
+	/**
+	 * @param array $registrations
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function copyAttendeeInfoInputs(array $registrations): array
+	{
+		$copy_attendee_info_inputs = [];
+		$prev_ticket               = null;
+		foreach ($registrations as $registration) {
+			// for all  attendees other than the primary attendee
+			if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
+				// if this is a new ticket OR if this is the very first additional attendee after the primary attendee
+				if ($registration->ticket()->ID() !== $prev_ticket) {
+					$item_name   = $registration->ticket()->name();
+					$item_name   .= $registration->ticket()->description() !== ''
+						? ' - ' . $registration->ticket()->description()
+						: '';
+					$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ]
+								 = new EE_Form_Section_HTML(
+						'<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+					);
+					$prev_ticket = $registration->ticket()->ID();
+				}
 
-                $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ]
-                    = new EE_Checkbox_Multi_Input(
-                    [
-                        $registration->ID() => sprintf(
-                            esc_html_x('Attendee #%s', 'Attendee #123', 'event_espresso'),
-                            $registration->count()
-                        )
-                    ],
-                    [
-                        'html_id'                 => 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
-                        'html_class'              => 'spco-copy-attendee-chk ee-do-not-validate',
-                        'display_html_label_text' => false,
-                    ]
-                );
-            }
-        }
-        return $copy_attendee_info_inputs;
-    }
+				$copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ]
+					= new EE_Checkbox_Multi_Input(
+					[
+						$registration->ID() => sprintf(
+							esc_html_x('Attendee #%s', 'Attendee #123', 'event_espresso'),
+							$registration->count()
+						)
+					],
+					[
+						'html_id'                 => 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+						'html_class'              => 'spco-copy-attendee-chk ee-do-not-validate',
+						'display_html_label_text' => false,
+					]
+				);
+			}
+		}
+		return $copy_attendee_info_inputs;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -56,18 +56,18 @@ 
             if ($registration instanceof EE_Registration && ! $registration->is_primary_registrant()) {
                 // if this is a new ticket OR if this is the very first additional attendee after the primary attendee
                 if ($registration->ticket()->ID() !== $prev_ticket) {
-                    $item_name   = $registration->ticket()->name();
-                    $item_name   .= $registration->ticket()->description() !== ''
-                        ? ' - ' . $registration->ticket()->description()
+                    $item_name = $registration->ticket()->name();
+                    $item_name .= $registration->ticket()->description() !== ''
+                        ? ' - '.$registration->ticket()->description()
                         : '';
-                    $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[ticket-' . $registration->ticket()->ID() . ']' ]
+                    $copy_attendee_info_inputs['spco_copy_attendee_chk[ticket-'.$registration->ticket()->ID().']']
                                  = new EE_Form_Section_HTML(
-                        '<h6 class="spco-copy-attendee-event-hdr">' . $item_name . '</h6>'
+                        '<h6 class="spco-copy-attendee-event-hdr">'.$item_name.'</h6>'
                     );
                     $prev_ticket = $registration->ticket()->ID();
                 }
 
-                $copy_attendee_info_inputs[ 'spco_copy_attendee_chk[' . $registration->ID() . ']' ]
+                $copy_attendee_info_inputs['spco_copy_attendee_chk['.$registration->ID().']']
                     = new EE_Checkbox_Multi_Input(
                     [
                         $registration->ID() => sprintf(
@@ -76,7 +76,7 @@ 
                         )
                     ],
                     [
-                        'html_id'                 => 'spco-copy-attendee-chk-' . $registration->reg_url_link(),
+                        'html_id'                 => 'spco-copy-attendee-chk-'.$registration->reg_url_link(),
                         'html_class'              => 'spco-copy-attendee-chk ee-do-not-validate',
                         'display_html_label_text' => false,
                     ]

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

Indentation +349 added lines, -349 removed lines

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

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;
     }
 
 
@@ -178,10 +178,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
                 );
             }
@@ -195,7 +195,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;
     }
 
 
@@ -214,7 +214,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, string $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -223,7 +223,7 @@ 
      */
     public function registrantAnswers(string $reg_url_link): array
     {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
+        return $this->registrant_answers[$reg_url_link] ?? [];
     }
 
 
@@ -234,7 +234,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;
     }
 
 
@@ -245,7 +245,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;
     }
 
 
@@ -358,8 +358,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

core/domain/services/registration/form/base/CountryOptions.php

Indentation +96 added lines, -96 removed lines

@@ -13,109 +13,109 @@
 
 class CountryOptions
 {
-    /**
-     * the action being performed on the current step
-     *
-     * @var string
-     */
-    public $action = '';
+	/**
+	 * the action being performed on the current step
+	 *
+	 * @var string
+	 */
+	public $action = '';
 
-    /**
-     * @var EEM_Answer
-     */
-    public $answer_model;
+	/**
+	 * @var EEM_Answer
+	 */
+	public $answer_model;
 
-    /**
-     * @var EEM_Country
-     */
-    public $country_model;
+	/**
+	 * @var EEM_Country
+	 */
+	public $country_model;
 
-    /**
-     * @var [][]
-     */
-    private $country_options = [];
+	/**
+	 * @var [][]
+	 */
+	private $country_options = [];
 
 
-    /**
-     * CountryOptions constructor.
-     *
-     * @param string      $action
-     * @param EEM_Answer  $answer_model
-     * @param EEM_Country $country_model
-     */
-    public function __construct(string $action, EEM_Answer $answer_model, EEM_Country $country_model)
-    {
-        $this->action        = $action;
-        $this->answer_model  = $answer_model;
-        $this->country_model = $country_model;
-        add_filter(
-            'FHEE__EE_Question__generate_form_input__country_options',
-            [$this, 'forLegacyFormInput'],
-            10,
-            4
-        );
-    }
+	/**
+	 * CountryOptions constructor.
+	 *
+	 * @param string      $action
+	 * @param EEM_Answer  $answer_model
+	 * @param EEM_Country $country_model
+	 */
+	public function __construct(string $action, EEM_Answer $answer_model, EEM_Country $country_model)
+	{
+		$this->action        = $action;
+		$this->answer_model  = $answer_model;
+		$this->country_model = $country_model;
+		add_filter(
+			'FHEE__EE_Question__generate_form_input__country_options',
+			[$this, 'forLegacyFormInput'],
+			10,
+			4
+		);
+	}
 
 
-    /**
-     * Gets the list of countries for the form input
-     *
-     * @param array|null           $countries_list deprecated prop from an old hook
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @param EE_Answer|null       $answer         deprecated prop from an old hook
-     * @return array 2d keys are country IDs, values are their names
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function forLegacyFormInput(
-        array $countries_list = null,
-        EE_Question $question = null,
-        EE_Registration $registration = null,
-        EE_Answer $answer = null
-    ): array {
-        if (! isset($this->country_options[ $this->action ])) {
-            $this->generateLegacyCountryOptions($question, $registration);
-        }
-        return $this->country_options[ $this->action ];
-    }
+	/**
+	 * Gets the list of countries for the form input
+	 *
+	 * @param array|null           $countries_list deprecated prop from an old hook
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @param EE_Answer|null       $answer         deprecated prop from an old hook
+	 * @return array 2d keys are country IDs, values are their names
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function forLegacyFormInput(
+		array $countries_list = null,
+		EE_Question $question = null,
+		EE_Registration $registration = null,
+		EE_Answer $answer = null
+	): array {
+		if (! isset($this->country_options[ $this->action ])) {
+			$this->generateLegacyCountryOptions($question, $registration);
+		}
+		return $this->country_options[ $this->action ];
+	}
 
 
-    /**
-     * @param EE_Question|null     $question
-     * @param EE_Registration|null $registration
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function generateLegacyCountryOptions(EE_Question $question = null, EE_Registration $registration = null)
-    {
-        // get possibly cached list of countries
-        $countries = $this->action === 'process_reg_step'
-            ? $this->country_model->get_all_countries()
-            : $this->country_model->get_all_active_countries();
-        // start with an empty option
-        $country_options = ['' => ''];
-        if (! empty($countries)) {
-            foreach ($countries as $country) {
-                if ($country instanceof EE_Country) {
-                    $country_options[ $country->ID() ] = $country->name();
-                }
-            }
-        }
-        if ($question instanceof EE_Question && $registration instanceof EE_Registration) {
-            $answer = $this->answer_model->get_one(
-                [['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
-            );
-        } else {
-            $answer = EE_Answer::new_instance();
-        }
-        $this->country_options[ $this->action ] = apply_filters(
-            'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
-            $country_options,
-            $this,
-            $registration,
-            $question,
-            $answer
-        );
-    }
+	/**
+	 * @param EE_Question|null     $question
+	 * @param EE_Registration|null $registration
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function generateLegacyCountryOptions(EE_Question $question = null, EE_Registration $registration = null)
+	{
+		// get possibly cached list of countries
+		$countries = $this->action === 'process_reg_step'
+			? $this->country_model->get_all_countries()
+			: $this->country_model->get_all_active_countries();
+		// start with an empty option
+		$country_options = ['' => ''];
+		if (! empty($countries)) {
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$country_options[ $country->ID() ] = $country->name();
+				}
+			}
+		}
+		if ($question instanceof EE_Question && $registration instanceof EE_Registration) {
+			$answer = $this->answer_model->get_one(
+				[['QST_ID' => $question->ID(), 'REG_ID' => $registration->ID()]]
+			);
+		} else {
+			$answer = EE_Answer::new_instance();
+		}
+		$this->country_options[ $this->action ] = apply_filters(
+			'FHEE__EE_SPCO_Reg_Step_Attendee_Information___generate_question_input__country_options',
+			$country_options,
+			$this,
+			$registration,
+			$question,
+			$answer
+		);
+	}
 }

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

Indentation +241 added lines, -241 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -137,21 +137,21 @@ 
         $this->valid = true;
         foreach ($registrations as $registration) {
             // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
+            if ( ! $this->isValidRegistration($registration)) {
                 return $this->isInvalid();
             }
             // reg_url_link exists ?
             $reg_url_link = $registration->reg_url_link();
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
+            if ( ! $this->isValidRegUrlLink($reg_url_link)) {
                 return $this->isInvalid();
             }
             // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+            if ( ! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
                 continue;
             }
             // if NOT revisiting, then let's save the registration now,
             // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
+            if ( ! $this->checkout->revisit) {
                 $registration->save();
             }
             /**
@@ -175,7 +175,7 @@ 
             }
 
             // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+            if ( ! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
                 return $this->isInvalid();
             }
         }
@@ -189,7 +189,7 @@ 
      */
     protected function isValidRegUrlLink(string $reg_url_link): bool
     {
-        if (! empty($reg_url_link)) {
+        if ( ! empty($reg_url_link)) {
             return true;
         }
         EE_Error::add_error(
@@ -242,11 +242,11 @@ 
         array $reg_form_data
     ): bool {
         $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+        if ( ! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
             return false;
         }
         // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+        if ( ! $this->attendee_factory->create($registration, $reg_url_link)) {
             return false;
         }
         // at this point, we should have enough details about the registrant to consider the registration

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

Indentation +57 added lines, -57 removed lines

@@ -22,66 +22,66 @@
  */
 class RegForm extends RegFormBase
 {
-    /**
-     * @var JsonDataAPI
-     */
-    public $form_data_api;
+	/**
+	 * @var JsonDataAPI
+	 */
+	public $form_data_api;
 
-    /**
-     * @var RegistrantFormInput
-     */
-    public $reg_form_input_factory;
+	/**
+	 * @var RegistrantFormInput
+	 */
+	public $reg_form_input_factory;
 
 
-    /**
-     * RegForm constructor.
-     *
-     * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
-     * @param JsonDataAPI                           $form_data_api
-     * @param EE_Registration_Config                $reg_config
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(
-        EE_SPCO_Reg_Step_Attendee_Information $reg_step,
-        JsonDataAPI $form_data_api,
-        EE_Registration_Config $reg_config
-    ) {
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
-        $this->form_data_api = $form_data_api;
-        $this->reg_form_input_factory = LoaderFactory::getNew(
-            RegistrantFormInput::class,
-            [
-                [$this, 'addRequiredQuestion'],
-                $this->form_data_api
-            ]
-        );
-        parent::__construct($reg_step, $reg_config);
-    }
+	/**
+	 * RegForm constructor.
+	 *
+	 * @param EE_SPCO_Reg_Step_Attendee_Information $reg_step
+	 * @param JsonDataAPI                           $form_data_api
+	 * @param EE_Registration_Config                $reg_config
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(
+		EE_SPCO_Reg_Step_Attendee_Information $reg_step,
+		JsonDataAPI $form_data_api,
+		EE_Registration_Config $reg_config
+	) {
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 2);
+		$this->form_data_api = $form_data_api;
+		$this->reg_form_input_factory = LoaderFactory::getNew(
+			RegistrantFormInput::class,
+			[
+				[$this, 'addRequiredQuestion'],
+				$this->form_data_api
+			]
+		);
+		parent::__construct($reg_step, $reg_config);
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param bool            $admin_request
-     * @param bool            $copy_attendee_info
-     * @param callable        $enablePrintCopyInfo
-     * @return RegistrantFormInterface
-     */
-    protected function getRegistrantForm(
-        EE_Registration $registration,
-        bool $admin_request,
-        bool $copy_attendee_info,
-        callable $enablePrintCopyInfo
-    ): RegistrantFormInterface {
-        return LoaderFactory::getNew(
-            RegistrantForm::class,
-            [
-                $registration,
-                $admin_request,
-                $copy_attendee_info,
-                $enablePrintCopyInfo,
-                $this->reg_form_input_factory,
-            ]
-        );
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param bool            $admin_request
+	 * @param bool            $copy_attendee_info
+	 * @param callable        $enablePrintCopyInfo
+	 * @return RegistrantFormInterface
+	 */
+	protected function getRegistrantForm(
+		EE_Registration $registration,
+		bool $admin_request,
+		bool $copy_attendee_info,
+		callable $enablePrintCopyInfo
+	): RegistrantFormInterface {
+		return LoaderFactory::getNew(
+			RegistrantForm::class,
+			[
+				$registration,
+				$admin_request,
+				$copy_attendee_info,
+				$enablePrintCopyInfo,
+				$this->reg_form_input_factory,
+			]
+		);
+	}
 }