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

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

Indentation +256 added lines, -256 removed lines

@@ -19,280 +19,280 @@
 class RegFormInputHandler extends RegFormInputHandlerV1
 {
 
-    // /**
-    //  * @var array
-    //  */
-    // protected $non_persistable_fields = [SystemInputFieldNamesInterface::EMAIL_CONFIRM];
+	// /**
+	//  * @var array
+	//  */
+	// protected $non_persistable_fields = [SystemInputFieldNamesInterface::EMAIL_CONFIRM];
 
-    // /**
-    //  * @var EEM_Attendee
-    //  */
-    // private $attendee_model;
-    //
-    // /**
-    //  * @var string
-    //  */
-    // private $checkout_reg_url_link;
+	// /**
+	//  * @var EEM_Attendee
+	//  */
+	// private $attendee_model;
+	//
+	// /**
+	//  * @var string
+	//  */
+	// private $checkout_reg_url_link;
 
-    // /**
-    //  * @var RegistrantData
-    //  */
-    // private $registrant_data;
-    //
-    // /**
-    //  * @var array
-    //  */
-    // private $required_questions;
+	// /**
+	//  * @var RegistrantData
+	//  */
+	// private $registrant_data;
+	//
+	// /**
+	//  * @var array
+	//  */
+	// private $required_questions;
 
 
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        string $checkout_reg_url_link,
-        array $required_questions,
-        EEM_Attendee $attendee_model,
-        RegistrantData $registrant_data,
-        SystemInputFieldNames $system_input_field_names
-    ) {
-        parent::__construct(
-            $checkout_reg_url_link,
-            $required_questions,
-            $attendee_model,
-            $registrant_data,
-            $system_input_field_names
-        );
-    }
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		string $checkout_reg_url_link,
+		array $required_questions,
+		EEM_Attendee $attendee_model,
+		RegistrantData $registrant_data,
+		SystemInputFieldNames $system_input_field_names
+	) {
+		parent::__construct(
+			$checkout_reg_url_link,
+			$required_questions,
+			$attendee_model,
+			$registrant_data,
+			$system_input_field_names
+		);
+	}
 
 
-    // /**
-    //  * @param EE_Registration  $registration
-    //  * @param string           $reg_url_link
-    //  * @param int|string       $form_input
-    //  * @param float|int|string $input_value
-    //  * @return bool
-    //  * @throws EE_Error
-    //  * @throws ReflectionException
-    //  */
-    // public function processFormInput(
-    //     EE_Registration $registration,
-    //     string $reg_url_link,
-    //     $form_input,
-    //     $input_value
-    // ): bool {
-    //     // check for critical inputs
-    //     if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
-    //         return false;
-    //     }
-    //     $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
-    //         $reg_url_link,
-    //         $form_input,
-    //         $input_value
-    //     );
-    //     if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
-    //         EE_Error::add_error(
-    //             sprintf(
-    //                 esc_html_x(
-    //                     'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
-    //                     'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
-    //                     'event_espresso'
-    //                 ),
-    //                 $form_input,
-    //                 $input_value
-    //             ),
-    //             __FILE__,
-    //             __FUNCTION__,
-    //             __LINE__
-    //         );
-    //         return false;
-    //     }
-    //     return true;
-    // }
+	// /**
+	//  * @param EE_Registration  $registration
+	//  * @param string           $reg_url_link
+	//  * @param int|string       $form_input
+	//  * @param float|int|string $input_value
+	//  * @return bool
+	//  * @throws EE_Error
+	//  * @throws ReflectionException
+	//  */
+	// public function processFormInput(
+	//     EE_Registration $registration,
+	//     string $reg_url_link,
+	//     $form_input,
+	//     $input_value
+	// ): bool {
+	//     // check for critical inputs
+	//     if (! $this->verifyCriticalAttendeeDetailsAreSetAndValidateEmail($form_input, $input_value)) {
+	//         return false;
+	//     }
+	//     $input_value = $this->registrant_data->saveOrCopyPrimaryRegistrantData(
+	//         $reg_url_link,
+	//         $form_input,
+	//         $input_value
+	//     );
+	//     if (! $this->saveRegistrationFormInput($registration, $reg_url_link, $form_input, $input_value)) {
+	//         EE_Error::add_error(
+	//             sprintf(
+	//                 esc_html_x(
+	//                     'Unable to save registration form data for the form input: "%1$s" with the submitted value: "%2$s"',
+	//                     'Unable to save registration form data for the form input: "form input name" with the submitted value: "form input value"',
+	//                     'event_espresso'
+	//                 ),
+	//                 $form_input,
+	//                 $input_value
+	//             ),
+	//             __FILE__,
+	//             __FUNCTION__,
+	//             __LINE__
+	//         );
+	//         return false;
+	//     }
+	//     return true;
+	// }
 
 
-    /**
-     * @param EE_Registration  $registration
-     * @param string           $reg_url_link
-     * @param int|string       $field
-     * @param float|int|string $value
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function saveRegistrationFormInput(
-        EE_Registration $registration,
-        string $reg_url_link,
-        $field = '',
-        $value = ''
-    ): bool {
-        // echo '<br />';
-        \EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 1);
-        \EEH_Debug_Tools::printr($field, '$field', '', __LINE__);
-        \EEH_Debug_Tools::printr($value, '$value', '', __LINE__);
-        // echo '<br />';
-        if ($this->bypassSaveRegFormInputValue($registration, $field, $value)) {
-            echo '<br />@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@<br />';
-            return true;
-        }
-        /*
+	/**
+	 * @param EE_Registration  $registration
+	 * @param string           $reg_url_link
+	 * @param int|string       $field
+	 * @param float|int|string $value
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function saveRegistrationFormInput(
+		EE_Registration $registration,
+		string $reg_url_link,
+		$field = '',
+		$value = ''
+	): bool {
+		// echo '<br />';
+		\EEH_Debug_Tools::printr(__FUNCTION__, __CLASS__, __FILE__, __LINE__, 1);
+		\EEH_Debug_Tools::printr($field, '$field', '', __LINE__);
+		\EEH_Debug_Tools::printr($value, '$value', '', __LINE__);
+		// echo '<br />';
+		if ($this->bypassSaveRegFormInputValue($registration, $field, $value)) {
+			echo '<br />@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@<br />';
+			return true;
+		}
+		/*
          * $answer_cache_id is the key used to find the EE_Answer we want
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
-        $answer_cache_id = $this->checkout_reg_url_link
-            ? $field . '-' . $reg_url_link
-            : $field;
-        \EEH_Debug_Tools::printr($answer_cache_id, '$answer_cache_id', __FILE__, __LINE__);
+		$answer_cache_id = $this->checkout_reg_url_link
+			? $field . '-' . $reg_url_link
+			: $field;
+		\EEH_Debug_Tools::printr($answer_cache_id, '$answer_cache_id', __FILE__, __LINE__);
 
-        $registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
-        \EEH_Debug_Tools::printr($registrant_answer, '$registrant_answer', __FILE__, __LINE__);
-        // $answer_is_obj     = $registrant_answer instanceof EE_Answer;
-        // \EEH_Debug_Tools::printr($answer_is_obj, '$answer_is_obj', __FILE__, __LINE__);
-        // if this form input has a corresponding attendee property
-        if ($this->isAttendeeProperty($field)) {
-            // rename form_inputs if they are EE_Attendee properties
-            $field = $this->renameFormInput($field);
-            \EEH_Debug_Tools::printr($field, '$field', __FILE__, __LINE__);
-            $this->registrant_data->addRegistrantDataValue($reg_url_link, $field, $value);
-            // if ($answer_is_obj) {
-            //     // and delete the corresponding answer since we won't be storing this data in that object
-            //     $registration->_remove_relation_to($registrant_answer, 'Answer');
-            //     $registrant_answer->delete_permanently();
-            // }
-            return true;
-        }
-        // if ($answer_is_obj) {
-        //     // save this data to the answer object
-        //     $registrant_answer->set_value($value);
-        //     $result = $registrant_answer->save();
-        //     return $result !== false;
-        // }
-        // foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
-        //     if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
-        //         $answer->set_value($value);
-        //         $result = $answer->save();
-        //         return $result !== false;
-        //     }
-        // }
-        echo '<br />*********************************************************<br />';
-        return false;
-    }
+		$registrant_answer = $this->registrant_data->getRegistrantAnswer($reg_url_link, $answer_cache_id);
+		\EEH_Debug_Tools::printr($registrant_answer, '$registrant_answer', __FILE__, __LINE__);
+		// $answer_is_obj     = $registrant_answer instanceof EE_Answer;
+		// \EEH_Debug_Tools::printr($answer_is_obj, '$answer_is_obj', __FILE__, __LINE__);
+		// if this form input has a corresponding attendee property
+		if ($this->isAttendeeProperty($field)) {
+			// rename form_inputs if they are EE_Attendee properties
+			$field = $this->renameFormInput($field);
+			\EEH_Debug_Tools::printr($field, '$field', __FILE__, __LINE__);
+			$this->registrant_data->addRegistrantDataValue($reg_url_link, $field, $value);
+			// if ($answer_is_obj) {
+			//     // and delete the corresponding answer since we won't be storing this data in that object
+			//     $registration->_remove_relation_to($registrant_answer, 'Answer');
+			//     $registrant_answer->delete_permanently();
+			// }
+			return true;
+		}
+		// if ($answer_is_obj) {
+		//     // save this data to the answer object
+		//     $registrant_answer->set_value($value);
+		//     $result = $registrant_answer->save();
+		//     return $result !== false;
+		// }
+		// foreach ($this->registrant_data->registrantAnswers($reg_url_link) as $answer) {
+		//     if ($answer instanceof EE_Answer && $answer->question_ID() === $answer_cache_id) {
+		//         $answer->set_value($value);
+		//         $result = $answer->save();
+		//         return $result !== false;
+		//     }
+		// }
+		echo '<br />*********************************************************<br />';
+		return false;
+	}
 
 
-    // /**
-    //  * @param EE_Registration $registration
-    //  * @param string          $form_input
-    //  * @param mixed           $input_value
-    //  * @return bool
-    //  */
-    // private function bypassSaveRegFormInputValue(EE_Registration $registration, string $form_input, $input_value): bool
-    // {
-    //     // If email_confirm is sent it's not saved
-    //     if ($form_input === 'email_confirm') {
-    //         return true;
-    //     }
-    //     // allow for plugins to hook in and do their own processing of the form input.
-    //     // For plugins to bypass normal processing here, they just need to return a truthy value.
-    //     // NOTE: this hook does the opposite of what its name implies...
-    //     // ie: returning true does NOT save the input here, meaning it needs to be saved externally.
-    //     // This should have been named something like  "bypass_save_registration_form_input"
-    //     return filter_var(
-    //         apply_filters(
-    //             'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
-    //             false,
-    //             $registration,
-    //             $form_input,
-    //             $input_value,
-    //             $this
-    //         ),
-    //         FILTER_VALIDATE_BOOLEAN
-    //     );
-    // }
+	// /**
+	//  * @param EE_Registration $registration
+	//  * @param string          $form_input
+	//  * @param mixed           $input_value
+	//  * @return bool
+	//  */
+	// private function bypassSaveRegFormInputValue(EE_Registration $registration, string $form_input, $input_value): bool
+	// {
+	//     // If email_confirm is sent it's not saved
+	//     if ($form_input === 'email_confirm') {
+	//         return true;
+	//     }
+	//     // allow for plugins to hook in and do their own processing of the form input.
+	//     // For plugins to bypass normal processing here, they just need to return a truthy value.
+	//     // NOTE: this hook does the opposite of what its name implies...
+	//     // ie: returning true does NOT save the input here, meaning it needs to be saved externally.
+	//     // This should have been named something like  "bypass_save_registration_form_input"
+	//     return filter_var(
+	//         apply_filters(
+	//             'FHEE__EE_SPCO_Reg_Step_Attendee_Information___save_registration_form_input',
+	//             false,
+	//             $registration,
+	//             $form_input,
+	//             $input_value,
+	//             $this
+	//         ),
+	//         FILTER_VALIDATE_BOOLEAN
+	//     );
+	// }
 
 
-    /**
-     * @param string $field
-     * @return bool
-     */
-    private function isAttendeeProperty(string $field): bool
-    {
-        // $this->reg_form_input_factory
-        switch ($field) {
-            case 'state':
-            case 'STA_ID':
-            case 'country':
-            case 'CNT_ISO':
-                return true;
-            default:
-                return $this->attendee_model->has_field("ATT_$field");
-        }
-    }
+	/**
+	 * @param string $field
+	 * @return bool
+	 */
+	private function isAttendeeProperty(string $field): bool
+	{
+		// $this->reg_form_input_factory
+		switch ($field) {
+			case 'state':
+			case 'STA_ID':
+			case 'country':
+			case 'CNT_ISO':
+				return true;
+			default:
+				return $this->attendee_model->has_field("ATT_$field");
+		}
+	}
 
 
-    // /**
-    //  * @param string $field
-    //  * @return string
-    //  */
-    // private function renameFormInput(string $field): string
-    // {
-    //     switch ($field) {
-    //         case 'state':
-    //         case 'STA_ID':
-    //             return 'STA_ID';
-    //
-    //         case 'country':
-    //         case 'CNT_ISO':
-    //             return 'CNT_ISO';
-    //
-    //         default:
-    //             return "ATT_$field";
-    //     }
-    // }
+	// /**
+	//  * @param string $field
+	//  * @return string
+	//  */
+	// private function renameFormInput(string $field): string
+	// {
+	//     switch ($field) {
+	//         case 'state':
+	//         case 'STA_ID':
+	//             return 'STA_ID';
+	//
+	//         case 'country':
+	//         case 'CNT_ISO':
+	//             return 'CNT_ISO';
+	//
+	//         default:
+	//             return "ATT_$field";
+	//     }
+	// }
 
 
-    /**
-     * @param int|string       $field
-     * @param float|int|string $value
-     * @return boolean
-     */
-    private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
-        $field = '',
-        $value = ''
-    ): bool {
-        if (empty($value)) {
-            // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $field ]) || ! $this->required_questions[ $field ]) {
-                return true;
-            }
-            switch ($field) {
-                case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::FIRST_NAME):
-                    EE_Error::add_error(
-                        esc_html__('First Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::LAST_NAME):
-                    EE_Error::add_error(
-                        esc_html__('Last Name is a required value.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-                case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::EMAIL):
-                    EE_Error::add_error(
-                        esc_html__('Please enter a valid email address.', 'event_espresso'),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                    return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * @param int|string       $field
+	 * @param float|int|string $value
+	 * @return boolean
+	 */
+	private function verifyCriticalAttendeeDetailsAreSetAndValidateEmail(
+		$field = '',
+		$value = ''
+	): bool {
+		if (empty($value)) {
+			// if the form input isn't marked as being required, then just return
+			if (! isset($this->required_questions[ $field ]) || ! $this->required_questions[ $field ]) {
+				return true;
+			}
+			switch ($field) {
+				case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::FIRST_NAME):
+					EE_Error::add_error(
+						esc_html__('First Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::LAST_NAME):
+					EE_Error::add_error(
+						esc_html__('Last Name is a required value.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+				case $this->system_input_field_names->getInputName(SystemInputFieldNamesInterface::EMAIL):
+					EE_Error::add_error(
+						esc_html__('Please enter a valid email address.', 'event_espresso'),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+					return false;
+			}
+		}
+		return true;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -142,7 +142,7 @@ 
          * @see https://events.codebasehq.com/projects/event-espresso/tickets/10477
          */
         $answer_cache_id = $this->checkout_reg_url_link
-            ? $field . '-' . $reg_url_link
+            ? $field.'-'.$reg_url_link
             : $field;
         \EEH_Debug_Tools::printr($answer_cache_id, '$answer_cache_id', __FILE__, __LINE__);
 
@@ -263,7 +263,7 @@ 
     ): bool {
         if (empty($value)) {
             // if the form input isn't marked as being required, then just return
-            if (! isset($this->required_questions[ $field ]) || ! $this->required_questions[ $field ]) {
+            if ( ! isset($this->required_questions[$field]) || ! $this->required_questions[$field]) {
                 return true;
             }
             switch ($field) {

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

Indentation +51 added lines, -51 removed lines

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

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

Indentation +218 added lines, -218 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Indentation +160 added lines, -160 removed lines

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

Spacing +7 added lines, -7 removed lines

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