eventespresso / event-espresso-core

core/db_classes/EE_Form_Section.class.php

Indentation +490 added lines, -490 removed lines

@@ -26,494 +26,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());
+	}
 }

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;

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

Indentation +109 added lines, -109 removed lines

@@ -30,122 +30,122 @@
 class NewEventDefaultEntities extends EventEditorData
 {
 
-    /**
-     * @var DefaultDatetimes
-     */
-    protected $default_datetimes;
+	/**
+	 * @var DefaultDatetimes
+	 */
+	protected $default_datetimes;
 
-    /**
-     * @var   DefaultFormSections
-     */
-    protected $default_form_sections;
+	/**
+	 * @var   DefaultFormSections
+	 */
+	protected $default_form_sections;
 
 
-    /**
-     * NewEventDefaultEntities constructor.
-     *
-     * @param DefaultDatetimes $default_datetimes
-     * @param DefaultFormSections $default_form_sections
-     * @param EEM_Datetime     $datetime_model
-     * @param EEM_Event        $event_model
-     * @param EEM_Price        $price_model
-     * @param EEM_Price_Type   $price_type_model
-     * @param EEM_Ticket       $ticket_model
-     * @param Utilities        $utilities
-     */
-    public function __construct(
-        DefaultDatetimes $default_datetimes,
-        DefaultFormSections $default_form_sections,
-        EEM_Datetime $datetime_model,
-        EEM_Event $event_model,
-        EEM_Price $price_model,
-        EEM_Price_Type $price_type_model,
-        EEM_Ticket $ticket_model,
-        Utilities $utilities
-    ) {
-        $this->default_datetimes = $default_datetimes;
-        $this->default_form_sections = $default_form_sections;
-        parent::__construct(
-            $datetime_model,
-            $event_model,
-            $price_model,
-            $price_type_model,
-            $ticket_model,
-            $utilities
-        );
-    }
+	/**
+	 * NewEventDefaultEntities constructor.
+	 *
+	 * @param DefaultDatetimes $default_datetimes
+	 * @param DefaultFormSections $default_form_sections
+	 * @param EEM_Datetime     $datetime_model
+	 * @param EEM_Event        $event_model
+	 * @param EEM_Price        $price_model
+	 * @param EEM_Price_Type   $price_type_model
+	 * @param EEM_Ticket       $ticket_model
+	 * @param Utilities        $utilities
+	 */
+	public function __construct(
+		DefaultDatetimes $default_datetimes,
+		DefaultFormSections $default_form_sections,
+		EEM_Datetime $datetime_model,
+		EEM_Event $event_model,
+		EEM_Price $price_model,
+		EEM_Price_Type $price_type_model,
+		EEM_Ticket $ticket_model,
+		Utilities $utilities
+	) {
+		$this->default_datetimes = $default_datetimes;
+		$this->default_form_sections = $default_form_sections;
+		parent::__construct(
+			$datetime_model,
+			$event_model,
+			$price_model,
+			$price_type_model,
+			$ticket_model,
+			$utilities
+		);
+	}
 
 
-    /**
-     * @param int $eventId
-     * @return EE_Datetime[]
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidEntityException
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function getData(int $eventId): array
-    {
-        $EVT_ID = absint($eventId);
-        if ($EVT_ID < 1) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'A missing or invalid event ID was received.',
-                    'event_espresso'
-                )
-            );
-        }
-        $event = $this->event_model->get_one_by_ID($EVT_ID);
-        if (! $event instanceof EE_Event) {
-            throw new InvalidEntityException($event, 'EE_Event');
-        }
-        $new_event = isset($_REQUEST['action']) && $_REQUEST['action'] === 'create_new';
-        return [
-            'datetimes'     => $this->createDefaultDatetimes($event, $new_event),
-            'form_sections' => $this->createDefaultFormSections($event, $new_event)
-        ];
-    }
+	/**
+	 * @param int $eventId
+	 * @return EE_Datetime[]
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidEntityException
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function getData(int $eventId): array
+	{
+		$EVT_ID = absint($eventId);
+		if ($EVT_ID < 1) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'A missing or invalid event ID was received.',
+					'event_espresso'
+				)
+			);
+		}
+		$event = $this->event_model->get_one_by_ID($EVT_ID);
+		if (! $event instanceof EE_Event) {
+			throw new InvalidEntityException($event, 'EE_Event');
+		}
+		$new_event = isset($_REQUEST['action']) && $_REQUEST['action'] === 'create_new';
+		return [
+			'datetimes'     => $this->createDefaultDatetimes($event, $new_event),
+			'form_sections' => $this->createDefaultFormSections($event, $new_event)
+		];
+	}
 
 
-    /**
-     * @param EE_Event $event
-     * @param bool     $new_event
-     * @return EE_Datetime[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function createDefaultDatetimes(EE_Event $event, bool $new_event): array
-    {
-        $datetime_count = $this->datetime_model->count(
-            [
-                [
-                    'EVT_ID'      => $event->ID(),
-                    'DTT_deleted' => ['IN', [true, false]],
-                ],
-                'default_where_conditions' => EEM_Base::default_where_conditions_none,
-            ],
-            'EVT_ID'
-        );
-        return $new_event || $datetime_count === 0
-            ? $this->default_datetimes->create($event)
-            : [];
-    }
+	/**
+	 * @param EE_Event $event
+	 * @param bool     $new_event
+	 * @return EE_Datetime[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function createDefaultDatetimes(EE_Event $event, bool $new_event): array
+	{
+		$datetime_count = $this->datetime_model->count(
+			[
+				[
+					'EVT_ID'      => $event->ID(),
+					'DTT_deleted' => ['IN', [true, false]],
+				],
+				'default_where_conditions' => EEM_Base::default_where_conditions_none,
+			],
+			'EVT_ID'
+		);
+		return $new_event || $datetime_count === 0
+			? $this->default_datetimes->create($event)
+			: [];
+	}
 
 
-    /**
-     * @param EE_Event $event
-     * @param bool     $new_event
-     * @return EE_Form_Section[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function createDefaultFormSections(EE_Event $event, bool $new_event): array
-    {
-        $reg_form_UUID = $event->registrationFormUuid();
-        // if it's a new event and defaults have not been created yet, OR if there is no reg form at all...
-        return ($new_event && ! $reg_form_UUID) ||  ! $reg_form_UUID
-            ? $this->default_form_sections->create($event)
-            : [];
-    }
+	/**
+	 * @param EE_Event $event
+	 * @param bool     $new_event
+	 * @return EE_Form_Section[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function createDefaultFormSections(EE_Event $event, bool $new_event): array
+	{
+		$reg_form_UUID = $event->registrationFormUuid();
+		// if it's a new event and defaults have not been created yet, OR if there is no reg form at all...
+		return ($new_event && ! $reg_form_UUID) ||  ! $reg_form_UUID
+			? $this->default_form_sections->create($event)
+			: [];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
             );
         }
         $event = $this->event_model->get_one_by_ID($EVT_ID);
-        if (! $event instanceof EE_Event) {
+        if ( ! $event instanceof EE_Event) {
             throw new InvalidEntityException($event, 'EE_Event');
         }
         $new_event = isset($_REQUEST['action']) && $_REQUEST['action'] === 'create_new';
@@ -144,7 +144,7 @@ 
     {
         $reg_form_UUID = $event->registrationFormUuid();
         // if it's a new event and defaults have not been created yet, OR if there is no reg form at all...
-        return ($new_event && ! $reg_form_UUID) ||  ! $reg_form_UUID
+        return ($new_event && ! $reg_form_UUID) || ! $reg_form_UUID
             ? $this->default_form_sections->create($event)
             : [];
     }

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

Indentation +48 added lines, -48 removed lines

@@ -21,56 +21,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 $VID:$
-     */
-    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 $VID:$
+	 */
+	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;
+	}
 }

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;

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

Indentation +87 added lines, -87 removed lines

@@ -25,97 +25,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);
+	}
 }

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

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

Indentation +8 added lines, -8 removed lines

@@ -17,12 +17,12 @@
 interface DefaultEntityGeneratorInterface
 {
 
-    /**
-     * @param EE_Base_Class $entity
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since $VID:$
-     */
-    public function create(EE_Base_Class $entity): array;
+	/**
+	 * @param EE_Base_Class $entity
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since $VID:$
+	 */
+	public function create(EE_Base_Class $entity): array;
 }

core/EE_Psr4AutoloaderInit.core.php

Indentation +37 added lines, -37 removed lines

@@ -17,41 +17,41 @@
 {
 
 
-    /**
-     * @type Psr4Autoloader
-     */
-    protected static $psr4_loader;
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public function initializeAutoloader()
-    {
-        static $initialized = false;
-        if (! $initialized) {
-            // instantiate PSR4 autoloader
-            espresso_load_required('Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php');
-            EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
-            // register the autoloader
-            EE_Psr4AutoloaderInit::$psr4_loader->register();
-            // register the base directories for the namespace prefix
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EETests', EE_PLUGIN_DIR_PATH . 'tests');
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EndyJasmi', EE_THIRD_PARTY . 'cuid');
-            $initialized = true;
-        }
-    }
-
-
-    /**
-     * @return Psr4Autoloader
-     */
-    public static function psr4_loader(): Psr4Autoloader
-    {
-        return self::$psr4_loader;
-    }
+	/**
+	 * @type Psr4Autoloader
+	 */
+	protected static $psr4_loader;
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function initializeAutoloader()
+	{
+		static $initialized = false;
+		if (! $initialized) {
+			// instantiate PSR4 autoloader
+			espresso_load_required('Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php');
+			EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
+			// register the autoloader
+			EE_Psr4AutoloaderInit::$psr4_loader->register();
+			// register the base directories for the namespace prefix
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EETests', EE_PLUGIN_DIR_PATH . 'tests');
+			EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EndyJasmi', EE_THIRD_PARTY . 'cuid');
+			$initialized = true;
+		}
+	}
+
+
+	/**
+	 * @return Psr4Autoloader
+	 */
+	public static function psr4_loader(): Psr4Autoloader
+	{
+		return self::$psr4_loader;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -30,18 +30,18 @@
     public function initializeAutoloader()
     {
         static $initialized = false;
-        if (! $initialized) {
+        if ( ! $initialized) {
             // instantiate PSR4 autoloader
-            espresso_load_required('Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php');
+            espresso_load_required('Psr4Autoloader', EE_CORE.'Psr4Autoloader.php');
             EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
             // register the autoloader
             EE_Psr4AutoloaderInit::$psr4_loader->register();
             // register the base directories for the namespace prefix
             EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
+            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES.'batch');
             EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EETests', EE_PLUGIN_DIR_PATH . 'tests');
-            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EndyJasmi', EE_THIRD_PARTY . 'cuid');
+            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EETests', EE_PLUGIN_DIR_PATH.'tests');
+            EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EndyJasmi', EE_THIRD_PARTY.'cuid');
             $initialized = true;
         }
     }

core/libraries/plugin_api/EE_Register_Model.lib.php

Indentation +176 added lines, -176 removed lines

@@ -11,194 +11,194 @@
  */
 class EE_Register_Model implements EEI_Plugin_API
 {
-    /**
-     *
-     * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
-     *      like EE_Register_Model::register()'s 2nd arg
-     */
-    protected static $_model_registry;
+	/**
+	 *
+	 * @var array keys are the model_id used to register with, values are the array provided to register them, exactly
+	 *      like EE_Register_Model::register()'s 2nd arg
+	 */
+	protected static $_model_registry;
 
-    /**
-     *
-     * @var array keys are model names, values are their class names. Stored on registration and used
-     * on a hook
-     */
-    protected static $_model_name_to_classname_map;
+	/**
+	 *
+	 * @var array keys are model names, values are their class names. Stored on registration and used
+	 * on a hook
+	 */
+	protected static $_model_name_to_classname_map;
 
 
-    /**
-     * @param string $addon_name  unique id for it
-     * @param array  $setup_args  {
-     * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
-     *                            convention, which is: EEM_{model_name}.model.php which contains a single class called
-     *                            EEM_{model_name}. Eg. you could pass
-     *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
-     *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
-     *                            contains the class "EEM_Food" and
-     *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
-     *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
-     *                            class contained in each file should extend EEM_Base.
-     * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
-     *                            naming convention, which is EE_{model_name}.class.php. The class contained in each
-     *                            file should extend EE_Base_Class
-     *
-     * }
-     * @return bool
-     * @throws EE_Error
-     */
-    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['model_paths'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
-                    'event_espresso'
-                )
-            );
-        }
+	/**
+	 * @param string $addon_name  unique id for it
+	 * @param array  $setup_args  {
+	 * @type array   $model_paths array of folders containing DB models, where each file follows the models naming
+	 *                            convention, which is: EEM_{model_name}.model.php which contains a single class called
+	 *                            EEM_{model_name}. Eg. you could pass
+	 *                            "public_html/wp-content/plugins/my_addon/db_models" (with or without trailing slash)
+	 *                            and in that folder put each of your model files, like "EEM_Food.model.php" which
+	 *                            contains the class "EEM_Food" and
+	 *                            "EEM_Monkey.model.php" which contains the class "EEM_Monkey". These will be
+	 *                            autoloaded and added to the EE registry so they can be used like ordinary models. The
+	 *                            class contained in each file should extend EEM_Base.
+	 * @type array   $class_paths array of folders containing DB classes, where each file follows the model class
+	 *                            naming convention, which is EE_{model_name}.class.php. The class contained in each
+	 *                            file should extend EE_Base_Class
+	 *
+	 * }
+	 * @return bool
+	 * @throws EE_Error
+	 */
+	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['model_paths'])) {
+			throw new EE_Error(
+				__(
+					'In order to register Models with EE_Register_Model::register(), you must include a "model_id" (a unique identifier for this set of models), and an array containing the following keys: "model_paths" (an array of full server paths to folders that contain models)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_model_registry[ $addon_name ])) {
-            return true;
-        }
+		// make sure we don't register twice
+		if (isset(self::$_model_registry[ $addon_name ])) {
+			return true;
+		}
 
-        if (
-            ! did_action('AHEE__EE_System__load_espresso_addons')
-            || did_action('FHEE__EE_System__parse_model_names')
-            || did_action('FHEE__EE_System__parse_implemented_model_names')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
-                        'event_espresso'
-                    ),
-                    $addon_name
-                ),
-                '4.5'
-            );
-        }
-        self::$_model_registry[ $addon_name ] = $setup_args;
+		if (
+			! did_action('AHEE__EE_System__load_espresso_addons')
+			|| did_action('FHEE__EE_System__parse_model_names')
+			|| did_action('FHEE__EE_System__parse_implemented_model_names')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'An attempt was made to register "%s" as a group models has failed because it was not registered at the correct time.  Please use the "AHEE__EE_System__load_espresso_addons" hook to register models.',
+						'event_espresso'
+					),
+					$addon_name
+				),
+				'4.5'
+			);
+		}
+		self::$_model_registry[ $addon_name ] = $setup_args;
 
-        if (
-            (
-                isset($setup_args['model_paths']) && ! isset($setup_args['class_paths'])
-            )
-            || (! isset($setup_args['model_paths']) && isset($setup_args['class_paths']))
-        ) {
-            throw new EE_Error(
-                sprintf(
-                    __(
-                        'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
-                        'event_espresso'
-                    ),
-                    implode(", ", array_keys($setup_args))
-                )
-            );
-        }
-        if (isset($setup_args['model_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($setup_args['model_paths'])) {
-                $setup_args['model_paths'] = [$setup_args['model_paths']];
-            }
-            // we want to add this as a model folder
-            // and autoload them all
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($setup_args['model_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            $model_name_to_classname_map = [];
-            foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
-            }
-            self::$_model_name_to_classname_map[ $addon_name ] = $model_name_to_classname_map;
-            add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
-            add_filter(
-                'FHEE__EE_System__parse_implemented_model_names',
-                ['EE_Register_Model', 'add_addon_models']
-            );
-            add_filter('FHEE__EE_Registry__load_model__paths', ['EE_Register_Model', 'add_model_folders']);
-            unset($setup_args['model_paths']);
-        }
-        if (isset($setup_args['class_paths'])) {
-            // make sure they passed in an array
-            if (! is_array($setup_args['class_paths'])) {
-                $setup_args['class_paths'] = [$setup_args['class_paths']];
-            }
-            $class_to_filepath_map = EEH_File::get_contents_of_folders($setup_args['class_paths']);
-            EEH_Autoloader::register_autoloader($class_to_filepath_map);
-            add_filter('FHEE__EE_Registry__load_class__paths', ['EE_Register_Model', 'add_class_folders']);
-            unset($setup_args['class_paths']);
-        }
-        foreach ($setup_args as $unknown_key => $unknown_config) {
-            self::deregister($addon_name);
-            throw new EE_Error(
-                sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
-            );
-        }
-        return true;
-    }
+		if (
+			(
+				isset($setup_args['model_paths']) && ! isset($setup_args['class_paths'])
+			)
+			|| (! isset($setup_args['model_paths']) && isset($setup_args['class_paths']))
+		) {
+			throw new EE_Error(
+				sprintf(
+					__(
+						'You must register both "model_paths" AND "class_paths", not just one or the other You provided %s',
+						'event_espresso'
+					),
+					implode(", ", array_keys($setup_args))
+				)
+			);
+		}
+		if (isset($setup_args['model_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($setup_args['model_paths'])) {
+				$setup_args['model_paths'] = [$setup_args['model_paths']];
+			}
+			// we want to add this as a model folder
+			// and autoload them all
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($setup_args['model_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			$model_name_to_classname_map = [];
+			foreach (array_keys($class_to_filepath_map) as $classname) {
+				$model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+			}
+			self::$_model_name_to_classname_map[ $addon_name ] = $model_name_to_classname_map;
+			add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
+			add_filter(
+				'FHEE__EE_System__parse_implemented_model_names',
+				['EE_Register_Model', 'add_addon_models']
+			);
+			add_filter('FHEE__EE_Registry__load_model__paths', ['EE_Register_Model', 'add_model_folders']);
+			unset($setup_args['model_paths']);
+		}
+		if (isset($setup_args['class_paths'])) {
+			// make sure they passed in an array
+			if (! is_array($setup_args['class_paths'])) {
+				$setup_args['class_paths'] = [$setup_args['class_paths']];
+			}
+			$class_to_filepath_map = EEH_File::get_contents_of_folders($setup_args['class_paths']);
+			EEH_Autoloader::register_autoloader($class_to_filepath_map);
+			add_filter('FHEE__EE_Registry__load_class__paths', ['EE_Register_Model', 'add_class_folders']);
+			unset($setup_args['class_paths']);
+		}
+		foreach ($setup_args as $unknown_key => $unknown_config) {
+			self::deregister($addon_name);
+			throw new EE_Error(
+				sprintf(__("The key '%s' is not a known key for registering a model", "event_espresso"), $unknown_key)
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * Filters the core list of models
-     *
-     * @param array $core_models
-     * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
-     */
-    public static function add_addon_models(array $core_models = []): array
-    {
-        $models = [];
-        foreach (self::$_model_name_to_classname_map as $model_map) {
-            $models[] = $model_map;
-        }
-        return array_merge($core_models, ...$models);
-    }
+	/**
+	 * Filters the core list of models
+	 *
+	 * @param array $core_models
+	 * @return array keys are model names (eg 'Event') and values are their classes (eg 'EE_Event')
+	 */
+	public static function add_addon_models(array $core_models = []): array
+	{
+		$models = [];
+		foreach (self::$_model_name_to_classname_map as $model_map) {
+			$models[] = $model_map;
+		}
+		return array_merge($core_models, ...$models);
+	}
 
 
-    /**
-     * Filters the list of model folders
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_model_folders(array $folders = []): array
-    {
-        $model_folders = [];
-        foreach (self::$_model_registry as $setup_args) {
-            if (isset($setup_args['model_paths'])) {
-                $model_folders[] = (array) $setup_args['model_paths'];
-            }
-        }
-        return array_merge($folders, ...$model_folders);
-    }
+	/**
+	 * Filters the list of model folders
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_model_folders(array $folders = []): array
+	{
+		$model_folders = [];
+		foreach (self::$_model_registry as $setup_args) {
+			if (isset($setup_args['model_paths'])) {
+				$model_folders[] = (array) $setup_args['model_paths'];
+			}
+		}
+		return array_merge($folders, ...$model_folders);
+	}
 
 
-    /**
-     * Filters the array of model class paths
-     *
-     * @param array $folders
-     * @return array of folder paths
-     */
-    public static function add_class_folders(array $folders = []): array
-    {
-        $class_folders = [];
-        foreach (self::$_model_registry as $setup_args) {
-            if (isset($setup_args['class_paths'])) {
-                $class_folders[] = (array) $setup_args['class_paths'];
-            }
-        }
-        return array_merge($folders, ...$class_folders);
-    }
+	/**
+	 * Filters the array of model class paths
+	 *
+	 * @param array $folders
+	 * @return array of folder paths
+	 */
+	public static function add_class_folders(array $folders = []): array
+	{
+		$class_folders = [];
+		foreach (self::$_model_registry as $setup_args) {
+			if (isset($setup_args['class_paths'])) {
+				$class_folders[] = (array) $setup_args['class_paths'];
+			}
+		}
+		return array_merge($folders, ...$class_folders);
+	}
 
 
-    /**
-     * deregister
-     *
-     * @param string $addon_name
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$_model_registry[ $addon_name ], self::$_model_name_to_classname_map[ $addon_name ]);
-    }
+	/**
+	 * deregister
+	 *
+	 * @param string $addon_name
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$_model_registry[ $addon_name ], self::$_model_name_to_classname_map[ $addon_name ]);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -59,7 +59,7 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_model_registry[ $addon_name ])) {
+        if (isset(self::$_model_registry[$addon_name])) {
             return true;
         }
 
@@ -80,13 +80,13 @@ 
                 '4.5'
             );
         }
-        self::$_model_registry[ $addon_name ] = $setup_args;
+        self::$_model_registry[$addon_name] = $setup_args;
 
         if (
             (
                 isset($setup_args['model_paths']) && ! isset($setup_args['class_paths'])
             )
-            || (! isset($setup_args['model_paths']) && isset($setup_args['class_paths']))
+            || ( ! isset($setup_args['model_paths']) && isset($setup_args['class_paths']))
         ) {
             throw new EE_Error(
                 sprintf(
@@ -100,7 +100,7 @@ 
         }
         if (isset($setup_args['model_paths'])) {
             // make sure they passed in an array
-            if (! is_array($setup_args['model_paths'])) {
+            if ( ! is_array($setup_args['model_paths'])) {
                 $setup_args['model_paths'] = [$setup_args['model_paths']];
             }
             // we want to add this as a model folder
@@ -109,9 +109,9 @@ 
             EEH_Autoloader::register_autoloader($class_to_filepath_map);
             $model_name_to_classname_map = [];
             foreach (array_keys($class_to_filepath_map) as $classname) {
-                $model_name_to_classname_map[ str_replace("EEM_", "", $classname) ] = $classname;
+                $model_name_to_classname_map[str_replace("EEM_", "", $classname)] = $classname;
             }
-            self::$_model_name_to_classname_map[ $addon_name ] = $model_name_to_classname_map;
+            self::$_model_name_to_classname_map[$addon_name] = $model_name_to_classname_map;
             add_filter('FHEE__EE_System__parse_model_names', ['EE_Register_Model', 'add_addon_models']);
             add_filter(
                 'FHEE__EE_System__parse_implemented_model_names',
@@ -122,7 +122,7 @@ 
         }
         if (isset($setup_args['class_paths'])) {
             // make sure they passed in an array
-            if (! is_array($setup_args['class_paths'])) {
+            if ( ! is_array($setup_args['class_paths'])) {
                 $setup_args['class_paths'] = [$setup_args['class_paths']];
             }
             $class_to_filepath_map = EEH_File::get_contents_of_folders($setup_args['class_paths']);
@@ -199,6 +199,6 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$_model_registry[ $addon_name ], self::$_model_name_to_classname_map[ $addon_name ]);
+        unset(self::$_model_registry[$addon_name], self::$_model_name_to_classname_map[$addon_name]);
     }
 }

core/libraries/plugin_api/EE_Register_Shortcode.lib.php

Indentation +148 added lines, -148 removed lines

@@ -20,163 +20,163 @@
 class EE_Register_Shortcode implements EEI_Plugin_API
 {
 
-    /**
-     * Holds values for registered shortcodes
-     *
-     * @var array
-     */
-    protected static $_settings = [];
+	/**
+	 * Holds values for registered shortcodes
+	 *
+	 * @var array
+	 */
+	protected static $_settings = [];
 
 
-    /**
-     *    Method for registering new EE_Shortcodes
-     *
-     * @param string $addon_name    a unique identifier for this set of modules Required.
-     * @param array  $setup_args    an array of arguments provided for registering shortcodes Required.
-     * @type array shortcode_paths  an array of full server paths to folders containing any EES_Shortcodes
-     * @type array shortcode_fqcns  an array of fully qualified class names for any new shortcode classes to register.
-     *                              Shortcode classes should extend EspressoShortcode
-     *                              and be properly namespaced so they are autoloaded.
-     * @return bool
-     * @throws EE_Error
-     * @since    4.3.0
-     * @since    4.9.46.rc.025  for the new `shortcode_fqcns` array argument.
-     */
-    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['shortcode_paths'])
-            )
-               && empty($setup_args['shortcode_fqcns'])
-        ) {
-            throw new EE_Error(
-                esc_html__(
-                    'In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)',
-                    'event_espresso'
-                )
-            );
-        }
+	/**
+	 *    Method for registering new EE_Shortcodes
+	 *
+	 * @param string $addon_name    a unique identifier for this set of modules Required.
+	 * @param array  $setup_args    an array of arguments provided for registering shortcodes Required.
+	 * @type array shortcode_paths  an array of full server paths to folders containing any EES_Shortcodes
+	 * @type array shortcode_fqcns  an array of fully qualified class names for any new shortcode classes to register.
+	 *                              Shortcode classes should extend EspressoShortcode
+	 *                              and be properly namespaced so they are autoloaded.
+	 * @return bool
+	 * @throws EE_Error
+	 * @since    4.3.0
+	 * @since    4.9.46.rc.025  for the new `shortcode_fqcns` array argument.
+	 */
+	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['shortcode_paths'])
+			)
+			   && empty($setup_args['shortcode_fqcns'])
+		) {
+			throw new EE_Error(
+				esc_html__(
+					'In order to register Modules with EE_Register_Shortcode::register(), you must include a "shortcode_id" (a unique identifier for this set of shortcodes), and an array containing the following keys: "shortcode_paths" (an array of full server paths to folders that contain shortcodes, or to the shortcode files themselves)',
+					'event_espresso'
+				)
+			);
+		}
 
-        // make sure we don't register twice
-        if (isset(self::$_settings[ $addon_name ])) {
-            return true;
-        }
+		// 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 shortcodes 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 shortcodes.',
-                    'event_espresso'
-                ),
-                '4.3.0'
-            );
-        }
-        // setup $_settings array from incoming values.
-        self::$_settings[ $addon_name ] = [
-            // array of full server paths to any EES_Shortcodes used by the shortcode
-            'shortcode_paths' => isset($setup_args['shortcode_paths'])
-                ? (array) $setup_args['shortcode_paths']
-                : [],
-            'shortcode_fqcns' => isset($setup_args['shortcode_fqcns'])
-                ? (array) $setup_args['shortcode_fqcns']
-                : [],
-        ];
-        // add to list of shortcodes to be registered
-        add_filter(
-            'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
-            ['EE_Register_Shortcode', 'add_shortcodes']
-        );
+		// 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 shortcodes 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 shortcodes.',
+					'event_espresso'
+				),
+				'4.3.0'
+			);
+		}
+		// setup $_settings array from incoming values.
+		self::$_settings[ $addon_name ] = [
+			// array of full server paths to any EES_Shortcodes used by the shortcode
+			'shortcode_paths' => isset($setup_args['shortcode_paths'])
+				? (array) $setup_args['shortcode_paths']
+				: [],
+			'shortcode_fqcns' => isset($setup_args['shortcode_fqcns'])
+				? (array) $setup_args['shortcode_fqcns']
+				: [],
+		];
+		// add to list of shortcodes to be registered
+		add_filter(
+			'FHEE__EE_Config__register_shortcodes__shortcodes_to_register',
+			['EE_Register_Shortcode', 'add_shortcodes']
+		);
 
-        add_filter(
-            'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
-            ['EE_Register_Shortcode', 'instantiateAndAddToShortcodeCollection']
-        );
-        return true;
-    }
+		add_filter(
+			'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
+			['EE_Register_Shortcode', 'instantiateAndAddToShortcodeCollection']
+		);
+		return true;
+	}
 
 
-    /**
-     * Filters the list of shortcodes to add ours.
-     * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
-     * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey'...)
-     *
-     * @param array $shortcodes_to_register array of paths to all shortcodes that require registering
-     * @return array
-     */
-    public static function add_shortcodes(array $shortcodes_to_register): array
-    {
-        $shortcode_paths = [];
-        foreach (self::$_settings as $settings) {
-            $shortcode_paths[] = $settings['shortcode_paths'];
-        }
-        return array_merge($shortcodes_to_register, ...$shortcode_paths);
-    }
+	/**
+	 * Filters the list of shortcodes to add ours.
+	 * and they're just full filepaths to FOLDERS containing a shortcode class file. Eg.
+	 * array('espresso_monkey'=>'/public_html/wonder-site/wp-content/plugins/ee4/shortcodes/espresso_monkey'...)
+	 *
+	 * @param array $shortcodes_to_register array of paths to all shortcodes that require registering
+	 * @return array
+	 */
+	public static function add_shortcodes(array $shortcodes_to_register): array
+	{
+		$shortcode_paths = [];
+		foreach (self::$_settings as $settings) {
+			$shortcode_paths[] = $settings['shortcode_paths'];
+		}
+		return array_merge($shortcodes_to_register, ...$shortcode_paths);
+	}
 
 
-    /**
-     * Hooks into
-     * FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection and
-     * registers any provided shortcode fully qualified class names.
-     *
-     * @param CollectionInterface $shortcodes_collection
-     * @return CollectionInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function instantiateAndAddToShortcodeCollection(
-        CollectionInterface $shortcodes_collection
-    ): CollectionInterface {
-        foreach (self::$_settings as $settings) {
-            if (! empty($settings['shortcode_fqcns'])) {
-                foreach ($settings['shortcode_fqcns'] as $shortcode_fqcn) {
-                    if (! class_exists($shortcode_fqcn)) {
-                        throw new InvalidClassException(
-                            sprintf(
-                                esc_html__(
-                                    'Are you sure %s is the right fully qualified class name for the shortcode class?',
-                                    'event_espresso'
-                                ),
-                                $shortcode_fqcn
-                            )
-                        );
-                    }
-                    if (! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
-                        // register dependencies
-                        EE_Dependency_Map::register_dependencies(
-                            $shortcode_fqcn,
-                            [
-                                'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
-                            ]
-                        );
-                    }
-                    $shortcodes_collection->add(LoaderFactory::getLoader()->getShared($shortcode_fqcn));
-                }
-            }
-        }
-        return $shortcodes_collection;
-    }
+	/**
+	 * Hooks into
+	 * FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection and
+	 * registers any provided shortcode fully qualified class names.
+	 *
+	 * @param CollectionInterface $shortcodes_collection
+	 * @return CollectionInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function instantiateAndAddToShortcodeCollection(
+		CollectionInterface $shortcodes_collection
+	): CollectionInterface {
+		foreach (self::$_settings as $settings) {
+			if (! empty($settings['shortcode_fqcns'])) {
+				foreach ($settings['shortcode_fqcns'] as $shortcode_fqcn) {
+					if (! class_exists($shortcode_fqcn)) {
+						throw new InvalidClassException(
+							sprintf(
+								esc_html__(
+									'Are you sure %s is the right fully qualified class name for the shortcode class?',
+									'event_espresso'
+								),
+								$shortcode_fqcn
+							)
+						);
+					}
+					if (! EE_Dependency_Map::instance()->has_dependency_for_class($shortcode_fqcn)) {
+						// register dependencies
+						EE_Dependency_Map::register_dependencies(
+							$shortcode_fqcn,
+							[
+								'EventEspresso\core\services\cache\PostRelatedCacheManager' => EE_Dependency_Map::load_from_cache,
+							]
+						);
+					}
+					$shortcodes_collection->add(LoaderFactory::getLoader()->getShared($shortcode_fqcn));
+				}
+			}
+		}
+		return $shortcodes_collection;
+	}
 
 
-    /**
-     * This deregisters a shortcode that was previously registered with a specific $addon_name.
-     *
-     * @param string $addon_name the name for the shortcode that was previously registered
-     * @return void
-     * @since    4.3.0
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$_settings[ $addon_name ]);
-    }
+	/**
+	 * This deregisters a shortcode that was previously registered with a specific $addon_name.
+	 *
+	 * @param string $addon_name the name for the shortcode that was previously registered
+	 * @return void
+	 * @since    4.3.0
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$_settings[ $addon_name ]);
+	}
 }

core/libraries/plugin_api/EE_Register_Messages_Template_Pack.lib.php

Indentation +198 added lines, -198 removed lines

@@ -12,202 +12,202 @@
 {
 
 
-    /**
-     * Holds values for registered template pack
-     *
-     * @since 4.5.0
-     *
-     * @var array
-     */
-    protected static $_registry = [];
-
-
-    /**
-     * Used to register a new template pack with the messages system.
-     *
-     * Template packs are primarily defined via class extending EE_Messages_Template_Pack and are typically used to
-     * change entire layouts for a set of message templates.  This method is used to register the new template pack and
-     * automatically have it loaded in the appropriate places.
-     *
-     * This registry also verifies that there isn't already a template pack registered with the same name and if there
-     * is then it will add an EE_Error notice.
-     *
-     * Note that this only handles registering the your Template Pack class with the message template pack system.
-     * However, there is also a naming schema you must follow for templates you are providing with your template pack.
-     *
-     * @param string $addon_name The internal reference used to refer to this template pack.  Note, this is first come,
-     *                           first serve.  If there is already a template pack registered with this name then the
-     *                           registry will assign a unique reference for it so it can still be activated (but this
-     *                           makes it harder to deregister as it will be unique per load - so its best to try to
-     *                           make this a unique string!)
-     * @param array  $setup_args array {
-     *                           An array of required values for registering the template pack.
-     * @type string  $path       The path for the new template pack class.
-     * @type string  $classname  The name of the new Template Pack Class.
-     *                           }
-     * @return bool
-     * @throws EE_Error
-     *
-     * @see    core/libraries/messages/defaults/default/* for all the example templates the default template pack
-     *         supports.
-     *
-     *
-     * @since  4.5.0
-     * @see    EE_Messages_Template_Pack_Default for an example class
-     */
-    public static function register(string $addon_name = '', array $setup_args = []): bool
-    {
-
-        // check for required params
-        if (empty($addon_name) || empty($setup_args['path']) || empty($setup_args['classname'])) {
-            throw new EE_Error(
-                __(
-                    'In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ',
-                    'event_espresso'
-                )
-            );
-        }
-
-        // make sure we don't register twice
-        if (isset(self::$_registry[ $addon_name ])) {
-            return true;
-        }
-
-        // check that incoming $addon_name doesn't already exist. If it does then we'll create a unique reference for this template pack.
-        if (isset(self::$_registry[ $addon_name ])) {
-            $addon_name = uniqid() . '_' . $addon_name;
-        }
-
-
-        // make sure this was called in the right place!
-        if (
-            ! did_action('EE_Brewing_Regular___messages_caf')
-            || did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
-        ) {
-            EE_Error::doing_it_wrong(
-                __METHOD__,
-                sprintf(
-                    __(
-                        'A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.',
-                        'event_espresso'
-                    ),
-                    $addon_name
-                ),
-                '4.5.0'
-            );
-        }
-
-        if (self::_verify_class_not_exist($setup_args['classname'])) {
-            self::$_registry[ $addon_name ] = [
-                'path'      => (string) $setup_args['path'],
-                'classname' => (string) $setup_args['classname'],
-            ];
-        }
-
-        // hook into the system
-        add_filter(
-            'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
-            ['EE_Register_Messages_Template_Pack', 'set_template_pack_path'],
-            10
-        );
-        add_filter(
-            'FHEE__EED_Messages__get_template_packs__template_packs',
-            ['EE_Register_Messages_Template_Pack', 'set_template_pack'],
-            10
-        );
-        return true;
-    }
-
-
-    /**
-     * Callback for the FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.  This adds this template packs path
-     * to the messages autoloader paths.
-     *
-     * @param array $paths Array of paths already registered with the messages autoloader
-     *
-     * @return array
-     * @since  4.5.0
-     *
-     */
-    public static function set_template_pack_path(array $paths): array
-    {
-        foreach (self::$_registry as $args) {
-            $paths[] = $args['path'];
-        }
-        return $paths;
-    }
-
-
-    /**
-     * Callback for the FHEE__EED_Messages__get_template_packs__template_packs filter. This adds the instantiated,
-     * registered template pack to the template packs array when requested by client code.
-     *
-     * @param EE_Messages_Template_Pack[] $template_packs
-     * @return EE_Messages_Template_Pack[]
-     * @since 4.5.0
-     *
-     */
-    public static function set_template_pack(array $template_packs): array
-    {
-        foreach (self::$_registry as $args) {
-            // verify class_exists
-            if (! class_exists($args['classname'])) {
-                require_once($args['path'] . '/' . $args['classname'] . '.class.php');
-            }
-
-            // check again!
-            if (class_exists($args['classname'])) {
-                $template_pack                           = new $args['classname']();
-                $template_packs[ $template_pack->dbref ] = $template_pack;
-            }
-        }
-
-        return $template_packs;
-    }
-
-
-    /**
-     * This verifies that the classes for each registered template pack are unique  names.
-     *
-     * @param string $classname The classname being checked
-     *
-     * @return bool
-     */
-    private static function _verify_class_not_exist(string $classname): bool
-    {
-        // loop through the existing registry and see if the classname is already present.
-        foreach (self::$_registry as $args) {
-            if ($args['classname'] == $classname) {
-                EE_Error::add_error(
-                    sprintf(
-                        __(
-                            'The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.',
-                            'event_espresso'
-                        ),
-                        $classname
-                    ),
-                    __FILE__,
-                    __LINE__,
-                    __FUNCTION__
-                );
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * This deregisters a variation set that was previously registered with the given slug.
-     *
-     * @param string $addon_name The name for the variation set that was previously registered.
-     *
-     * @return void
-     * @since 4.5.0
-     *
-     */
-    public static function deregister(string $addon_name = '')
-    {
-        unset(self::$_registry[ $addon_name ]);
-    }
+	/**
+	 * Holds values for registered template pack
+	 *
+	 * @since 4.5.0
+	 *
+	 * @var array
+	 */
+	protected static $_registry = [];
+
+
+	/**
+	 * Used to register a new template pack with the messages system.
+	 *
+	 * Template packs are primarily defined via class extending EE_Messages_Template_Pack and are typically used to
+	 * change entire layouts for a set of message templates.  This method is used to register the new template pack and
+	 * automatically have it loaded in the appropriate places.
+	 *
+	 * This registry also verifies that there isn't already a template pack registered with the same name and if there
+	 * is then it will add an EE_Error notice.
+	 *
+	 * Note that this only handles registering the your Template Pack class with the message template pack system.
+	 * However, there is also a naming schema you must follow for templates you are providing with your template pack.
+	 *
+	 * @param string $addon_name The internal reference used to refer to this template pack.  Note, this is first come,
+	 *                           first serve.  If there is already a template pack registered with this name then the
+	 *                           registry will assign a unique reference for it so it can still be activated (but this
+	 *                           makes it harder to deregister as it will be unique per load - so its best to try to
+	 *                           make this a unique string!)
+	 * @param array  $setup_args array {
+	 *                           An array of required values for registering the template pack.
+	 * @type string  $path       The path for the new template pack class.
+	 * @type string  $classname  The name of the new Template Pack Class.
+	 *                           }
+	 * @return bool
+	 * @throws EE_Error
+	 *
+	 * @see    core/libraries/messages/defaults/default/* for all the example templates the default template pack
+	 *         supports.
+	 *
+	 *
+	 * @since  4.5.0
+	 * @see    EE_Messages_Template_Pack_Default for an example class
+	 */
+	public static function register(string $addon_name = '', array $setup_args = []): bool
+	{
+
+		// check for required params
+		if (empty($addon_name) || empty($setup_args['path']) || empty($setup_args['classname'])) {
+			throw new EE_Error(
+				__(
+					'In order to register a new template pack for the EE Messages system, you must include a value to reference the template pack being registered and the setup_args must have the path for the new template pack class as well as the classname for the new Template Pack Class. ',
+					'event_espresso'
+				)
+			);
+		}
+
+		// make sure we don't register twice
+		if (isset(self::$_registry[ $addon_name ])) {
+			return true;
+		}
+
+		// check that incoming $addon_name doesn't already exist. If it does then we'll create a unique reference for this template pack.
+		if (isset(self::$_registry[ $addon_name ])) {
+			$addon_name = uniqid() . '_' . $addon_name;
+		}
+
+
+		// make sure this was called in the right place!
+		if (
+			! did_action('EE_Brewing_Regular___messages_caf')
+			|| did_action('AHEE__EE_System__perform_activations_upgrades_and_migrations')
+		) {
+			EE_Error::doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					__(
+						'A EE Messages Template Pack given the reference "%s" has been attempted to be registered with the EE Messages System.  It may or may not work because it should be only called on the "EE_Brewing_Regular__messages_caf" hook.',
+						'event_espresso'
+					),
+					$addon_name
+				),
+				'4.5.0'
+			);
+		}
+
+		if (self::_verify_class_not_exist($setup_args['classname'])) {
+			self::$_registry[ $addon_name ] = [
+				'path'      => (string) $setup_args['path'],
+				'classname' => (string) $setup_args['classname'],
+			];
+		}
+
+		// hook into the system
+		add_filter(
+			'FHEE__EED_Messages___set_messages_paths___MSG_PATHS',
+			['EE_Register_Messages_Template_Pack', 'set_template_pack_path'],
+			10
+		);
+		add_filter(
+			'FHEE__EED_Messages__get_template_packs__template_packs',
+			['EE_Register_Messages_Template_Pack', 'set_template_pack'],
+			10
+		);
+		return true;
+	}
+
+
+	/**
+	 * Callback for the FHEE__EED_Messages___set_messages_paths___MSG_PATHS filter.  This adds this template packs path
+	 * to the messages autoloader paths.
+	 *
+	 * @param array $paths Array of paths already registered with the messages autoloader
+	 *
+	 * @return array
+	 * @since  4.5.0
+	 *
+	 */
+	public static function set_template_pack_path(array $paths): array
+	{
+		foreach (self::$_registry as $args) {
+			$paths[] = $args['path'];
+		}
+		return $paths;
+	}
+
+
+	/**
+	 * Callback for the FHEE__EED_Messages__get_template_packs__template_packs filter. This adds the instantiated,
+	 * registered template pack to the template packs array when requested by client code.
+	 *
+	 * @param EE_Messages_Template_Pack[] $template_packs
+	 * @return EE_Messages_Template_Pack[]
+	 * @since 4.5.0
+	 *
+	 */
+	public static function set_template_pack(array $template_packs): array
+	{
+		foreach (self::$_registry as $args) {
+			// verify class_exists
+			if (! class_exists($args['classname'])) {
+				require_once($args['path'] . '/' . $args['classname'] . '.class.php');
+			}
+
+			// check again!
+			if (class_exists($args['classname'])) {
+				$template_pack                           = new $args['classname']();
+				$template_packs[ $template_pack->dbref ] = $template_pack;
+			}
+		}
+
+		return $template_packs;
+	}
+
+
+	/**
+	 * This verifies that the classes for each registered template pack are unique  names.
+	 *
+	 * @param string $classname The classname being checked
+	 *
+	 * @return bool
+	 */
+	private static function _verify_class_not_exist(string $classname): bool
+	{
+		// loop through the existing registry and see if the classname is already present.
+		foreach (self::$_registry as $args) {
+			if ($args['classname'] == $classname) {
+				EE_Error::add_error(
+					sprintf(
+						__(
+							'The %s template pack that you just activated cannot be registered with the messages system because there is already a template pack active using the same classname.  Contact the author of this template pack to let them know of the conflict.  To stop seeing this message you will need to deactivate this template pack.',
+							'event_espresso'
+						),
+						$classname
+					),
+					__FILE__,
+					__LINE__,
+					__FUNCTION__
+				);
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * This deregisters a variation set that was previously registered with the given slug.
+	 *
+	 * @param string $addon_name The name for the variation set that was previously registered.
+	 *
+	 * @return void
+	 * @since 4.5.0
+	 *
+	 */
+	public static function deregister(string $addon_name = '')
+	{
+		unset(self::$_registry[ $addon_name ]);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -69,13 +69,13 @@ 
         }
 
         // make sure we don't register twice
-        if (isset(self::$_registry[ $addon_name ])) {
+        if (isset(self::$_registry[$addon_name])) {
             return true;
         }
 
         // check that incoming $addon_name doesn't already exist. If it does then we'll create a unique reference for this template pack.
-        if (isset(self::$_registry[ $addon_name ])) {
-            $addon_name = uniqid() . '_' . $addon_name;
+        if (isset(self::$_registry[$addon_name])) {
+            $addon_name = uniqid().'_'.$addon_name;
         }
 
 
@@ -98,7 +98,7 @@ 
         }
 
         if (self::_verify_class_not_exist($setup_args['classname'])) {
-            self::$_registry[ $addon_name ] = [
+            self::$_registry[$addon_name] = [
                 'path'      => (string) $setup_args['path'],
                 'classname' => (string) $setup_args['classname'],
             ];
@@ -151,14 +151,14 @@ 
     {
         foreach (self::$_registry as $args) {
             // verify class_exists
-            if (! class_exists($args['classname'])) {
-                require_once($args['path'] . '/' . $args['classname'] . '.class.php');
+            if ( ! class_exists($args['classname'])) {
+                require_once($args['path'].'/'.$args['classname'].'.class.php');
             }
 
             // check again!
             if (class_exists($args['classname'])) {
                 $template_pack                           = new $args['classname']();
-                $template_packs[ $template_pack->dbref ] = $template_pack;
+                $template_packs[$template_pack->dbref] = $template_pack;
             }
         }
 
@@ -208,6 +208,6 @@ 
      */
     public static function deregister(string $addon_name = '')
     {
-        unset(self::$_registry[ $addon_name ]);
+        unset(self::$_registry[$addon_name]);
     }
 }