eventespresso / event-espresso-core

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

Indentation +102 added lines, -102 removed lines

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

Spacing +12 added lines, -12 removed lines

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

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

Indentation +58 added lines, -58 removed lines

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

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

Indentation +330 added lines, -330 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -59,9 +59,9 @@ 
     public function initializeRegistrantData(EE_Registration $registration): void
     {
         $reg_url_link = $registration->reg_url_link();
-        $this->registrations[ $reg_url_link ] = $registration;
-        $this->registrant_answers[ $reg_url_link ] = $registration->answers();
-        $this->registrant_data[ $reg_url_link ] = [];
+        $this->registrations[$reg_url_link] = $registration;
+        $this->registrant_answers[$reg_url_link] = $registration->answers();
+        $this->registrant_data[$reg_url_link] = [];
         $this->attendee_counter++;
     }
 
@@ -99,7 +99,7 @@ 
      */
     public function getRegistrant(string $reg_url_link): ?EE_Registration
     {
-        return $this->registrations[ $reg_url_link ] ?? null;
+        return $this->registrations[$reg_url_link] ?? null;
     }
 
 
@@ -109,7 +109,7 @@ 
      */
     public function getRegistrantData(string $reg_url_link): ?array
     {
-        return $this->registrant_data[ $reg_url_link ] ?? null;
+        return $this->registrant_data[$reg_url_link] ?? null;
     }
 
 
@@ -120,7 +120,7 @@ 
      */
     public function addRegistrantDataValue(string $reg_url_link, string $key, $value): void
     {
-        $this->registrant_data[ $reg_url_link ][ $key ] = $value;
+        $this->registrant_data[$reg_url_link][$key] = $value;
     }
 
 
@@ -157,10 +157,10 @@ 
         }
         foreach ($critical_attendee_details as $critical_attendee_detail) {
             if (
-                ! isset($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
-                || empty($this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ])
+                ! isset($this->registrant_data[$reg_url_link][$critical_attendee_detail])
+                || empty($this->registrant_data[$reg_url_link][$critical_attendee_detail])
             ) {
-                $this->registrant_data[ $reg_url_link ][ $critical_attendee_detail ] = $this->primary_registrant->get(
+                $this->registrant_data[$reg_url_link][$critical_attendee_detail] = $this->primary_registrant->get(
                     $critical_attendee_detail
                 );
             }
@@ -174,7 +174,7 @@ 
      */
     public function setRegistrantData(string $reg_url_link, array $registrant_data): void
     {
-        $this->registrant_data[ $reg_url_link ] = $registrant_data;
+        $this->registrant_data[$reg_url_link] = $registrant_data;
     }
 
 
@@ -193,7 +193,7 @@ 
      */
     public function addRequiredQuestion(string $identifier, string $required_question): void
     {
-        $this->required_questions[ $identifier ] = $required_question;
+        $this->required_questions[$identifier] = $required_question;
     }
 
 
@@ -202,7 +202,7 @@ 
      */
     public function registrantAnswers(string $reg_url_link): array
     {
-        return $this->registrant_answers[ $reg_url_link ] ?? [];
+        return $this->registrant_answers[$reg_url_link] ?? [];
     }
 
 
@@ -213,7 +213,7 @@ 
      */
     public function addRegistrantAnswer(string $reg_url_link, string $identifier, EE_Answer $answer): void
     {
-        $this->registrant_answers[ $reg_url_link ][ $identifier ] = $answer;
+        $this->registrant_answers[$reg_url_link][$identifier] = $answer;
     }
 
 
@@ -224,7 +224,7 @@ 
      */
     public function getRegistrantAnswer(string $reg_url_link, string $identifier): ?EE_Answer
     {
-        return $this->registrant_answers[ $reg_url_link ][ $identifier ] ?? null;
+        return $this->registrant_answers[$reg_url_link][$identifier] ?? null;
     }
 
 
@@ -256,7 +256,7 @@ 
      */
     public function addPrimaryRegistrantDataValue(string $key, $value): void
     {
-        $this->primary_registrant_data[ $key ] = $value;
+        $this->primary_registrant_data[$key] = $value;
     }
 
 
@@ -266,7 +266,7 @@ 
      */
     public function getPrimaryRegistrantDataValue(string $key)
     {
-        return $this->primary_registrant_data[ $key ] ?? null;
+        return $this->primary_registrant_data[$key] ?? null;
     }
 
 
@@ -338,8 +338,8 @@ 
     public function saveOrCopyPrimaryRegistrantData(string $reg_url_link, string $form_input, $input_value)
     {
         // store a bit of data about the primary attendee
-        if (! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
-            $this->primary_registrant_data[ $form_input ] = $input_value;
+        if ( ! empty($input_value) && $this->currentRegistrantIsPrimary($reg_url_link)) {
+            $this->primary_registrant_data[$form_input] = $input_value;
             return $input_value;
         }
         // or copy value from primary if incoming value is not set

core/domain/services/registration/CancelRegistrationForm.php

Indentation +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
 		 *  	"confirmation_code" => "01EF",
 		 *  	"ee-form-submit-registration_cancellations" => "Cancel Registration(s)",
 		 * ]
- 		 */
+		 */
 		$success = true;
 		foreach ($valid_data['registrations'] as $registrant) {
 			$reg_url_link = $registrant['reg_url_link'];

Spacing +5 added lines, -5 removed lines

@@ -83,12 +83,12 @@ 
 						]
 					),
 					'required_input_notice'   => new EE_Form_Section_HTML(
-						EEH_HTML::br(2) .
+						EEH_HTML::br(2).
 						EEH_HTML::span(
 							esc_html__('* required field', 'event_espresso'),
 							'',
 							'ee-status-bg--info'
-						) .
+						).
 						EEH_HTML::br(2)
 					),
 					'cancel_registration'     => $this->generateSubmitButton(
@@ -216,14 +216,14 @@ 
 		foreach ($valid_data['registrations'] as $registrant) {
 			$reg_url_link = $registrant['reg_url_link'];
 			$registration = EEM_Registration::instance()->get_registration_for_reg_url_link($reg_url_link);
-			if (! $registration instanceof EE_Registration) {
+			if ( ! $registration instanceof EE_Registration) {
 				return sprintf(
 					esc_html__(
 						'%1$sCould not find registration for the REG URL link: %2$s',
 						'event_espresso'
 					),
 					'<p class="ee-registrations-cancelled-pg ee-attention">',
-					$reg_url_link . '</p>'
+					$reg_url_link.'</p>'
 				);
 			}
 			if ($registration->status_ID() === RegStatus::CANCELLED) {
@@ -247,7 +247,7 @@ 
 			);
 			$success = $updated && $success;
 		}
-		if (! $success) {
+		if ( ! $success) {
 			return sprintf(
 				esc_html__(
 					'%1$sAn error occurred and the one or more registrations could not be cancelled.%2$s',

core/services/dependencies/DependencyHandler.php

Indentation +10 added lines, -10 removed lines

@@ -6,16 +6,16 @@
 
 abstract class DependencyHandler implements DependencyHandlerInterface
 {
-    protected EE_Dependency_Map $dependency_map;
+	protected EE_Dependency_Map $dependency_map;
 
 
-    /**
-     * DependencyHandler constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     */
-    public function __construct(EE_Dependency_Map $dependency_map)
-    {
-        $this->dependency_map = $dependency_map;
-    }
+	/**
+	 * DependencyHandler constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map)
+	{
+		$this->dependency_map = $dependency_map;
+	}
 }

core/services/container/Mirror.php

Indentation +341 added lines, -341 removed lines

@@ -19,345 +19,345 @@
  */
 class Mirror
 {
-    /**
-     * @var ReflectionClass[]
-     */
-    private array $classes = [];
-
-    /**
-     * @var ReflectionMethod[]
-     */
-    private array $constructors = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private array $parameters = [];
-
-    /**
-     * @var ReflectionParameter[][]
-     */
-    private array $parameter_classes = [];
-
-    /**
-     * @var ReflectionProperty[][]
-     */
-    private array $properties = [];
-
-    /**
-     * @var ReflectionMethod[][]
-     */
-    private array $methods = [];
-
-    private array $default_properties = [];
-
-    private array $static_properties = [];
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionClass
-     * @throws ReflectionException
-     */
-    public function getReflectionClass(string $class_name): ReflectionClass
-    {
-        if (! isset($this->classes[ $class_name ])) {
-            $this->classes[ $class_name ] = new ReflectionClass($class_name);
-        }
-        return $this->classes[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod|null
-     * @throws ReflectionException
-     */
-    public function getConstructor(string $class_name): ?ReflectionMethod
-    {
-        if (! isset($this->constructors[ $class_name ])) {
-            $reflection_class                  = $this->getReflectionClass($class_name);
-            $this->constructors[ $class_name ] = $reflection_class->getConstructor();
-        }
-        return $this->constructors[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionMethod|null
-     * @throws ReflectionException
-     */
-    public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
-    {
-        return $this->getConstructor($reflection_class->getName());
-    }
-
-
-    /**
-     * @throws ReflectionException
-     */
-    public function getClassShortName(string $class_name): string
-    {
-        return $this->getReflectionClass($class_name)->getShortName();
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws ReflectionException
-     */
-    public function getParameters(string $class_name): array
-    {
-        if (! isset($this->parameters[ $class_name ])) {
-            $constructor                     = $this->getConstructor($class_name);
-            $this->parameters[ $class_name ] = $constructor->getParameters();
-        }
-        return $this->parameters[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionParameter[]
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getParameters($reflection_class->getName());
-    }
-
-
-    /**
-     * @param ReflectionMethod $constructor
-     * @return ReflectionParameter[]
-     * @throws ReflectionException
-     */
-    public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
-    {
-        return $this->getParameters($constructor->getDeclaringClass());
-    }
-
-
-    /**
-     * returns array of ReflectionParameter objects for parameters that are NOT optional
-     *
-     * @param string $class_name
-     * @return ReflectionParameter[]
-     * @throws ReflectionException
-     */
-    public function getRequiredParameters(string $class_name): array
-    {
-        $required_parameters = [];
-        $parameters          = $this->getParameters($class_name);
-        foreach ($parameters as $parameter) {
-            if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
-                $required_parameters[] = $parameter;
-            }
-        }
-        return $required_parameters;
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return string|null
-     */
-    public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        // ReflectionParameter::getClass() is deprecated in PHP 8+
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = PHP_VERSION_ID < 70100
-            ? $this->getParameterClassNameLegacy($param)
-            : $this->getParameterClassNamePhp8($param);
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @return string|null
-     * @since   4.10.13.p
-     */
-    private function getParameterClassNameLegacy(ReflectionParameter $param): ?string
-    {
-        $reflection_class = $param->getClass();
-        return $reflection_class instanceof ReflectionClass
-            ? $reflection_class->getName()
-            : null;
-    }
-
-
-    /**
-     * ReflectionParameter::getClass() is deprecated in PHP 8+,
-     * so the class name for a parameter needs to be extracted from the ReflectionType,
-     * which can either be a ReflectionNamedType or ReflectionUnionType
-     *
-     * @param ReflectionParameter $param
-     * @return string|null
-     * @since   4.10.13.p
-     */
-    private function getParameterClassNamePhp8(ReflectionParameter $param): ?string
-    {
-        $reflection_type = $param->getType();
-        if ($reflection_type instanceof \ReflectionNamedType) {
-            return $reflection_type->getName();
-        }
-        if ($reflection_type instanceof \ReflectionUnionType) {
-            $reflection_types = $reflection_type->getTypes();
-            if (is_array($reflection_types)) {
-                $first = reset($reflection_types);
-                return $first->getName();
-            }
-        }
-        return null;
-    }
-
-
-    /**
-     * @param ReflectionParameter $param
-     * @param string              $class_name
-     * @param string              $index
-     * @return array|string|null
-     */
-    public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
-    {
-        if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
-            return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-        }
-        if (! isset($this->parameter_classes[ $class_name ])) {
-            $this->parameter_classes[ $class_name ] = [];
-        }
-        if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
-            $this->parameter_classes[ $class_name ][ $index ] = [];
-        }
-        $this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
-            ? $param->getDefaultValue()
-            : null;
-        return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionProperty[]
-     * @throws ReflectionException
-     */
-    public function getProperties(string $class_name): array
-    {
-        if (! isset($this->properties[ $class_name ])) {
-            $reflection_class = $this->getReflectionClass($class_name);
-            $properties       = $reflection_class->getProperties();
-            foreach ($properties as $property) {
-                $this->properties[ $class_name ][ $property->getName() ] = $property;
-            }
-        }
-        return $this->properties[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class
-     * @return ReflectionProperty[]
-     * @throws ReflectionException
-     */
-    public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getProperties($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @param string $property_name
-     * @return ReflectionProperty|null
-     * @throws ReflectionException
-     */
-    public function getProperty(string $class_name, string $property_name): ?ReflectionProperty
-    {
-        if (! isset($this->properties[ $class_name ][ $property_name ])) {
-            $this->getProperties($class_name);
-        }
-        return $this->properties[ $class_name ][ $property_name ] ?? null;
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return ReflectionMethod[]
-     * @throws ReflectionException
-     */
-    public function getMethods(string $class_name): array
-    {
-        if (! isset($this->methods[ $class_name ])) {
-            $reflection_class             = $this->getReflectionClass($class_name);
-            $this->methods[ $class_name ] = $reflection_class->getMethods();
-        }
-        return $this->methods[ $class_name ];
-    }
-
-
-    /**
-     * @param ReflectionClass $reflection_class )
-     * @return ReflectionMethod[]
-     * @throws ReflectionException
-     */
-    public function getMethodsFromReflection(ReflectionClass $reflection_class): array
-    {
-        return $this->getMethods($reflection_class->getName());
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws ReflectionException
-     */
-    public function getDefaultProperties(string $class_name): array
-    {
-        if (! isset($this->default_properties[ $class_name ])) {
-            $reflection_class                        = $this->getReflectionClass($class_name);
-            $this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
-        }
-        return $this->default_properties[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @return array
-     * @throws ReflectionException
-     */
-    public function getStaticProperties(string $class_name): array
-    {
-        if (! isset($this->static_properties[ $class_name ])) {
-            $reflection_class                       = $this->getReflectionClass($class_name);
-            $this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
-        }
-        return $this->static_properties[ $class_name ];
-    }
-
-
-    /**
-     * @param string $class_name
-     * @param string $property
-     * @return bool
-     * @throws ReflectionException
-     */
-    public function hasProperty(string $class_name, string $property): bool
-    {
-        $this->getProperties($class_name);
-        return isset($this->properties[ $class_name ][ $property ]);
-    }
+	/**
+	 * @var ReflectionClass[]
+	 */
+	private array $classes = [];
+
+	/**
+	 * @var ReflectionMethod[]
+	 */
+	private array $constructors = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private array $parameters = [];
+
+	/**
+	 * @var ReflectionParameter[][]
+	 */
+	private array $parameter_classes = [];
+
+	/**
+	 * @var ReflectionProperty[][]
+	 */
+	private array $properties = [];
+
+	/**
+	 * @var ReflectionMethod[][]
+	 */
+	private array $methods = [];
+
+	private array $default_properties = [];
+
+	private array $static_properties = [];
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionClass
+	 * @throws ReflectionException
+	 */
+	public function getReflectionClass(string $class_name): ReflectionClass
+	{
+		if (! isset($this->classes[ $class_name ])) {
+			$this->classes[ $class_name ] = new ReflectionClass($class_name);
+		}
+		return $this->classes[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod|null
+	 * @throws ReflectionException
+	 */
+	public function getConstructor(string $class_name): ?ReflectionMethod
+	{
+		if (! isset($this->constructors[ $class_name ])) {
+			$reflection_class                  = $this->getReflectionClass($class_name);
+			$this->constructors[ $class_name ] = $reflection_class->getConstructor();
+		}
+		return $this->constructors[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionMethod|null
+	 * @throws ReflectionException
+	 */
+	public function getConstructorFromReflection(ReflectionClass $reflection_class): ?ReflectionMethod
+	{
+		return $this->getConstructor($reflection_class->getName());
+	}
+
+
+	/**
+	 * @throws ReflectionException
+	 */
+	public function getClassShortName(string $class_name): string
+	{
+		return $this->getReflectionClass($class_name)->getShortName();
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws ReflectionException
+	 */
+	public function getParameters(string $class_name): array
+	{
+		if (! isset($this->parameters[ $class_name ])) {
+			$constructor                     = $this->getConstructor($class_name);
+			$this->parameters[ $class_name ] = $constructor->getParameters();
+		}
+		return $this->parameters[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionParameter[]
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getParameters($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param ReflectionMethod $constructor
+	 * @return ReflectionParameter[]
+	 * @throws ReflectionException
+	 */
+	public function getParametersFromReflectionConstructor(ReflectionMethod $constructor): array
+	{
+		return $this->getParameters($constructor->getDeclaringClass());
+	}
+
+
+	/**
+	 * returns array of ReflectionParameter objects for parameters that are NOT optional
+	 *
+	 * @param string $class_name
+	 * @return ReflectionParameter[]
+	 * @throws ReflectionException
+	 */
+	public function getRequiredParameters(string $class_name): array
+	{
+		$required_parameters = [];
+		$parameters          = $this->getParameters($class_name);
+		foreach ($parameters as $parameter) {
+			if ($parameter instanceof ReflectionParameter && ! $parameter->isOptional()) {
+				$required_parameters[] = $parameter;
+			}
+		}
+		return $required_parameters;
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return string|null
+	 */
+	public function getParameterClassName(ReflectionParameter $param, string $class_name, string $index): ?string
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_name'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		// ReflectionParameter::getClass() is deprecated in PHP 8+
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_name'] = PHP_VERSION_ID < 70100
+			? $this->getParameterClassNameLegacy($param)
+			: $this->getParameterClassNamePhp8($param);
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_name'];
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @return string|null
+	 * @since   4.10.13.p
+	 */
+	private function getParameterClassNameLegacy(ReflectionParameter $param): ?string
+	{
+		$reflection_class = $param->getClass();
+		return $reflection_class instanceof ReflectionClass
+			? $reflection_class->getName()
+			: null;
+	}
+
+
+	/**
+	 * ReflectionParameter::getClass() is deprecated in PHP 8+,
+	 * so the class name for a parameter needs to be extracted from the ReflectionType,
+	 * which can either be a ReflectionNamedType or ReflectionUnionType
+	 *
+	 * @param ReflectionParameter $param
+	 * @return string|null
+	 * @since   4.10.13.p
+	 */
+	private function getParameterClassNamePhp8(ReflectionParameter $param): ?string
+	{
+		$reflection_type = $param->getType();
+		if ($reflection_type instanceof \ReflectionNamedType) {
+			return $reflection_type->getName();
+		}
+		if ($reflection_type instanceof \ReflectionUnionType) {
+			$reflection_types = $reflection_type->getTypes();
+			if (is_array($reflection_types)) {
+				$first = reset($reflection_types);
+				return $first->getName();
+			}
+		}
+		return null;
+	}
+
+
+	/**
+	 * @param ReflectionParameter $param
+	 * @param string              $class_name
+	 * @param string              $index
+	 * @return array|string|null
+	 */
+	public function getParameterDefaultValue(ReflectionParameter $param, string $class_name, string $index)
+	{
+		if (isset($this->parameter_classes[ $class_name ][ $index ]['param_class_default'])) {
+			return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+		}
+		if (! isset($this->parameter_classes[ $class_name ])) {
+			$this->parameter_classes[ $class_name ] = [];
+		}
+		if (! isset($this->parameter_classes[ $class_name ][ $index ])) {
+			$this->parameter_classes[ $class_name ][ $index ] = [];
+		}
+		$this->parameter_classes[ $class_name ][ $index ]['param_class_default'] = $param->isDefaultValueAvailable()
+			? $param->getDefaultValue()
+			: null;
+		return $this->parameter_classes[ $class_name ][ $index ]['param_class_default'];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionProperty[]
+	 * @throws ReflectionException
+	 */
+	public function getProperties(string $class_name): array
+	{
+		if (! isset($this->properties[ $class_name ])) {
+			$reflection_class = $this->getReflectionClass($class_name);
+			$properties       = $reflection_class->getProperties();
+			foreach ($properties as $property) {
+				$this->properties[ $class_name ][ $property->getName() ] = $property;
+			}
+		}
+		return $this->properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class
+	 * @return ReflectionProperty[]
+	 * @throws ReflectionException
+	 */
+	public function getPropertiesFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getProperties($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @param string $property_name
+	 * @return ReflectionProperty|null
+	 * @throws ReflectionException
+	 */
+	public function getProperty(string $class_name, string $property_name): ?ReflectionProperty
+	{
+		if (! isset($this->properties[ $class_name ][ $property_name ])) {
+			$this->getProperties($class_name);
+		}
+		return $this->properties[ $class_name ][ $property_name ] ?? null;
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return ReflectionMethod[]
+	 * @throws ReflectionException
+	 */
+	public function getMethods(string $class_name): array
+	{
+		if (! isset($this->methods[ $class_name ])) {
+			$reflection_class             = $this->getReflectionClass($class_name);
+			$this->methods[ $class_name ] = $reflection_class->getMethods();
+		}
+		return $this->methods[ $class_name ];
+	}
+
+
+	/**
+	 * @param ReflectionClass $reflection_class )
+	 * @return ReflectionMethod[]
+	 * @throws ReflectionException
+	 */
+	public function getMethodsFromReflection(ReflectionClass $reflection_class): array
+	{
+		return $this->getMethods($reflection_class->getName());
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws ReflectionException
+	 */
+	public function getDefaultProperties(string $class_name): array
+	{
+		if (! isset($this->default_properties[ $class_name ])) {
+			$reflection_class                        = $this->getReflectionClass($class_name);
+			$this->default_properties[ $class_name ] = $reflection_class->getDefaultProperties();
+		}
+		return $this->default_properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @return array
+	 * @throws ReflectionException
+	 */
+	public function getStaticProperties(string $class_name): array
+	{
+		if (! isset($this->static_properties[ $class_name ])) {
+			$reflection_class                       = $this->getReflectionClass($class_name);
+			$this->static_properties[ $class_name ] = $reflection_class->getStaticProperties();
+		}
+		return $this->static_properties[ $class_name ];
+	}
+
+
+	/**
+	 * @param string $class_name
+	 * @param string $property
+	 * @return bool
+	 * @throws ReflectionException
+	 */
+	public function hasProperty(string $class_name, string $property): bool
+	{
+		$this->getProperties($class_name);
+		return isset($this->properties[ $class_name ][ $property ]);
+	}
 }

core/services/service_changes/ServiceChangesManager.php

Indentation +46 added lines, -46 removed lines

@@ -19,57 +19,57 @@
  */
 class ServiceChangesManager
 {
-    private EE_Dependency_Map $dependency_map;
+	private EE_Dependency_Map $dependency_map;
 
-    private LoaderInterface $loader;
+	private LoaderInterface $loader;
 
 
-    /**
-     * @param EE_Dependency_Map $dependency_map
-     * @param LoaderInterface   $loader
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader)
-    {
-        $this->dependency_map = $dependency_map;
-        $this->loader         = $loader;
-        if (DbStatus::isOnline()) {
-            $this->registerDependencies();
-            $this->loadServiceChangeNotifications();
-        }
-    }
+	/**
+	 * @param EE_Dependency_Map $dependency_map
+	 * @param LoaderInterface   $loader
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader)
+	{
+		$this->dependency_map = $dependency_map;
+		$this->loader         = $loader;
+		if (DbStatus::isOnline()) {
+			$this->registerDependencies();
+			$this->loadServiceChangeNotifications();
+		}
+	}
 
 
-    /**
-     * @return void
-     */
-    private function registerDependencies()
-    {
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\services\service_changes\PaymentMethodDeprecations2025',
-            [
-                'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-    }
+	/**
+	 * @return void
+	 */
+	private function registerDependencies()
+	{
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\services\service_changes\PaymentMethodDeprecations2025',
+			[
+				'EEM_Payment_Method' => EE_Dependency_Map::load_from_cache,
+			]
+		);
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function loadServiceChangeNotifications()
-    {
-        if (
-            apply_filters(
-                'FHEE__EventEspresso_core_services_service_changes_ServiceChangesManager__loadServiceChangeNotifications__loadPaymentMethodDeprecations2025',
-                true
-            )
-        ) {
-            /** @var PaymentMethodDeprecations2025 $pm_deps */
-            $pm_deps = $this->loader->getShared(PaymentMethodDeprecations2025::class);
-            $pm_deps->setHooks();
-        }
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function loadServiceChangeNotifications()
+	{
+		if (
+			apply_filters(
+				'FHEE__EventEspresso_core_services_service_changes_ServiceChangesManager__loadServiceChangeNotifications__loadPaymentMethodDeprecations2025',
+				true
+			)
+		) {
+			/** @var PaymentMethodDeprecations2025 $pm_deps */
+			$pm_deps = $this->loader->getShared(PaymentMethodDeprecations2025::class);
+			$pm_deps->setHooks();
+		}
+	}
 }

core/services/routing/Router.php

Indentation +222 added lines, -222 removed lines

@@ -30,246 +30,246 @@
  */
 class Router
 {
-    protected EE_Dependency_Map $dependency_map;
+	protected EE_Dependency_Map $dependency_map;
 
-    protected LoaderInterface $loader;
+	protected LoaderInterface $loader;
 
-    protected RouteHandler $route_handler;
+	protected RouteHandler $route_handler;
 
-    protected string $route_request_type;
+	protected string $route_request_type;
 
-    protected array $routes_loaded;
+	protected array $routes_loaded;
 
 
-    /**
-     * RoutingSwitch constructor.
-     *
-     * @param EE_Dependency_Map $dependency_map
-     * @param LoaderInterface   $loader
-     * @param RouteHandler      $router
-     */
-    public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader, RouteHandler $router)
-    {
-        $this->dependency_map = $dependency_map;
-        $this->loader         = $loader;
-        $this->route_handler  = $router;
-    }
+	/**
+	 * RoutingSwitch constructor.
+	 *
+	 * @param EE_Dependency_Map $dependency_map
+	 * @param LoaderInterface   $loader
+	 * @param RouteHandler      $router
+	 */
+	public function __construct(EE_Dependency_Map $dependency_map, LoaderInterface $loader, RouteHandler $router)
+	{
+		$this->dependency_map = $dependency_map;
+		$this->loader         = $loader;
+		$this->route_handler  = $router;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function loadPrimaryRoutes()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests',
-            Route::getFullDependencies()
-        );
-        $this->dependency_map->registerDependencies(
-            'EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests',
-            Route::getFullDependencies()
-        );
-        // now load and prep all primary Routes
-        $this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests');
-        $this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests');
-        $this->route_request_type = $this->route_handler->getRouteRequestType();
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__loadPrimaryRoutes',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function loadPrimaryRoutes()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests',
+			Route::getFullDependencies()
+		);
+		$this->dependency_map->registerDependencies(
+			'EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests',
+			Route::getFullDependencies()
+		);
+		// now load and prep all primary Routes
+		$this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\admin\ActivationRequests');
+		$this->route_handler->addRoute('EventEspresso\core\domain\entities\routing\handlers\shared\RegularRequests');
+		$this->route_request_type = $this->route_handler->getRouteRequestType();
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__loadPrimaryRoutes',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function registerShortcodesModulesAndWidgets()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__registerShortcodesModulesAndWidgets',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function registerShortcodesModulesAndWidgets()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__registerShortcodesModulesAndWidgets',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
 
-        /** @var LegacyModulesManager $legacy_modules_manager */
-        $legacy_modules_manager = $this->loader->getShared(LegacyModulesManager::class);
-        $legacy_modules_manager->setHooks();
+		/** @var LegacyModulesManager $legacy_modules_manager */
+		$legacy_modules_manager = $this->loader->getShared(LegacyModulesManager::class);
+		$legacy_modules_manager->setHooks();
 
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests'
-                );
-                /** @var LegacyWidgetsManager $legacy_widgets_manager */
-                $legacy_widgets_manager = $this->loader->getShared(LegacyWidgetsManager::class);
-                $legacy_widgets_manager->setHooks();
-                break;
-        }
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\frontend\ShortcodeRequests'
+				);
+				/** @var LegacyWidgetsManager $legacy_widgets_manager */
+				$legacy_widgets_manager = $this->loader->getShared(LegacyWidgetsManager::class);
+				$legacy_widgets_manager->setHooks();
+				break;
+		}
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function brewEspresso()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__brewEspresso',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'
-                );
-                break;
-        }
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function brewEspresso()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__brewEspresso',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\GQLRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\RestApiRequests'
+				);
+				break;
+		}
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function loadControllers()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__loadControllers',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        $this->route_handler->addRoute(
-            'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
-                );
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\frontend\RegistrationCheckoutRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\NonEspressoAdminAjax'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressProfilePage'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPostsPage'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoBatchJob'
-                );
-                break;
-        }
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function loadControllers()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__loadControllers',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		$this->route_handler->addRoute(
+			'EventEspresso\core\domain\entities\routing\handlers\admin\AdminRoute'
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
+				);
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\frontend\FrontendRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\frontend\RegistrationCheckoutRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoLegacyAdmin'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventsAdmin'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoEventEditor'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\GutenbergEditor'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\NonEspressoAdminAjax'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPluginsPage'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressProfilePage'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\WordPressPostsPage'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\WordPressHeartbeat'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\EspressoBatchJob'
+				);
+				break;
+		}
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function coreLoadedAndReady()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__coreLoadedAndReady',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'
-                );
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'
-                );
-                break;
-        }
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function coreLoadedAndReady()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__coreLoadedAndReady',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\AssetRequests'
+				);
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\shared\SessionRequests'
+				);
+				break;
+		}
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 
 
-    /**
-     * @throws Exception|Throwable
-     */
-    public function initializeLast()
-    {
-        if (isset($this->routes_loaded[ __FUNCTION__ ])) {
-            return;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_routing_Router__initializeLast',
-            $this->route_handler,
-            $this->route_request_type,
-            $this->dependency_map
-        );
-        switch ($this->route_request_type) {
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
-                break;
-            case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
-                $this->route_handler->addRoute(
-                    'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests'
-                );
-                break;
-        }
-        $this->routes_loaded[ __FUNCTION__ ] = true;
-    }
+	/**
+	 * @throws Exception|Throwable
+	 */
+	public function initializeLast()
+	{
+		if (isset($this->routes_loaded[ __FUNCTION__ ])) {
+			return;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_routing_Router__initializeLast',
+			$this->route_handler,
+			$this->route_request_type,
+			$this->dependency_map
+		);
+		switch ($this->route_request_type) {
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_ACTIVATION:
+				break;
+			case PrimaryRoute::ROUTE_REQUEST_TYPE_REGULAR:
+				$this->route_handler->addRoute(
+					'EventEspresso\core\domain\entities\routing\handlers\admin\PersonalDataRequests'
+				);
+				break;
+		}
+		$this->routes_loaded[ __FUNCTION__ ] = true;
+	}
 }

core/services/routing/RouteHandler.php

Indentation +154 added lines, -154 removed lines

@@ -22,161 +22,161 @@
  */
 class RouteHandler
 {
-    private CapabilitiesCheckerInterface $capabilities_checker;
-
-    private JsonDataNodeHandler $data_node_handler;
-
-    private LoaderInterface $loader;
-
-    protected RequestInterface $request;
-
-    private RouteCollection $routes;
-
-    private bool $print_data_nodes = true;
-
-    protected string $route_request_type = '';
-
-
-    /**
-     * RouteHandler constructor.
-     *
-     * @param CapabilitiesCheckerInterface $capabilities_checker
-     * @param JsonDataNodeHandler $data_node_handler
-     * @param LoaderInterface     $loader
-     * @param RequestInterface    $request
-     * @param RouteCollection     $routes
-     */
-    public function __construct(
-        CapabilitiesCheckerInterface $capabilities_checker,
-        JsonDataNodeHandler $data_node_handler,
-        LoaderInterface $loader,
-        RequestInterface $request,
-        RouteCollection $routes
-    ) {
-        $this->capabilities_checker = $capabilities_checker;
-        $this->data_node_handler = $data_node_handler;
-        $this->loader            = $loader;
-        $this->request           = $request;
-        $this->routes            = $routes;
-    }
-
-
-    /**
-     * @param string $fqcn   Fully Qualified Class Name for Route
-     * @param bool   $handle if true [default] will immediately call RouteInterface::handleRequest() after adding
-     * @throws Exception|Throwable
-     */
-    public function addRoute(string $fqcn, bool $handle = true)
-    {
-        try {
-            $route = $this->loader->getShared($fqcn);
-            $this->validateRoute($route, $fqcn);
-            if ($this->capabilities_checker->processCapCheck($route->getCapCheck(), true)) {
-                $this->routes->add($route);
-                $this->handle($route, $handle);
-            }
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay(
-                new DomainException(
-                    sprintf(
-                        esc_html__(
-                            'The following error occurred while trying to handle the "%1$s" route:%2$s%3$s',
-                            'event_espresso'
-                        ),
-                        $fqcn,
-                        '<br />',
-                        $exception->getMessage()
-                    )
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getRouteRequestType(): string
-    {
-        return $this->route_request_type;
-    }
-
-
-    /**
-     * @param string $route_request_type
-     */
-    public function setRouteRequestType(string $route_request_type = '')
-    {
-        $this->route_request_type = ! empty($route_request_type) ? $route_request_type : $this->route_request_type;
-    }
-
-
-    /**
-     * @param RouteInterface $route
-     * @param bool           $handle if true [default] will immediately call RouteInterface::handleRequest()
-     */
-    public function handle(RouteInterface $route, bool $handle = true)
-    {
-        if ($handle && $route->isNotHandled()) {
-            $route->handleRequest();
-            if ($route instanceof PrimaryRoute) {
-                $this->setRouteRequestType($route->getRouteRequestType());
-            }
-            $data_node = $route->dataNode();
-            if ($data_node instanceof JsonDataNode) {
-                $this->data_node_handler->addDataNode($data_node);
-                $this->printDataNodes();
-            }
-        }
-    }
-
-
-    /**
-     * calls RouteInterface::handleRequest() on all Routes that
-     *      - match current request
-     *      - have yet to be handled
-     *
-     * @return void
-     */
-    public function handleRoutesForCurrentRequest()
-    {
-        $this->routes->handleRoutesForCurrentRequest();
-    }
-
-
-    /**
-     * @return void
-     */
-    private function printDataNodes()
-    {
-        if ($this->print_data_nodes) {
-            add_action('admin_footer', [$this->data_node_handler, 'printDataNode'], 0);
-            add_action('wp_footer', [$this->data_node_handler, 'printDataNode'], 0);
-            $this->print_data_nodes = false;
-        }
-    }
-
-
-    /**
-     * @param RouteInterface|null $route
-     * @param string              $fqcn
-     */
-    private function validateRoute(?RouteInterface $route, string $fqcn = '')
-    {
-        if (! $route instanceof RouteInterface) {
-            throw new InvalidClassException(
-                sprintf(
-                    /*
+	private CapabilitiesCheckerInterface $capabilities_checker;
+
+	private JsonDataNodeHandler $data_node_handler;
+
+	private LoaderInterface $loader;
+
+	protected RequestInterface $request;
+
+	private RouteCollection $routes;
+
+	private bool $print_data_nodes = true;
+
+	protected string $route_request_type = '';
+
+
+	/**
+	 * RouteHandler constructor.
+	 *
+	 * @param CapabilitiesCheckerInterface $capabilities_checker
+	 * @param JsonDataNodeHandler $data_node_handler
+	 * @param LoaderInterface     $loader
+	 * @param RequestInterface    $request
+	 * @param RouteCollection     $routes
+	 */
+	public function __construct(
+		CapabilitiesCheckerInterface $capabilities_checker,
+		JsonDataNodeHandler $data_node_handler,
+		LoaderInterface $loader,
+		RequestInterface $request,
+		RouteCollection $routes
+	) {
+		$this->capabilities_checker = $capabilities_checker;
+		$this->data_node_handler = $data_node_handler;
+		$this->loader            = $loader;
+		$this->request           = $request;
+		$this->routes            = $routes;
+	}
+
+
+	/**
+	 * @param string $fqcn   Fully Qualified Class Name for Route
+	 * @param bool   $handle if true [default] will immediately call RouteInterface::handleRequest() after adding
+	 * @throws Exception|Throwable
+	 */
+	public function addRoute(string $fqcn, bool $handle = true)
+	{
+		try {
+			$route = $this->loader->getShared($fqcn);
+			$this->validateRoute($route, $fqcn);
+			if ($this->capabilities_checker->processCapCheck($route->getCapCheck(), true)) {
+				$this->routes->add($route);
+				$this->handle($route, $handle);
+			}
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay(
+				new DomainException(
+					sprintf(
+						esc_html__(
+							'The following error occurred while trying to handle the "%1$s" route:%2$s%3$s',
+							'event_espresso'
+						),
+						$fqcn,
+						'<br />',
+						$exception->getMessage()
+					)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getRouteRequestType(): string
+	{
+		return $this->route_request_type;
+	}
+
+
+	/**
+	 * @param string $route_request_type
+	 */
+	public function setRouteRequestType(string $route_request_type = '')
+	{
+		$this->route_request_type = ! empty($route_request_type) ? $route_request_type : $this->route_request_type;
+	}
+
+
+	/**
+	 * @param RouteInterface $route
+	 * @param bool           $handle if true [default] will immediately call RouteInterface::handleRequest()
+	 */
+	public function handle(RouteInterface $route, bool $handle = true)
+	{
+		if ($handle && $route->isNotHandled()) {
+			$route->handleRequest();
+			if ($route instanceof PrimaryRoute) {
+				$this->setRouteRequestType($route->getRouteRequestType());
+			}
+			$data_node = $route->dataNode();
+			if ($data_node instanceof JsonDataNode) {
+				$this->data_node_handler->addDataNode($data_node);
+				$this->printDataNodes();
+			}
+		}
+	}
+
+
+	/**
+	 * calls RouteInterface::handleRequest() on all Routes that
+	 *      - match current request
+	 *      - have yet to be handled
+	 *
+	 * @return void
+	 */
+	public function handleRoutesForCurrentRequest()
+	{
+		$this->routes->handleRoutesForCurrentRequest();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	private function printDataNodes()
+	{
+		if ($this->print_data_nodes) {
+			add_action('admin_footer', [$this->data_node_handler, 'printDataNode'], 0);
+			add_action('wp_footer', [$this->data_node_handler, 'printDataNode'], 0);
+			$this->print_data_nodes = false;
+		}
+	}
+
+
+	/**
+	 * @param RouteInterface|null $route
+	 * @param string              $fqcn
+	 */
+	private function validateRoute(?RouteInterface $route, string $fqcn = '')
+	{
+		if (! $route instanceof RouteInterface) {
+			throw new InvalidClassException(
+				sprintf(
+					/*
                      * translators:
                      * The supplied FQCN (Fully\Qualified\Class\Name) must be an instance of RouteInterface.
                      */
-                    esc_html__(
-                        'The supplied FQCN (%1$s) must be an instance of RouteInterface.',
-                        'event_espresso'
-                    ),
-                    $fqcn
-                )
-            );
-        }
-    }
+					esc_html__(
+						'The supplied FQCN (%1$s) must be an instance of RouteInterface.',
+						'event_espresso'
+					),
+					$fqcn
+				)
+			);
+		}
+	}
 }