eventespresso / event-espresso-core

core/domain/services/licensing/LicenseDataPue.php

Indentation +32 added lines, -32 removed lines

@@ -14,48 +14,48 @@
  */
 class LicenseDataPue implements LicenseDataStrategy
 {
-    private string $license_key = '';
+	private string $license_key = '';
 
-    private string $status;
+	private string $status;
 
-    protected EE_Network_Core_Config $network_core_config;
+	protected EE_Network_Core_Config $network_core_config;
 
 
-    /**
-     * @param EE_Network_Core_Config $network_core_config
-     */
-    public function __construct(EE_Network_Core_Config $network_core_config)
-    {
-        $this->network_core_config = $network_core_config;
-    }
+	/**
+	 * @param EE_Network_Core_Config $network_core_config
+	 */
+	public function __construct(EE_Network_Core_Config $network_core_config)
+	{
+		$this->network_core_config = $network_core_config;
+	}
 
 
-    public function loadLicenseData(): void
-    {
-        if (empty($this->network_core_config->site_license_key)) {
-            $this->status = LicenseStatus::EXPIRED;
-            return;
-        }
-        $this->license_key = $this->network_core_config->site_license_key;
-        $verify_fail       = get_option('puvererr_' . basename(EE_PLUGIN_BASENAME), false);
-        $this->status      = $verify_fail ? LicenseStatus::EXPIRED : LicenseStatus::ACTIVE;
-    }
+	public function loadLicenseData(): void
+	{
+		if (empty($this->network_core_config->site_license_key)) {
+			$this->status = LicenseStatus::EXPIRED;
+			return;
+		}
+		$this->license_key = $this->network_core_config->site_license_key;
+		$verify_fail       = get_option('puvererr_' . basename(EE_PLUGIN_BASENAME), false);
+		$this->status      = $verify_fail ? LicenseStatus::EXPIRED : LicenseStatus::ACTIVE;
+	}
 
 
-    public function getLicenseKey(): string
-    {
-        return $this->license_key;
-    }
+	public function getLicenseKey(): string
+	{
+		return $this->license_key;
+	}
 
 
-    public function getLicenseStatus(): string
-    {
-        return $this->status;
-    }
+	public function getLicenseStatus(): string
+	{
+		return $this->status;
+	}
 
 
-    public function getLicenseExpiry(): string
-    {
-        return '';
-    }
+	public function getLicenseExpiry(): string
+	{
+		return '';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             return;
         }
         $this->license_key = $this->network_core_config->site_license_key;
-        $verify_fail       = get_option('puvererr_' . basename(EE_PLUGIN_BASENAME), false);
+        $verify_fail       = get_option('puvererr_'.basename(EE_PLUGIN_BASENAME), false);
         $this->status      = $verify_fail ? LicenseStatus::EXPIRED : LicenseStatus::ACTIVE;
     }
 

core/domain/services/licensing/LicenseKeysAdminForm.php

Indentation +184 added lines, -184 removed lines

@@ -19,188 +19,188 @@
 
 class LicenseKeysAdminForm extends FormHandler
 {
-    public function __construct(EE_Registry $registry)
-    {
-        parent::__construct(
-            LICENSE_KEYS_LABEL,
-            LICENSE_KEYS_LABEL,
-            LICENSE_KEYS_PG_SLUG,
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    public function generate(): EE_Form_Section_Proper
-    {
-        $subsections = (array) apply_filters('FHEE__LicenseKeysAdminForm__generate__form_subsections', []);
-        ksort($subsections);
-        return new EE_Form_Section_Proper(
-            [
-                'name'            => 'license_keys_admin_form',
-                'html_id'         => 'license_keys_admin_form',
-                'layout_strategy' => new EE_No_Layout(),
-                'subsections'     => $this->addCoreSupportLicenseKey($subsections),
-            ]
-        );
-    }
-
-
-    private function addCoreSupportLicenseKey(array $subsections): array
-    {
-        // we want to move the license key input for core to a different location,
-        // so to do that, we need to copy it, delete the old location, then add re-add to the form
-        $core_license_key = $subsections['event_espresso_core'] ?? null;
-        unset($subsections['event_espresso_core']);
-        $new_subsections = [
-            'license_keys_hdr'           => new EE_Form_Section_HTML(
-                EEH_HTML::h1(
-                    esc_html__('Event Espresso Core License & Support Keys', 'event_espresso'),
-                    '',
-                    'ee-admin-settings-hdr'
-                )
-            ),
-            'support_license_notice'     => new EE_Form_Section_HTML(
-                EEH_HTML::div(
-                    '<span class="dashicons dashicons-sos"></span>'
-                    . EEH_HTML::span(
-                        esc_html__(
-                            'Adding a valid Support License Key will enable automatic update notifications and backend updates.',
-                            'event_espresso'
-                        )
-                    ),
-                    'support-license-notice-dv',
-                    'ee-status-outline ee-status-outline--small ee-status-bg--info'
-                )
-            ),
-            'event_espresso_core'        => $core_license_key,
-            'dev_site_notice'            => new EE_Form_Section_HTML(
-                EEH_HTML::br()
-                . EEH_HTML::div(
-                    EEH_HTML::span(
-                        sprintf(
-                            esc_html__(
-                                'If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
-                                'event_espresso'
-                            ),
-                            '<strong>',
-                            '</strong>'
-                        )
-                    ),
-                    'dev-site-notice-dv',
-                    'ee-status--warning'
-                )
-            ),
-            'add-on-license-keys-hdr'    => new EE_Form_Section_HTML(
-                EEH_HTML::h2(
-                    esc_html__('Add-on License Keys', 'event_espresso'),
-                    '',
-                    'ee-admin-settings-hdr'
-                )
-            ),
-            'add-on-license-keys-notice' => new EE_Form_Section_HTML(
-                EEH_HTML::div(
-                    EEH_HTML::span(
-                        esc_html__(
-                            'Please activate an Event Espresso Core support license key first in order to activate your add-on license keys',
-                            'event_espresso'
-                        )
-                    ),
-                    'add-on-license-keys-notice-dv',
-                    'ee-status-outline ee-status-outline--micro ee-status-bg--attention',
-                    'display: none;'
-                )
-            ),
-        ];
-
-        if ($core_license_key instanceof LicenseKeyFormInput && $core_license_key->get_default()) {
-            unset($new_subsections['dev_site_notice']);
-            unset($new_subsections['support_license_notice']);
-            unset($new_subsections['add-on-license-keys-notice']);
-        }
-        return EEH_Array::insert_into_array($subsections, $new_subsections);
-    }
-
-
-    /**
-     * @param array $submitted_form_data
-     * @return stdClass
-     * @throws EE_Error
-     */
-    public function process($submitted_form_data = [])
-    {
-        $capabilities = LoaderFactory::getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('manage_options', __FUNCTION__)) {
-            throw new RuntimeException(
-                esc_html__('You do not have the required privileges to perform this action', 'event_espresso')
-            );
-        }
-
-        // NOTE! we're not using parent::process() here
-        // because the requests are coming in via ajax
-        // and the request parameters do not match the form schema
-        $license_action   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ACTION ] ?? '';
-        $license_key      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_LICENSE_KEY ] ?? '';
-        $item_id          = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_ID ] ?? 0;
-        $item_name        = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_NAME ] ?? '';
-        $plugin_slug      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_SLUG ] ?? '';
-        $plugin_version   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_VER ] ?? '';
-        $min_core_version = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_MIN_CORE_VER ] ?? '';
-
-        /** @var LicenseManager $licence_manager */
-        $licence_manager = LoaderFactory::getShared(LicenseManager::class);
-
-        $license_data = [];
-        switch ($license_action) {
-            case LicenseAPI::ACTION_ACTIVATE:
-                $license_data = $licence_manager->activateLicense(
-                    $license_key,
-                    $item_id,
-                    $item_name,
-                    $plugin_slug,
-                    $plugin_version,
-                    $min_core_version
-                );
-                break;
-
-            case LicenseAPI::ACTION_DEACTIVATE:
-                $license_data = $licence_manager->deactivateLicense(
-                    $license_key,
-                    $item_id,
-                    $item_name,
-                    $plugin_slug,
-                    $plugin_version,
-                    $min_core_version
-                );
-                break;
-
-            case LicenseAPI::ACTION_CHECK:
-                $license_data = $licence_manager->checkLicense(
-                    $license_key,
-                    $item_id,
-                    $item_name,
-                    $plugin_slug,
-                    $plugin_version,
-                    $min_core_version
-                );
-                break;
-
-            case LicenseAPI::ACTION_GET_VERSION:
-                $license_data = $licence_manager->getVersionInfo();
-                break;
-
-            case LicenseAPI::ACTION_RESET:
-                $license_data = $licence_manager->resetLicenseKey($plugin_slug);
-                break;
-        }
-
-        $license_data               = (object) $license_data;
-        $license_data->statusNotice = LicenseStatusDisplay::statusNotice($license_data->license);
-        $license_data->statusClass  = LicenseStatusDisplay::statusClass($license_data->license);
-        return $license_data;
-    }
+	public function __construct(EE_Registry $registry)
+	{
+		parent::__construct(
+			LICENSE_KEYS_LABEL,
+			LICENSE_KEYS_LABEL,
+			LICENSE_KEYS_PG_SLUG,
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	public function generate(): EE_Form_Section_Proper
+	{
+		$subsections = (array) apply_filters('FHEE__LicenseKeysAdminForm__generate__form_subsections', []);
+		ksort($subsections);
+		return new EE_Form_Section_Proper(
+			[
+				'name'            => 'license_keys_admin_form',
+				'html_id'         => 'license_keys_admin_form',
+				'layout_strategy' => new EE_No_Layout(),
+				'subsections'     => $this->addCoreSupportLicenseKey($subsections),
+			]
+		);
+	}
+
+
+	private function addCoreSupportLicenseKey(array $subsections): array
+	{
+		// we want to move the license key input for core to a different location,
+		// so to do that, we need to copy it, delete the old location, then add re-add to the form
+		$core_license_key = $subsections['event_espresso_core'] ?? null;
+		unset($subsections['event_espresso_core']);
+		$new_subsections = [
+			'license_keys_hdr'           => new EE_Form_Section_HTML(
+				EEH_HTML::h1(
+					esc_html__('Event Espresso Core License & Support Keys', 'event_espresso'),
+					'',
+					'ee-admin-settings-hdr'
+				)
+			),
+			'support_license_notice'     => new EE_Form_Section_HTML(
+				EEH_HTML::div(
+					'<span class="dashicons dashicons-sos"></span>'
+					. EEH_HTML::span(
+						esc_html__(
+							'Adding a valid Support License Key will enable automatic update notifications and backend updates.',
+							'event_espresso'
+						)
+					),
+					'support-license-notice-dv',
+					'ee-status-outline ee-status-outline--small ee-status-bg--info'
+				)
+			),
+			'event_espresso_core'        => $core_license_key,
+			'dev_site_notice'            => new EE_Form_Section_HTML(
+				EEH_HTML::br()
+				. EEH_HTML::div(
+					EEH_HTML::span(
+						sprintf(
+							esc_html__(
+								'If this is a Development or Test site, %sDO NOT%s enter your Support License Key.',
+								'event_espresso'
+							),
+							'<strong>',
+							'</strong>'
+						)
+					),
+					'dev-site-notice-dv',
+					'ee-status--warning'
+				)
+			),
+			'add-on-license-keys-hdr'    => new EE_Form_Section_HTML(
+				EEH_HTML::h2(
+					esc_html__('Add-on License Keys', 'event_espresso'),
+					'',
+					'ee-admin-settings-hdr'
+				)
+			),
+			'add-on-license-keys-notice' => new EE_Form_Section_HTML(
+				EEH_HTML::div(
+					EEH_HTML::span(
+						esc_html__(
+							'Please activate an Event Espresso Core support license key first in order to activate your add-on license keys',
+							'event_espresso'
+						)
+					),
+					'add-on-license-keys-notice-dv',
+					'ee-status-outline ee-status-outline--micro ee-status-bg--attention',
+					'display: none;'
+				)
+			),
+		];
+
+		if ($core_license_key instanceof LicenseKeyFormInput && $core_license_key->get_default()) {
+			unset($new_subsections['dev_site_notice']);
+			unset($new_subsections['support_license_notice']);
+			unset($new_subsections['add-on-license-keys-notice']);
+		}
+		return EEH_Array::insert_into_array($subsections, $new_subsections);
+	}
+
+
+	/**
+	 * @param array $submitted_form_data
+	 * @return stdClass
+	 * @throws EE_Error
+	 */
+	public function process($submitted_form_data = [])
+	{
+		$capabilities = LoaderFactory::getShared(EE_Capabilities::class);
+		if (! $capabilities->current_user_can('manage_options', __FUNCTION__)) {
+			throw new RuntimeException(
+				esc_html__('You do not have the required privileges to perform this action', 'event_espresso')
+			);
+		}
+
+		// NOTE! we're not using parent::process() here
+		// because the requests are coming in via ajax
+		// and the request parameters do not match the form schema
+		$license_action   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ACTION ] ?? '';
+		$license_key      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_LICENSE_KEY ] ?? '';
+		$item_id          = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_ID ] ?? 0;
+		$item_name        = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_NAME ] ?? '';
+		$plugin_slug      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_SLUG ] ?? '';
+		$plugin_version   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_VER ] ?? '';
+		$min_core_version = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_MIN_CORE_VER ] ?? '';
+
+		/** @var LicenseManager $licence_manager */
+		$licence_manager = LoaderFactory::getShared(LicenseManager::class);
+
+		$license_data = [];
+		switch ($license_action) {
+			case LicenseAPI::ACTION_ACTIVATE:
+				$license_data = $licence_manager->activateLicense(
+					$license_key,
+					$item_id,
+					$item_name,
+					$plugin_slug,
+					$plugin_version,
+					$min_core_version
+				);
+				break;
+
+			case LicenseAPI::ACTION_DEACTIVATE:
+				$license_data = $licence_manager->deactivateLicense(
+					$license_key,
+					$item_id,
+					$item_name,
+					$plugin_slug,
+					$plugin_version,
+					$min_core_version
+				);
+				break;
+
+			case LicenseAPI::ACTION_CHECK:
+				$license_data = $licence_manager->checkLicense(
+					$license_key,
+					$item_id,
+					$item_name,
+					$plugin_slug,
+					$plugin_version,
+					$min_core_version
+				);
+				break;
+
+			case LicenseAPI::ACTION_GET_VERSION:
+				$license_data = $licence_manager->getVersionInfo();
+				break;
+
+			case LicenseAPI::ACTION_RESET:
+				$license_data = $licence_manager->resetLicenseKey($plugin_slug);
+				break;
+		}
+
+		$license_data               = (object) $license_data;
+		$license_data->statusNotice = LicenseStatusDisplay::statusNotice($license_data->license);
+		$license_data->statusClass  = LicenseStatusDisplay::statusClass($license_data->license);
+		return $license_data;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -134,7 +134,7 @@ 
     public function process($submitted_form_data = [])
     {
         $capabilities = LoaderFactory::getShared(EE_Capabilities::class);
-        if (! $capabilities->current_user_can('manage_options', __FUNCTION__)) {
+        if ( ! $capabilities->current_user_can('manage_options', __FUNCTION__)) {
             throw new RuntimeException(
                 esc_html__('You do not have the required privileges to perform this action', 'event_espresso')
             );
@@ -143,13 +143,13 @@ 
         // NOTE! we're not using parent::process() here
         // because the requests are coming in via ajax
         // and the request parameters do not match the form schema
-        $license_action   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ACTION ] ?? '';
-        $license_key      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_LICENSE_KEY ] ?? '';
-        $item_id          = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_ID ] ?? 0;
-        $item_name        = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_ITEM_NAME ] ?? '';
-        $plugin_slug      = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_SLUG ] ?? '';
-        $plugin_version   = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_PLUGIN_VER ] ?? '';
-        $min_core_version = $submitted_form_data[ LicenseAPI::REQUEST_PARAM_MIN_CORE_VER ] ?? '';
+        $license_action   = $submitted_form_data[LicenseAPI::REQUEST_PARAM_ACTION] ?? '';
+        $license_key      = $submitted_form_data[LicenseAPI::REQUEST_PARAM_LICENSE_KEY] ?? '';
+        $item_id          = $submitted_form_data[LicenseAPI::REQUEST_PARAM_ITEM_ID] ?? 0;
+        $item_name        = $submitted_form_data[LicenseAPI::REQUEST_PARAM_ITEM_NAME] ?? '';
+        $plugin_slug      = $submitted_form_data[LicenseAPI::REQUEST_PARAM_PLUGIN_SLUG] ?? '';
+        $plugin_version   = $submitted_form_data[LicenseAPI::REQUEST_PARAM_PLUGIN_VER] ?? '';
+        $min_core_version = $submitted_form_data[LicenseAPI::REQUEST_PARAM_MIN_CORE_VER] ?? '';
 
         /** @var LicenseManager $licence_manager */
         $licence_manager = LoaderFactory::getShared(LicenseManager::class);

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

Indentation +111 added lines, -111 removed lines

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

core/domain/services/cron/CronUtilities.php

Indentation +72 added lines, -72 removed lines

@@ -7,80 +7,80 @@
 
 class CronUtilities
 {
-    public static function logScheduledEspressoCrons(): void
-    {
-        $ee_crons = [
-            'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
-            'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
-            'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
-        ];
-        $crons    = (array) get_option('cron');
-        foreach ($crons as $cron) {
-            /** @var array[] $cron */
-            foreach ($ee_crons as $ee_cron) {
-                if (isset($cron[ $ee_cron ]) && is_array($cron[ $ee_cron ])) {
-                    do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
-                    foreach ($cron[ $ee_cron ] as $ee_cron_details) {
-                        if (! empty($ee_cron_details['args'])) {
-                            do_action(
-                                'AHEE_log',
-                                __CLASS__,
-                                __FUNCTION__,
-                                print_r($ee_cron_details['args'], true),
-                                "$ee_cron args"
-                            );
-                        }
-                    }
-                }
-            }
-        }
-    }
+	public static function logScheduledEspressoCrons(): void
+	{
+		$ee_crons = [
+			'AHEE__EE_Cron_Tasks__update_transaction_with_payment',
+			'AHEE__EE_Cron_Tasks__finalize_abandoned_transactions',
+			'AHEE__EE_Cron_Tasks__clean_up_junk_transactions',
+		];
+		$crons    = (array) get_option('cron');
+		foreach ($crons as $cron) {
+			/** @var array[] $cron */
+			foreach ($ee_crons as $ee_cron) {
+				if (isset($cron[ $ee_cron ]) && is_array($cron[ $ee_cron ])) {
+					do_action('AHEE_log', __CLASS__, __FUNCTION__, $ee_cron, 'scheduled EE cron');
+					foreach ($cron[ $ee_cron ] as $ee_cron_details) {
+						if (! empty($ee_cron_details['args'])) {
+							do_action(
+								'AHEE_log',
+								__CLASS__,
+								__FUNCTION__,
+								print_r($ee_cron_details['args'], true),
+								"$ee_cron args"
+							);
+						}
+					}
+				}
+			}
+		}
+	}
 
 
-    /**
-     * reschedule_cron_for_transactions_if_maintenance_mode
-     * if Maintenance Mode is active, this will reschedule a cron to run again in 10 minutes
-     *
-     * @param callable $cron_job
-     * @param array    $TXN_IDs
-     * @return bool
-     */
-    public static function rescheduleCronForTransactions(callable $cron_job, array $TXN_IDs): bool
-    {
-        // if database is accessible then return false so cron can run now
-        if (DbStatus::isOnline()) {
-            return false;
-        }
-        // reschedule the cron because we can't hit the db right now
-        foreach ($TXN_IDs as $TXN_ID => $additional_vars) {
-            // reset cron job for the TXN
-            call_user_func_array(
-                $cron_job,
-                array_merge(
-                    [
-                        time() + (10 * MINUTE_IN_SECONDS),
-                        $TXN_ID,
-                    ],
-                    (array) $additional_vars
-                )
-            );
-        }
-        return true;
-    }
+	/**
+	 * reschedule_cron_for_transactions_if_maintenance_mode
+	 * if Maintenance Mode is active, this will reschedule a cron to run again in 10 minutes
+	 *
+	 * @param callable $cron_job
+	 * @param array    $TXN_IDs
+	 * @return bool
+	 */
+	public static function rescheduleCronForTransactions(callable $cron_job, array $TXN_IDs): bool
+	{
+		// if database is accessible then return false so cron can run now
+		if (DbStatus::isOnline()) {
+			return false;
+		}
+		// reschedule the cron because we can't hit the db right now
+		foreach ($TXN_IDs as $TXN_ID => $additional_vars) {
+			// reset cron job for the TXN
+			call_user_func_array(
+				$cron_job,
+				array_merge(
+					[
+						time() + (10 * MINUTE_IN_SECONDS),
+						$TXN_ID,
+					],
+					(array) $additional_vars
+				)
+			);
+		}
+		return true;
+	}
 
 
-    public static function updateMessagesOnSameRequest()
-    {
-        // verify that WP Cron is not enabled
-        if (
-            defined('DISABLE_WP_CRON')
-            && DISABLE_WP_CRON
-            && is_admin()
-            && did_action('AHEE__EE_System__load_core_configuration__begin')
-            && EE_Network_Config::instance()->core->do_messages_on_same_request !== true
-        ) {
-            EE_Network_Config::instance()->core->do_messages_on_same_request = true;
-            EE_Network_Config::instance()->update_config(true, false);
-        }
-    }
+	public static function updateMessagesOnSameRequest()
+	{
+		// verify that WP Cron is not enabled
+		if (
+			defined('DISABLE_WP_CRON')
+			&& DISABLE_WP_CRON
+			&& is_admin()
+			&& did_action('AHEE__EE_System__load_core_configuration__begin')
+			&& EE_Network_Config::instance()->core->do_messages_on_same_request !== true
+		) {
+			EE_Network_Config::instance()->core->do_messages_on_same_request = true;
+			EE_Network_Config::instance()->update_config(true, false);
+		}
+	}
 }

core/domain/services/cron/jobs/UpdateTransactionsWithPayment.php

Indentation +119 added lines, -119 removed lines

@@ -21,131 +21,131 @@
 {
 
 
-    /**
-     * array of TXN IDs and the payment
-     *
-     * @var array
-     */
-    protected array $update_transactions_with_payment = [];
+	/**
+	 * array of TXN IDs and the payment
+	 *
+	 * @var array
+	 */
+	protected array $update_transactions_with_payment = [];
 
 
-    public function setHooks(): void
-    {
-        add_action(
-            'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-            [$this, 'setupUpdateForTransactionWithPayment'],
-            10,
-            2
-        );
-    }
+	public function setHooks(): void
+	{
+		add_action(
+			'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
+			[$this, 'setupUpdateForTransactionWithPayment'],
+			10,
+			2
+		);
+	}
 
 
-    /**
-     * schedule_update_transaction_with_payment
-     * sets a wp_schedule_single_event() for updating any TXNs that may
-     * require updating due to recently received payments
-     *
-     * @param int $timestamp
-     * @param int $TXN_ID
-     * @param int $PAY_ID
-     */
-    public static function scheduleUpdateTransactionWithPayment(
-        int $timestamp,
-        int $TXN_ID,
-        int $PAY_ID
-    ): void {
-        // validate $TXN_ID and $timestamp
-        $TXN_ID    = absint($TXN_ID);
-        $timestamp = absint($timestamp);
-        if ($TXN_ID && $timestamp) {
-            wp_schedule_single_event(
-                $timestamp,
-                'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
-                [$TXN_ID, $PAY_ID]
-            );
-        }
-    }
+	/**
+	 * schedule_update_transaction_with_payment
+	 * sets a wp_schedule_single_event() for updating any TXNs that may
+	 * require updating due to recently received payments
+	 *
+	 * @param int $timestamp
+	 * @param int $TXN_ID
+	 * @param int $PAY_ID
+	 */
+	public static function scheduleUpdateTransactionWithPayment(
+		int $timestamp,
+		int $TXN_ID,
+		int $PAY_ID
+	): void {
+		// validate $TXN_ID and $timestamp
+		$TXN_ID    = absint($TXN_ID);
+		$timestamp = absint($timestamp);
+		if ($TXN_ID && $timestamp) {
+			wp_schedule_single_event(
+				$timestamp,
+				'AHEE__EE_Cron_Tasks__update_transaction_with_payment_2',
+				[$TXN_ID, $PAY_ID]
+			);
+		}
+	}
 
 
-    /**
-     * setup_update_for_transaction_with_payment
-     * this is the callback for the action hook:
-     * 'AHEE__EE_Cron_Tasks__update_transaction_with_payment'
-     * which is set up by EE_Cron_Tasks::schedule_update_transaction_with_payment().
-     * The passed TXN_ID and associated payment gets added to an array, and then
-     * the EE_Cron_Tasks::update_transaction_with_payment() function is hooked into
-     * 'shutdown' which will actually handle the processing of any
-     * transactions requiring updating, because doing so now would be too early
-     * and the required resources may not be available
-     *
-     * @param int $TXN_ID
-     * @param int $PAY_ID
-     */
-    public function setupUpdateForTransactionWithPayment(int $TXN_ID = 0, int $PAY_ID = 0): void
-    {
-        if (absint($TXN_ID)) {
-            $this->update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
-            add_action(
-                'shutdown',
-                [$this, 'updateTransactionWithPayment'],
-                5
-            );
-        }
-    }
+	/**
+	 * setup_update_for_transaction_with_payment
+	 * this is the callback for the action hook:
+	 * 'AHEE__EE_Cron_Tasks__update_transaction_with_payment'
+	 * which is set up by EE_Cron_Tasks::schedule_update_transaction_with_payment().
+	 * The passed TXN_ID and associated payment gets added to an array, and then
+	 * the EE_Cron_Tasks::update_transaction_with_payment() function is hooked into
+	 * 'shutdown' which will actually handle the processing of any
+	 * transactions requiring updating, because doing so now would be too early
+	 * and the required resources may not be available
+	 *
+	 * @param int $TXN_ID
+	 * @param int $PAY_ID
+	 */
+	public function setupUpdateForTransactionWithPayment(int $TXN_ID = 0, int $PAY_ID = 0): void
+	{
+		if (absint($TXN_ID)) {
+			$this->update_transactions_with_payment[ $TXN_ID ] = $PAY_ID;
+			add_action(
+				'shutdown',
+				[$this, 'updateTransactionWithPayment'],
+				5
+			);
+		}
+	}
 
 
-    /**
-     * update_transaction_with_payment
-     * loops through the self::$_abandoned_transactions array
-     * and attempts to finalize any TXNs that have not been completed
-     * but have had their sessions expired, most likely due to a user not
-     * returning from an off-site payment gateway
-     *
-     * @throws EE_Error
-     * @throws DomainException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     */
-    public function updateTransactionWithPayment(): void
-    {
-        if (
-            // are there any TXNs that need cleaning up ?
-            empty($this->update_transactions_with_payment)
-            // reschedule the cron if we can't hit the db right now
-            || CronUtilities::rescheduleCronForTransactions(
-                [UpdateTransactionsWithPayment::class, 'scheduleUpdateTransactionWithPayment'],
-                $this->update_transactions_with_payment
-            )
-        ) {
-            return;
-        }
-        /** @var EE_Transaction_Processor $transaction_processor */
-        $transaction_processor = LoaderFactory::getShared(EE_Transaction_Processor::class);
-        if ($transaction_processor instanceof EE_Transaction_Processor) {
-            // set revisit flag for payment processor
-            $transaction_processor->set_revisit();
-        }
-        foreach ($this->update_transactions_with_payment as $TXN_ID => $PAY_ID) {
-            // reschedule the cron if we can't hit the db right now
-            if (DbStatus::isOffline()) {
-                // reset cron job for updating the TXN
-                UpdateTransactionsWithPayment::scheduleUpdateTransactionWithPayment(
-                    time() + CronJob::RESCHEDULE_TIMEOUT,
-                    $TXN_ID,
-                    $PAY_ID
-                );
-                continue;
-            }
-            $transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
-            $payment     = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
-            // verify transaction
-            if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
-                // now try to update the TXN with any payments
-                /** @var PaymentProcessor $payment_processor */
-                $payment_processor = LoaderFactory::getShared(PaymentProcessor::class);
-                $payment_processor->updateTransactionBasedOnPayment($transaction, $payment, true, true);
-            }
-            unset($this->update_transactions_with_payment[ $TXN_ID ]);
-        }
-    }
+	/**
+	 * update_transaction_with_payment
+	 * loops through the self::$_abandoned_transactions array
+	 * and attempts to finalize any TXNs that have not been completed
+	 * but have had their sessions expired, most likely due to a user not
+	 * returning from an off-site payment gateway
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 */
+	public function updateTransactionWithPayment(): void
+	{
+		if (
+			// are there any TXNs that need cleaning up ?
+			empty($this->update_transactions_with_payment)
+			// reschedule the cron if we can't hit the db right now
+			|| CronUtilities::rescheduleCronForTransactions(
+				[UpdateTransactionsWithPayment::class, 'scheduleUpdateTransactionWithPayment'],
+				$this->update_transactions_with_payment
+			)
+		) {
+			return;
+		}
+		/** @var EE_Transaction_Processor $transaction_processor */
+		$transaction_processor = LoaderFactory::getShared(EE_Transaction_Processor::class);
+		if ($transaction_processor instanceof EE_Transaction_Processor) {
+			// set revisit flag for payment processor
+			$transaction_processor->set_revisit();
+		}
+		foreach ($this->update_transactions_with_payment as $TXN_ID => $PAY_ID) {
+			// reschedule the cron if we can't hit the db right now
+			if (DbStatus::isOffline()) {
+				// reset cron job for updating the TXN
+				UpdateTransactionsWithPayment::scheduleUpdateTransactionWithPayment(
+					time() + CronJob::RESCHEDULE_TIMEOUT,
+					$TXN_ID,
+					$PAY_ID
+				);
+				continue;
+			}
+			$transaction = EEM_Transaction::instance()->get_one_by_ID($TXN_ID);
+			$payment     = EEM_Payment::instance()->get_one_by_ID($PAY_ID);
+			// verify transaction
+			if ($transaction instanceof EE_Transaction && $payment instanceof EE_Payment) {
+				// now try to update the TXN with any payments
+				/** @var PaymentProcessor $payment_processor */
+				$payment_processor = LoaderFactory::getShared(PaymentProcessor::class);
+				$payment_processor->updateTransactionBasedOnPayment($transaction, $payment, true, true);
+			}
+			unset($this->update_transactions_with_payment[ $TXN_ID ]);
+		}
+	}
 }

core/domain/services/cron/jobs/UpdatePluginLicenseData.php

Indentation +38 added lines, -38 removed lines

@@ -20,48 +20,48 @@
  */
 class UpdatePluginLicenseData extends CronJob
 {
-    public const HOOK = 'AHEE_EventEspresso_core_domain_services_cron_jobs_UpdatePluginLicenseData';
+	public const HOOK = 'AHEE_EventEspresso_core_domain_services_cron_jobs_UpdatePluginLicenseData';
 
 
-    public function setHooks(): void
-    {
-        add_action(UpdatePluginLicenseData::HOOK, [$this, 'checkCoreLicenseOnShutdown']);
-        if (! wp_next_scheduled(UpdatePluginLicenseData::HOOK) && ! wp_installing()) {
-            $one_am = strtotime('1:00') + (int) ((float) get_option('gmt_offset', 0) * HOUR_IN_SECONDS);
-            wp_schedule_event($one_am, 'daily', UpdatePluginLicenseData::HOOK);
-        }
-    }
+	public function setHooks(): void
+	{
+		add_action(UpdatePluginLicenseData::HOOK, [$this, 'checkCoreLicenseOnShutdown']);
+		if (! wp_next_scheduled(UpdatePluginLicenseData::HOOK) && ! wp_installing()) {
+			$one_am = strtotime('1:00') + (int) ((float) get_option('gmt_offset', 0) * HOUR_IN_SECONDS);
+			wp_schedule_event($one_am, 'daily', UpdatePluginLicenseData::HOOK);
+		}
+	}
 
 
-    public function checkCoreLicenseOnShutdown(): void
-    {
-        // run license check on shutdown so it doesn't interfere with the rest of the request
-        add_action('shutdown', [$this, 'checkCoreLicense']);
-    }
+	public function checkCoreLicenseOnShutdown(): void
+	{
+		// run license check on shutdown so it doesn't interfere with the rest of the request
+		add_action('shutdown', [$this, 'checkCoreLicense']);
+	}
 
 
-    public function checkCoreLicense(): void
-    {
-        EE_Dependency_Map::instance()->registerDependencies(
-            LicenseManager::class,
-            [
-                LicenseAPI::class              => EE_Dependency_Map::load_from_cache,
-                LicenseKeyData::class          => EE_Dependency_Map::load_from_cache,
-                PluginLicenseCollection::class => EE_Dependency_Map::load_from_cache,
-            ]
-        );
-        /** @var PluginLicense $core_license */
-        $core_license = $this->loader->getShared(PluginLicense::class);
-        /** @var LicenseManager $licence_manager */
-        $licence_manager = $this->loader->getShared(LicenseManager::class);
-        $licence_manager->checkLicense(
-            $core_license->licenseKey(),
-            $core_license->itemID(),
-            $core_license->itemName(),
-            $core_license->pluginSlug(),
-            $core_license->version(),
-            $core_license->minCoreVersion(),
-            $core_license->status()
-        );
-    }
+	public function checkCoreLicense(): void
+	{
+		EE_Dependency_Map::instance()->registerDependencies(
+			LicenseManager::class,
+			[
+				LicenseAPI::class              => EE_Dependency_Map::load_from_cache,
+				LicenseKeyData::class          => EE_Dependency_Map::load_from_cache,
+				PluginLicenseCollection::class => EE_Dependency_Map::load_from_cache,
+			]
+		);
+		/** @var PluginLicense $core_license */
+		$core_license = $this->loader->getShared(PluginLicense::class);
+		/** @var LicenseManager $licence_manager */
+		$licence_manager = $this->loader->getShared(LicenseManager::class);
+		$licence_manager->checkLicense(
+			$core_license->licenseKey(),
+			$core_license->itemID(),
+			$core_license->itemName(),
+			$core_license->pluginSlug(),
+			$core_license->version(),
+			$core_license->minCoreVersion(),
+			$core_license->status()
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function setHooks(): void
     {
         add_action(UpdatePluginLicenseData::HOOK, [$this, 'checkCoreLicenseOnShutdown']);
-        if (! wp_next_scheduled(UpdatePluginLicenseData::HOOK) && ! wp_installing()) {
+        if ( ! wp_next_scheduled(UpdatePluginLicenseData::HOOK) && ! wp_installing()) {
             $one_am = strtotime('1:00') + (int) ((float) get_option('gmt_offset', 0) * HOUR_IN_SECONDS);
             wp_schedule_event($one_am, 'daily', UpdatePluginLicenseData::HOOK);
         }

core/domain/services/cron/CronManager.php

Indentation +46 added lines, -46 removed lines

@@ -13,59 +13,59 @@
 
 class CronManager
 {
-    protected LoaderInterface $loader;
+	protected LoaderInterface $loader;
 
-    private static array $cron_jobs = [
-        // ExpiredTransactionCheck::class,
-        // GarbageCollection::class,
-        UpdatePluginLicenseData::class,
-        // UpdateTransactionsWithPayment::class,
-    ];
+	private static array $cron_jobs = [
+		// ExpiredTransactionCheck::class,
+		// GarbageCollection::class,
+		UpdatePluginLicenseData::class,
+		// UpdateTransactionsWithPayment::class,
+	];
 
 
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
 
-    }
+	}
 
-    public function initialize(): void
-    {
-        $this->registerDependencies();
-        $this->loadCronJobs();
-        add_action(
-            'AHEE__EE_System__load_core_configuration__complete',
-            [CronUtilities::class, 'updateMessagesOnSameRequest']
-        );
-    }
+	public function initialize(): void
+	{
+		$this->registerDependencies();
+		$this->loadCronJobs();
+		add_action(
+			'AHEE__EE_System__load_core_configuration__complete',
+			[CronUtilities::class, 'updateMessagesOnSameRequest']
+		);
+	}
 
 
-    public function registerDependencies()
-    {
-        foreach (CronManager::$cron_jobs as $cron_class) {
-            EE_Dependency_Map::register_dependencies(
-                $cron_class,
-                [LoaderInterface::class => EE_Dependency_Map::load_from_cache]
-            );
-        }
-    }
+	public function registerDependencies()
+	{
+		foreach (CronManager::$cron_jobs as $cron_class) {
+			EE_Dependency_Map::register_dependencies(
+				$cron_class,
+				[LoaderInterface::class => EE_Dependency_Map::load_from_cache]
+			);
+		}
+	}
 
 
-    public function loadCronJobs()
-    {
-        foreach (CronManager::$cron_jobs as $cron_class) {
-            $cron_job = $this->loader->getShared($cron_class);
-            if (! $cron_job instanceof CronJob) {
-                throw new RuntimeException(
-                    sprintf(
-                        esc_html__('Class %s must be an instance of %s', 'event_espresso'),
-                        $cron_class,
-                        CronJob::class
-                    )
-                );
-            }
-            $cron_job->setHooks();
-        }
-        // will also need to load EE_Messages_Scheduler::class separately, because it's "special"
-    }
+	public function loadCronJobs()
+	{
+		foreach (CronManager::$cron_jobs as $cron_class) {
+			$cron_job = $this->loader->getShared($cron_class);
+			if (! $cron_job instanceof CronJob) {
+				throw new RuntimeException(
+					sprintf(
+						esc_html__('Class %s must be an instance of %s', 'event_espresso'),
+						$cron_class,
+						CronJob::class
+					)
+				);
+			}
+			$cron_job->setHooks();
+		}
+		// will also need to load EE_Messages_Scheduler::class separately, because it's "special"
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         foreach (CronManager::$cron_jobs as $cron_class) {
             $cron_job = $this->loader->getShared($cron_class);
-            if (! $cron_job instanceof CronJob) {
+            if ( ! $cron_job instanceof CronJob) {
                 throw new RuntimeException(
                     sprintf(
                         esc_html__('Class %s must be an instance of %s', 'event_espresso'),

core/domain/services/cron/CronJob.php

Indentation +14 added lines, -14 removed lines

@@ -6,24 +6,24 @@
 
 abstract class CronJob
 {
-    /**
-     * WordPress doesn't allow duplicate crons within 10 minutes of the original,
-     * so we'll set our retry time for just over 10 minutes to avoid that
-     */
-    public const RESCHEDULE_TIMEOUT = 605;
+	/**
+	 * WordPress doesn't allow duplicate crons within 10 minutes of the original,
+	 * so we'll set our retry time for just over 10 minutes to avoid that
+	 */
+	public const RESCHEDULE_TIMEOUT = 605;
 
 
-    protected LoaderInterface $loader;
+	protected LoaderInterface $loader;
 
 
-    /**
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    abstract public function setHooks(): void;
+	abstract public function setHooks(): void;
 }

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

Indentation +258 added lines, -258 removed lines

@@ -17,290 +17,290 @@
 
 class RegFormHandler
 {
-    public EE_Checkout $checkout;
+	public EE_Checkout $checkout;
 
-    public RegFormInputHandler $input_handler;
+	public RegFormInputHandler $input_handler;
 
-    private RegFormAttendeeFactory $attendee_factory;
+	private RegFormAttendeeFactory $attendee_factory;
 
-    private RegistrantData $registrant_data;
+	private RegistrantData $registrant_data;
 
-    private EE_Registration_Processor $registration_processor;
+	private EE_Registration_Processor $registration_processor;
 
-    /**
-     * reg form sections that do not contain inputs
-     *
-     * @var string[]
-     */
-    private array $non_input_form_sections = [
-        'primary_registrant',
-        'additional_attendee_reg_info',
-        'spco_copy_attendee_chk',
-    ];
+	/**
+	 * reg form sections that do not contain inputs
+	 *
+	 * @var string[]
+	 */
+	private array $non_input_form_sections = [
+		'primary_registrant',
+		'additional_attendee_reg_info',
+		'spco_copy_attendee_chk',
+	];
 
-    private bool $valid;
+	private bool $valid;
 
 
-    /**
-     * RegFormHandler constructor.
-     */
-    public function __construct(
-        EE_Checkout $checkout,
-        RegistrantData $registrant_data,
-        RegFormAttendeeFactory $attendee_factory,
-        EE_Registration_Processor $registration_processor
-    ) {
-        $this->checkout               = $checkout;
-        $this->registrant_data        = $registrant_data;
-        $this->attendee_factory       = $attendee_factory;
-        $this->registration_processor = $registration_processor;
-        $this->initializeInputHandler();
-    }
+	/**
+	 * RegFormHandler constructor.
+	 */
+	public function __construct(
+		EE_Checkout $checkout,
+		RegistrantData $registrant_data,
+		RegFormAttendeeFactory $attendee_factory,
+		EE_Registration_Processor $registration_processor
+	) {
+		$this->checkout               = $checkout;
+		$this->registrant_data        = $registrant_data;
+		$this->attendee_factory       = $attendee_factory;
+		$this->registration_processor = $registration_processor;
+		$this->initializeInputHandler();
+	}
 
 
-    private function initializeInputHandler()
-    {
-        $reg_form            = $this->checkout->current_step->reg_form;
-        $required_questions  = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
-        $this->input_handler = LoaderFactory::getShared(
-            RegFormInputHandler::class,
-            [$this->checkout->reg_url_link, $required_questions]
-        );
-    }
+	private function initializeInputHandler()
+	{
+		$reg_form            = $this->checkout->current_step->reg_form;
+		$required_questions  = $reg_form instanceof RegForm ? $reg_form->requiredQuestions() : [];
+		$this->input_handler = LoaderFactory::getShared(
+			RegFormInputHandler::class,
+			[$this->checkout->reg_url_link, $required_questions]
+		);
+	}
 
 
-    /**
-     * @return int
-     */
-    public function attendeeCount(): int
-    {
-        return $this->registrant_data->attendeeCount();
-    }
+	/**
+	 * @return int
+	 */
+	public function attendeeCount(): int
+	{
+		return $this->registrant_data->attendeeCount();
+	}
 
 
-    /**
-     * @return bool
-     */
-    private function isInvalid(): bool
-    {
-        $this->valid = false;
-        return $this->valid;
-    }
+	/**
+	 * @return bool
+	 */
+	private function isInvalid(): bool
+	{
+		$this->valid = false;
+		return $this->valid;
+	}
 
 
-    /**
-     * @param EE_Registration[] $registrations
-     * @param array[][]         $reg_form_data
-     * @return bool
-     * @throws EntityNotFoundException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws RuntimeException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function processRegistrations(array $registrations, array $reg_form_data): bool
-    {
-        // start off optimistic, then trip this to false if anything goes wrong
-        $this->valid = true;
-        foreach ($registrations as $registration) {
-            // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
-                return $this->isInvalid();
-            }
-            $reg_url_link = $registration->reg_url_link();
-            // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
-                return $this->isInvalid();
-            }
-            // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
-                continue;
-            }
-            // if NOT revisiting, then let's save the registration now,
-            // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
-                $registration->save();
-            }
+	/**
+	 * @param EE_Registration[] $registrations
+	 * @param array[][]         $reg_form_data
+	 * @return bool
+	 * @throws EntityNotFoundException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws RuntimeException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processRegistrations(array $registrations, array $reg_form_data): bool
+	{
+		// start off optimistic, then trip this to false if anything goes wrong
+		$this->valid = true;
+		foreach ($registrations as $registration) {
+			// verify EE_Registration object
+			if (! $this->isValidRegistration($registration)) {
+				return $this->isInvalid();
+			}
+			$reg_url_link = $registration->reg_url_link();
+			// reg_url_link exists ?
+			if (! $this->isValidRegUrlLink($reg_url_link)) {
+				return $this->isInvalid();
+			}
+			// should this registration be processed during this visit ?
+			if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+				continue;
+			}
+			// if NOT revisiting, then let's save the registration now,
+			// so that we have a REG_ID to use when generating other objects
+			if (! $this->checkout->revisit) {
+				$registration->save();
+			}
 
-            if (
-                // This allows plugins to trigger a fail on processing of a registration
-                // for any conditions they may have for it to pass.
-                apply_filters(
-                    'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegistrations__bypass',
-                    false, // if the plugin returns 'true' then the registration processing is halted.
-                    $this->registrant_data->attendeeCount(),
-                    $registration,
-                    $registrations,
-                    $reg_form_data,
-                    $this
-                )
-            ) {
-                return $this->isInvalid();
-            }
+			if (
+				// This allows plugins to trigger a fail on processing of a registration
+				// for any conditions they may have for it to pass.
+				apply_filters(
+					'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegistrations__bypass',
+					false, // if the plugin returns 'true' then the registration processing is halted.
+					$this->registrant_data->attendeeCount(),
+					$registration,
+					$registrations,
+					$reg_form_data,
+					$this
+				)
+			) {
+				return $this->isInvalid();
+			}
 
-            // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
-                return $this->isInvalid();
-            }
-        }
-        return $this->valid;
-    }
+			// Houston, we have a registration!
+			if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+				return $this->isInvalid();
+			}
+		}
+		return $this->valid;
+	}
 
 
-    /**
-     * @param string $reg_url_link
-     * @return bool
-     */
-    private function isValidRegUrlLink(string $reg_url_link): bool
-    {
-        if (! empty($reg_url_link)) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid or missing line item ID was encountered while attempting to process the registration form.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param string $reg_url_link
+	 * @return bool
+	 */
+	private function isValidRegUrlLink(string $reg_url_link): bool
+	{
+		if (! empty($reg_url_link)) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid or missing line item ID was encountered while attempting to process the registration form.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration|null $registration
-     * @return bool
-     */
-    private function isValidRegistration(?EE_Registration $registration): bool
-    {
-        // verify EE_Registration object
-        if ($registration instanceof EE_Registration) {
-            return true;
-        }
-        EE_Error::add_error(
-            esc_html__(
-                'An invalid Registration object was discovered when attempting to process your registration information.',
-                'event_espresso'
-            ),
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        return false;
-    }
+	/**
+	 * @param EE_Registration|null $registration
+	 * @return bool
+	 */
+	private function isValidRegistration(?EE_Registration $registration): bool
+	{
+		// verify EE_Registration object
+		if ($registration instanceof EE_Registration) {
+			return true;
+		}
+		EE_Error::add_error(
+			esc_html__(
+				'An invalid Registration object was discovered when attempting to process your registration information.',
+				'event_espresso'
+			),
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		return false;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array[][]       $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegistration(
-        EE_Registration $registration,
-        string $reg_url_link,
-        array $reg_form_data
-    ): bool {
-        $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
-            return false;
-        }
-        // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
-            return false;
-        }
-        // at this point, we should have enough details about the registrant to consider the registration
-        // NOT incomplete
-        $this->registration_processor->toggle_incomplete_registration_status_to_default(
-            $registration,
-            false,
-            new Context(
-                'spco_reg_step_attendee_information_process_registrations',
-                esc_html__(
-                    'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
-                    'event_espresso'
-                )
-            )
-        );
-        // we can also consider the TXN to not have been failed, so temporarily upgrade its status to
-        // abandoned
-        $this->checkout->transaction->toggle_failed_transaction_status();
-        // if we've gotten this far, then let's save what we have
-        $registration->save();
-        // add relation between TXN and registration
-        $this->associateRegistrationWithTransaction($registration);
-        return true;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array[][]       $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegistration(
+		EE_Registration $registration,
+		string $reg_url_link,
+		array $reg_form_data
+	): bool {
+		$this->registrant_data->initializeRegistrantData($registration);
+		if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+			return false;
+		}
+		// RegFormAttendeeFactory
+		if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+			return false;
+		}
+		// at this point, we should have enough details about the registrant to consider the registration
+		// NOT incomplete
+		$this->registration_processor->toggle_incomplete_registration_status_to_default(
+			$registration,
+			false,
+			new Context(
+				'spco_reg_step_attendee_information_process_registrations',
+				esc_html__(
+					'Finished populating registration with details from the registration form after submitting the Attendee Information Reg Step.',
+					'event_espresso'
+				)
+			)
+		);
+		// we can also consider the TXN to not have been failed, so temporarily upgrade its status to
+		// abandoned
+		$this->checkout->transaction->toggle_failed_transaction_status();
+		// if we've gotten this far, then let's save what we have
+		$registration->save();
+		// add relation between TXN and registration
+		$this->associateRegistrationWithTransaction($registration);
+		return true;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @param string          $reg_url_link
-     * @param array           $reg_form_data
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
-    {
-        if (! isset($reg_form_data[ $reg_url_link ])) {
-            return false;
-        }
-        // do we need to copy basic info from primary attendee ?
-        $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-            && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
-        $this->registrant_data->setCopyPrimary($copy_primary);
-        // filter form input data for this registration
-        $reg_form_data[ $reg_url_link ] = (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegFormData__registrant_form_data',
-            $reg_form_data[ $reg_url_link ],
-            $registration
-        );
-        if (isset($reg_form_data['primary_attendee'])) {
-            $primary_reg_url_link = $reg_form_data['primary_attendee'] ?: '';
-            $this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
-            unset($reg_form_data['primary_attendee']);
-        }
-        // now loop through our array of valid post data && process attendee reg forms
-        foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
-            if (in_array($form_section, $this->non_input_form_sections, true)) {
-                continue;
-            }
-            foreach ($form_inputs as $form_input => $input_value) {
-                $input_processed = $this->input_handler->processFormInput(
-                    $registration,
-                    $reg_url_link,
-                    $form_input,
-                    $input_value
-                );
-                if (! $input_processed) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @param string          $reg_url_link
+	 * @param array           $reg_form_data
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
+	{
+		if (! isset($reg_form_data[ $reg_url_link ])) {
+			return false;
+		}
+		// do we need to copy basic info from primary attendee ?
+		$copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
+			&& absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+		$this->registrant_data->setCopyPrimary($copy_primary);
+		// filter form input data for this registration
+		$reg_form_data[ $reg_url_link ] = (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegFormData__registrant_form_data',
+			$reg_form_data[ $reg_url_link ],
+			$registration
+		);
+		if (isset($reg_form_data['primary_attendee'])) {
+			$primary_reg_url_link = $reg_form_data['primary_attendee'] ?: '';
+			$this->registrant_data->addPrimaryRegistrantDataValue('reg_url_link', $primary_reg_url_link);
+			unset($reg_form_data['primary_attendee']);
+		}
+		// now loop through our array of valid post data && process attendee reg forms
+		foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+			if (in_array($form_section, $this->non_input_form_sections, true)) {
+				continue;
+			}
+			foreach ($form_inputs as $form_input => $input_value) {
+				$input_processed = $this->input_handler->processFormInput(
+					$registration,
+					$reg_url_link,
+					$form_input,
+					$input_value
+				);
+				if (! $input_processed) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
 
 
-    /**
-     * @param EE_Registration $registration
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function associateRegistrationWithTransaction(EE_Registration $registration)
-    {
-        // add relation to registration
-        $this->checkout->transaction->_add_relation_to($registration, 'Registration');
-        $this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
-    }
+	/**
+	 * @param EE_Registration $registration
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function associateRegistrationWithTransaction(EE_Registration $registration)
+	{
+		// add relation to registration
+		$this->checkout->transaction->_add_relation_to($registration, 'Registration');
+		$this->checkout->transaction->update_cache_after_object_save('Registration', $registration);
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -106,21 +106,21 @@ 
         $this->valid = true;
         foreach ($registrations as $registration) {
             // verify EE_Registration object
-            if (! $this->isValidRegistration($registration)) {
+            if ( ! $this->isValidRegistration($registration)) {
                 return $this->isInvalid();
             }
             $reg_url_link = $registration->reg_url_link();
             // reg_url_link exists ?
-            if (! $this->isValidRegUrlLink($reg_url_link)) {
+            if ( ! $this->isValidRegUrlLink($reg_url_link)) {
                 return $this->isInvalid();
             }
             // should this registration be processed during this visit ?
-            if (! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
+            if ( ! $this->checkout->visit_allows_processing_of_this_registration($registration)) {
                 continue;
             }
             // if NOT revisiting, then let's save the registration now,
             // so that we have a REG_ID to use when generating other objects
-            if (! $this->checkout->revisit) {
+            if ( ! $this->checkout->revisit) {
                 $registration->save();
             }
 
@@ -141,7 +141,7 @@ 
             }
 
             // Houston, we have a registration!
-            if (! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
+            if ( ! $this->processRegistration($registration, $reg_url_link, $reg_form_data)) {
                 return $this->isInvalid();
             }
         }
@@ -155,7 +155,7 @@ 
      */
     private function isValidRegUrlLink(string $reg_url_link): bool
     {
-        if (! empty($reg_url_link)) {
+        if ( ! empty($reg_url_link)) {
             return true;
         }
         EE_Error::add_error(
@@ -208,11 +208,11 @@ 
         array $reg_form_data
     ): bool {
         $this->registrant_data->initializeRegistrantData($registration);
-        if (! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
+        if ( ! $this->processRegFormData($registration, $reg_url_link, $reg_form_data)) {
             return false;
         }
         // RegFormAttendeeFactory
-        if (! $this->attendee_factory->create($registration, $reg_url_link)) {
+        if ( ! $this->attendee_factory->create($registration, $reg_url_link)) {
             return false;
         }
         // at this point, we should have enough details about the registrant to consider the registration
@@ -249,17 +249,17 @@ 
      */
     private function processRegFormData(EE_Registration $registration, string $reg_url_link, array $reg_form_data): bool
     {
-        if (! isset($reg_form_data[ $reg_url_link ])) {
+        if ( ! isset($reg_form_data[$reg_url_link])) {
             return false;
         }
         // do we need to copy basic info from primary attendee ?
-        $copy_primary = isset($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info'])
-            && absint($reg_form_data[ $reg_url_link ]['additional_attendee_reg_info']) === 0;
+        $copy_primary = isset($reg_form_data[$reg_url_link]['additional_attendee_reg_info'])
+            && absint($reg_form_data[$reg_url_link]['additional_attendee_reg_info']) === 0;
         $this->registrant_data->setCopyPrimary($copy_primary);
         // filter form input data for this registration
-        $reg_form_data[ $reg_url_link ] = (array) apply_filters(
+        $reg_form_data[$reg_url_link] = (array) apply_filters(
             'FHEE__EventEspresso_core_domain_services_registration_form_v1_RegFormHandler__processRegFormData__registrant_form_data',
-            $reg_form_data[ $reg_url_link ],
+            $reg_form_data[$reg_url_link],
             $registration
         );
         if (isset($reg_form_data['primary_attendee'])) {
@@ -268,7 +268,7 @@ 
             unset($reg_form_data['primary_attendee']);
         }
         // now loop through our array of valid post data && process attendee reg forms
-        foreach ($reg_form_data[ $reg_url_link ] as $form_section => $form_inputs) {
+        foreach ($reg_form_data[$reg_url_link] as $form_section => $form_inputs) {
             if (in_array($form_section, $this->non_input_form_sections, true)) {
                 continue;
             }
@@ -279,7 +279,7 @@ 
                     $form_input,
                     $input_value
                 );
-                if (! $input_processed) {
+                if ( ! $input_processed) {
                     return false;
                 }
             }