eventespresso / event-espresso-core

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

Indentation +70 added lines, -70 removed lines

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

Spacing +7 added lines, -7 removed lines

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

core/services/orm/tree_traversal/NodeGroupDao.php

Spacing +5 added lines, -5 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function getModelObjNodesInGroup($code)
     {
-        if (! $code) {
+        if ( ! $code) {
             throw new Exception(
                 esc_html__(
                     'We aren’t sure which job you are performing. Please press back in your browser and try again.',
@@ -58,9 +58,9 @@ 
                 )
             );
         }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
+        $deletion_data = get_option($this->getOptionPrefix().$code, []);
         foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
+            if ( ! $root instanceof ModelObjNode) {
                 throw new UnexpectedEntityException($root, 'ModelObjNode');
             }
         }
@@ -121,7 +121,7 @@ 
     public function persistModelObjNodesGroup(array $model_obj_nodes, $code)
     {
         return add_option(
-            $this->getOptionPrefix() . $code,
+            $this->getOptionPrefix().$code,
             $model_obj_nodes,
             null,
             'no'
@@ -137,7 +137,7 @@ 
      */
     public function deleteModelObjNodesInGroup($code)
     {
-        return delete_option($this->getOptionPrefix() . $code);
+        return delete_option($this->getOptionPrefix().$code);
     }
 }
 // End of file NodeGroupDao.php

Indentation +107 added lines, -107 removed lines

@@ -22,125 +22,125 @@
  */
 class NodeGroupDao
 {
-    /**
-     * @return mixed|void
-     */
-    public function generateGroupCode()
-    {
-        return wp_generate_password(6, false);
-    }
+	/**
+	 * @return mixed|void
+	 */
+	public function generateGroupCode()
+	{
+		return wp_generate_password(6, false);
+	}
 
 
-    /**
-     * Gets the string we put in front of the WP Option name used to store the jobs.
-     *
-     * @return string
-     */
-    private function getOptionPrefix()
-    {
-        return 'ee_deletion_';
-    }
+	/**
+	 * Gets the string we put in front of the WP Option name used to store the jobs.
+	 *
+	 * @return string
+	 */
+	private function getOptionPrefix()
+	{
+		return 'ee_deletion_';
+	}
 
 
-    /**
-     * @param $code
-     * @return ModelObjNode[]
-     * @throws Exception
-     * @throws UnexpectedEntityException
-     * @throws Exception
-     */
-    public function getModelObjNodesInGroup($code)
-    {
-        if (! $code) {
-            throw new Exception(
-                esc_html__(
-                    'We aren’t sure which job you are performing. Please press back in your browser and try again.',
-                    'event_espresso'
-                )
-            );
-        }
-        $deletion_data = get_option($this->getOptionPrefix() . $code, []);
-        foreach ($deletion_data as $root) {
-            if (! $root instanceof ModelObjNode) {
-                throw new UnexpectedEntityException($root, 'ModelObjNode');
-            }
-        }
-        return $deletion_data;
-    }
+	/**
+	 * @param $code
+	 * @return ModelObjNode[]
+	 * @throws Exception
+	 * @throws UnexpectedEntityException
+	 * @throws Exception
+	 */
+	public function getModelObjNodesInGroup($code)
+	{
+		if (! $code) {
+			throw new Exception(
+				esc_html__(
+					'We aren’t sure which job you are performing. Please press back in your browser and try again.',
+					'event_espresso'
+				)
+			);
+		}
+		$deletion_data = get_option($this->getOptionPrefix() . $code, []);
+		foreach ($deletion_data as $root) {
+			if (! $root instanceof ModelObjNode) {
+				throw new UnexpectedEntityException($root, 'ModelObjNode');
+			}
+		}
+		return $deletion_data;
+	}
 
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     *
-     * @param ModelObjNode[] $model_obj_nodes
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function getModelsAndIdsContainedIn(array $model_obj_nodes)
-    {
-        $models_and_ids_to_delete = [];
-        foreach ($model_obj_nodes as $root) {
-            $models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
-        }
-        return $models_and_ids_to_delete;
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 *
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function getModelsAndIdsContainedIn(array $model_obj_nodes)
+	{
+		$models_and_ids_to_delete = [];
+		foreach ($model_obj_nodes as $root) {
+			$models_and_ids_to_delete = array_replace_recursive($models_and_ids_to_delete, $root->getIds());
+		}
+		return $models_and_ids_to_delete;
+	}
 
 
-    /**
-     * Gets an array indicating what database rows are contained in the job.
-     * Each top-level key is a model name, and its value is an array of IDs.
-     *
-     * @param string $code
-     * @return array
-     * @throws EE_Error
-     * @throws Exception
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     * @throws UnexpectedEntityException
-     * @throws Exception
-     */
-    public function getModelsAndIdsFromGroup($code)
-    {
-        $model_obj_nodes = $this->getModelObjNodesInGroup($code);
-        return $this->getModelsAndIdsContainedIn($model_obj_nodes);
-    }
+	/**
+	 * Gets an array indicating what database rows are contained in the job.
+	 * Each top-level key is a model name, and its value is an array of IDs.
+	 *
+	 * @param string $code
+	 * @return array
+	 * @throws EE_Error
+	 * @throws Exception
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 * @throws UnexpectedEntityException
+	 * @throws Exception
+	 */
+	public function getModelsAndIdsFromGroup($code)
+	{
+		$model_obj_nodes = $this->getModelObjNodesInGroup($code);
+		return $this->getModelsAndIdsContainedIn($model_obj_nodes);
+	}
 
 
-    /**
-     * Persists the ModelObjNodes for future requests, using the code for reference.
-     *
-     * @param ModelObjNode[] $model_obj_nodes
-     * @param string         $code
-     * @return bool
-     */
-    public function persistModelObjNodesGroup(array $model_obj_nodes, $code)
-    {
-        return add_option(
-            $this->getOptionPrefix() . $code,
-            $model_obj_nodes,
-            null,
-            'no'
-        );
-    }
+	/**
+	 * Persists the ModelObjNodes for future requests, using the code for reference.
+	 *
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @param string         $code
+	 * @return bool
+	 */
+	public function persistModelObjNodesGroup(array $model_obj_nodes, $code)
+	{
+		return add_option(
+			$this->getOptionPrefix() . $code,
+			$model_obj_nodes,
+			null,
+			'no'
+		);
+	}
 
 
-    /**
-     * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
-     *
-     * @param $code
-     * @return bool
-     */
-    public function deleteModelObjNodesInGroup($code)
-    {
-        return delete_option($this->getOptionPrefix() . $code);
-    }
+	/**
+	 * Forgets about the group of ModelObjNodes. Doesn't delete the rows in the database they reference though.
+	 *
+	 * @param $code
+	 * @return bool
+	 */
+	public function deleteModelObjNodesInGroup($code)
+	{
+		return delete_option($this->getOptionPrefix() . $code);
+	}
 }
 // End of file NodeGroupDao.php
 // Location: EventEspresso\core\services\orm\tree_traversal/NodeGroupDao.php

core/libraries/plugin_api/EE_Register_Personal_Data_Exporter.lib.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public static function register(string $addon_name = '', array $setup_args = []): bool
     {
-        self::$exporters[ $addon_name ] = $setup_args;
+        self::$exporters[$addon_name] = $setup_args;
         // add to list of modules to be registered
         add_filter(
             'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
@@ -44,7 +44,7 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$exporters[ $addon_name ]);
+        unset(self::$exporters[$addon_name]);
     }
 
 

Indentation +43 added lines, -43 removed lines

@@ -12,57 +12,57 @@
  */
 class EE_Register_Personal_Data_Exporter implements EEI_Plugin_API
 {
-    /**
-     * FQCN for all privacy policy generators
-     *
-     * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
-     */
-    protected static $exporters = [];
+	/**
+	 * FQCN for all privacy policy generators
+	 *
+	 * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
+	 */
+	protected static $exporters = [];
 
 
-    /**
-     * @param string $addon_name
-     * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
-     *                           OR fully qualified class names of privacy policies
-     * @return bool
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-        self::$exporters[ $addon_name ] = $setup_args;
-        // add to list of modules to be registered
-        add_filter(
-            'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
-            ['EE_Register_Personal_Data_Exporter', 'addExporters']
-        );
-        return true;
-    }
+	/**
+	 * @param string $addon_name
+	 * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
+	 *                           OR fully qualified class names of privacy policies
+	 * @return bool
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+		self::$exporters[ $addon_name ] = $setup_args;
+		// add to list of modules to be registered
+		add_filter(
+			'FHEE__EventEspresso_core_services_privacy_export_PersonalDataExporterManager__exporters',
+			['EE_Register_Personal_Data_Exporter', 'addExporters']
+		);
+		return true;
+	}
 
 
-    /**
-     * @param string $addon_name
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$exporters[ $addon_name ]);
-    }
+	/**
+	 * @param string $addon_name
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$exporters[ $addon_name ]);
+	}
 
 
-    /**
-     * Adds our personal data exporters registered by add-ons
-     *
-     * @param string[] $exporters
-     * @return string[]
-     */
-    public static function addExporters(array $exporters): array
-    {
-        return array_merge($exporters, ...self::$exporters);
-    }
+	/**
+	 * Adds our personal data exporters registered by add-ons
+	 *
+	 * @param string[] $exporters
+	 * @return string[]
+	 */
+	public static function addExporters(array $exporters): array
+	{
+		return array_merge($exporters, ...self::$exporters);
+	}
 
 
-    public static function reset(): void
-    {
-        self::$exporters = [];
-    }
+	public static function reset(): void
+	{
+		self::$exporters = [];
+	}
 }
 // End of file EE_Register_Personal_Data_Exporter.lib.php
 // Location: ${NAMESPACE}/EE_Register_Personal_Data_Exporter.lib.php

core/libraries/plugin_api/EE_Register_Personal_Data_Eraser.lib.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public static function register(string $addon_name = '', array $setup_args = []): bool
     {
-        self::$erasers[ $addon_name ] = $setup_args;
+        self::$erasers[$addon_name] = $setup_args;
         // add to list of modules to be registered
         add_filter(
             'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
@@ -44,7 +44,7 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$erasers[ $addon_name ]);
+        unset(self::$erasers[$addon_name]);
     }
 
 

Indentation +43 added lines, -43 removed lines

@@ -12,57 +12,57 @@
  */
 class EE_Register_Personal_Data_Eraser implements EEI_Plugin_API
 {
-    /**
-     * FQCN for all privacy policy generators
-     *
-     * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
-     */
-    protected static $erasers = [];
+	/**
+	 * FQCN for all privacy policy generators
+	 *
+	 * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
+	 */
+	protected static $erasers = [];
 
 
-    /**
-     * @param string $addon_name
-     * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
-     *                           OR fully qualified class names of privacy policies
-     * @return bool
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-        self::$erasers[ $addon_name ] = $setup_args;
-        // add to list of modules to be registered
-        add_filter(
-            'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
-            ['EE_Register_Personal_Data_Eraser', 'addErasers']
-        );
-        return true;
-    }
+	/**
+	 * @param string $addon_name
+	 * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
+	 *                           OR fully qualified class names of privacy policies
+	 * @return bool
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+		self::$erasers[ $addon_name ] = $setup_args;
+		// add to list of modules to be registered
+		add_filter(
+			'FHEE__EventEspresso_core_services_privacy_erasure_PersonalDataEraserManager__erasers',
+			['EE_Register_Personal_Data_Eraser', 'addErasers']
+		);
+		return true;
+	}
 
 
-    /**
-     * @param string $addon_name
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$erasers[ $addon_name ]);
-    }
+	/**
+	 * @param string $addon_name
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$erasers[ $addon_name ]);
+	}
 
 
-    /**
-     * Adds our personal data erasers registered by add-ons
-     *
-     * @param string[] $erasers
-     * @return string[]
-     */
-    public static function addErasers(array $erasers): array
-    {
-        return array_merge($erasers, ...self::$erasers);
-    }
+	/**
+	 * Adds our personal data erasers registered by add-ons
+	 *
+	 * @param string[] $erasers
+	 * @return string[]
+	 */
+	public static function addErasers(array $erasers): array
+	{
+		return array_merge($erasers, ...self::$erasers);
+	}
 
 
-    public static function reset(): void
-    {
-        self::$erasers = [];
-    }
+	public static function reset(): void
+	{
+		self::$erasers = [];
+	}
 }
 // End of file EE_Register_Personal_Data_Eraser.lib.php
 // Location: ${NAMESPACE}/EE_Register_Personal_Data_Eraser.lib.php

core/libraries/plugin_api/EE_Register_Messages_Shortcode_Library.lib.php

Spacing +9 added lines, -9 removed lines

@@ -65,7 +65,7 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_ee_messages_shortcode_registry[ $addon_name ])) {
+        if (isset(self::$_ee_messages_shortcode_registry[$addon_name])) {
             return true;
         }
 
@@ -87,7 +87,7 @@ 
             );
         }
 
-        self::$_ee_messages_shortcode_registry[ $addon_name ] = [
+        self::$_ee_messages_shortcode_registry[$addon_name] = [
             'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
             'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
                 ? (array) $setup_args['list_type_shortcodes'] : [],
@@ -101,19 +101,19 @@ 
         );
 
         // add below filters if the required callback is provided.
-        if (! empty($setup_args['msgr_validator_callback'])) {
+        if ( ! empty($setup_args['msgr_validator_callback'])) {
             add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['msgr_template_fields_callback'])) {
+        if ( ! empty($setup_args['msgr_template_fields_callback'])) {
             add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['valid_shortcodes_callback'])) {
+        if ( ! empty($setup_args['valid_shortcodes_callback'])) {
             add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
         }
 
-        if (! empty($setup_args['list_type_shortcodes'])) {
+        if ( ! empty($setup_args['list_type_shortcodes'])) {
             add_filter(
                 'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
                 ['EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'],
@@ -133,7 +133,7 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$_ee_messages_shortcode_registry[ $addon_name ]);
+        unset(self::$_ee_messages_shortcode_registry[$addon_name]);
     }
 
 
@@ -148,7 +148,7 @@ 
     public static function register_msgs_autoload_paths(array $paths): array
     {
         $autoload_paths = [];
-        if (! empty(self::$_ee_messages_shortcode_registry)) {
+        if ( ! empty(self::$_ee_messages_shortcode_registry)) {
             foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
                 if (empty($st_reg['autoloadpaths'])) {
                     continue;
@@ -176,7 +176,7 @@ 
         }
         $shortcodes = [];
         foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
-            if (! empty($sc_reg['list_type_shortcodes'])) {
+            if ( ! empty($sc_reg['list_type_shortcodes'])) {
                 $shortcodes[] = $sc_reg['list_type_shortcodes'];
             }
         }

Indentation +176 added lines, -176 removed lines

@@ -10,180 +10,180 @@
  */
 class EE_Register_Messages_Shortcode_Library implements EEI_Plugin_API
 {
-    /**
-     * holds values for registered messages shortcode libraries
-     *
-     * @var array
-     */
-    protected static $_ee_messages_shortcode_registry = [];
-
-
-    /**
-     * Helper method for registering a new shortcodes library class for the messages system.
-     *
-     * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
-     * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
-     *
-     * @param string $addon_name    What is the name of this shortcode library (e.g. 'question_list');
-     * @param array  $setup_args    An array of arguments provided for registering the new messages shortcode library.
-     *                              {
-     *
-     * @type array $autoloadpaths                       An array of paths to add to the messages autoloader
-     *                                                  for the new shortcode library class file.
-     * @type string $msgr_validator_callback            Callback for a method that will register the library with the
-     *                                                  messenger _validator_config. Optional.
-     * @type string  $msgr_template_fields_callback     Callback for changing adding the _template_fields property for
-     *                                                  messenger. For example, the shortcode library may add a new
-     *                                                  field to the message templates. Optional.
-     * @type string  $valid_shortcodes_callback         Callback for message types _valid_shortcodes array setup.
-     *                                                  Optional.
-     * @type array $list_type_shortcodes                If there are any specific shortcodes with this message
-     *                                                  shortcode library that should be considered "list type"
-     *                                                  then include them in an array.
-     *                                                  List Type shortcodes are shortcodes that have a corresponding
-     *                                                  field that indicates how they are parsed. Optional.
-     *                              }
-     * @return bool
-     * @throws EE_Error
-     * @throws EE_Error
-     * @since    4.3.0
-     *
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($addon_name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
-            throw new EE_Error(
-                esc_html__(
-                    'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // make sure we don't register twice
-        if (isset(self::$_ee_messages_shortcode_registry[ $addon_name ])) {
-            return true;
-        }
-
-        // make sure this was called in the right place!
-        if (
-            ! did_action('EE_Brewing_Regular___messages_caf')
-            || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    esc_html__(
-                        'Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).',
-                        'event_espresso'
-                    ),
-                    $addon_name
-                ),
-                '4.3.0'
-            );
-        }
-
-        self::$_ee_messages_shortcode_registry[ $addon_name ] = [
-            'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
-            'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
-                ? (array) $setup_args['list_type_shortcodes'] : [],
-        ];
-
-        // add filters
-        add_filter(
-            'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-            ['EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'],
-            10
-        );
-
-        // add below filters if the required callback is provided.
-        if (! empty($setup_args['msgr_validator_callback'])) {
-            add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['msgr_template_fields_callback'])) {
-            add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['valid_shortcodes_callback'])) {
-            add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
-        }
-
-        if (! empty($setup_args['list_type_shortcodes'])) {
-            add_filter(
-                'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
-                ['EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'],
-                10
-            );
-        }
-        return true;
-    }
-
-
-    /**
-     * This deregisters any messages shortcode library previously registered with the given name.
-     *
-     * @param string $addon_name name used to register the shortcode library.
-     * @return  void
-     * @since    4.3.0
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$_ee_messages_shortcode_registry[ $addon_name ]);
-    }
-
-
-    /**
-     * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
-     *
-     * @param array $paths array of paths to be checked by EE_messages autoloader.
-     * @return array
-     * @since    4.3.0
-     *
-     */
-    public static function register_msgs_autoload_paths(array $paths): array
-    {
-        $autoload_paths = [];
-        if (! empty(self::$_ee_messages_shortcode_registry)) {
-            foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
-                if (empty($st_reg['autoloadpaths'])) {
-                    continue;
-                }
-                $autoload_paths[] = $st_reg['autoloadpaths'];
-            }
-        }
-        return array_merge($paths, ...$autoload_paths);
-    }
-
-
-    /**
-     * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
-     * filter which is used to add additional list type shortcodes.
-     *
-     * @param array $original_shortcodes
-     * @return  array                                   Modifications to original shortcodes.
-     * @since 4.3.0
-     *
-     */
-    public static function register_list_type_shortcodes(array $original_shortcodes): array
-    {
-        if (empty(self::$_ee_messages_shortcode_registry)) {
-            return $original_shortcodes;
-        }
-        $shortcodes = [];
-        foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
-            if (! empty($sc_reg['list_type_shortcodes'])) {
-                $shortcodes[] = $sc_reg['list_type_shortcodes'];
-            }
-        }
-        return array_merge($original_shortcodes, ...$shortcodes);
-    }
-
-
-    public static function reset(): void
-    {
-        self::$_ee_messages_shortcode_registry = [];
-    }
+	/**
+	 * holds values for registered messages shortcode libraries
+	 *
+	 * @var array
+	 */
+	protected static $_ee_messages_shortcode_registry = [];
+
+
+	/**
+	 * Helper method for registering a new shortcodes library class for the messages system.
+	 *
+	 * Note this is not used for adding shortcodes to existing libraries.  It's for registering anything
+	 * related to registering a new EE_{shortcode_library_name}_Shortcodes.lib.php class.
+	 *
+	 * @param string $addon_name    What is the name of this shortcode library (e.g. 'question_list');
+	 * @param array  $setup_args    An array of arguments provided for registering the new messages shortcode library.
+	 *                              {
+	 *
+	 * @type array $autoloadpaths                       An array of paths to add to the messages autoloader
+	 *                                                  for the new shortcode library class file.
+	 * @type string $msgr_validator_callback            Callback for a method that will register the library with the
+	 *                                                  messenger _validator_config. Optional.
+	 * @type string  $msgr_template_fields_callback     Callback for changing adding the _template_fields property for
+	 *                                                  messenger. For example, the shortcode library may add a new
+	 *                                                  field to the message templates. Optional.
+	 * @type string  $valid_shortcodes_callback         Callback for message types _valid_shortcodes array setup.
+	 *                                                  Optional.
+	 * @type array $list_type_shortcodes                If there are any specific shortcodes with this message
+	 *                                                  shortcode library that should be considered "list type"
+	 *                                                  then include them in an array.
+	 *                                                  List Type shortcodes are shortcodes that have a corresponding
+	 *                                                  field that indicates how they are parsed. Optional.
+	 *                              }
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws EE_Error
+	 * @since    4.3.0
+	 *
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($addon_name) || ! is_array($setup_args) || empty($setup_args['autoloadpaths'])) {
+			throw new EE_Error(
+				esc_html__(
+					'In order to register a messages shortcode library with EE_Register_Messages_Shortcode_Library::register, you must include a "name" (a unique identifier for this set of message shortcodes), and an array containing the following keys: : "autoload_paths"',
+					'event_espresso'
+				)
+			);
+		}
+
+		// make sure we don't register twice
+		if (isset(self::$_ee_messages_shortcode_registry[ $addon_name ])) {
+			return true;
+		}
+
+		// make sure this was called in the right place!
+		if (
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					esc_html__(
+						'Should be only called on the "EE_Brewing_Regular___messages_caf" hook (Trying to register a library named %s).',
+						'event_espresso'
+					),
+					$addon_name
+				),
+				'4.3.0'
+			);
+		}
+
+		self::$_ee_messages_shortcode_registry[ $addon_name ] = [
+			'autoloadpaths'        => (array) $setup_args['autoloadpaths'],
+			'list_type_shortcodes' => ! empty($setup_args['list_type_shortcodes'])
+				? (array) $setup_args['list_type_shortcodes'] : [],
+		];
+
+		// add filters
+		add_filter(
+			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+			['EE_Register_Messages_Shortcode_Library', 'register_msgs_autoload_paths'],
+			10
+		);
+
+		// add below filters if the required callback is provided.
+		if (! empty($setup_args['msgr_validator_callback'])) {
+			add_filter('FHEE__EE_messenger__get_validator_config', $setup_args['msgr_validator_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['msgr_template_fields_callback'])) {
+			add_filter('FHEE__EE_messenger__get_template_fields', $setup_args['msgr_template_fields_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['valid_shortcodes_callback'])) {
+			add_filter('FHEE__EE_Messages_Base__get_valid_shortcodes', $setup_args['valid_shortcodes_callback'], 10, 2);
+		}
+
+		if (! empty($setup_args['list_type_shortcodes'])) {
+			add_filter(
+				'FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes',
+				['EE_Register_Messages_Shortcode_Library', 'register_list_type_shortcodes'],
+				10
+			);
+		}
+		return true;
+	}
+
+
+	/**
+	 * This deregisters any messages shortcode library previously registered with the given name.
+	 *
+	 * @param string $addon_name name used to register the shortcode library.
+	 * @return  void
+	 * @since    4.3.0
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$_ee_messages_shortcode_registry[ $addon_name ]);
+	}
+
+
+	/**
+	 * callback for FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.
+	 *
+	 * @param array $paths array of paths to be checked by EE_messages autoloader.
+	 * @return array
+	 * @since    4.3.0
+	 *
+	 */
+	public static function register_msgs_autoload_paths(array $paths): array
+	{
+		$autoload_paths = [];
+		if (! empty(self::$_ee_messages_shortcode_registry)) {
+			foreach (self::$_ee_messages_shortcode_registry as $st_reg) {
+				if (empty($st_reg['autoloadpaths'])) {
+					continue;
+				}
+				$autoload_paths[] = $st_reg['autoloadpaths'];
+			}
+		}
+		return array_merge($paths, ...$autoload_paths);
+	}
+
+
+	/**
+	 * This is the callback for the FHEE__EEH_Parse_Shortcodes___parse_message_template__list_type_shortcodes
+	 * filter which is used to add additional list type shortcodes.
+	 *
+	 * @param array $original_shortcodes
+	 * @return  array                                   Modifications to original shortcodes.
+	 * @since 4.3.0
+	 *
+	 */
+	public static function register_list_type_shortcodes(array $original_shortcodes): array
+	{
+		if (empty(self::$_ee_messages_shortcode_registry)) {
+			return $original_shortcodes;
+		}
+		$shortcodes = [];
+		foreach (self::$_ee_messages_shortcode_registry as $sc_reg) {
+			if (! empty($sc_reg['list_type_shortcodes'])) {
+				$shortcodes[] = $sc_reg['list_type_shortcodes'];
+			}
+		}
+		return array_merge($original_shortcodes, ...$shortcodes);
+	}
+
+
+	public static function reset(): void
+	{
+		self::$_ee_messages_shortcode_registry = [];
+	}
 }

core/libraries/plugin_api/EE_Register_Privacy_Policy.lib.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public static function register(string $addon_name = '', array $setup_args = []): bool
     {
-        self::$privacy_policies[ $addon_name ] = $setup_args;
+        self::$privacy_policies[$addon_name] = $setup_args;
         // add to list of modules to be registered
         add_filter(
             'FHEE__EventEspresso_core_services_privacy_policy_PrivacyPolicyManager__privacy_policies',
@@ -44,7 +44,7 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$privacy_policies[ $addon_name ]);
+        unset(self::$privacy_policies[$addon_name]);
     }
 
 

Indentation +43 added lines, -43 removed lines

@@ -12,57 +12,57 @@
  */
 class EE_Register_Privacy_Policy implements EEI_Plugin_API
 {
-    /**
-     * FQCN for all privacy policy generators
-     *
-     * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
-     */
-    protected static $privacy_policies = [];
+	/**
+	 * FQCN for all privacy policy generators
+	 *
+	 * @var array keys are plugin_ids, and values are an array of FQCNs or FQCNs
+	 */
+	protected static $privacy_policies = [];
 
 
-    /**
-     * @param string $addon_name
-     * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
-     *                           OR fully qualified class names of privacy policies
-     * @return bool
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-        self::$privacy_policies[ $addon_name ] = $setup_args;
-        // add to list of modules to be registered
-        add_filter(
-            'FHEE__EventEspresso_core_services_privacy_policy_PrivacyPolicyManager__privacy_policies',
-            ['EE_Register_Privacy_Policy', 'addPrivacyPolicies']
-        );
-        return true;
-    }
+	/**
+	 * @param string $addon_name
+	 * @param array  $setup_args can be the fully qualified namespaces each containing only privacy policies,
+	 *                           OR fully qualified class names of privacy policies
+	 * @return bool
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+		self::$privacy_policies[ $addon_name ] = $setup_args;
+		// add to list of modules to be registered
+		add_filter(
+			'FHEE__EventEspresso_core_services_privacy_policy_PrivacyPolicyManager__privacy_policies',
+			['EE_Register_Privacy_Policy', 'addPrivacyPolicies']
+		);
+		return true;
+	}
 
 
-    /**
-     * @param string $addon_name
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$privacy_policies[ $addon_name ]);
-    }
+	/**
+	 * @param string $addon_name
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$privacy_policies[ $addon_name ]);
+	}
 
 
-    /**
-     * Adds our privacy policy generators registered by add-ons
-     *
-     * @param string[] $privacy_policies
-     * @return string[]
-     */
-    public static function addPrivacyPolicies(array $privacy_policies): array
-    {
-        return array_merge($privacy_policies, ...self::$privacy_policies);
-    }
+	/**
+	 * Adds our privacy policy generators registered by add-ons
+	 *
+	 * @param string[] $privacy_policies
+	 * @return string[]
+	 */
+	public static function addPrivacyPolicies(array $privacy_policies): array
+	{
+		return array_merge($privacy_policies, ...self::$privacy_policies);
+	}
 
 
-    public static function reset(): void
-    {
-        self::$privacy_policies = [];
-    }
+	public static function reset(): void
+	{
+		self::$privacy_policies = [];
+	}
 }
 // End of file EE_Register_Privacy_Policy.lib.php
 // Location: ${NAMESPACE}/EE_Register_Privacy_Policy.lib.php

core/libraries/plugin_api/EE_Register_Payment_Method.lib.php

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
             );
         }
         // make sure we don't register twice
-        if (isset(self::$_settings[ $addon_name ])) {
+        if (isset(self::$_settings[$addon_name])) {
             return true;
         }
         // make sure this was called in the right place!
@@ -77,7 +77,7 @@ 
             );
         }
         // setup $_settings array from incoming values.
-        self::$_settings[ $addon_name ] = [
+        self::$_settings[$addon_name] = [
             // array of full server paths to any EE_PMT_Base children used
             'payment_method_paths' => isset($setup_args['payment_method_paths'])
                 ? (array) $setup_args['payment_method_paths']
@@ -93,12 +93,12 @@ 
         if (did_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods')) {
             $payment_method_manager = LoaderFactory::getLoader()->getShared('EE_Payment_Method_Manager');
             // register payment methods directly
-            foreach (self::$_settings[ $addon_name ]['payment_method_paths'] as $payment_method_path) {
+            foreach (self::$_settings[$addon_name]['payment_method_paths'] as $payment_method_path) {
                 $payment_method_manager->register_payment_method($payment_method_path);
             }
             $capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
             $capabilities->addCaps(
-                self::getPaymentMethodCapabilities(self::$_settings[ $addon_name ])
+                self::getPaymentMethodCapabilities(self::$_settings[$addon_name])
             );
         }
         return true;
@@ -135,13 +135,13 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        if (isset(self::$_settings[ $addon_name ])) {
+        if (isset(self::$_settings[$addon_name])) {
             // set action for just this module id to delay deregistration until core is loaded and ready.
-            $module_settings = self::$_settings[ $addon_name ];
-            unset(self::$_settings[ $addon_name ]);
+            $module_settings = self::$_settings[$addon_name];
+            unset(self::$_settings[$addon_name]);
             add_action(
                 'AHEE__EE_System__core_loaded_and_ready',
-                function () use ($module_settings) {
+                function() use ($module_settings) {
                     $capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
                     $capabilities->removeCaps(
                         EE_Register_Payment_Method::getPaymentMethodCapabilities($module_settings)

Indentation +155 added lines, -155 removed lines

@@ -18,169 +18,169 @@
  */
 class EE_Register_Payment_Method implements EEI_Plugin_API
 {
-    /**
-     * Holds values for registered payment methods
-     *
-     * @var array
-     */
-    protected static $_settings = [];
+	/**
+	 * Holds values for registered payment methods
+	 *
+	 * @var array
+	 */
+	protected static $_settings = [];
 
 
-    /**
-     * Method for registering new EE_PMT_Base children
-     *
-     * @param string  $addon_name           a unique identifier for this set of modules Required.
-     * @param array   $setup_args           an array of arguments provided for registering modules Required.{
-     * @type string[] $payment_method_paths each element is the folder containing the EE_PMT_Base child class
-     *                                      (eg, 'public_html/wp-content/plugins/my_plugin/Payomatic/' which contains
-     *                                      the files EE_PMT_Payomatic.pm.php)
-     *                                      }
-     * @return bool
-     * @throws EE_Error
-     * @type array payment_method_paths    an array of full server paths to folders containing any EE_PMT_Base
-     *                                      children, or to the EED_Module files themselves
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @since    4.5.0
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-        // required fields MUST be present, so let's make sure they are.
-        if (empty($addon_name) || ! is_array($setup_args) || empty($setup_args['payment_method_paths'])) {
-            throw new EE_Error(
-                esc_html__(
-                    'In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)',
-                    'event_espresso'
-                )
-            );
-        }
-        // make sure we don't register twice
-        if (isset(self::$_settings[ $addon_name ])) {
-            return true;
-        }
-        // make sure this was called in the right place!
-        if (
-            ! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                esc_html__(
-                    'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.',
-                    'event_espresso'
-                ),
-                '4.3.0'
-            );
-        }
-        // setup $_settings array from incoming values.
-        self::$_settings[ $addon_name ] = [
-            // array of full server paths to any EE_PMT_Base children used
-            'payment_method_paths' => isset($setup_args['payment_method_paths'])
-                ? (array) $setup_args['payment_method_paths']
-                : [],
-        ];
-        // add to list of modules to be registered
-        add_filter(
-            'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
-            ['EE_Register_Payment_Method', 'add_payment_methods']
-        );
-        // If EE_Payment_Method_Manager::register_payment_methods has already been called,
-        // then we need to add our caps for this payment method manually
-        if (did_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods')) {
-            $payment_method_manager = LoaderFactory::getLoader()->getShared('EE_Payment_Method_Manager');
-            // register payment methods directly
-            foreach (self::$_settings[ $addon_name ]['payment_method_paths'] as $payment_method_path) {
-                $payment_method_manager->register_payment_method($payment_method_path);
-            }
-            $capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
-            $capabilities->addCaps(
-                self::getPaymentMethodCapabilities(self::$_settings[ $addon_name ])
-            );
-        }
-        return true;
-    }
+	/**
+	 * Method for registering new EE_PMT_Base children
+	 *
+	 * @param string  $addon_name           a unique identifier for this set of modules Required.
+	 * @param array   $setup_args           an array of arguments provided for registering modules Required.{
+	 * @type string[] $payment_method_paths each element is the folder containing the EE_PMT_Base child class
+	 *                                      (eg, 'public_html/wp-content/plugins/my_plugin/Payomatic/' which contains
+	 *                                      the files EE_PMT_Payomatic.pm.php)
+	 *                                      }
+	 * @return bool
+	 * @throws EE_Error
+	 * @type array payment_method_paths    an array of full server paths to folders containing any EE_PMT_Base
+	 *                                      children, or to the EED_Module files themselves
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @since    4.5.0
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+		// required fields MUST be present, so let's make sure they are.
+		if (empty($addon_name) || ! is_array($setup_args) || empty($setup_args['payment_method_paths'])) {
+			throw new EE_Error(
+				esc_html__(
+					'In order to register Payment Methods with EE_Register_Payment_Method::register(), you must include a "payment_method_id" (a unique identifier for this set of modules), and an array containing the following keys: "payment_method_paths" (an array of full server paths to folders that contain modules, or to the module files themselves)',
+					'event_espresso'
+				)
+			);
+		}
+		// make sure we don't register twice
+		if (isset(self::$_settings[ $addon_name ])) {
+			return true;
+		}
+		// make sure this was called in the right place!
+		if (
+			! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('AHEE__EE_System__register_shortcodes_modules_and_widgets')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				esc_html__(
+					'An attempt to register modules has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__register_shortcodes_modules_and_widgets" hook to register modules.',
+					'event_espresso'
+				),
+				'4.3.0'
+			);
+		}
+		// setup $_settings array from incoming values.
+		self::$_settings[ $addon_name ] = [
+			// array of full server paths to any EE_PMT_Base children used
+			'payment_method_paths' => isset($setup_args['payment_method_paths'])
+				? (array) $setup_args['payment_method_paths']
+				: [],
+		];
+		// add to list of modules to be registered
+		add_filter(
+			'FHEE__EE_Payment_Method_Manager__register_payment_methods__payment_methods_to_register',
+			['EE_Register_Payment_Method', 'add_payment_methods']
+		);
+		// If EE_Payment_Method_Manager::register_payment_methods has already been called,
+		// then we need to add our caps for this payment method manually
+		if (did_action('FHEE__EE_Payment_Method_Manager__register_payment_methods__registered_payment_methods')) {
+			$payment_method_manager = LoaderFactory::getLoader()->getShared('EE_Payment_Method_Manager');
+			// register payment methods directly
+			foreach (self::$_settings[ $addon_name ]['payment_method_paths'] as $payment_method_path) {
+				$payment_method_manager->register_payment_method($payment_method_path);
+			}
+			$capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
+			$capabilities->addCaps(
+				self::getPaymentMethodCapabilities(self::$_settings[ $addon_name ])
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * Filters the list of payment methods to add ours.
-     * and they're just full filepaths to FOLDERS containing a payment method class file. Eg.
-     *
-     * @param array $payment_method_folders array of paths to all payment methods that require registering
-     * @return array
-     */
-    public static function add_payment_methods(array $payment_method_folders): array
-    {
-        $payment_method_paths = [];
-        foreach (self::$_settings as $settings) {
-            $payment_method_paths[] = $settings['payment_method_paths'];
-        }
-        return array_merge($payment_method_folders, ...$payment_method_paths);
-    }
+	/**
+	 * Filters the list of payment methods to add ours.
+	 * and they're just full filepaths to FOLDERS containing a payment method class file. Eg.
+	 *
+	 * @param array $payment_method_folders array of paths to all payment methods that require registering
+	 * @return array
+	 */
+	public static function add_payment_methods(array $payment_method_folders): array
+	{
+		$payment_method_paths = [];
+		foreach (self::$_settings as $settings) {
+			$payment_method_paths[] = $settings['payment_method_paths'];
+		}
+		return array_merge($payment_method_folders, ...$payment_method_paths);
+	}
 
 
-    /**
-     * This deregisters a module that was previously registered with a specific $addon_name.
-     *
-     * @param string $addon_name the name for the module that was previously registered
-     * @return void
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @since    4.3.0
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        if (isset(self::$_settings[ $addon_name ])) {
-            // set action for just this module id to delay deregistration until core is loaded and ready.
-            $module_settings = self::$_settings[ $addon_name ];
-            unset(self::$_settings[ $addon_name ]);
-            add_action(
-                'AHEE__EE_System__core_loaded_and_ready',
-                function () use ($module_settings) {
-                    $capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
-                    $capabilities->removeCaps(
-                        EE_Register_Payment_Method::getPaymentMethodCapabilities($module_settings)
-                    );
-                }
-            );
-        }
-    }
+	/**
+	 * This deregisters a module that was previously registered with a specific $addon_name.
+	 *
+	 * @param string $addon_name the name for the module that was previously registered
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @since    4.3.0
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		if (isset(self::$_settings[ $addon_name ])) {
+			// set action for just this module id to delay deregistration until core is loaded and ready.
+			$module_settings = self::$_settings[ $addon_name ];
+			unset(self::$_settings[ $addon_name ]);
+			add_action(
+				'AHEE__EE_System__core_loaded_and_ready',
+				function () use ($module_settings) {
+					$capabilities = LoaderFactory::getLoader()->getShared('EE_Capabilities');
+					$capabilities->removeCaps(
+						EE_Register_Payment_Method::getPaymentMethodCapabilities($module_settings)
+					);
+				}
+			);
+		}
+	}
 
 
-    /**
-     * returns an array of the caps that get added when a Payment Method is registered
-     *
-     * @param array $settings
-     * @return array
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @access private  Developers do NOT use this method.  It's only public for PHP5.3 closure support (see deregister)
-     *                  When we drop support for PHP5.3 this will be made private again.  You have been warned.
-     */
-    public static function getPaymentMethodCapabilities(array $settings): array
-    {
-        $payment_method_manager = LoaderFactory::getLoader()->getShared('EE_Payment_Method_Manager');
-        $payment_method_caps    = ['administrator' => []];
-        if (isset($settings['payment_method_paths'])) {
-            foreach ($settings['payment_method_paths'] as $payment_method_path) {
-                $payment_method_caps = $payment_method_manager->addPaymentMethodCap(
-                    strtolower(basename($payment_method_path)),
-                    $payment_method_caps
-                );
-            }
-        }
-        return $payment_method_caps;
-    }
+	/**
+	 * returns an array of the caps that get added when a Payment Method is registered
+	 *
+	 * @param array $settings
+	 * @return array
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @access private  Developers do NOT use this method.  It's only public for PHP5.3 closure support (see deregister)
+	 *                  When we drop support for PHP5.3 this will be made private again.  You have been warned.
+	 */
+	public static function getPaymentMethodCapabilities(array $settings): array
+	{
+		$payment_method_manager = LoaderFactory::getLoader()->getShared('EE_Payment_Method_Manager');
+		$payment_method_caps    = ['administrator' => []];
+		if (isset($settings['payment_method_paths'])) {
+			foreach ($settings['payment_method_paths'] as $payment_method_path) {
+				$payment_method_caps = $payment_method_manager->addPaymentMethodCap(
+					strtolower(basename($payment_method_path)),
+					$payment_method_caps
+				);
+			}
+		}
+		return $payment_method_caps;
+	}
 
 
-    public static function reset(): void
-    {
-        self::$_settings = [];
-    }
+	public static function reset(): void
+	{
+		self::$_settings = [];
+	}
 }

core/db_classes/EE_Form_Section.class.php

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
      */
     public function setUUID(string $UUID)
     {
-        if (! Cuid::isCuid($UUID)) {
+        if ( ! Cuid::isCuid($UUID)) {
             throw new InvalidArgumentException(
                 sprintf(
                     /* translators: 1: UUID value, 2: UUID generator function. */
@@ -177,7 +177,7 @@ 
      */
     public function attributes(): ?Attributes
     {
-        if (! $this->attributes instanceof Attributes) {
+        if ( ! $this->attributes instanceof Attributes) {
             $this->attributes = Attributes::fromJson($this->get('FSC_attributes'));
         }
         return $this->attributes;
@@ -243,7 +243,7 @@ 
         $form_elements = $this->get_many_related('Form_Element', ['order_by' => ['FIN_order' => 'ASC']]);
         foreach ($form_elements as $form_element) {
             if ($form_element instanceof EE_Form_Element) {
-                $this->form_elements[ $form_element->UUID() ] = $form_element;
+                $this->form_elements[$form_element->UUID()] = $form_element;
             }
         }
         return $this->form_elements;
@@ -260,7 +260,7 @@ 
         foreach ($form_elements as $form_element) {
             if ($form_element instanceof EE_Form_Element) {
                 $this->_add_relation_to($form_element->UUID(), 'Form_Element');
-                $this->form_elements[ $form_element->UUID() ] = $form_element;
+                $this->form_elements[$form_element->UUID()] = $form_element;
             }
         }
     }
@@ -291,7 +291,7 @@ 
     public function formElementFilter(): Closure
     {
         $FSC_UUID = strtolower($this->UUID());
-        return function ($form_element) use ($FSC_UUID) {
+        return function($form_element) use ($FSC_UUID) {
             return $form_element instanceof EE_Form_Element && strtolower($form_element->belongsTo()) === $FSC_UUID;
         };
     }
@@ -306,7 +306,7 @@ 
      */
     public function label(): ?FormLabel
     {
-        if (! $this->label instanceof FormLabel) {
+        if ( ! $this->label instanceof FormLabel) {
             $this->label = FormLabel::fromJson($this->get('FSC_label'));
         }
         return $this->label;

Indentation +490 added lines, -490 removed lines

@@ -25,494 +25,494 @@
  */
 class EE_Form_Section extends EE_Base_Class
 {
-    /**
-     * @var Attributes
-     */
-    private $attributes;
-
-    /**
-     * @var EE_Form_Element[]
-     */
-    private $form_elements = [];
-
-    /**
-     * @var FormLabel
-     */
-    private $label;
-
-
-
-    /**
-     * @param array $props_n_values
-     * @return EE_Form_Section
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance(array $props_n_values = []): EE_Form_Section
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__);
-        return $has_object ?: new self($props_n_values);
-    }
-
-
-    /**
-     * @param array $props_n_values
-     * @return EE_Form_Section
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function new_instance_from_db(array $props_n_values = []): EE_Form_Section
-    {
-        return new self($props_n_values, true);
-    }
-
-
-    /**
-     * Form Section UUID (universally unique identifier)
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function UUID(): string
-    {
-        return $this->get('FSC_UUID');
-    }
-
-
-    /**
-     * last 8 characters of the UUID
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function uuidSlug(): string
-    {
-        return substr($this->UUID(), -8);
-    }
-
-
-    /**
-     * @param string $UUID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setUUID(string $UUID)
-    {
-        if (! Cuid::isCuid($UUID)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    /* translators: 1: UUID value, 2: UUID generator function. */
-                    esc_html__(
-                        'The supplied UUID "%1$s" is invalid or missing. Please use %2$s to generate a valid one.',
-                        'event_espresso'
-                    ),
-                    $UUID,
-                    "`Cuid::cuid()`"
-                )
-            );
-        }
-        $this->set('FSC_UUID', $UUID);
-    }
-
-
-    /**
-     * Form user types that this form section should be presented to.
-     * Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function appliesTo(): string
-    {
-        return $this->get('FSC_appliesTo');
-    }
-
-
-    /**
-     * Form user types that this form section should be presented to.
-     * Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.
-     *
-     * @param EE_Registration|string $registrant
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function appliesToRegistrant($registrant): bool
-    {
-        switch ($this->appliesTo()) {
-            case EEM_Form_Section::APPLIES_TO_PRIMARY:
-                return $registrant instanceof EE_Registration && $registrant->is_primary_registrant();
-            case EEM_Form_Section::APPLIES_TO_PURCHASER:
-                return $registrant === 'purchaser';
-            case EEM_Form_Section::APPLIES_TO_REGISTRANTS:
-                return $registrant instanceof EE_Registration && ! $registrant->is_primary_registrant();
-            case EEM_Form_Section::APPLIES_TO_ALL:
-            default:
-                return true;
-        }
-    }
-
-
-    /**
-     * @param string $user_type
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setAppliesTo(string $user_type)
-    {
-        $this->set('FSC_appliesTo', $user_type);
-    }
-
-
-    /**
-     * JSON string of HTML attributes, such as class, to be applied to this form section\'s container.
-     *
-     * @return Attributes
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function attributes(): ?Attributes
-    {
-        if (! $this->attributes instanceof Attributes) {
-            $this->attributes = Attributes::fromJson($this->get('FSC_attributes'));
-        }
-        return $this->attributes;
-    }
-
-
-    /**
-     * @param Attributes $attributes
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setAttributes(Attributes $attributes)
-    {
-        // set local object
-        $this->attributes = $attributes;
-        // then pass to model as an array which will get converted to JSON by the model field
-        $this->set('FSC_attributes', $attributes->toArray());
-    }
-
-
-    /**
-     * UUID or ID of related entity this form section belongs to.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function belongsTo(): ?string
-    {
-        return $this->get('FSC_belongsTo');
-    }
-
-
-    /**
-     * @param string $parent_UUID
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setBelongsTo(string $parent_UUID)
-    {
-        $this->set('FSC_belongsTo', $parent_UUID);
-    }
-
-
-    /**
-     * @return EE_Form_Element[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function formElements(): array
-    {
-        return $this->form_elements ?: $this->getFormElements();
-    }
-
-
-    /**
-     * @return EE_Form_Element[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function getFormElements(): array
-    {
-        $form_elements = $this->get_many_related('Form_Element', ['order_by' => ['FIN_order' => 'ASC']]);
-        foreach ($form_elements as $form_element) {
-            if ($form_element instanceof EE_Form_Element) {
-                $this->form_elements[ $form_element->UUID() ] = $form_element;
-            }
-        }
-        return $this->form_elements;
-    }
-
-
-    /**
-     * @param EE_Form_Element[] $form_elements
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setFormElements(array $form_elements): void
-    {
-        foreach ($form_elements as $form_element) {
-            if ($form_element instanceof EE_Form_Element) {
-                $this->_add_relation_to($form_element->UUID(), 'Form_Element');
-                $this->form_elements[ $form_element->UUID() ] = $form_element;
-            }
-        }
-    }
-
-
-    /**
-     * @param EE_Form_Element[] $all_form_elements
-     * @return EE_Form_Element[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function filterFormElements(array $all_form_elements): array
-    {
-        return array_filter($all_form_elements, $this->formElementFilter());
-    }
-
-
-    /**
-     * returns a closure that can be used to filter form elements for this form section
-     * usage:
-     *  $filter = EEM_Form_Element::formElementFilter();
-     *  $filtered_form_elements = array_filter( $all_form_elements, $filter );
-     *
-     * @return Closure
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function formElementFilter(): Closure
-    {
-        $FSC_UUID = strtolower($this->UUID());
-        return function ($form_element) use ($FSC_UUID) {
-            return $form_element instanceof EE_Form_Element && strtolower($form_element->belongsTo()) === $FSC_UUID;
-        };
-    }
-
-
-    /**
-     * returns a FormLabel object for managing form section labels, ie: the form section heading
-     *
-     * @return FormLabel
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function label(): ?FormLabel
-    {
-        if (! $this->label instanceof FormLabel) {
-            $this->label = FormLabel::fromJson($this->get('FSC_label'));
-        }
-        return $this->label;
-    }
-
-
-    /**
-     * @param FormLabel $label
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setLabel(FormLabel $label)
-    {
-        // set local object
-        $this->label = $label;
-        // then pass to model as an array which will get converted to JSON by the model field
-        $this->set('FSC_label', $label->toJson());
-    }
-
-
-    /**
-     * Order in which form section appears in a form.
-     *
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function order(): int
-    {
-        return $this->get('FSC_order');
-    }
-
-
-    /**
-     * @param int $order
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setOrder(int $order)
-    {
-        $this->set('FSC_order', $order);
-    }
-
-
-    /**
-     * combination of public label and UUID slug for use in identifiers
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function slug(): ?string
-    {
-        $label = sanitize_title($this->label()->publicLabel());
-        return "{$label}-{$this->uuidSlug()}";
-    }
-
-
-    /**
-     * Whether form section is active, archived, trashed, or used as a default on new forms.
-     * Values correspond to the EEM_Form_Section::STATUS_* constants.
-     *
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function status(): ?string
-    {
-        return $this->get('FSC_status');
-    }
-
-
-    /**
-     * Whether form section is active, archived, trashed, or used as a default on new forms.
-     * Values correspond to the EEM_Form_Section::STATUS_* constants.
-     *
-     * @param string $status
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setStatus(string $status)
-    {
-        $this->set('FSC_status', $status);
-    }
-
-
-    /**
-     * returns the id the wordpress user who created this question
-     *
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function wp_user(): int
-    {
-        return $this->get('FSC_wpUser');
-    }
-
-
-    /**
-     * @param int $wp_user
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function setWpUser(int $wp_user)
-    {
-        $this->set('FSC_wpUser', $wp_user);
-    }
-
-
-    /**
-     * @param array $set_cols_n_values
-     * @return bool|int|string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function save($set_cols_n_values = [])
-    {
-        // make sure internal versions for all composite objects are updated
-        $this->set('FSC_attributes', $this->attributes()->toArray());
-        $this->set('FSC_label', $this->label()->toArray());
-        return parent::save($set_cols_n_values);
-    }
-
-    /**
-     * Whether the section is active.
-     *
-     * @return boolean  TRUE if is active, FALSE if not.
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function isActive(): bool
-    {
-        return $this->status() === FormStatus::ACTIVE;
-    }
-
-    /**
-     * Whether the section is archived.
-     *
-     * @return boolean  TRUE if is archived, FALSE if not.
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function isArchived(): bool
-    {
-        return $this->status() === FormStatus::ARCHIVED;
-    }
-
-    /**
-     * Whether the section is a default one.
-     *
-     * @return boolean  TRUE if is default, FALSE if not.
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function isDefault(): bool
-    {
-        return $this->status() === FormStatus::DEFAULT;
-    }
-
-    /**
-     * Whether the section is a shared one.
-     *
-     * @return boolean  TRUE if is shared, FALSE if not.
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function isShared(): bool
-    {
-        return $this->status() === FormStatus::SHARED;
-    }
-
-    /**
-     * Whether the section is trashed.
-     *
-     * @return boolean  TRUE if is trashed, FALSE if not.
-     * @throws ReflectionException
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     */
-    public function isTrashed(): bool
-    {
-        return $this->status() === FormStatus::TRASHED;
-    }
-
-
-    /**
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function isTopLevelFormSection(): bool
-    {
-        return empty($this->belongsTo());
-    }
+	/**
+	 * @var Attributes
+	 */
+	private $attributes;
+
+	/**
+	 * @var EE_Form_Element[]
+	 */
+	private $form_elements = [];
+
+	/**
+	 * @var FormLabel
+	 */
+	private $label;
+
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Form_Section
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance(array $props_n_values = []): EE_Form_Section
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ?: new self($props_n_values);
+	}
+
+
+	/**
+	 * @param array $props_n_values
+	 * @return EE_Form_Section
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function new_instance_from_db(array $props_n_values = []): EE_Form_Section
+	{
+		return new self($props_n_values, true);
+	}
+
+
+	/**
+	 * Form Section UUID (universally unique identifier)
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function UUID(): string
+	{
+		return $this->get('FSC_UUID');
+	}
+
+
+	/**
+	 * last 8 characters of the UUID
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function uuidSlug(): string
+	{
+		return substr($this->UUID(), -8);
+	}
+
+
+	/**
+	 * @param string $UUID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setUUID(string $UUID)
+	{
+		if (! Cuid::isCuid($UUID)) {
+			throw new InvalidArgumentException(
+				sprintf(
+					/* translators: 1: UUID value, 2: UUID generator function. */
+					esc_html__(
+						'The supplied UUID "%1$s" is invalid or missing. Please use %2$s to generate a valid one.',
+						'event_espresso'
+					),
+					$UUID,
+					"`Cuid::cuid()`"
+				)
+			);
+		}
+		$this->set('FSC_UUID', $UUID);
+	}
+
+
+	/**
+	 * Form user types that this form section should be presented to.
+	 * Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function appliesTo(): string
+	{
+		return $this->get('FSC_appliesTo');
+	}
+
+
+	/**
+	 * Form user types that this form section should be presented to.
+	 * Values correspond to the EEM_Form_Section::APPLIES_TO_* constants.
+	 *
+	 * @param EE_Registration|string $registrant
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function appliesToRegistrant($registrant): bool
+	{
+		switch ($this->appliesTo()) {
+			case EEM_Form_Section::APPLIES_TO_PRIMARY:
+				return $registrant instanceof EE_Registration && $registrant->is_primary_registrant();
+			case EEM_Form_Section::APPLIES_TO_PURCHASER:
+				return $registrant === 'purchaser';
+			case EEM_Form_Section::APPLIES_TO_REGISTRANTS:
+				return $registrant instanceof EE_Registration && ! $registrant->is_primary_registrant();
+			case EEM_Form_Section::APPLIES_TO_ALL:
+			default:
+				return true;
+		}
+	}
+
+
+	/**
+	 * @param string $user_type
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setAppliesTo(string $user_type)
+	{
+		$this->set('FSC_appliesTo', $user_type);
+	}
+
+
+	/**
+	 * JSON string of HTML attributes, such as class, to be applied to this form section\'s container.
+	 *
+	 * @return Attributes
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function attributes(): ?Attributes
+	{
+		if (! $this->attributes instanceof Attributes) {
+			$this->attributes = Attributes::fromJson($this->get('FSC_attributes'));
+		}
+		return $this->attributes;
+	}
+
+
+	/**
+	 * @param Attributes $attributes
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setAttributes(Attributes $attributes)
+	{
+		// set local object
+		$this->attributes = $attributes;
+		// then pass to model as an array which will get converted to JSON by the model field
+		$this->set('FSC_attributes', $attributes->toArray());
+	}
+
+
+	/**
+	 * UUID or ID of related entity this form section belongs to.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function belongsTo(): ?string
+	{
+		return $this->get('FSC_belongsTo');
+	}
+
+
+	/**
+	 * @param string $parent_UUID
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setBelongsTo(string $parent_UUID)
+	{
+		$this->set('FSC_belongsTo', $parent_UUID);
+	}
+
+
+	/**
+	 * @return EE_Form_Element[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function formElements(): array
+	{
+		return $this->form_elements ?: $this->getFormElements();
+	}
+
+
+	/**
+	 * @return EE_Form_Element[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function getFormElements(): array
+	{
+		$form_elements = $this->get_many_related('Form_Element', ['order_by' => ['FIN_order' => 'ASC']]);
+		foreach ($form_elements as $form_element) {
+			if ($form_element instanceof EE_Form_Element) {
+				$this->form_elements[ $form_element->UUID() ] = $form_element;
+			}
+		}
+		return $this->form_elements;
+	}
+
+
+	/**
+	 * @param EE_Form_Element[] $form_elements
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setFormElements(array $form_elements): void
+	{
+		foreach ($form_elements as $form_element) {
+			if ($form_element instanceof EE_Form_Element) {
+				$this->_add_relation_to($form_element->UUID(), 'Form_Element');
+				$this->form_elements[ $form_element->UUID() ] = $form_element;
+			}
+		}
+	}
+
+
+	/**
+	 * @param EE_Form_Element[] $all_form_elements
+	 * @return EE_Form_Element[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function filterFormElements(array $all_form_elements): array
+	{
+		return array_filter($all_form_elements, $this->formElementFilter());
+	}
+
+
+	/**
+	 * returns a closure that can be used to filter form elements for this form section
+	 * usage:
+	 *  $filter = EEM_Form_Element::formElementFilter();
+	 *  $filtered_form_elements = array_filter( $all_form_elements, $filter );
+	 *
+	 * @return Closure
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function formElementFilter(): Closure
+	{
+		$FSC_UUID = strtolower($this->UUID());
+		return function ($form_element) use ($FSC_UUID) {
+			return $form_element instanceof EE_Form_Element && strtolower($form_element->belongsTo()) === $FSC_UUID;
+		};
+	}
+
+
+	/**
+	 * returns a FormLabel object for managing form section labels, ie: the form section heading
+	 *
+	 * @return FormLabel
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function label(): ?FormLabel
+	{
+		if (! $this->label instanceof FormLabel) {
+			$this->label = FormLabel::fromJson($this->get('FSC_label'));
+		}
+		return $this->label;
+	}
+
+
+	/**
+	 * @param FormLabel $label
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setLabel(FormLabel $label)
+	{
+		// set local object
+		$this->label = $label;
+		// then pass to model as an array which will get converted to JSON by the model field
+		$this->set('FSC_label', $label->toJson());
+	}
+
+
+	/**
+	 * Order in which form section appears in a form.
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function order(): int
+	{
+		return $this->get('FSC_order');
+	}
+
+
+	/**
+	 * @param int $order
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setOrder(int $order)
+	{
+		$this->set('FSC_order', $order);
+	}
+
+
+	/**
+	 * combination of public label and UUID slug for use in identifiers
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function slug(): ?string
+	{
+		$label = sanitize_title($this->label()->publicLabel());
+		return "{$label}-{$this->uuidSlug()}";
+	}
+
+
+	/**
+	 * Whether form section is active, archived, trashed, or used as a default on new forms.
+	 * Values correspond to the EEM_Form_Section::STATUS_* constants.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function status(): ?string
+	{
+		return $this->get('FSC_status');
+	}
+
+
+	/**
+	 * Whether form section is active, archived, trashed, or used as a default on new forms.
+	 * Values correspond to the EEM_Form_Section::STATUS_* constants.
+	 *
+	 * @param string $status
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setStatus(string $status)
+	{
+		$this->set('FSC_status', $status);
+	}
+
+
+	/**
+	 * returns the id the wordpress user who created this question
+	 *
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function wp_user(): int
+	{
+		return $this->get('FSC_wpUser');
+	}
+
+
+	/**
+	 * @param int $wp_user
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function setWpUser(int $wp_user)
+	{
+		$this->set('FSC_wpUser', $wp_user);
+	}
+
+
+	/**
+	 * @param array $set_cols_n_values
+	 * @return bool|int|string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function save($set_cols_n_values = [])
+	{
+		// make sure internal versions for all composite objects are updated
+		$this->set('FSC_attributes', $this->attributes()->toArray());
+		$this->set('FSC_label', $this->label()->toArray());
+		return parent::save($set_cols_n_values);
+	}
+
+	/**
+	 * Whether the section is active.
+	 *
+	 * @return boolean  TRUE if is active, FALSE if not.
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function isActive(): bool
+	{
+		return $this->status() === FormStatus::ACTIVE;
+	}
+
+	/**
+	 * Whether the section is archived.
+	 *
+	 * @return boolean  TRUE if is archived, FALSE if not.
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function isArchived(): bool
+	{
+		return $this->status() === FormStatus::ARCHIVED;
+	}
+
+	/**
+	 * Whether the section is a default one.
+	 *
+	 * @return boolean  TRUE if is default, FALSE if not.
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function isDefault(): bool
+	{
+		return $this->status() === FormStatus::DEFAULT;
+	}
+
+	/**
+	 * Whether the section is a shared one.
+	 *
+	 * @return boolean  TRUE if is shared, FALSE if not.
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function isShared(): bool
+	{
+		return $this->status() === FormStatus::SHARED;
+	}
+
+	/**
+	 * Whether the section is trashed.
+	 *
+	 * @return boolean  TRUE if is trashed, FALSE if not.
+	 * @throws ReflectionException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 */
+	public function isTrashed(): bool
+	{
+		return $this->status() === FormStatus::TRASHED;
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function isTopLevelFormSection(): bool
+	{
+		return empty($this->belongsTo());
+	}
 }

core/domain/services/admin/entities/DefaultDatetimes.php

Spacing +3 added lines, -3 removed lines

@@ -52,14 +52,14 @@ 
      */
     public function create(EE_Base_Class $entity): array
     {
-        if (! $entity instanceof EE_Event) {
+        if ( ! $entity instanceof EE_Event) {
             throw new InvalidEntityException($entity, 'EE_Event');
         }
         $default_dates = [];
         $blank_dates = $this->datetime_model->create_new_blank_datetime();
         if (is_array($blank_dates)) {
             foreach ($blank_dates as $blank_date) {
-                if (! $blank_date instanceof EE_Datetime) {
+                if ( ! $blank_date instanceof EE_Datetime) {
                     throw new InvalidEntityException($blank_date, 'EE_Datetime');
                 }
                 // clone date, strip out ID, then save to get a new ID
@@ -68,7 +68,7 @@ 
                 $default_date->save();
                 $default_date->_add_relation_to($entity->ID(), 'Event');
                 $this->default_tickets->create($default_date);
-                $default_dates[ $default_date->ID() ] = $default_date;
+                $default_dates[$default_date->ID()] = $default_date;
             }
         }
         return $default_dates;

Indentation +48 added lines, -48 removed lines

@@ -20,56 +20,56 @@
  */
 class DefaultDatetimes implements DefaultEntityGeneratorInterface
 {
-    /**
-     * @var DefaultTickets $default_tickets
-     */
-    protected $default_tickets;
+	/**
+	 * @var DefaultTickets $default_tickets
+	 */
+	protected $default_tickets;
 
-    /**
-     * @var EEM_Datetime $datetime_model
-     */
-    protected $datetime_model;
+	/**
+	 * @var EEM_Datetime $datetime_model
+	 */
+	protected $datetime_model;
 
-    /**
-     * @param DefaultTickets $default_tickets
-     * @param EEM_Datetime $datetime_model
-     */
-    public function __construct(DefaultTickets $default_tickets, EEM_Datetime $datetime_model)
-    {
-        $this->default_tickets = $default_tickets;
-        $this->datetime_model = $datetime_model;
-    }
+	/**
+	 * @param DefaultTickets $default_tickets
+	 * @param EEM_Datetime $datetime_model
+	 */
+	public function __construct(DefaultTickets $default_tickets, EEM_Datetime $datetime_model)
+	{
+		$this->default_tickets = $default_tickets;
+		$this->datetime_model = $datetime_model;
+	}
 
 
-    /**
-     * @param EE_Event|EE_Base_Class $entity
-     * @return EE_Datetime[]
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     * @throws ReflectionException
-     * @since 5.0.0.p
-     */
-    public function create(EE_Base_Class $entity): array
-    {
-        if (! $entity instanceof EE_Event) {
-            throw new InvalidEntityException($entity, 'EE_Event');
-        }
-        $default_dates = [];
-        $blank_dates = $this->datetime_model->create_new_blank_datetime();
-        if (is_array($blank_dates)) {
-            foreach ($blank_dates as $blank_date) {
-                if (! $blank_date instanceof EE_Datetime) {
-                    throw new InvalidEntityException($blank_date, 'EE_Datetime');
-                }
-                // clone date, strip out ID, then save to get a new ID
-                $default_date = clone $blank_date;
-                $default_date->set('DTT_ID', null);
-                $default_date->save();
-                $default_date->_add_relation_to($entity->ID(), 'Event');
-                $this->default_tickets->create($default_date);
-                $default_dates[ $default_date->ID() ] = $default_date;
-            }
-        }
-        return $default_dates;
-    }
+	/**
+	 * @param EE_Event|EE_Base_Class $entity
+	 * @return EE_Datetime[]
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 * @throws ReflectionException
+	 * @since 5.0.0.p
+	 */
+	public function create(EE_Base_Class $entity): array
+	{
+		if (! $entity instanceof EE_Event) {
+			throw new InvalidEntityException($entity, 'EE_Event');
+		}
+		$default_dates = [];
+		$blank_dates = $this->datetime_model->create_new_blank_datetime();
+		if (is_array($blank_dates)) {
+			foreach ($blank_dates as $blank_date) {
+				if (! $blank_date instanceof EE_Datetime) {
+					throw new InvalidEntityException($blank_date, 'EE_Datetime');
+				}
+				// clone date, strip out ID, then save to get a new ID
+				$default_date = clone $blank_date;
+				$default_date->set('DTT_ID', null);
+				$default_date->save();
+				$default_date->_add_relation_to($entity->ID(), 'Event');
+				$this->default_tickets->create($default_date);
+				$default_dates[ $default_date->ID() ] = $default_date;
+			}
+		}
+		return $default_dates;
+	}
 }