eventespresso / event-espresso-core

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;
+	}
 }

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

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function create(EE_Base_Class $entity): array
     {
-        if (! $entity instanceof EE_Event) {
+        if ( ! $entity instanceof EE_Event) {
             throw new InvalidEntityException($entity, 'EE_Event');
         }
         /** @var EE_Form_Section[] $new_form_sections */
@@ -63,7 +63,7 @@ 
         $default_form_sections = $this->form_section_model->getDefaultFormSections();
         if (is_array($default_form_sections)) {
             foreach ($default_form_sections as $default_form_section) {
-                if (! $default_form_section instanceof EE_Form_Section) {
+                if ( ! $default_form_section instanceof EE_Form_Section) {
                     throw new InvalidEntityException($default_form_section, 'EE_Form_Section');
                 }
                 // we're calling this inside the loop, because this might get set the first time around
@@ -80,7 +80,7 @@ 
                     $new_form_section->setBelongsTo($top_level_form_section);
                 }
                 $new_form_section->save();
-                $new_form_sections[ $UUID ] = $new_form_section;
+                $new_form_sections[$UUID] = $new_form_section;
                 // now retrieve, clone, and save all of the form elements
                 $this->createDefaultFormElements($new_form_section, $default_form_elements);
                 // save form section UUID on event if it is the top-level form section
@@ -103,7 +103,7 @@ 
         /** @var EE_Form_Element[] $new_form_sections */
         $new_form_elements = [];
         foreach ($default_form_elements as $default_form_element) {
-            if (! $default_form_element instanceof EE_Form_Element) {
+            if ( ! $default_form_element instanceof EE_Form_Element) {
                 throw new InvalidEntityException($default_form_element, 'EE_Form_Element');
             }
             // clone form_element, generate a new UUID, reset the status, then save it
@@ -114,7 +114,7 @@ 
             $new_form_element->setBelongsTo($new_form_section->UUID());
             $new_form_element->setStatus(FormStatus::ACTIVE);
             $new_form_element->save();
-            $new_form_elements[ $UUID ] = $new_form_element;
+            $new_form_elements[$UUID] = $new_form_element;
         }
         $new_form_section->setFormElements($new_form_elements);
     }

Indentation +87 added lines, -87 removed lines

@@ -24,97 +24,97 @@
  */
 class DefaultFormSections implements DefaultEntityGeneratorInterface
 {
-    /**
-     * @var EEM_Form_Element $form_element_model
-     */
-    protected $form_element_model;
+	/**
+	 * @var EEM_Form_Element $form_element_model
+	 */
+	protected $form_element_model;
 
-    /**
-     * @var EEM_Form_Section $form_section_model
-     */
-    protected $form_section_model;
+	/**
+	 * @var EEM_Form_Section $form_section_model
+	 */
+	protected $form_section_model;
 
-    /**
-     * @param EEM_Form_Element $form_element_model
-     * @param EEM_Form_Section $form_section_model
-     */
-    public function __construct(EEM_Form_Element $form_element_model, EEM_Form_Section $form_section_model)
-    {
-        $this->form_element_model = $form_element_model;
-        $this->form_section_model = $form_section_model;
-    }
+	/**
+	 * @param EEM_Form_Element $form_element_model
+	 * @param EEM_Form_Section $form_section_model
+	 */
+	public function __construct(EEM_Form_Element $form_element_model, EEM_Form_Section $form_section_model)
+	{
+		$this->form_element_model = $form_element_model;
+		$this->form_section_model = $form_section_model;
+	}
 
 
-    /**
-     * @param EE_Event|EE_Base_Class $entity
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     * @throws InvalidEntityException
-     * @throws ReflectionException
-     */
-    public function create(EE_Base_Class $entity): array
-    {
-        if (! $entity instanceof EE_Event) {
-            throw new InvalidEntityException($entity, 'EE_Event');
-        }
-        /** @var EE_Form_Section[] $new_form_sections */
-        $new_form_sections     = [];
-        $default_form_sections = $this->form_section_model->getDefaultFormSections();
-        if (is_array($default_form_sections)) {
-            foreach ($default_form_sections as $default_form_section) {
-                if (! $default_form_section instanceof EE_Form_Section) {
-                    throw new InvalidEntityException($default_form_section, 'EE_Form_Section');
-                }
-                // we're calling this inside the loop, because this might get set the first time around
-                // and it would always be blank for a new event if we were to call it before the loop,
-                // and then we couldn't set the "BelongsTo" for any child form sections
-                $top_level_form_section = $entity->registrationFormUuid();
-                $default_form_elements = $default_form_section->formElements();
-                // clone form_section, generate a new UUID, reset the status, then save it
-                $new_form_section = clone $default_form_section;
-                $UUID = Cuid::cuid();
-                $new_form_section->setUUID($UUID);
-                $new_form_section->setStatus(FormStatus::ACTIVE);
-                if ($top_level_form_section) {
-                    $new_form_section->setBelongsTo($top_level_form_section);
-                }
-                $new_form_section->save();
-                $new_form_sections[ $UUID ] = $new_form_section;
-                // now retrieve, clone, and save all of the form elements
-                $this->createDefaultFormElements($new_form_section, $default_form_elements);
-                // save form section UUID on event if it is the top-level form section
-                if ($new_form_section->isTopLevelFormSection()) {
-                    $entity->setRegistrationFormUuid($UUID);
-                    $entity->save();
-                }
-            }
-        }
-        return $new_form_sections;
-    }
+	/**
+	 * @param EE_Event|EE_Base_Class $entity
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 * @throws InvalidEntityException
+	 * @throws ReflectionException
+	 */
+	public function create(EE_Base_Class $entity): array
+	{
+		if (! $entity instanceof EE_Event) {
+			throw new InvalidEntityException($entity, 'EE_Event');
+		}
+		/** @var EE_Form_Section[] $new_form_sections */
+		$new_form_sections     = [];
+		$default_form_sections = $this->form_section_model->getDefaultFormSections();
+		if (is_array($default_form_sections)) {
+			foreach ($default_form_sections as $default_form_section) {
+				if (! $default_form_section instanceof EE_Form_Section) {
+					throw new InvalidEntityException($default_form_section, 'EE_Form_Section');
+				}
+				// we're calling this inside the loop, because this might get set the first time around
+				// and it would always be blank for a new event if we were to call it before the loop,
+				// and then we couldn't set the "BelongsTo" for any child form sections
+				$top_level_form_section = $entity->registrationFormUuid();
+				$default_form_elements = $default_form_section->formElements();
+				// clone form_section, generate a new UUID, reset the status, then save it
+				$new_form_section = clone $default_form_section;
+				$UUID = Cuid::cuid();
+				$new_form_section->setUUID($UUID);
+				$new_form_section->setStatus(FormStatus::ACTIVE);
+				if ($top_level_form_section) {
+					$new_form_section->setBelongsTo($top_level_form_section);
+				}
+				$new_form_section->save();
+				$new_form_sections[ $UUID ] = $new_form_section;
+				// now retrieve, clone, and save all of the form elements
+				$this->createDefaultFormElements($new_form_section, $default_form_elements);
+				// save form section UUID on event if it is the top-level form section
+				if ($new_form_section->isTopLevelFormSection()) {
+					$entity->setRegistrationFormUuid($UUID);
+					$entity->save();
+				}
+			}
+		}
+		return $new_form_sections;
+	}
 
 
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function createDefaultFormElements(EE_Form_Section $new_form_section, array $default_form_elements)
-    {
-        /** @var EE_Form_Element[] $new_form_sections */
-        $new_form_elements = [];
-        foreach ($default_form_elements as $default_form_element) {
-            if (! $default_form_element instanceof EE_Form_Element) {
-                throw new InvalidEntityException($default_form_element, 'EE_Form_Element');
-            }
-            // clone form_element, generate a new UUID, reset the status, then save it
-            $new_form_element = clone $default_form_element;
-            // generate a new UUID for this form section then save it
-            $UUID = Cuid::cuid();
-            $new_form_element->setUUID($UUID);
-            $new_form_element->setBelongsTo($new_form_section->UUID());
-            $new_form_element->setStatus(FormStatus::ACTIVE);
-            $new_form_element->save();
-            $new_form_elements[ $UUID ] = $new_form_element;
-        }
-        $new_form_section->setFormElements($new_form_elements);
-    }
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function createDefaultFormElements(EE_Form_Section $new_form_section, array $default_form_elements)
+	{
+		/** @var EE_Form_Element[] $new_form_sections */
+		$new_form_elements = [];
+		foreach ($default_form_elements as $default_form_element) {
+			if (! $default_form_element instanceof EE_Form_Element) {
+				throw new InvalidEntityException($default_form_element, 'EE_Form_Element');
+			}
+			// clone form_element, generate a new UUID, reset the status, then save it
+			$new_form_element = clone $default_form_element;
+			// generate a new UUID for this form section then save it
+			$UUID = Cuid::cuid();
+			$new_form_element->setUUID($UUID);
+			$new_form_element->setBelongsTo($new_form_section->UUID());
+			$new_form_element->setStatus(FormStatus::ACTIVE);
+			$new_form_element->save();
+			$new_form_elements[ $UUID ] = $new_form_element;
+		}
+		$new_form_section->setFormElements($new_form_elements);
+	}
 }

core/domain/services/admin/events/editor/FormBuilder.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
                 $UUID = $section->UUID();
 
                 // Avoid duplicates, if any
-                $sections[ $UUID ] = [
+                $sections[$UUID] = [
                     'id'         => $UUID,
                     'appliesTo'  => GQLUtils::formatEnumKey($section->appliesTo()),
                     'attributes' => $section->attributes()->toJson(),
@@ -85,7 +85,7 @@ 
                 $UUID = $element->UUID();
 
             // Avoid duplicates
-                $elements[ $UUID ] = [
+                $elements[$UUID] = [
                 'id'         => $UUID,
                 'adminOnly'  => $element->adminOnly(),
                 'attributes' => $element->attributes()->toJson(),

Indentation +76 added lines, -76 removed lines

@@ -23,87 +23,87 @@
  */
 class FormBuilder implements EventEditorDataInterface
 {
-    /**
-     * @param int $eventId
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getData(int $eventId): array
-    {
-        /** @var EE_Event $event */
-        $event = EEM_Event::instance()->get_one_by_ID($eventId);
-        $topLevelSectionId = $event->registrationFormUuid();
+	/**
+	 * @param int $eventId
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getData(int $eventId): array
+	{
+		/** @var EE_Event $event */
+		$event = EEM_Event::instance()->get_one_by_ID($eventId);
+		$topLevelSectionId = $event->registrationFormUuid();
 
-        /** @var EE_Form_Section[] $form_sections */
-        $form_sections = EEM_Form_Section::instance()->get_all([
-            [
-                'OR' => [
-                    'FSC_UUID'      => $topLevelSectionId, // top level form
-                    'FSC_belongsTo' => $topLevelSectionId, // child form sections
-                    'FSC_status'    => FormStatus::SHARED, // shared form sections
-                ]
-                ],
-            'order_by' => ['FSC_order' => 'ASC'],
-        ]);
+		/** @var EE_Form_Section[] $form_sections */
+		$form_sections = EEM_Form_Section::instance()->get_all([
+			[
+				'OR' => [
+					'FSC_UUID'      => $topLevelSectionId, // top level form
+					'FSC_belongsTo' => $topLevelSectionId, // child form sections
+					'FSC_status'    => FormStatus::SHARED, // shared form sections
+				]
+				],
+			'order_by' => ['FSC_order' => 'ASC'],
+		]);
 
-        $sections = [];
-        foreach ($form_sections as $section) {
-            if ($section instanceof EE_Form_Section) {
-                $UUID = $section->UUID();
+		$sections = [];
+		foreach ($form_sections as $section) {
+			if ($section instanceof EE_Form_Section) {
+				$UUID = $section->UUID();
 
-                // Avoid duplicates, if any
-                $sections[ $UUID ] = [
-                    'id'         => $UUID,
-                    'appliesTo'  => GQLUtils::formatEnumKey($section->appliesTo()),
-                    'attributes' => $section->attributes()->toJson(),
-                    'belongsTo'  => $section->belongsTo(),
-                    'isActive'   => $section->isActive(),
-                    'isArchived' => $section->isArchived(),
-                    'isDefault'  => $section->isDefault(),
-                    'isShared'   => $section->isShared(),
-                    'isTrashed'  => $section->isTrashed(),
-                    'label'      => $section->label()->toJson(),
-                    'order'      => $section->order(),
-                    'status'     => GQLUtils::formatEnumKey($section->status()),
-                ];
-            }
-        }
+				// Avoid duplicates, if any
+				$sections[ $UUID ] = [
+					'id'         => $UUID,
+					'appliesTo'  => GQLUtils::formatEnumKey($section->appliesTo()),
+					'attributes' => $section->attributes()->toJson(),
+					'belongsTo'  => $section->belongsTo(),
+					'isActive'   => $section->isActive(),
+					'isArchived' => $section->isArchived(),
+					'isDefault'  => $section->isDefault(),
+					'isShared'   => $section->isShared(),
+					'isTrashed'  => $section->isTrashed(),
+					'label'      => $section->label()->toJson(),
+					'order'      => $section->order(),
+					'status'     => GQLUtils::formatEnumKey($section->status()),
+				];
+			}
+		}
 
-        /** @var EE_Form_Element[] $form_elements */
-        $form_elements = EEM_Form_Element::instance()->get_all([
-            [
-                'FSC_UUID' => ['IN', array_keys($sections)]
-            ]
-        ]);
+		/** @var EE_Form_Element[] $form_elements */
+		$form_elements = EEM_Form_Element::instance()->get_all([
+			[
+				'FSC_UUID' => ['IN', array_keys($sections)]
+			]
+		]);
 
-        $elements = [];
-        foreach ($form_elements as $element) {
-            if ($element instanceof EE_Form_Element) {
-                $UUID = $element->UUID();
+		$elements = [];
+		foreach ($form_elements as $element) {
+			if ($element instanceof EE_Form_Element) {
+				$UUID = $element->UUID();
 
-            // Avoid duplicates
-                $elements[ $UUID ] = [
-                'id'         => $UUID,
-                'adminOnly'  => $element->adminOnly(),
-                'attributes' => $element->attributes()->toJson(),
-                'belongsTo'  => $element->belongsTo(),
-                'helpText'   => $element->helpText()->toJson(),
-                'label'      => $element->label()->toJson(),
-                'mapsTo'     => $element->mapsTo(),
-                'options'    => $element->options()->toJson(),
-                'order'      => $element->order(),
-                'required'   => $element->required()->toJson(),
-                'status'     => GQLUtils::formatEnumKey($element->status()),
-                'type'       => GQLUtils::formatEnumKey($element->type()),
-                ];
-            }
-        }
+			// Avoid duplicates
+				$elements[ $UUID ] = [
+				'id'         => $UUID,
+				'adminOnly'  => $element->adminOnly(),
+				'attributes' => $element->attributes()->toJson(),
+				'belongsTo'  => $element->belongsTo(),
+				'helpText'   => $element->helpText()->toJson(),
+				'label'      => $element->label()->toJson(),
+				'mapsTo'     => $element->mapsTo(),
+				'options'    => $element->options()->toJson(),
+				'order'      => $element->order(),
+				'required'   => $element->required()->toJson(),
+				'status'     => GQLUtils::formatEnumKey($element->status()),
+				'type'       => GQLUtils::formatEnumKey($element->type()),
+				];
+			}
+		}
 
-        return [
-            'elements'          => array_values($elements),
-            'sections'          => array_values($sections),
-            'topLevelSectionId' => $event->registrationFormUuid()
-        ];
-    }
+		return [
+			'elements'          => array_values($elements),
+			'sections'          => array_values($sections),
+			'topLevelSectionId' => $event->registrationFormUuid()
+		];
+	}
 }

core/services/form/meta/inputs/Text.php

Indentation +47 added lines, -47 removed lines

@@ -4,61 +4,61 @@
 
 class Text
 {
-    /**
-     * indicates that the HTML input type is 'email'
-     */
-    public const TYPE_EMAIL = 'email';
+	/**
+	 * indicates that the HTML input type is 'email'
+	 */
+	public const TYPE_EMAIL = 'email';
 
-    /**
-     * indicates that the input is used to confirm an email address
-     */
-    public const TYPE_EMAIL_CONFIRMATION = 'email-confirmation';
+	/**
+	 * indicates that the input is used to confirm an email address
+	 */
+	public const TYPE_EMAIL_CONFIRMATION = 'email-confirmation';
 
-    /**
-     * indicates that the HTML input type is 'text'
-     */
-    public const TYPE_TEXT = 'text';
+	/**
+	 * indicates that the HTML input type is 'text'
+	 */
+	public const TYPE_TEXT = 'text';
 
-    /**
-     * indicates that the input is a TEXTAREA that only allows plain text
-     */
-    public const TYPE_TEXTAREA = 'textarea';
+	/**
+	 * indicates that the input is a TEXTAREA that only allows plain text
+	 */
+	public const TYPE_TEXTAREA = 'textarea';
 
-    /**
-     * indicates that the input is a TEXTAREA that allows simple html
-     */
-    public const TYPE_TEXTAREA_HTML = 'textarea-html';
+	/**
+	 * indicates that the input is a TEXTAREA that allows simple html
+	 */
+	public const TYPE_TEXTAREA_HTML = 'textarea-html';
 
 
-    /**
-     * @var array
-     */
-    private $valid_type_options;
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
 
 
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Text__valid_type_options',
-            [
-                Text::TYPE_EMAIL              => esc_html__('Email', 'event_espresso'),
-                Text::TYPE_EMAIL_CONFIRMATION => esc_html__('Email Confirmation', 'event_espresso'),
-                Text::TYPE_TEXT               => esc_html__('Plain Text', 'event_espresso'),
-                Text::TYPE_TEXTAREA           => esc_html__('Plain Textarea', 'event_espresso'),
-                Text::TYPE_TEXTAREA_HTML      => esc_html__('Simple HTML Textarea', 'event_espresso'),
-            ]
-        );
-    }
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Text__valid_type_options',
+			[
+				Text::TYPE_EMAIL              => esc_html__('Email', 'event_espresso'),
+				Text::TYPE_EMAIL_CONFIRMATION => esc_html__('Email Confirmation', 'event_espresso'),
+				Text::TYPE_TEXT               => esc_html__('Plain Text', 'event_espresso'),
+				Text::TYPE_TEXTAREA           => esc_html__('Plain Textarea', 'event_espresso'),
+				Text::TYPE_TEXTAREA_HTML      => esc_html__('Simple HTML Textarea', 'event_espresso'),
+			]
+		);
+	}
 
 
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/form/meta/inputs/Input.php

Indentation +86 added lines, -86 removed lines

@@ -5,90 +5,90 @@
 class Input
 {
 
-    /**
-     * indicates that the HTML input type is 'checkbox'
-     */
-    public const TYPE_CHECKBOX = 'checkbox';
-
-    /**
-     * indicates that the HTML input type is 'multi checkbox'
-     */
-    public const TYPE_CHECKBOX_MULTI = 'checkbox-multi';
-
-    /**
-     * indicates that the HTML input type is 'color'
-     */
-    public const TYPE_COLOR = 'color';
-
-    /**
-     * indicates that the HTML input type is 'file'
-     */
-    public const TYPE_FILE = 'file';
-
-    /**
-     * indicates that the HTML input type is 'hidden'
-     */
-    public const TYPE_HIDDEN = 'hidden';
-
-    /**
-     * indicates that the HTML input type is 'image'
-     */
-    public const TYPE_IMAGE = 'image';
-
-    /**
-     * indicates that the HTML input type is 'password'
-     */
-    public const TYPE_PASSWORD = 'password';
-
-    /**
-     * indicates that the input is used to confirm a password
-     */
-    public const TYPE_PASSWORD_CONFIRMATION = 'password-confirmation';
-
-    /**
-     * indicates that the HTML input type is 'radio'
-     */
-    public const TYPE_RADIO = 'radio';
-
-    /**
-     * indicates that the HTML input type is 'url'
-     */
-    public const TYPE_URL = 'url';
-
-    /**
-     * @var array
-     */
-    private $valid_type_options;
-
-
-    public function __construct()
-    {
-        $this->valid_type_options = apply_filters(
-            'FHEE__EventEspresso_core_services_form_meta_inputs_Input__valid_type_options',
-            [
-                Input::TYPE_CHECKBOX              => esc_html__('Checkbox', 'event_espresso'),
-                Input::TYPE_CHECKBOX_MULTI        => esc_html__('Multi Checkbox', 'event_espresso'),
-                Input::TYPE_COLOR                 => esc_html__('Color Picker', 'event_espresso'),
-                Input::TYPE_FILE                  => esc_html__('File Upload', 'event_espresso'),
-                Input::TYPE_HIDDEN                => esc_html__('Hidden', 'event_espresso'),
-                Input::TYPE_IMAGE                 => esc_html__('Image Upload', 'event_espresso'),
-                Input::TYPE_PASSWORD              => esc_html__('Password', 'event_espresso'),
-                Input::TYPE_PASSWORD_CONFIRMATION => esc_html__('Password Confirmation', 'event_espresso'),
-                Input::TYPE_RADIO                 => esc_html__('Radio Button', 'event_espresso'),
-                Input::TYPE_URL                   => esc_html__('URL', 'event_espresso'),
-            ]
-        );
-    }
-
-
-    /**
-     * @param bool $constants_only
-     * @return array
-     */
-    public function validTypeOptions(bool $constants_only = false): array
-    {
-        return $constants_only
-            ? array_keys($this->valid_type_options)
-            : $this->valid_type_options;
-    }
+	/**
+	 * indicates that the HTML input type is 'checkbox'
+	 */
+	public const TYPE_CHECKBOX = 'checkbox';
+
+	/**
+	 * indicates that the HTML input type is 'multi checkbox'
+	 */
+	public const TYPE_CHECKBOX_MULTI = 'checkbox-multi';
+
+	/**
+	 * indicates that the HTML input type is 'color'
+	 */
+	public const TYPE_COLOR = 'color';
+
+	/**
+	 * indicates that the HTML input type is 'file'
+	 */
+	public const TYPE_FILE = 'file';
+
+	/**
+	 * indicates that the HTML input type is 'hidden'
+	 */
+	public const TYPE_HIDDEN = 'hidden';
+
+	/**
+	 * indicates that the HTML input type is 'image'
+	 */
+	public const TYPE_IMAGE = 'image';
+
+	/**
+	 * indicates that the HTML input type is 'password'
+	 */
+	public const TYPE_PASSWORD = 'password';
+
+	/**
+	 * indicates that the input is used to confirm a password
+	 */
+	public const TYPE_PASSWORD_CONFIRMATION = 'password-confirmation';
+
+	/**
+	 * indicates that the HTML input type is 'radio'
+	 */
+	public const TYPE_RADIO = 'radio';
+
+	/**
+	 * indicates that the HTML input type is 'url'
+	 */
+	public const TYPE_URL = 'url';
+
+	/**
+	 * @var array
+	 */
+	private $valid_type_options;
+
+
+	public function __construct()
+	{
+		$this->valid_type_options = apply_filters(
+			'FHEE__EventEspresso_core_services_form_meta_inputs_Input__valid_type_options',
+			[
+				Input::TYPE_CHECKBOX              => esc_html__('Checkbox', 'event_espresso'),
+				Input::TYPE_CHECKBOX_MULTI        => esc_html__('Multi Checkbox', 'event_espresso'),
+				Input::TYPE_COLOR                 => esc_html__('Color Picker', 'event_espresso'),
+				Input::TYPE_FILE                  => esc_html__('File Upload', 'event_espresso'),
+				Input::TYPE_HIDDEN                => esc_html__('Hidden', 'event_espresso'),
+				Input::TYPE_IMAGE                 => esc_html__('Image Upload', 'event_espresso'),
+				Input::TYPE_PASSWORD              => esc_html__('Password', 'event_espresso'),
+				Input::TYPE_PASSWORD_CONFIRMATION => esc_html__('Password Confirmation', 'event_espresso'),
+				Input::TYPE_RADIO                 => esc_html__('Radio Button', 'event_espresso'),
+				Input::TYPE_URL                   => esc_html__('URL', 'event_espresso'),
+			]
+		);
+	}
+
+
+	/**
+	 * @param bool $constants_only
+	 * @return array
+	 */
+	public function validTypeOptions(bool $constants_only = false): array
+	{
+		return $constants_only
+			? array_keys($this->valid_type_options)
+			: $this->valid_type_options;
+	}
 }

core/services/progress_steps/ProgressStepManager.php

Spacing +9 added lines, -9 removed lines

@@ -75,11 +75,11 @@ 
         $this->setDisplayStrategy($display_strategy_name);
         $this->setDefaultStep($default_step);
         $this->setFormStepUrlKey($form_step_url_key);
-        if (! $collection instanceof CollectionInterface) {
+        if ( ! $collection instanceof CollectionInterface) {
             $collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
         }
         $this->collection = $collection;
-        if (! $request instanceof RequestInterface) {
+        if ( ! $request instanceof RequestInterface) {
             /** @var RequestInterface $request */
             $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
         }
@@ -94,23 +94,23 @@ 
      */
     protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
     {
-        if (! is_string($display_strategy_name)) {
+        if ( ! is_string($display_strategy_name)) {
             throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
         }
         // build up FQCN from incoming display strategy folder name
         $display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-        $display_strategy_class .= $display_strategy_name . '\\';
+        $display_strategy_class .= $display_strategy_name.'\\';
         $display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
         $display_strategy_class .= 'ProgressStepsDisplay';
         $display_strategy_class = apply_filters(
             'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
             $display_strategy_class
         );
-        if (! class_exists($display_strategy_class)) {
+        if ( ! class_exists($display_strategy_class)) {
             throw new InvalidClassException($display_strategy_class);
         }
         $display_strategy = new $display_strategy_class();
-        if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
+        if ( ! $display_strategy instanceof ProgressStepsDisplayInterface) {
             throw new InvalidClassException(
                 $display_strategy_class,
                 sprintf(
@@ -130,7 +130,7 @@ 
      */
     public function setDefaultStep($default_step)
     {
-        if (! is_string($default_step)) {
+        if ( ! is_string($default_step)) {
             throw new InvalidDataTypeException('$default_step', $default_step, 'string');
         }
         $this->default_step = $default_step;
@@ -143,7 +143,7 @@ 
      */
     public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
     {
-        if (! is_string($form_step_url_key)) {
+        if ( ! is_string($form_step_url_key)) {
             throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
         }
         $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
@@ -163,7 +163,7 @@ 
         // grab the step previously known as current, in case we need to revert
         $current_current_step = $this->collection->current();
         // verify that requested step exists
-        if (! $this->collection->has($step)) {
+        if ( ! $this->collection->has($step)) {
             throw new InvalidIdentifierException($step, $this->default_step);
         }
         if ($this->collection->setCurrent($step)) {

Indentation +221 added lines, -221 removed lines

@@ -26,225 +26,225 @@
  */
 class ProgressStepManager
 {
-    /**
-     * @var ProgressStepInterface[]
-     */
-    private $collection;
-
-    /**
-     * @var string
-     */
-    private $default_step;
-
-    /**
-     * the key used for the URL param that denotes the current form step
-     * defaults to 'ee-form-step'
-     *
-     * @var string
-     */
-    private $form_step_url_key = '';
-
-    /**
-     * @var ProgressStepsDisplayInterface
-     */
-    private $display_strategy;
-
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-
-    /**
-     * ProgressStepManager constructor
-     *
-     * @param string              $display_strategy_name
-     * @param string              $default_step
-     * @param string              $form_step_url_key
-     * @param CollectionInterface $collection
-     * @param RequestInterface    $request
-     */
-    public function __construct(
-        $display_strategy_name = 'number_bubbles',
-        $default_step = '',
-        $form_step_url_key = '',
-        CollectionInterface $collection = null,
-        RequestInterface $request = null
-    ) {
-        $this->setDisplayStrategy($display_strategy_name);
-        $this->setDefaultStep($default_step);
-        $this->setFormStepUrlKey($form_step_url_key);
-        if (! $collection instanceof CollectionInterface) {
-            $collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
-        }
-        $this->collection = $collection;
-        if (! $request instanceof RequestInterface) {
-            /** @var RequestInterface $request */
-            $request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
-        }
-        $this->request = $request;
-    }
-
-
-    /**
-     * @param string $display_strategy_name
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
-    {
-        if (! is_string($display_strategy_name)) {
-            throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
-        }
-        // build up FQCN from incoming display strategy folder name
-        $display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
-        $display_strategy_class .= $display_strategy_name . '\\';
-        $display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
-        $display_strategy_class .= 'ProgressStepsDisplay';
-        $display_strategy_class = apply_filters(
-            'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
-            $display_strategy_class
-        );
-        if (! class_exists($display_strategy_class)) {
-            throw new InvalidClassException($display_strategy_class);
-        }
-        $display_strategy = new $display_strategy_class();
-        if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
-            throw new InvalidClassException(
-                $display_strategy_class,
-                sprintf(
-                    esc_html__('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
-                    $display_strategy_class,
-                    '\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
-                )
-            );
-        }
-        $this->display_strategy = $display_strategy;
-    }
-
-
-    /**
-     * @param string $default_step
-     * @throws InvalidDataTypeException
-     */
-    public function setDefaultStep($default_step)
-    {
-        if (! is_string($default_step)) {
-            throw new InvalidDataTypeException('$default_step', $default_step, 'string');
-        }
-        $this->default_step = $default_step;
-    }
-
-
-    /**
-     * @param string $form_step_url_key
-     * @throws InvalidDataTypeException
-     */
-    public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
-    {
-        if (! is_string($form_step_url_key)) {
-            throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
-        }
-        $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
-    }
-
-
-    /**
-     * @param string $step
-     * @throws InvalidIdentifierException
-     */
-    public function setCurrentStep($step = '')
-    {
-        // use incoming value if it's set, otherwise use request param if it's set, otherwise use default
-        $step = ! empty($step)
-            ? $step
-            : $this->request->getRequestParam($this->form_step_url_key, $this->default_step);
-        // grab the step previously known as current, in case we need to revert
-        $current_current_step = $this->collection->current();
-        // verify that requested step exists
-        if (! $this->collection->has($step)) {
-            throw new InvalidIdentifierException($step, $this->default_step);
-        }
-        if ($this->collection->setCurrent($step)) {
-            // if the old boss is the same as the new boss, then nothing changes
-            if ($this->collection->current() !== $current_current_step) {
-                $current_current_step->setIsCurrent(false);
-            }
-            $this->collection->current()->setIsCurrent();
-        } else {
-            $this->collection->setCurrent($current_current_step->id());
-            $current_current_step->setIsCurrent(true);
-        }
-    }
-
-
-    /**
-     * setPreviousStepsCompleted
-     */
-    public function setPreviousStepsCompleted()
-    {
-        $current_current_step = $this->collection->current();
-        $this->collection->rewind();
-        while ($this->collection->valid()) {
-            if ($this->collection->current() === $current_current_step) {
-                break;
-            }
-            $this->setCurrentStepCompleted();
-            $this->collection->next();
-        }
-        $this->collection->setCurrentUsingObject($current_current_step);
-        return false;
-    }
-
-
-    /**
-     * @return ProgressStepInterface
-     */
-    public function currentStep()
-    {
-        return $this->collection->current();
-    }
-
-
-    /**
-     * @return ProgressStepInterface
-     */
-    public function nextStep()
-    {
-        return $this->collection->next();
-    }
-
-
-    /**
-     * @return void
-     */
-    public function enqueueStylesAndScripts()
-    {
-        $this->display_strategy->enqueueStylesAndScripts();
-    }
-
-
-    /**
-     * echos out HTML
-     *
-     * @return string
-     */
-    public function displaySteps()
-    {
-        return EEH_Template::display_template(
-            $this->display_strategy->getTemplate(),
-            array('progress_steps' => $this->collection),
-            true
-        );
-    }
-
-
-    /**
-     * @param bool $completed
-     * @return ProgressStepInterface
-     */
-    public function setCurrentStepCompleted($completed = true)
-    {
-        return $this->collection->current()->setIsCompleted($completed);
-    }
+	/**
+	 * @var ProgressStepInterface[]
+	 */
+	private $collection;
+
+	/**
+	 * @var string
+	 */
+	private $default_step;
+
+	/**
+	 * the key used for the URL param that denotes the current form step
+	 * defaults to 'ee-form-step'
+	 *
+	 * @var string
+	 */
+	private $form_step_url_key = '';
+
+	/**
+	 * @var ProgressStepsDisplayInterface
+	 */
+	private $display_strategy;
+
+	/**
+	 * @var RequestInterface
+	 */
+	private $request;
+
+
+	/**
+	 * ProgressStepManager constructor
+	 *
+	 * @param string              $display_strategy_name
+	 * @param string              $default_step
+	 * @param string              $form_step_url_key
+	 * @param CollectionInterface $collection
+	 * @param RequestInterface    $request
+	 */
+	public function __construct(
+		$display_strategy_name = 'number_bubbles',
+		$default_step = '',
+		$form_step_url_key = '',
+		CollectionInterface $collection = null,
+		RequestInterface $request = null
+	) {
+		$this->setDisplayStrategy($display_strategy_name);
+		$this->setDefaultStep($default_step);
+		$this->setFormStepUrlKey($form_step_url_key);
+		if (! $collection instanceof CollectionInterface) {
+			$collection = new Collection('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
+		}
+		$this->collection = $collection;
+		if (! $request instanceof RequestInterface) {
+			/** @var RequestInterface $request */
+			$request = LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\Request');
+		}
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @param string $display_strategy_name
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function setDisplayStrategy($display_strategy_name = 'number_bubbles')
+	{
+		if (! is_string($display_strategy_name)) {
+			throw new InvalidDataTypeException('$display_strategy_name', $display_strategy_name, 'string');
+		}
+		// build up FQCN from incoming display strategy folder name
+		$display_strategy_class = 'EventEspresso\core\services\progress_steps\display_strategies\\';
+		$display_strategy_class .= $display_strategy_name . '\\';
+		$display_strategy_class .= str_replace(' ', '', ucwords(str_replace('_', ' ', $display_strategy_name)));
+		$display_strategy_class .= 'ProgressStepsDisplay';
+		$display_strategy_class = apply_filters(
+			'FHEE__ProgressStepManager__setDisplayStrategy__display_strategy_class',
+			$display_strategy_class
+		);
+		if (! class_exists($display_strategy_class)) {
+			throw new InvalidClassException($display_strategy_class);
+		}
+		$display_strategy = new $display_strategy_class();
+		if (! $display_strategy instanceof ProgressStepsDisplayInterface) {
+			throw new InvalidClassException(
+				$display_strategy_class,
+				sprintf(
+					esc_html__('The "%1$s" Class needs to be an implementation of the "%1$s" Interface.', 'event_espresso'),
+					$display_strategy_class,
+					'\EventEspresso\core\services\progress_steps\display_strategies\ProgressStepsDisplayInterface'
+				)
+			);
+		}
+		$this->display_strategy = $display_strategy;
+	}
+
+
+	/**
+	 * @param string $default_step
+	 * @throws InvalidDataTypeException
+	 */
+	public function setDefaultStep($default_step)
+	{
+		if (! is_string($default_step)) {
+			throw new InvalidDataTypeException('$default_step', $default_step, 'string');
+		}
+		$this->default_step = $default_step;
+	}
+
+
+	/**
+	 * @param string $form_step_url_key
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
+	{
+		if (! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
+		}
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
+	}
+
+
+	/**
+	 * @param string $step
+	 * @throws InvalidIdentifierException
+	 */
+	public function setCurrentStep($step = '')
+	{
+		// use incoming value if it's set, otherwise use request param if it's set, otherwise use default
+		$step = ! empty($step)
+			? $step
+			: $this->request->getRequestParam($this->form_step_url_key, $this->default_step);
+		// grab the step previously known as current, in case we need to revert
+		$current_current_step = $this->collection->current();
+		// verify that requested step exists
+		if (! $this->collection->has($step)) {
+			throw new InvalidIdentifierException($step, $this->default_step);
+		}
+		if ($this->collection->setCurrent($step)) {
+			// if the old boss is the same as the new boss, then nothing changes
+			if ($this->collection->current() !== $current_current_step) {
+				$current_current_step->setIsCurrent(false);
+			}
+			$this->collection->current()->setIsCurrent();
+		} else {
+			$this->collection->setCurrent($current_current_step->id());
+			$current_current_step->setIsCurrent(true);
+		}
+	}
+
+
+	/**
+	 * setPreviousStepsCompleted
+	 */
+	public function setPreviousStepsCompleted()
+	{
+		$current_current_step = $this->collection->current();
+		$this->collection->rewind();
+		while ($this->collection->valid()) {
+			if ($this->collection->current() === $current_current_step) {
+				break;
+			}
+			$this->setCurrentStepCompleted();
+			$this->collection->next();
+		}
+		$this->collection->setCurrentUsingObject($current_current_step);
+		return false;
+	}
+
+
+	/**
+	 * @return ProgressStepInterface
+	 */
+	public function currentStep()
+	{
+		return $this->collection->current();
+	}
+
+
+	/**
+	 * @return ProgressStepInterface
+	 */
+	public function nextStep()
+	{
+		return $this->collection->next();
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function enqueueStylesAndScripts()
+	{
+		$this->display_strategy->enqueueStylesAndScripts();
+	}
+
+
+	/**
+	 * echos out HTML
+	 *
+	 * @return string
+	 */
+	public function displaySteps()
+	{
+		return EEH_Template::display_template(
+			$this->display_strategy->getTemplate(),
+			array('progress_steps' => $this->collection),
+			true
+		);
+	}
+
+
+	/**
+	 * @param bool $completed
+	 * @return ProgressStepInterface
+	 */
+	public function setCurrentStepCompleted($completed = true)
+	{
+		return $this->collection->current()->setIsCompleted($completed);
+	}
 }