eventespresso / event-espresso-core

core/domain/services/graphql/types/FormElement.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function __construct(EEM_Form_Element $form_element_model)
     {
-        $this->setName($this->namespace . 'FormElement');
+        $this->setName($this->namespace.'FormElement');
         $this->setDescription(__('A form element', 'event_espresso'));
         $this->setIsCustomPostType(false);
 
@@ -133,7 +133,7 @@ 
             ),
             new GraphQLField(
                 'status',
-                $this->namespace . 'FormStatusEnum',
+                $this->namespace.'FormStatusEnum',
                 'status',
                 esc_html__(
                     'Whether form element is active, archived, trashed, or used as a default on new forms.',
@@ -142,7 +142,7 @@ 
             ),
             new GraphQLField(
                 'type',
-                $this->namespace . 'ElementTypeEnum',
+                $this->namespace.'ElementTypeEnum',
                 'type',
                 esc_html__('Form element type.', 'event_espresso')
             ),
@@ -180,7 +180,7 @@ 
     {
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'update' . $this->name(),
+            'update'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [
@@ -194,7 +194,7 @@ 
         );
         // Register mutation to delete an entity.
         register_graphql_mutation(
-            'delete' . $this->name(),
+            'delete'.$this->name(),
             [
                 'inputFields'         => [
                     'id' => $inputFields['id'],
@@ -203,7 +203,7 @@ 
                     lcfirst($this->name()) => [
                         'type'        => $this->name(),
                         'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
+                        'resolve'     => static function($payload) {
                             $deleted = (object) $payload['deleted'];
 
                             return ! empty($deleted) ? $deleted : null;
@@ -220,7 +220,7 @@ 
 
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'create' . $this->name(),
+            'create'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [

Indentation +197 added lines, -197 removed lines

@@ -26,210 +26,210 @@
  */
 class FormElement extends TypeBase
 {
-    /**
-     * FormElement constructor.
-     *
-     * @param EEM_Form_Element $form_element_model
-     */
-    public function __construct(EEM_Form_Element $form_element_model)
-    {
-        $this->setName($this->namespace . 'FormElement');
-        $this->setDescription(__('A form element', 'event_espresso'));
-        $this->setIsCustomPostType(false);
+	/**
+	 * FormElement constructor.
+	 *
+	 * @param EEM_Form_Element $form_element_model
+	 */
+	public function __construct(EEM_Form_Element $form_element_model)
+	{
+		$this->setName($this->namespace . 'FormElement');
+		$this->setDescription(__('A form element', 'event_espresso'));
+		$this->setIsCustomPostType(false);
 
-        parent::__construct($form_element_model);
-    }
+		parent::__construct($form_element_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields()
-    {
-        $fields = [
-            new GraphQLField(
-                'id',
-                ['non_null' => 'ID'],
-                null,
-                esc_html__('The globally unique ID for the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'adminOnly',
-                'Boolean',
-                'adminOnly',
-                esc_html__(
-                    'Whether or not the element is only displayed in the admin. If false, input will appear in public forms',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLField(
-                'attributes',
-                'String',
-                'attributes',
-                esc_html__(
-                    'JSON string of HTML attributes such as class, max, min, placeholder, type, etc.',
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'belongsTo',
-                'String',
-                'belongsTo',
-                esc_html__('UUID of parent form section this form element belongs to.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'helpText',
-                'String',
-                'helpText',
-                esc_html__(
-                    "JSON string of properties pertaining to any help text required for an input.",
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'label',
-                'String',
-                'label',
-                esc_html__(
-                    'JSON string of properties pertaining to an element\'s label.',
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'mapsTo',
-                'String',
-                'mapsTo',
-                esc_html__("Model and Fields name that this element maps to; ex: Attendee.email", 'event_espresso')
-            ),
-            new GraphQLField(
-                'options',
-                'String',
-                'options',
-                esc_html__(
-                    "JSON string of options for ENUM type inputs like checkboxes, radio buttons, select inputs, etc.",
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'order',
-                'Int',
-                'order',
-                esc_html__('Order in which form element appears in a form.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'required',
-                'String',
-                'required',
-                esc_html__(
-                    "properties pertaining to an input\'s required status and the validation text to display.",
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'status',
-                $this->namespace . 'FormStatusEnum',
-                'status',
-                esc_html__(
-                    'Whether form element is active, archived, trashed, or used as a default on new forms.',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLField(
-                'type',
-                $this->namespace . 'ElementTypeEnum',
-                'type',
-                esc_html__('Form element type.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'wpUser',
-                'User',
-                null,
-                esc_html__('WP User that created this form element.', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'wpUser',
-                'ID',
-                null,
-                esc_html__('ID of the WP User that created the form element.', 'event_espresso')
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields()
+	{
+		$fields = [
+			new GraphQLField(
+				'id',
+				['non_null' => 'ID'],
+				null,
+				esc_html__('The globally unique ID for the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'adminOnly',
+				'Boolean',
+				'adminOnly',
+				esc_html__(
+					'Whether or not the element is only displayed in the admin. If false, input will appear in public forms',
+					'event_espresso'
+				)
+			),
+			new GraphQLField(
+				'attributes',
+				'String',
+				'attributes',
+				esc_html__(
+					'JSON string of HTML attributes such as class, max, min, placeholder, type, etc.',
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'belongsTo',
+				'String',
+				'belongsTo',
+				esc_html__('UUID of parent form section this form element belongs to.', 'event_espresso')
+			),
+			new GraphQLField(
+				'helpText',
+				'String',
+				'helpText',
+				esc_html__(
+					"JSON string of properties pertaining to any help text required for an input.",
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'label',
+				'String',
+				'label',
+				esc_html__(
+					'JSON string of properties pertaining to an element\'s label.',
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'mapsTo',
+				'String',
+				'mapsTo',
+				esc_html__("Model and Fields name that this element maps to; ex: Attendee.email", 'event_espresso')
+			),
+			new GraphQLField(
+				'options',
+				'String',
+				'options',
+				esc_html__(
+					"JSON string of options for ENUM type inputs like checkboxes, radio buttons, select inputs, etc.",
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'order',
+				'Int',
+				'order',
+				esc_html__('Order in which form element appears in a form.', 'event_espresso')
+			),
+			new GraphQLField(
+				'required',
+				'String',
+				'required',
+				esc_html__(
+					"properties pertaining to an input\'s required status and the validation text to display.",
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'status',
+				$this->namespace . 'FormStatusEnum',
+				'status',
+				esc_html__(
+					'Whether form element is active, archived, trashed, or used as a default on new forms.',
+					'event_espresso'
+				)
+			),
+			new GraphQLField(
+				'type',
+				$this->namespace . 'ElementTypeEnum',
+				'type',
+				esc_html__('Form element type.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'wpUser',
+				'User',
+				null,
+				esc_html__('WP User that created this form element.', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'wpUser',
+				'ID',
+				null,
+				esc_html__('ID of the WP User that created the form element.', 'event_espresso')
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__form_element_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__form_element_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * @param array $inputFields The mutation input fields.
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function registerMutations($inputFields)
-    {
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'update' . $this->name(),
-            [
-                'inputFields'         => $inputFields,
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'    => $this->name(),
-                        'resolve' => [$this, 'resolveFromPayload'],
-                    ],
-                ],
-                'mutateAndGetPayload' => FormElementUpdate::mutateAndGetPayload($this->model),
-            ]
-        );
-        // Register mutation to delete an entity.
-        register_graphql_mutation(
-            'delete' . $this->name(),
-            [
-                'inputFields'         => [
-                    'id' => $inputFields['id'],
-                ],
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'        => $this->name(),
-                        'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
-                            $deleted = (object) $payload['deleted'];
+	/**
+	 * @param array $inputFields The mutation input fields.
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function registerMutations($inputFields)
+	{
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'update' . $this->name(),
+			[
+				'inputFields'         => $inputFields,
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'    => $this->name(),
+						'resolve' => [$this, 'resolveFromPayload'],
+					],
+				],
+				'mutateAndGetPayload' => FormElementUpdate::mutateAndGetPayload($this->model),
+			]
+		);
+		// Register mutation to delete an entity.
+		register_graphql_mutation(
+			'delete' . $this->name(),
+			[
+				'inputFields'         => [
+					'id' => $inputFields['id'],
+				],
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'        => $this->name(),
+						'description' => esc_html__('The object before it was deleted', 'event_espresso'),
+						'resolve'     => static function ($payload) {
+							$deleted = (object) $payload['deleted'];
 
-                            return ! empty($deleted) ? $deleted : null;
-                        },
-                    ],
-                ],
-                'mutateAndGetPayload' => FormElementDelete::mutateAndGetPayload($this->model),
-            ]
-        );
+							return ! empty($deleted) ? $deleted : null;
+						},
+					],
+				],
+				'mutateAndGetPayload' => FormElementDelete::mutateAndGetPayload($this->model),
+			]
+		);
 
-        // Make element 'type' a required field for create mutations
-        // Yes it's "['type']['type']" 

core/domain/services/graphql/types/FormSection.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function __construct(EEM_Form_Section $form_section_model)
     {
-        $this->setName($this->namespace . 'FormSection');
+        $this->setName($this->namespace.'FormSection');
         $this->setDescription(__('A form section', 'event_espresso'));
         $this->setIsCustomPostType(false);
 
@@ -56,7 +56,7 @@ 
             ),
             new GraphQLField(
                 'appliesTo',
-                $this->namespace . 'FormSectionAppliesToEnum',
+                $this->namespace.'FormSectionAppliesToEnum',
                 'appliesTo',
                 esc_html__('Form user type that this form section should be presented to.', 'event_espresso')
             ),
@@ -94,7 +94,7 @@ 
             ),
             new GraphQLField(
                 'status',
-                $this->namespace . 'FormStatusEnum',
+                $this->namespace.'FormStatusEnum',
                 'status',
                 esc_html__(
                     'Whether form section is active, archived, shared, trashed, or used as a default on new forms.',
@@ -135,7 +135,7 @@ 
     {
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'update' . $this->name(),
+            'update'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [
@@ -149,7 +149,7 @@ 
         );
         // Register mutation to delete an entity.
         register_graphql_mutation(
-            'delete' . $this->name(),
+            'delete'.$this->name(),
             [
                 'inputFields'         => [
                     'id' => $inputFields['id'],
@@ -158,7 +158,7 @@ 
                     lcfirst($this->name()) => [
                         'type'        => $this->name(),
                         'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
+                        'resolve'     => static function($payload) {
                             $deleted = (object) $payload['deleted'];
 
                             return ! empty($deleted) ? $deleted : null;
@@ -171,7 +171,7 @@ 
 
         // Register mutation to update an entity.
         register_graphql_mutation(
-            'create' . $this->name(),
+            'create'.$this->name(),
             [
                 'inputFields'         => $inputFields,
                 'outputFields'        => [

Indentation +179 added lines, -179 removed lines

@@ -26,191 +26,191 @@
  */
 class FormSection extends TypeBase
 {
-    /**
-     * FormSection constructor.
-     *
-     * @param EEM_Form_Section $form_section_model
-     */
-    public function __construct(EEM_Form_Section $form_section_model)
-    {
-        $this->setName($this->namespace . 'FormSection');
-        $this->setDescription(__('A form section', 'event_espresso'));
-        $this->setIsCustomPostType(false);
+	/**
+	 * FormSection constructor.
+	 *
+	 * @param EEM_Form_Section $form_section_model
+	 */
+	public function __construct(EEM_Form_Section $form_section_model)
+	{
+		$this->setName($this->namespace . 'FormSection');
+		$this->setDescription(__('A form section', 'event_espresso'));
+		$this->setIsCustomPostType(false);
 
-        parent::__construct($form_section_model);
-    }
+		parent::__construct($form_section_model);
+	}
 
 
-    /**
-     * @return GraphQLFieldInterface[]
-     */
-    public function getFields()
-    {
-        $fields = [
-            new GraphQLField(
-                'id',
-                ['non_null' => 'ID'],
-                null,
-                esc_html__('The globally unique ID for the object.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'appliesTo',
-                $this->namespace . 'FormSectionAppliesToEnum',
-                'appliesTo',
-                esc_html__('Form user type that this form section should be presented to.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'attributes',
-                'String',
-                'attributes',
-                esc_html__(
-                    'JSON string of HTML attributes, such as class, to be applied to this form section\'s container.',
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'belongsTo',
-                'String',
-                'belongsTo',
-                esc_html__('UUID or ID of related entity this form section belongs to.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isActive',
-                'Boolean',
-                'isActive',
-                esc_html__('Flag indicating whether the section is active.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isArchived',
-                'Boolean',
-                'isArchived',
-                esc_html__('Flag indicating whether the section is archived.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isDefault',
-                'Boolean',
-                'isDefault',
-                esc_html__('Flag indicating whether the section is a default one.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isShared',
-                'Boolean',
-                'isShared',
-                esc_html__('Flag indicating whether the section is a shared one.', 'event_espresso')
-            ),
-            new GraphQLOutputField(
-                'isTrashed',
-                'Boolean',
-                'isTrashed',
-                esc_html__('Flag indicating whether the section is trashed.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'label',
-                'String',
-                'label',
-                esc_html__(
-                    'JSON string of properties pertaining to a form section\'s label.',
-                    'event_espresso'
-                ),
-                [$this, 'toJson']
-            ),
-            new GraphQLField(
-                'order',
-                'Int',
-                'order',
-                esc_html__('Order in which form section appears in a form.', 'event_espresso')
-            ),
-            new GraphQLField(
-                'status',
-                $this->namespace . 'FormStatusEnum',
-                'status',
-                esc_html__(
-                    'Whether form section is active, archived, shared, trashed, or used as a default on new forms.',
-                    'event_espresso'
-                )
-            ),
-            new GraphQLOutputField(
-                'wpUser',
-                'User',
-                null,
-                esc_html__('WP User that created this form section.', 'event_espresso')
-            ),
-            new GraphQLInputField(
-                'wpUser',
-                'ID',
-                null,
-                esc_html__('ID of the WP User that created the form section.', 'event_espresso')
-            ),
-        ];
+	/**
+	 * @return GraphQLFieldInterface[]
+	 */
+	public function getFields()
+	{
+		$fields = [
+			new GraphQLField(
+				'id',
+				['non_null' => 'ID'],
+				null,
+				esc_html__('The globally unique ID for the object.', 'event_espresso')
+			),
+			new GraphQLField(
+				'appliesTo',
+				$this->namespace . 'FormSectionAppliesToEnum',
+				'appliesTo',
+				esc_html__('Form user type that this form section should be presented to.', 'event_espresso')
+			),
+			new GraphQLField(
+				'attributes',
+				'String',
+				'attributes',
+				esc_html__(
+					'JSON string of HTML attributes, such as class, to be applied to this form section\'s container.',
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'belongsTo',
+				'String',
+				'belongsTo',
+				esc_html__('UUID or ID of related entity this form section belongs to.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isActive',
+				'Boolean',
+				'isActive',
+				esc_html__('Flag indicating whether the section is active.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isArchived',
+				'Boolean',
+				'isArchived',
+				esc_html__('Flag indicating whether the section is archived.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isDefault',
+				'Boolean',
+				'isDefault',
+				esc_html__('Flag indicating whether the section is a default one.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isShared',
+				'Boolean',
+				'isShared',
+				esc_html__('Flag indicating whether the section is a shared one.', 'event_espresso')
+			),
+			new GraphQLOutputField(
+				'isTrashed',
+				'Boolean',
+				'isTrashed',
+				esc_html__('Flag indicating whether the section is trashed.', 'event_espresso')
+			),
+			new GraphQLField(
+				'label',
+				'String',
+				'label',
+				esc_html__(
+					'JSON string of properties pertaining to a form section\'s label.',
+					'event_espresso'
+				),
+				[$this, 'toJson']
+			),
+			new GraphQLField(
+				'order',
+				'Int',
+				'order',
+				esc_html__('Order in which form section appears in a form.', 'event_espresso')
+			),
+			new GraphQLField(
+				'status',
+				$this->namespace . 'FormStatusEnum',
+				'status',
+				esc_html__(
+					'Whether form section is active, archived, shared, trashed, or used as a default on new forms.',
+					'event_espresso'
+				)
+			),
+			new GraphQLOutputField(
+				'wpUser',
+				'User',
+				null,
+				esc_html__('WP User that created this form section.', 'event_espresso')
+			),
+			new GraphQLInputField(
+				'wpUser',
+				'ID',
+				null,
+				esc_html__('ID of the WP User that created the form section.', 'event_espresso')
+			),
+		];
 
-        return apply_filters(
-            'FHEE__EventEspresso_core_domain_services_graphql_types__form_section_fields',
-            $fields,
-            $this->name,
-            $this->model
-        );
-    }
+		return apply_filters(
+			'FHEE__EventEspresso_core_domain_services_graphql_types__form_section_fields',
+			$fields,
+			$this->name,
+			$this->model
+		);
+	}
 
 
-    /**
-     * @param array $inputFields The mutation input fields.
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws Exception
-     * @since $VID:$
-     */
-    public function registerMutations($inputFields)
-    {
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'update' . $this->name(),
-            [
-                'inputFields'         => $inputFields,
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'    => $this->name(),
-                        'resolve' => [$this, 'resolveFromPayload'],
-                    ],
-                ],
-                'mutateAndGetPayload' => FormSectionUpdate::mutateAndGetPayload($this->model),
-            ]
-        );
-        // Register mutation to delete an entity.
-        register_graphql_mutation(
-            'delete' . $this->name(),
-            [
-                'inputFields'         => [
-                    'id' => $inputFields['id'],
-                ],
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'        => $this->name(),
-                        'description' => esc_html__('The object before it was deleted', 'event_espresso'),
-                        'resolve'     => static function ($payload) {
-                            $deleted = (object) $payload['deleted'];
+	/**
+	 * @param array $inputFields The mutation input fields.
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws Exception
+	 * @since $VID:$
+	 */
+	public function registerMutations($inputFields)
+	{
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'update' . $this->name(),
+			[
+				'inputFields'         => $inputFields,
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'    => $this->name(),
+						'resolve' => [$this, 'resolveFromPayload'],
+					],
+				],
+				'mutateAndGetPayload' => FormSectionUpdate::mutateAndGetPayload($this->model),
+			]
+		);
+		// Register mutation to delete an entity.
+		register_graphql_mutation(
+			'delete' . $this->name(),
+			[
+				'inputFields'         => [
+					'id' => $inputFields['id'],
+				],
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'        => $this->name(),
+						'description' => esc_html__('The object before it was deleted', 'event_espresso'),
+						'resolve'     => static function ($payload) {
+							$deleted = (object) $payload['deleted'];
 
-                            return ! empty($deleted) ? $deleted : null;
-                        },
-                    ],
-                ],
-                'mutateAndGetPayload' => FormSectionDelete::mutateAndGetPayload($this->model),
-            ]
-        );
+							return ! empty($deleted) ? $deleted : null;
+						},
+					],
+				],
+				'mutateAndGetPayload' => FormSectionDelete::mutateAndGetPayload($this->model),
+			]
+		);
 
-        // Register mutation to update an entity.
-        register_graphql_mutation(
-            'create' . $this->name(),
-            [
-                'inputFields'         => $inputFields,
-                'outputFields'        => [
-                    lcfirst($this->name()) => [
-                        'type'    => $this->name(),
-                        'resolve' => [$this, 'resolveFromPayload'],
-                    ],
-                ],
-                'mutateAndGetPayload' => FormSectionCreate::mutateAndGetPayload($this->model),
-            ]
-        );
-    }
+		// Register mutation to update an entity.
+		register_graphql_mutation(
+			'create' . $this->name(),
+			[
+				'inputFields'         => $inputFields,
+				'outputFields'        => [
+					lcfirst($this->name()) => [
+						'type'    => $this->name(),
+						'resolve' => [$this, 'resolveFromPayload'],
+					],
+				],
+				'mutateAndGetPayload' => FormSectionCreate::mutateAndGetPayload($this->model),
+			]
+		);
+	}
 }

core/db_models/helpers/EE_Table_Base.php

Spacing +5 added lines, -5 removed lines

@@ -93,7 +93,7 @@ 
      */
     public function get_table_name()
     {
-        return $this->get_table_prefix() . $this->_table_name;
+        return $this->get_table_prefix().$this->_table_name;
     }
 
 
@@ -105,7 +105,7 @@ 
      */
     public function get_table_alias()
     {
-        if (! $this->_table_alias) {
+        if ( ! $this->_table_alias) {
             throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
         }
         return $this->_table_alias;
@@ -128,7 +128,7 @@ 
      */
     public function get_fully_qualified_pk_column()
     {
-        return $this->get_table_alias() . "." . $this->get_pk_column();
+        return $this->get_table_alias().".".$this->get_pk_column();
     }
 
 
@@ -139,8 +139,8 @@ 
      */
     public function get_select_join_limit($limit)
     {
-        $limit = is_array($limit) ? 'LIMIT ' . implode(',', array_map('intval', $limit)) : 'LIMIT ' . (int) $limit;
-        return SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+        $limit = is_array($limit) ? 'LIMIT '.implode(',', array_map('intval', $limit)) : 'LIMIT '.(int) $limit;
+        return SP.'(SELECT * FROM '.$this->_table_name.SP.$limit.') AS '.$this->_table_alias;
     }
 
 

Indentation +147 added lines, -147 removed lines

@@ -6,151 +6,151 @@
  */
 abstract class EE_Table_Base
 {
-    /**
-     * This holds the table_name without the table prefix.
-     *
-     * @var string
-     */
-    public $_table_name;
-
-
-    /**
-     * This holds what is used as the alias for the table in queries.
-     *
-     * @var string
-     */
-    public $_table_alias;
-
-
-    /**
-     * Table's private key column
-     *
-     * @var string
-     */
-    protected $_pk_column;
-
-
-    /**
-     * Whether this table is a global table (in multisite) or specific to site.
-     *
-     * @var bool
-     */
-    protected $_global;
-
-
-    /**
-     * @param string  $table_name with or without wpdb prefix
-     * @param string  $pk_column
-     * @param boolean $global     whether the table is "global" as in there is only 1 table on an entire multisite
-     *                            install, or whether each site on a multisite install has a copy of this table
-     * @global wpdb   $wpdb
-     */
-    public function __construct($table_name, $pk_column, $global = false)
-    {
-        $this->_global = $global;
-        $prefix        = $this->get_table_prefix();
-        // if they added the prefix, let's remove it because we delay adding the prefix until right when its needed.
-        if (strpos($table_name, $prefix) === 0) {
-            $table_name = substr_replace($table_name, '', 0, strlen($prefix));
-        }
-        $this->_table_name = $table_name;
-        $this->_pk_column  = $pk_column;
-    }
-
-
-    /**
-     * This returns the table prefix for the current model state.
-     *
-     * @return string
-     * @global wpdb $wpdb
-     */
-    public function get_table_prefix()
-    {
-        global $wpdb;
-        if ($this->_global) {
-            return $wpdb->base_prefix;
-        }
-        return $wpdb->get_blog_prefix(EEM_Base::get_model_query_blog_id());
-    }
-
-
-    /**
-     * Used to set the table_alias property
-     *
-     * @param string $table_alias
-     */
-    public function _construct_finalize_with_alias($table_alias)
-    {
-        $this->_table_alias = $table_alias;
-    }
-
-
-    /**
-     * Returns the fully qualified table name for the database (includes the table prefix current for the blog).
-     *
-     * @return string
-     */
-    public function get_table_name()
-    {
-        return $this->get_table_prefix() . $this->_table_name;
-    }
-
-
-    /**
-     * Provides what is currently set as the alias for the table to be used in queries.
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function get_table_alias()
-    {
-        if (! $this->_table_alias) {
-            throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
-        }
-        return $this->_table_alias;
-    }
-
-
-    /**
-     * @return string name of column of PK
-     */
-    public function get_pk_column()
-    {
-        return $this->_pk_column;
-    }
-
-
-    /**
-     * returns a string with the table alias, a period, and the private key's column.
-     *
-     * @return string
-     */
-    public function get_fully_qualified_pk_column()
-    {
-        return $this->get_table_alias() . "." . $this->get_pk_column();
-    }
-
-
-    /**
-     * returns the special sql for a inner select with a limit.
-     *
-     * @return string    SQL select
-     */
-    public function get_select_join_limit($limit)
-    {
-        $limit = is_array($limit) ? 'LIMIT ' . implode(',', array_map('intval', $limit)) : 'LIMIT ' . (int) $limit;
-        return SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
-    }
-
-
-    /**
-     * Returns whether or not htis is a global table (ie, on multisite there's
-     * only one of these tables, on the main blog)
-     *
-     * @return boolean
-     */
-    public function is_global()
-    {
-        return $this->_global;
-    }
+	/**
+	 * This holds the table_name without the table prefix.
+	 *
+	 * @var string
+	 */
+	public $_table_name;
+
+
+	/**
+	 * This holds what is used as the alias for the table in queries.
+	 *
+	 * @var string
+	 */
+	public $_table_alias;
+
+
+	/**
+	 * Table's private key column
+	 *
+	 * @var string
+	 */
+	protected $_pk_column;
+
+
+	/**
+	 * Whether this table is a global table (in multisite) or specific to site.
+	 *
+	 * @var bool
+	 */
+	protected $_global;
+
+
+	/**
+	 * @param string  $table_name with or without wpdb prefix
+	 * @param string  $pk_column
+	 * @param boolean $global     whether the table is "global" as in there is only 1 table on an entire multisite
+	 *                            install, or whether each site on a multisite install has a copy of this table
+	 * @global wpdb   $wpdb
+	 */
+	public function __construct($table_name, $pk_column, $global = false)
+	{
+		$this->_global = $global;
+		$prefix        = $this->get_table_prefix();
+		// if they added the prefix, let's remove it because we delay adding the prefix until right when its needed.
+		if (strpos($table_name, $prefix) === 0) {
+			$table_name = substr_replace($table_name, '', 0, strlen($prefix));
+		}
+		$this->_table_name = $table_name;
+		$this->_pk_column  = $pk_column;
+	}
+
+
+	/**
+	 * This returns the table prefix for the current model state.
+	 *
+	 * @return string
+	 * @global wpdb $wpdb
+	 */
+	public function get_table_prefix()
+	{
+		global $wpdb;
+		if ($this->_global) {
+			return $wpdb->base_prefix;
+		}
+		return $wpdb->get_blog_prefix(EEM_Base::get_model_query_blog_id());
+	}
+
+
+	/**
+	 * Used to set the table_alias property
+	 *
+	 * @param string $table_alias
+	 */
+	public function _construct_finalize_with_alias($table_alias)
+	{
+		$this->_table_alias = $table_alias;
+	}
+
+
+	/**
+	 * Returns the fully qualified table name for the database (includes the table prefix current for the blog).
+	 *
+	 * @return string
+	 */
+	public function get_table_name()
+	{
+		return $this->get_table_prefix() . $this->_table_name;
+	}
+
+
+	/**
+	 * Provides what is currently set as the alias for the table to be used in queries.
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function get_table_alias()
+	{
+		if (! $this->_table_alias) {
+			throw new EE_Error("You must call _construct_finalize_with_alias before using the EE_Table_Base. Did you forget to call parent::__construct at the end of your EEMerimental_Base child's __construct?");
+		}
+		return $this->_table_alias;
+	}
+
+
+	/**
+	 * @return string name of column of PK
+	 */
+	public function get_pk_column()
+	{
+		return $this->_pk_column;
+	}
+
+
+	/**
+	 * returns a string with the table alias, a period, and the private key's column.
+	 *
+	 * @return string
+	 */
+	public function get_fully_qualified_pk_column()
+	{
+		return $this->get_table_alias() . "." . $this->get_pk_column();
+	}
+
+
+	/**
+	 * returns the special sql for a inner select with a limit.
+	 *
+	 * @return string    SQL select
+	 */
+	public function get_select_join_limit($limit)
+	{
+		$limit = is_array($limit) ? 'LIMIT ' . implode(',', array_map('intval', $limit)) : 'LIMIT ' . (int) $limit;
+		return SP . '(SELECT * FROM ' . $this->_table_name . SP . $limit . ') AS ' . $this->_table_alias;
+	}
+
+
+	/**
+	 * Returns whether or not htis is a global table (ie, on multisite there's
+	 * only one of these tables, on the main blog)
+	 *
+	 * @return boolean
+	 */
+	public function is_global()
+	{
+		return $this->_global;
+	}
 }

core/db_models/fields/EE_JSON_Field.php

Indentation +64 added lines, -64 removed lines

@@ -5,76 +5,76 @@
 class EE_JSON_Field extends EE_Model_Field_Base
 {
 
-    /**
-     * @var JsonDataHandler
-     */
-    private $json_data_handler;
+	/**
+	 * @var JsonDataHandler
+	 */
+	private $json_data_handler;
 
 
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct(
-        $table_column,
-        $nicename,
-        $nullable,
-        $default_value = null
-    ) {
-        $this->json_data_handler = new JsonDataHandler();
-        $this->json_data_handler->configure(
-            JsonDataHandler::DATA_TYPE_OBJECT
-        );
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct(
+		$table_column,
+		$nicename,
+		$nullable,
+		$default_value = null
+	) {
+		$this->json_data_handler = new JsonDataHandler();
+		$this->json_data_handler->configure(
+			JsonDataHandler::DATA_TYPE_OBJECT
+		);
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+	}
 
 
-    // /**
-    //  * When get() is called on a model object (eg EE_Event), before returning its value,
-    //  * call this function on it, allowing us to customize the returned value based on
-    //  * the field's type. Eg, we may want to unserialize it, strip tags, etc. By default,
-    //  * we simply return it.
-    //  *
-    //  * @param mixed $value_of_field_on_model_object
-    //  * @return mixed
-    //  */
-    // public function prepare_for_get($value_of_field_on_model_object)
-    // {
-    //     // return $this->json_data_handler->decodeJson($value_of_field_on_model_object);
-    //     return $value_of_field_on_model_object;
-    // }
+	// /**
+	//  * When get() is called on a model object (eg EE_Event), before returning its value,
+	//  * call this function on it, allowing us to customize the returned value based on
+	//  * the field's type. Eg, we may want to unserialize it, strip tags, etc. By default,
+	//  * we simply return it.
+	//  *
+	//  * @param mixed $value_of_field_on_model_object
+	//  * @return mixed
+	//  */
+	// public function prepare_for_get($value_of_field_on_model_object)
+	// {
+	//     // return $this->json_data_handler->decodeJson($value_of_field_on_model_object);
+	//     return $value_of_field_on_model_object;
+	// }
 
 
-    /**
-     * When creating a brand-new model object, or setting a particular value for one of its fields, this function
-     * is called before setting it on the model object. We may want to strip slashes, unserialize the value, etc.
-     * By default, we do nothing.
-     *
-     * If the model field is going to perform any validation on the input, this is where it should be done
-     * (once the value is on the model object, it may be used in other ways besides putting it into the DB
-     * so it's best to validate it right away).
-     *
-     * @param mixed $value_inputted_for_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        return $this->json_data_handler->encodeData($value_inputted_for_field_on_model_object);
-    }
+	/**
+	 * When creating a brand-new model object, or setting a particular value for one of its fields, this function
+	 * is called before setting it on the model object. We may want to strip slashes, unserialize the value, etc.
+	 * By default, we do nothing.
+	 *
+	 * If the model field is going to perform any validation on the input, this is where it should be done
+	 * (once the value is on the model object, it may be used in other ways besides putting it into the DB
+	 * so it's best to validate it right away).
+	 *
+	 * @param mixed $value_inputted_for_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		return $this->json_data_handler->encodeData($value_inputted_for_field_on_model_object);
+	}
 
 
-    /**
-     * When inserting or updating a field on a model object, run this function on each
-     * value to prepare it for insertion into the db. Generally this converts
-     * the validated input on the model object into the format used in the DB.
-     *
-     * @param mixed $value_of_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
-    {
-        return $this->json_data_handler->encodeData($value_of_field_on_model_object);
-    }
+	/**
+	 * When inserting or updating a field on a model object, run this function on each
+	 * value to prepare it for insertion into the db. Generally this converts
+	 * the validated input on the model object into the format used in the DB.
+	 *
+	 * @param mixed $value_of_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
+	{
+		return $this->json_data_handler->encodeData($value_of_field_on_model_object);
+	}
 }

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

Spacing +7 added lines, -7 removed lines

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

Indentation +71 added lines, -71 removed lines

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

core/services/orm/tree_traversal/RelationNode.php

Spacing +8 added lines, -8 removed lines

@@ -98,17 +98,17 @@ 
                     ],
                 ]
             );
-            $new_item_nodes     = [];
+            $new_item_nodes = [];
 
             // Add entity nodes for each of the model objects we fetched.
             foreach ($related_model_objs as $related_model_obj) {
-                $entity_node                                = new ModelObjNode(
+                $entity_node = new ModelObjNode(
                     $related_model_obj->ID(),
                     $related_model_obj->get_model(),
                     $this->dont_traverse_models
                 );
-                $this->nodes[ $related_model_obj->ID() ]    = $entity_node;
-                $new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
+                $this->nodes[$related_model_obj->ID()]    = $entity_node;
+                $new_item_nodes[$related_model_obj->ID()] = $entity_node;
             }
             $num_identified += count($new_item_nodes);
             if ($num_identified < $model_objects_to_identify) {
@@ -135,7 +135,7 @@ 
     protected function allChildrenComplete()
     {
         foreach ($this->nodes as $model_obj_node) {
-            if (! $model_obj_node->isComplete()) {
+            if ( ! $model_obj_node->isComplete()) {
                 return false;
             }
         }
@@ -153,7 +153,7 @@ 
     protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
     {
         $work_done = 0;
-        if (! $model_obj_nodes) {
+        if ( ! $model_obj_nodes) {
             return 0;
         }
         foreach ($model_obj_nodes as $model_obj_node) {
@@ -229,7 +229,7 @@ 
             $relation_settings = null;
         }
         if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
-            $where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] =
+            $where_params[$this->related_model->get_field_containing_related_model_name()->get_name()] =
                 $this->main_model->get_this_model_name();
         }
         return $where_params;
@@ -249,7 +249,7 @@ 
             'objs'     => [],
         ];
         foreach ($this->nodes as $id => $model_obj_node) {
-            $tree['objs'][ $id ] = $model_obj_node->toArray();
+            $tree['objs'][$id] = $model_obj_node->toArray();
         }
         return $tree;
     }

Indentation +303 added lines, -303 removed lines

@@ -24,309 +24,309 @@
  */
 class RelationNode extends BaseNode
 {
-    /**
-     * @var int
-     */
-    protected $count;
-
-    /**
-     * @var string|int
-     */
-    protected $id;
-
-    /**
-     * @var EEM_Base
-     */
-    protected $main_model;
-
-    /**
-     * @var ModelObjNode[]
-     */
-    protected $nodes;
-
-    /**
-     * @var EEM_Base
-     */
-    protected $related_model;
-
-
-
-    /**
-     * RelationNode constructor.
-     *
-     * @param          $main_model_obj_id
-     * @param EEM_Base $main_model
-     * @param EEM_Base $related_model
-     * @param array    $dont_traverse_models array of model names we DON'T want to traverse
-     */
-    public function __construct(
-        $main_model_obj_id,
-        EEM_Base $main_model,
-        EEM_Base $related_model,
-        array $dont_traverse_models = []
-    ) {
-        $this->id                   = $main_model_obj_id;
-        $this->main_model           = $main_model;
-        $this->related_model        = $related_model;
-        $this->nodes                = [];
-        $this->dont_traverse_models = $dont_traverse_models;
-    }
-
-
-    /**
-     * Here is where most of the work happens. We've counted how many related model objects exist, here we identify
-     * them (ie, learn their IDs). But its recursive, so we'll also find their related dependent model objects etc.
-     *
-     * @param int $model_objects_to_identify
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function work($model_objects_to_identify)
-    {
-        $num_identified = $this->visitAlreadyDiscoveredNodes($this->nodes, $model_objects_to_identify);
-        if ($num_identified < $model_objects_to_identify) {
-            $related_model_objs = $this->related_model->get_all(
-                [
-                    $this->whereQueryParams(),
-                    'limit' => [
-                        count($this->nodes),
-                        $model_objects_to_identify - $num_identified,
-                    ],
-                ]
-            );
-            $new_item_nodes     = [];
-
-            // Add entity nodes for each of the model objects we fetched.
-            foreach ($related_model_objs as $related_model_obj) {
-                $entity_node                                = new ModelObjNode(
-                    $related_model_obj->ID(),
-                    $related_model_obj->get_model(),
-                    $this->dont_traverse_models
-                );
-                $this->nodes[ $related_model_obj->ID() ]    = $entity_node;
-                $new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
-            }
-            $num_identified += count($new_item_nodes);
-            if ($num_identified < $model_objects_to_identify) {
-                // And lastly do the work.
-                $num_identified += $this->visitAlreadyDiscoveredNodes(
-                    $new_item_nodes,
-                    $model_objects_to_identify - $num_identified
-                );
-            }
-        }
-
-        if (count($this->nodes) >= $this->count && $this->allChildrenComplete()) {
-            $this->complete = true;
-        }
-        return $num_identified;
-    }
-
-
-    /**
-     * Checks if all the identified child nodes are complete or not.
-     *
-     * @return bool
-     */
-    protected function allChildrenComplete()
-    {
-        foreach ($this->nodes as $model_obj_node) {
-            if (! $model_obj_node->isComplete()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-    /**
-     * Visits the provided nodes and keeps track of how much work was done, making sure to not go over budget.
-     *
-     * @param ModelObjNode[] $model_obj_nodes
-     * @param                $work_budget
-     * @return int
-     */
-    protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
-    {
-        $work_done = 0;
-        if (! $model_obj_nodes) {
-            return 0;
-        }
-        foreach ($model_obj_nodes as $model_obj_node) {
-            if ($work_done >= $work_budget) {
-                break;
-            }
-            $work_done += $model_obj_node->visit($work_budget - $work_done);
-        }
-        return $work_done;
-    }
-
-
-    /**
-     * Whether this item has already been initialized
-     */
-    protected function isDiscovered()
-    {
-        return $this->count !== null;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function isComplete()
-    {
-        if ($this->complete === null) {
-            if (count($this->nodes) === $this->count) {
-                $this->complete = true;
-            } else {
-                $this->complete = false;
-            }
-        }
-        return $this->complete;
-    }
-
-
-    /**
-     * Discovers how many related model objects exist.
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function discover()
-    {
-        $this->count = $this->related_model->count([$this->whereQueryParams()]);
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    protected function whereQueryParams()
-    {
-        $where_params = [
-            $this->related_model->get_foreign_key_to(
-                $this->main_model->get_this_model_name()
-            )->get_name() => $this->id,
-        ];
-        try {
-            $relation_settings = $this->main_model->related_settings_for($this->related_model->get_this_model_name());
-        } catch (EE_Error $e) {
-            // This will happen for has-and-belongs-to-many relations, when this node's related model is that join table
-            // which hasn't been explicitly declared in the main model object's model's relations.
-            $relation_settings = null;
-        }
-        if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
-            $where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] =
-                $this->main_model->get_this_model_name();
-        }
-        return $where_params;
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function toArray()
-    {
-        $tree = [
-            'count'    => $this->count,
-            'complete' => $this->isComplete(),
-            'objs'     => [],
-        ];
-        foreach ($this->nodes as $id => $model_obj_node) {
-            $tree['objs'][ $id ] = $model_obj_node->toArray();
-        }
-        return $tree;
-    }
-
-
-    /**
-     * Gets the IDs of all the model objects to delete; indexed first by model object name.
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function getIds()
-    {
-        if (empty($this->nodes)) {
-            return [];
-        }
-        $ids = [
-            $this->related_model->get_this_model_name() => array_combine(
-                array_keys($this->nodes),
-                array_keys($this->nodes)
-            ),
-        ];
-        foreach ($this->nodes as $model_obj_node) {
-            $ids = array_replace_recursive($ids, $model_obj_node->getIds());
-        }
-        return $ids;
-    }
-
-
-    /**
-     * Returns the number of sub-nodes found (ie, related model objects across this relation.)
-     *
-     * @return int
-     */
-    public function countSubNodes()
-    {
-        return count($this->nodes);
-    }
-
-
-    /**
-     * Don't serialize the models. Just record their names on some dynamic properties.
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->m  = $this->main_model->get_this_model_name();
-        $this->rm = $this->related_model->get_this_model_name();
-        return array_merge(
-            [
-                'm',
-                'rm',
-                'id',
-                'count',
-                'nodes',
-            ],
-            parent::__sleep()
-        );
-    }
-
-
-    /**
-     * Use the dynamic properties to instantiate the models we use.
-     *
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __wakeup()
-    {
-        $this->main_model    = EE_Registry::instance()->load_model($this->m);
-        $this->related_model = EE_Registry::instance()->load_model($this->rm);
-        parent::__wakeup();
-    }
+	/**
+	 * @var int
+	 */
+	protected $count;
+
+	/**
+	 * @var string|int
+	 */
+	protected $id;
+
+	/**
+	 * @var EEM_Base
+	 */
+	protected $main_model;
+
+	/**
+	 * @var ModelObjNode[]
+	 */
+	protected $nodes;
+
+	/**
+	 * @var EEM_Base
+	 */
+	protected $related_model;
+
+
+
+	/**
+	 * RelationNode constructor.
+	 *
+	 * @param          $main_model_obj_id
+	 * @param EEM_Base $main_model
+	 * @param EEM_Base $related_model
+	 * @param array    $dont_traverse_models array of model names we DON'T want to traverse
+	 */
+	public function __construct(
+		$main_model_obj_id,
+		EEM_Base $main_model,
+		EEM_Base $related_model,
+		array $dont_traverse_models = []
+	) {
+		$this->id                   = $main_model_obj_id;
+		$this->main_model           = $main_model;
+		$this->related_model        = $related_model;
+		$this->nodes                = [];
+		$this->dont_traverse_models = $dont_traverse_models;
+	}
+
+
+	/**
+	 * Here is where most of the work happens. We've counted how many related model objects exist, here we identify
+	 * them (ie, learn their IDs). But its recursive, so we'll also find their related dependent model objects etc.
+	 *
+	 * @param int $model_objects_to_identify
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function work($model_objects_to_identify)
+	{
+		$num_identified = $this->visitAlreadyDiscoveredNodes($this->nodes, $model_objects_to_identify);
+		if ($num_identified < $model_objects_to_identify) {
+			$related_model_objs = $this->related_model->get_all(
+				[
+					$this->whereQueryParams(),
+					'limit' => [
+						count($this->nodes),
+						$model_objects_to_identify - $num_identified,
+					],
+				]
+			);
+			$new_item_nodes     = [];
+
+			// Add entity nodes for each of the model objects we fetched.
+			foreach ($related_model_objs as $related_model_obj) {
+				$entity_node                                = new ModelObjNode(
+					$related_model_obj->ID(),
+					$related_model_obj->get_model(),
+					$this->dont_traverse_models
+				);
+				$this->nodes[ $related_model_obj->ID() ]    = $entity_node;
+				$new_item_nodes[ $related_model_obj->ID() ] = $entity_node;
+			}
+			$num_identified += count($new_item_nodes);
+			if ($num_identified < $model_objects_to_identify) {
+				// And lastly do the work.
+				$num_identified += $this->visitAlreadyDiscoveredNodes(
+					$new_item_nodes,
+					$model_objects_to_identify - $num_identified
+				);
+			}
+		}
+
+		if (count($this->nodes) >= $this->count && $this->allChildrenComplete()) {
+			$this->complete = true;
+		}
+		return $num_identified;
+	}
+
+
+	/**
+	 * Checks if all the identified child nodes are complete or not.
+	 *
+	 * @return bool
+	 */
+	protected function allChildrenComplete()
+	{
+		foreach ($this->nodes as $model_obj_node) {
+			if (! $model_obj_node->isComplete()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+
+	/**
+	 * Visits the provided nodes and keeps track of how much work was done, making sure to not go over budget.
+	 *
+	 * @param ModelObjNode[] $model_obj_nodes
+	 * @param                $work_budget
+	 * @return int
+	 */
+	protected function visitAlreadyDiscoveredNodes($model_obj_nodes, $work_budget)
+	{
+		$work_done = 0;
+		if (! $model_obj_nodes) {
+			return 0;
+		}
+		foreach ($model_obj_nodes as $model_obj_node) {
+			if ($work_done >= $work_budget) {
+				break;
+			}
+			$work_done += $model_obj_node->visit($work_budget - $work_done);
+		}
+		return $work_done;
+	}
+
+
+	/**
+	 * Whether this item has already been initialized
+	 */
+	protected function isDiscovered()
+	{
+		return $this->count !== null;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function isComplete()
+	{
+		if ($this->complete === null) {
+			if (count($this->nodes) === $this->count) {
+				$this->complete = true;
+			} else {
+				$this->complete = false;
+			}
+		}
+		return $this->complete;
+	}
+
+
+	/**
+	 * Discovers how many related model objects exist.
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function discover()
+	{
+		$this->count = $this->related_model->count([$this->whereQueryParams()]);
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	protected function whereQueryParams()
+	{
+		$where_params = [
+			$this->related_model->get_foreign_key_to(
+				$this->main_model->get_this_model_name()
+			)->get_name() => $this->id,
+		];
+		try {
+			$relation_settings = $this->main_model->related_settings_for($this->related_model->get_this_model_name());
+		} catch (EE_Error $e) {
+			// This will happen for has-and-belongs-to-many relations, when this node's related model is that join table
+			// which hasn't been explicitly declared in the main model object's model's relations.
+			$relation_settings = null;
+		}
+		if ($relation_settings instanceof EE_Has_Many_Any_Relation) {
+			$where_params[ $this->related_model->get_field_containing_related_model_name()->get_name() ] =
+				$this->main_model->get_this_model_name();
+		}
+		return $where_params;
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function toArray()
+	{
+		$tree = [
+			'count'    => $this->count,
+			'complete' => $this->isComplete(),
+			'objs'     => [],
+		];
+		foreach ($this->nodes as $id => $model_obj_node) {
+			$tree['objs'][ $id ] = $model_obj_node->toArray();
+		}
+		return $tree;
+	}
+
+
+	/**
+	 * Gets the IDs of all the model objects to delete; indexed first by model object name.
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function getIds()
+	{
+		if (empty($this->nodes)) {
+			return [];
+		}
+		$ids = [
+			$this->related_model->get_this_model_name() => array_combine(
+				array_keys($this->nodes),
+				array_keys($this->nodes)
+			),
+		];
+		foreach ($this->nodes as $model_obj_node) {
+			$ids = array_replace_recursive($ids, $model_obj_node->getIds());
+		}
+		return $ids;
+	}
+
+
+	/**
+	 * Returns the number of sub-nodes found (ie, related model objects across this relation.)
+	 *
+	 * @return int
+	 */
+	public function countSubNodes()
+	{
+		return count($this->nodes);
+	}
+
+
+	/**
+	 * Don't serialize the models. Just record their names on some dynamic properties.
+	 *
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->m  = $this->main_model->get_this_model_name();
+		$this->rm = $this->related_model->get_this_model_name();
+		return array_merge(
+			[
+				'm',
+				'rm',
+				'id',
+				'count',
+				'nodes',
+			],
+			parent::__sleep()
+		);
+	}
+
+
+	/**
+	 * Use the dynamic properties to instantiate the models we use.
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __wakeup()
+	{
+		$this->main_model    = EE_Registry::instance()->load_model($this->m);
+		$this->related_model = EE_Registry::instance()->load_model($this->rm);
+		parent::__wakeup();
+	}
 }
 // End of file RelationNode.php
 // Location: EventEspresso\core\services\orm\tree_traversal/RelationNode.php

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

Spacing +2 added lines, -2 removed lines

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

Indentation +76 added lines, -76 removed lines

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

core/services/progress_steps/ProgressStepManager.php

Spacing +9 added lines, -9 removed lines

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

Indentation +221 added lines, -221 removed lines

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

core/libraries/form_sections/form_handlers/SequentialStepFormManager.php

Spacing +12 added lines, -12 removed lines

@@ -140,7 +140,7 @@ 
      */
     protected function setBaseUrl($base_url)
     {
-        if (! is_string($base_url)) {
+        if ( ! is_string($base_url)) {
             throw new InvalidDataTypeException('$base_url', $base_url, 'string');
         }
         if (empty($base_url)) {
@@ -171,7 +171,7 @@ 
      */
     public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
     {
-        if (! is_string($form_step_url_key)) {
+        if ( ! is_string($form_step_url_key)) {
             throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
         }
         $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
@@ -193,7 +193,7 @@ 
      */
     protected function setDefaultFormStep($default_form_step)
     {
-        if (! is_string($default_form_step)) {
+        if ( ! is_string($default_form_step)) {
             throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
         }
         $this->default_form_step = $default_form_step;
@@ -208,7 +208,7 @@ 
     protected function setCurrentStepFromRequest()
     {
         $current_step_slug = $this->request()->getRequestParam($this->formStepUrlKey(), $this->defaultFormStep());
-        if (! $this->form_steps->setCurrent($current_step_slug)) {
+        if ( ! $this->form_steps->setCurrent($current_step_slug)) {
             throw new InvalidIdentifierException(
                 $current_step_slug,
                 $this->defaultFormStep(),
@@ -227,7 +227,7 @@ 
      */
     public function getCurrentStep()
     {
-        if (! $this->form_steps->current() instanceof SequentialStepForm) {
+        if ( ! $this->form_steps->current() instanceof SequentialStepForm) {
             throw new InvalidFormHandlerException($this->form_steps->current());
         }
         return $this->form_steps->current();
@@ -240,7 +240,7 @@ 
      */
     public function formAction()
     {
-        if (! is_string($this->form_action) || empty($this->form_action)) {
+        if ( ! is_string($this->form_action) || empty($this->form_action)) {
             $this->form_action = $this->baseUrl();
         }
         return $this->form_action;
@@ -253,7 +253,7 @@ 
      */
     public function setFormAction($form_action)
     {
-        if (! is_string($form_action)) {
+        if ( ! is_string($form_action)) {
             throw new InvalidDataTypeException('$form_action', $form_action, 'string');
         }
         $this->form_action = $form_action;
@@ -267,7 +267,7 @@ 
      */
     public function addFormActionArgs($form_action_args = array())
     {
-        if (! is_array($form_action_args)) {
+        if ( ! is_array($form_action_args)) {
             throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
         }
         $form_action_args = ! empty($form_action_args)
@@ -332,7 +332,7 @@ 
     protected function getProgressStepsCollection()
     {
         static $collection = null;
-        if (! $collection instanceof ProgressStepCollection) {
+        if ( ! $collection instanceof ProgressStepCollection) {
             $collection = new ProgressStepCollection();
         }
         return $collection;
@@ -354,7 +354,7 @@ 
         /** @var SequentialStepForm $form_step */
         foreach ($this->form_steps as $form_step) {
             // is this step active ?
-            if (! $form_step->initialize()) {
+            if ( ! $form_step->initialize()) {
                 continue;
             }
             $progress_steps_collection->add(
@@ -423,7 +423,7 @@ 
     {
         $form_step = $this->buildCurrentStepForm();
         // no displayable content ? then skip straight to processing
-        if (! $form_step->displayable()) {
+        if ( ! $form_step->displayable()) {
             $this->addFormActionArgs();
             $form_step->setFormAction($this->formAction());
             wp_safe_redirect($form_step->formAction());
@@ -499,7 +499,7 @@ 
     public function displayProgressSteps($return_as_string = true)
     {
         $form_step = $this->getCurrentStep();
-        if (! $form_step->displayable()) {
+        if ( ! $form_step->displayable()) {
             return '';
         }
         $progress_steps = apply_filters(

Indentation +579 added lines, -579 removed lines

@@ -30,583 +30,583 @@
  */
 abstract class SequentialStepFormManager
 {
-    /**
-     * a simplified URL with no form related parameters
-     * that will be used to build the form's redirect URLs
-     *
-     * @var string $base_url
-     */
-    private $base_url = '';
-
-    /**
-     * the key used for the URL param that denotes the current form step
-     * defaults to 'ee-form-step'
-     *
-     * @var string $form_step_url_key
-     */
-    private $form_step_url_key = '';
-
-    /**
-     * @var string $default_form_step
-     */
-    private $default_form_step = '';
-
-    /**
-     * @var string $form_action
-     */
-    private $form_action;
-
-    /**
-     * value of one of the string constant above
-     *
-     * @var string $form_config
-     */
-    private $form_config;
-
-    /**
-     * @var string $progress_step_style
-     */
-    private $progress_step_style = '';
-
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
-
-    /**
-     * @var Collection $form_steps
-     */
-    protected $form_steps;
-
-    /**
-     * @var ProgressStepManager $progress_step_manager
-     */
-    protected $progress_step_manager;
-
-
-    /**
-     * @return Collection|null
-     */
-    abstract protected function getFormStepsCollection();
-
-    // phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
-    /**
-     * StepsManager constructor
-     *
-     * @param string                           $base_url
-     * @param string                           $default_form_step
-     * @param string                           $form_action
-     * @param string                           $form_config
-     * @param EE_Request|RequestInterface|null $request
-     * @param string                           $progress_step_style
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        $base_url,
-        $default_form_step,
-        $form_action = '',
-        $form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
-        $progress_step_style = 'number_bubbles',
-        $request = null
-    ) {
-        $this->setBaseUrl($base_url);
-        $this->setDefaultFormStep($default_form_step);
-        $this->setFormAction($form_action);
-        $this->setFormConfig($form_config);
-        $this->setProgressStepStyle($progress_step_style);
-        $this->request = $request instanceof RequestInterface
-            ? $request
-            : LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function baseUrl()
-    {
-        if (strpos($this->base_url, $this->getCurrentStep()->slug()) === false) {
-            add_query_arg(
-                array($this->form_step_url_key => $this->getCurrentStep()->slug()),
-                $this->base_url
-            );
-        }
-        return $this->base_url;
-    }
-
-
-    /**
-     * @param string $base_url
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    protected function setBaseUrl($base_url)
-    {
-        if (! is_string($base_url)) {
-            throw new InvalidDataTypeException('$base_url', $base_url, 'string');
-        }
-        if (empty($base_url)) {
-            throw new InvalidArgumentException(
-                esc_html__('The base URL can not be an empty string.', 'event_espresso')
-            );
-        }
-        $this->base_url = $base_url;
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidDataTypeException
-     */
-    public function formStepUrlKey()
-    {
-        if (empty($this->form_step_url_key)) {
-            $this->setFormStepUrlKey();
-        }
-        return $this->form_step_url_key;
-    }
-
-
-    /**
-     * @param string $form_step_url_key
-     * @throws InvalidDataTypeException
-     */
-    public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
-    {
-        if (! is_string($form_step_url_key)) {
-            throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
-        }
-        $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function defaultFormStep()
-    {
-        return $this->default_form_step;
-    }
-
-
-    /**
-     * @param $default_form_step
-     * @throws InvalidDataTypeException
-     */
-    protected function setDefaultFormStep($default_form_step)
-    {
-        if (! is_string($default_form_step)) {
-            throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
-        }
-        $this->default_form_step = $default_form_step;
-    }
-
-
-    /**
-     * @return void
-     * @throws InvalidIdentifierException
-     * @throws InvalidDataTypeException
-     */
-    protected function setCurrentStepFromRequest()
-    {
-        $current_step_slug = $this->request()->getRequestParam($this->formStepUrlKey(), $this->defaultFormStep());
-        if (! $this->form_steps->setCurrent($current_step_slug)) {
-            throw new InvalidIdentifierException(
-                $current_step_slug,
-                $this->defaultFormStep(),
-                sprintf(
-                    esc_html__('The "%1$s" form step could not be set.', 'event_espresso'),
-                    $current_step_slug
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return SequentialStepFormInterface|object
-     * @throws InvalidFormHandlerException
-     */
-    public function getCurrentStep()
-    {
-        if (! $this->form_steps->current() instanceof SequentialStepForm) {
-            throw new InvalidFormHandlerException($this->form_steps->current());
-        }
-        return $this->form_steps->current();
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function formAction()
-    {
-        if (! is_string($this->form_action) || empty($this->form_action)) {
-            $this->form_action = $this->baseUrl();
-        }
-        return $this->form_action;
-    }
-
-
-    /**
-     * @param string $form_action
-     * @throws InvalidDataTypeException
-     */
-    public function setFormAction($form_action)
-    {
-        if (! is_string($form_action)) {
-            throw new InvalidDataTypeException('$form_action', $form_action, 'string');
-        }
-        $this->form_action = $form_action;
-    }
-
-
-    /**
-     * @param array $form_action_args
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function addFormActionArgs($form_action_args = array())
-    {
-        if (! is_array($form_action_args)) {
-            throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
-        }
-        $form_action_args = ! empty($form_action_args)
-            ? $form_action_args
-            : array($this->formStepUrlKey() => $this->form_steps->current()->slug());
-        $this->getCurrentStep()->setFormAction(
-            add_query_arg($form_action_args, $this->formAction())
-        );
-        $this->form_action = $this->getCurrentStep()->formAction();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function formConfig()
-    {
-        return $this->form_config;
-    }
-
-
-    /**
-     * @param string $form_config
-     */
-    public function setFormConfig($form_config)
-    {
-        $this->form_config = $form_config;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function progressStepStyle()
-    {
-        return $this->progress_step_style;
-    }
-
-
-    /**
-     * @param string $progress_step_style
-     */
-    public function setProgressStepStyle($progress_step_style)
-    {
-        $this->progress_step_style = $progress_step_style;
-    }
-
-
-    /**
-     * @return RequestInterface
-     */
-    public function request()
-    {
-        return $this->request;
-    }
-
-
-    /**
-     * @return Collection|null
-     * @throws InvalidInterfaceException
-     */
-    protected function getProgressStepsCollection()
-    {
-        static $collection = null;
-        if (! $collection instanceof ProgressStepCollection) {
-            $collection = new ProgressStepCollection();
-        }
-        return $collection;
-    }
-
-
-    /**
-     * @param Collection $progress_steps_collection
-     * @return ProgressStepManager
-     * @throws InvalidInterfaceException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     */
-    protected function generateProgressSteps($progress_steps_collection)
-    {
-        $current_step = $this->getCurrentStep();
-        /** @var SequentialStepForm $form_step */
-        foreach ($this->form_steps as $form_step) {
-            // is this step active ?
-            if (! $form_step->initialize()) {
-                continue;
-            }
-            $progress_steps_collection->add(
-                new ProgressStep(
-                    $form_step->order(),
-                    $form_step->slug(),
-                    $form_step->slug(),
-                    $form_step->formName()
-                ),
-                $form_step->slug()
-            );
-        }
-        // set collection pointer back to current step
-        $this->form_steps->setCurrentUsingObject($current_step);
-        return new ProgressStepManager(
-            $this->progressStepStyle(),
-            $this->defaultFormStep(),
-            $this->formStepUrlKey(),
-            $progress_steps_collection
-        );
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildForm()
-    {
-        $this->buildCurrentStepFormForDisplay();
-    }
-
-
-    /**
-     * @param array $form_data
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    public function processForm($form_data = array())
-    {
-        $this->buildCurrentStepFormForProcessing();
-        $this->processCurrentStepForm($form_data);
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildCurrentStepFormForDisplay()
-    {
-        $form_step = $this->buildCurrentStepForm();
-        // no displayable content ? then skip straight to processing
-        if (! $form_step->displayable()) {
-            $this->addFormActionArgs();
-            $form_step->setFormAction($this->formAction());
-            wp_safe_redirect($form_step->formAction());
-        }
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildCurrentStepFormForProcessing()
-    {
-        $this->buildCurrentStepForm(false);
-    }
-
-
-    /**
-     * @param bool $for_display
-     * @return SequentialStepFormInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    private function buildCurrentStepForm($for_display = true)
-    {
-        $this->form_steps = $this->getFormStepsCollection();
-        $this->setCurrentStepFromRequest();
-        $form_step = $this->getCurrentStep();
-        if ($form_step->submitBtnText() === esc_html__('Submit', 'event_espresso')) {
-            $form_step->setSubmitBtnText(esc_html__('Next Step', 'event_espresso'));
-        }
-        if ($for_display && $form_step->displayable()) {
-            $this->progress_step_manager = $this->generateProgressSteps(
-                $this->getProgressStepsCollection()
-            );
-            $this->progress_step_manager->setCurrentStep(
-                $form_step->slug()
-            );
-            // mark all previous progress steps as completed
-            $this->progress_step_manager->setPreviousStepsCompleted();
-            $this->progress_step_manager->enqueueStylesAndScripts();
-            $this->addFormActionArgs();
-            $form_step->setFormAction($this->formAction());
-        } else {
-            $form_step->setRedirectUrl($this->baseUrl());
-            $form_step->addRedirectArgs(
-                array($this->formStepUrlKey() => $this->form_steps->current()->slug())
-            );
-        }
-        $form_step->generate();
-        if ($for_display) {
-            $form_step->enqueueStylesAndScripts();
-        }
-        return $form_step;
-    }
-
-
-    /**
-     * @param bool $return_as_string
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function displayProgressSteps($return_as_string = true)
-    {
-        $form_step = $this->getCurrentStep();
-        if (! $form_step->displayable()) {
-            return '';
-        }
-        $progress_steps = apply_filters(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__before_steps',
-            ''
-        );
-        $progress_steps .= $this->progress_step_manager->displaySteps();
-        $progress_steps .= apply_filters(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__after_steps',
-            ''
-        );
-        if ($return_as_string) {
-            return $progress_steps;
-        }
-        echo wp_kses($progress_steps, AllowedTags::getWithFormTags());
-        return '';
-    }
-
-
-    /**
-     * @param bool $return_as_string
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function displayCurrentStepForm($return_as_string = true)
-    {
-        if ($return_as_string) {
-            return $this->getCurrentStep()->display();
-        }
-        echo wp_kses($this->getCurrentStep()->display(), AllowedTags::getWithFormTags());
-        return '';
-    }
-
-
-    /**
-     * @param array $form_data
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function processCurrentStepForm($form_data = array())
-    {
-        // grab instance of current step because after calling next() below,
-        // any calls to getCurrentStep() will return the "next" step because we advanced
-        $current_step = $this->getCurrentStep();
-        try {
-            // form processing should either throw exceptions or return true
-            $current_step->process($form_data);
-        } catch (Exception $e) {
-            // something went wrong, convert the Exception to an EE_Error
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            // prevent redirect to next step or other if exception was thrown
-            if (
-                $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_NEXT_STEP
-                || $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_OTHER
-            ) {
-                $current_step->setRedirectTo(SequentialStepForm::REDIRECT_TO_CURRENT_STEP);
-            }
-        }
-        // save notices to a transient so that when we redirect back
-        // to the display portion for this step
-        // those notices can be displayed
-        EE_Error::get_notices(false, true);
-        $this->redirectForm($current_step);
-    }
-
-
-    /**
-     * handles where to go to next
-     *
-     * @param SequentialStepFormInterface $current_step
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function redirectForm($current_step)
-    {
-        $redirect_step = $current_step;
-        switch ($current_step->redirectTo()) {
-            case SequentialStepForm::REDIRECT_TO_OTHER:
-                // going somewhere else, so just check out now
-                wp_safe_redirect($redirect_step->redirectUrl());
-                exit();
-            case SequentialStepForm::REDIRECT_TO_PREV_STEP:
-                $redirect_step = $this->form_steps->previous();
-                break;
-            case SequentialStepForm::REDIRECT_TO_NEXT_STEP:
-                $this->form_steps->next();
-                if ($this->form_steps->valid()) {
-                    $redirect_step = $this->form_steps->current();
-                }
-                break;
-            case SequentialStepForm::REDIRECT_TO_CURRENT_STEP:
-            default:
-                // $redirect_step is already set
-        }
-        $current_step->setRedirectUrl($this->baseUrl());
-        $current_step->addRedirectArgs(
-            // use the slug for whatever step we are redirecting too
-            array($this->formStepUrlKey() => $redirect_step->slug())
-        );
-        wp_safe_redirect($current_step->redirectUrl());
-        exit();
-    }
+	/**
+	 * a simplified URL with no form related parameters
+	 * that will be used to build the form's redirect URLs
+	 *
+	 * @var string $base_url
+	 */
+	private $base_url = '';
+
+	/**
+	 * the key used for the URL param that denotes the current form step
+	 * defaults to 'ee-form-step'
+	 *
+	 * @var string $form_step_url_key
+	 */
+	private $form_step_url_key = '';
+
+	/**
+	 * @var string $default_form_step
+	 */
+	private $default_form_step = '';
+
+	/**
+	 * @var string $form_action
+	 */
+	private $form_action;
+
+	/**
+	 * value of one of the string constant above
+	 *
+	 * @var string $form_config
+	 */
+	private $form_config;
+
+	/**
+	 * @var string $progress_step_style
+	 */
+	private $progress_step_style = '';
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
+
+	/**
+	 * @var Collection $form_steps
+	 */
+	protected $form_steps;
+
+	/**
+	 * @var ProgressStepManager $progress_step_manager
+	 */
+	protected $progress_step_manager;
+
+
+	/**
+	 * @return Collection|null
+	 */
+	abstract protected function getFormStepsCollection();
+
+	// phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
+	/**
+	 * StepsManager constructor
+	 *
+	 * @param string                           $base_url
+	 * @param string                           $default_form_step
+	 * @param string                           $form_action
+	 * @param string                           $form_config
+	 * @param EE_Request|RequestInterface|null $request
+	 * @param string                           $progress_step_style
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		$base_url,
+		$default_form_step,
+		$form_action = '',
+		$form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
+		$progress_step_style = 'number_bubbles',
+		$request = null
+	) {
+		$this->setBaseUrl($base_url);
+		$this->setDefaultFormStep($default_form_step);
+		$this->setFormAction($form_action);
+		$this->setFormConfig($form_config);
+		$this->setProgressStepStyle($progress_step_style);
+		$this->request = $request instanceof RequestInterface
+			? $request
+			: LoaderFactory::getLoader()->getShared('EventEspresso\core\services\request\RequestInterface');
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function baseUrl()
+	{
+		if (strpos($this->base_url, $this->getCurrentStep()->slug()) === false) {
+			add_query_arg(
+				array($this->form_step_url_key => $this->getCurrentStep()->slug()),
+				$this->base_url
+			);
+		}
+		return $this->base_url;
+	}
+
+
+	/**
+	 * @param string $base_url
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function setBaseUrl($base_url)
+	{
+		if (! is_string($base_url)) {
+			throw new InvalidDataTypeException('$base_url', $base_url, 'string');
+		}
+		if (empty($base_url)) {
+			throw new InvalidArgumentException(
+				esc_html__('The base URL can not be an empty string.', 'event_espresso')
+			);
+		}
+		$this->base_url = $base_url;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidDataTypeException
+	 */
+	public function formStepUrlKey()
+	{
+		if (empty($this->form_step_url_key)) {
+			$this->setFormStepUrlKey();
+		}
+		return $this->form_step_url_key;
+	}
+
+
+	/**
+	 * @param string $form_step_url_key
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
+	{
+		if (! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
+		}
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function defaultFormStep()
+	{
+		return $this->default_form_step;
+	}
+
+
+	/**
+	 * @param $default_form_step
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setDefaultFormStep($default_form_step)
+	{
+		if (! is_string($default_form_step)) {
+			throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
+		}
+		$this->default_form_step = $default_form_step;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setCurrentStepFromRequest()
+	{
+		$current_step_slug = $this->request()->getRequestParam($this->formStepUrlKey(), $this->defaultFormStep());
+		if (! $this->form_steps->setCurrent($current_step_slug)) {
+			throw new InvalidIdentifierException(
+				$current_step_slug,
+				$this->defaultFormStep(),
+				sprintf(
+					esc_html__('The "%1$s" form step could not be set.', 'event_espresso'),
+					$current_step_slug
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return SequentialStepFormInterface|object
+	 * @throws InvalidFormHandlerException
+	 */
+	public function getCurrentStep()
+	{
+		if (! $this->form_steps->current() instanceof SequentialStepForm) {
+			throw new InvalidFormHandlerException($this->form_steps->current());
+		}
+		return $this->form_steps->current();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function formAction()
+	{
+		if (! is_string($this->form_action) || empty($this->form_action)) {
+			$this->form_action = $this->baseUrl();
+		}
+		return $this->form_action;
+	}
+
+
+	/**
+	 * @param string $form_action
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormAction($form_action)
+	{
+		if (! is_string($form_action)) {
+			throw new InvalidDataTypeException('$form_action', $form_action, 'string');
+		}
+		$this->form_action = $form_action;
+	}
+
+
+	/**
+	 * @param array $form_action_args
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function addFormActionArgs($form_action_args = array())
+	{
+		if (! is_array($form_action_args)) {
+			throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
+		}
+		$form_action_args = ! empty($form_action_args)
+			? $form_action_args
+			: array($this->formStepUrlKey() => $this->form_steps->current()->slug());
+		$this->getCurrentStep()->setFormAction(
+			add_query_arg($form_action_args, $this->formAction())
+		);
+		$this->form_action = $this->getCurrentStep()->formAction();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function formConfig()
+	{
+		return $this->form_config;
+	}
+
+
+	/**
+	 * @param string $form_config
+	 */
+	public function setFormConfig($form_config)
+	{
+		$this->form_config = $form_config;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function progressStepStyle()
+	{
+		return $this->progress_step_style;
+	}
+
+
+	/**
+	 * @param string $progress_step_style
+	 */
+	public function setProgressStepStyle($progress_step_style)
+	{
+		$this->progress_step_style = $progress_step_style;
+	}
+
+
+	/**
+	 * @return RequestInterface
+	 */
+	public function request()
+	{
+		return $this->request;
+	}
+
+
+	/**
+	 * @return Collection|null
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getProgressStepsCollection()
+	{
+		static $collection = null;
+		if (! $collection instanceof ProgressStepCollection) {
+			$collection = new ProgressStepCollection();
+		}
+		return $collection;
+	}
+
+
+	/**
+	 * @param Collection $progress_steps_collection
+	 * @return ProgressStepManager
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 */
+	protected function generateProgressSteps($progress_steps_collection)
+	{
+		$current_step = $this->getCurrentStep();
+		/** @var SequentialStepForm $form_step */
+		foreach ($this->form_steps as $form_step) {
+			// is this step active ?
+			if (! $form_step->initialize()) {
+				continue;
+			}
+			$progress_steps_collection->add(
+				new ProgressStep(
+					$form_step->order(),
+					$form_step->slug(),
+					$form_step->slug(),
+					$form_step->formName()
+				),
+				$form_step->slug()
+			);
+		}
+		// set collection pointer back to current step
+		$this->form_steps->setCurrentUsingObject($current_step);
+		return new ProgressStepManager(
+			$this->progressStepStyle(),
+			$this->defaultFormStep(),
+			$this->formStepUrlKey(),
+			$progress_steps_collection
+		);
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildForm()
+	{
+		$this->buildCurrentStepFormForDisplay();
+	}
+
+
+	/**
+	 * @param array $form_data
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processForm($form_data = array())
+	{
+		$this->buildCurrentStepFormForProcessing();
+		$this->processCurrentStepForm($form_data);
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildCurrentStepFormForDisplay()
+	{
+		$form_step = $this->buildCurrentStepForm();
+		// no displayable content ? then skip straight to processing
+		if (! $form_step->displayable()) {
+			$this->addFormActionArgs();
+			$form_step->setFormAction($this->formAction());
+			wp_safe_redirect($form_step->formAction());
+		}
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildCurrentStepFormForProcessing()
+	{
+		$this->buildCurrentStepForm(false);
+	}
+
+
+	/**
+	 * @param bool $for_display
+	 * @return SequentialStepFormInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	private function buildCurrentStepForm($for_display = true)
+	{
+		$this->form_steps = $this->getFormStepsCollection();
+		$this->setCurrentStepFromRequest();
+		$form_step = $this->getCurrentStep();
+		if ($form_step->submitBtnText() === esc_html__('Submit', 'event_espresso')) {
+			$form_step->setSubmitBtnText(esc_html__('Next Step', 'event_espresso'));
+		}
+		if ($for_display && $form_step->displayable()) {
+			$this->progress_step_manager = $this->generateProgressSteps(
+				$this->getProgressStepsCollection()
+			);
+			$this->progress_step_manager->setCurrentStep(
+				$form_step->slug()
+			);
+			// mark all previous progress steps as completed
+			$this->progress_step_manager->setPreviousStepsCompleted();
+			$this->progress_step_manager->enqueueStylesAndScripts();
+			$this->addFormActionArgs();
+			$form_step->setFormAction($this->formAction());
+		} else {
+			$form_step->setRedirectUrl($this->baseUrl());
+			$form_step->addRedirectArgs(
+				array($this->formStepUrlKey() => $this->form_steps->current()->slug())
+			);
+		}
+		$form_step->generate();
+		if ($for_display) {
+			$form_step->enqueueStylesAndScripts();
+		}
+		return $form_step;
+	}
+
+
+	/**
+	 * @param bool $return_as_string
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function displayProgressSteps($return_as_string = true)
+	{
+		$form_step = $this->getCurrentStep();
+		if (! $form_step->displayable()) {
+			return '';
+		}
+		$progress_steps = apply_filters(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__before_steps',
+			''
+		);
+		$progress_steps .= $this->progress_step_manager->displaySteps();
+		$progress_steps .= apply_filters(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__after_steps',
+			''
+		);
+		if ($return_as_string) {
+			return $progress_steps;
+		}
+		echo wp_kses($progress_steps, AllowedTags::getWithFormTags());
+		return '';
+	}
+
+
+	/**
+	 * @param bool $return_as_string
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function displayCurrentStepForm($return_as_string = true)
+	{
+		if ($return_as_string) {
+			return $this->getCurrentStep()->display();
+		}
+		echo wp_kses($this->getCurrentStep()->display(), AllowedTags::getWithFormTags());
+		return '';
+	}
+
+
+	/**
+	 * @param array $form_data
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function processCurrentStepForm($form_data = array())
+	{
+		// grab instance of current step because after calling next() below,
+		// any calls to getCurrentStep() will return the "next" step because we advanced
+		$current_step = $this->getCurrentStep();
+		try {
+			// form processing should either throw exceptions or return true
+			$current_step->process($form_data);
+		} catch (Exception $e) {
+			// something went wrong, convert the Exception to an EE_Error
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			// prevent redirect to next step or other if exception was thrown
+			if (
+				$current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_NEXT_STEP
+				|| $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_OTHER
+			) {
+				$current_step->setRedirectTo(SequentialStepForm::REDIRECT_TO_CURRENT_STEP);
+			}
+		}
+		// save notices to a transient so that when we redirect back
+		// to the display portion for this step
+		// those notices can be displayed
+		EE_Error::get_notices(false, true);
+		$this->redirectForm($current_step);
+	}
+
+
+	/**
+	 * handles where to go to next
+	 *
+	 * @param SequentialStepFormInterface $current_step
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function redirectForm($current_step)
+	{
+		$redirect_step = $current_step;
+		switch ($current_step->redirectTo()) {
+			case SequentialStepForm::REDIRECT_TO_OTHER:
+				// going somewhere else, so just check out now
+				wp_safe_redirect($redirect_step->redirectUrl());
+				exit();
+			case SequentialStepForm::REDIRECT_TO_PREV_STEP:
+				$redirect_step = $this->form_steps->previous();
+				break;
+			case SequentialStepForm::REDIRECT_TO_NEXT_STEP:
+				$this->form_steps->next();
+				if ($this->form_steps->valid()) {
+					$redirect_step = $this->form_steps->current();
+				}
+				break;
+			case SequentialStepForm::REDIRECT_TO_CURRENT_STEP:
+			default:
+				// $redirect_step is already set
+		}
+		$current_step->setRedirectUrl($this->baseUrl());
+		$current_step->addRedirectArgs(
+			// use the slug for whatever step we are redirecting too
+			array($this->formStepUrlKey() => $redirect_step->slug())
+		);
+		wp_safe_redirect($current_step->redirectUrl());
+		exit();
+	}
 }