eventespresso / event-espresso-core

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/services/licensing/LicenseAPI.php

Indentation +154 added lines, -154 removed lines

@@ -8,158 +8,158 @@
 
 class LicenseAPI
 {
-    public const ACTION_ACTIVATE            = 'activate_license';
-
-    public const ACTION_DEACTIVATE          = 'deactivate_license';
-
-    public const ACTION_CHECK               = 'check_license';
-
-    public const ACTION_GET_VERSION         = 'get_version';
-
-    public const ACTION_RESET               = 'reset_license';
-
-    public const API_USES_ITEM_ID_OR_NAME   = 'item_id';
-
-    public const AUTHOR                     = 'Event Espresso';
-
-    public const REQUEST_PARAM_ACTION       = 'license_action';
-
-    public const REQUEST_PARAM_ITEM_ID      = 'item_id';
-
-    public const REQUEST_PARAM_ITEM_NAME    = 'item_name';
-
-    public const REQUEST_PARAM_LICENSE_KEY  = 'license_key';
-
-    public const REQUEST_PARAM_MIN_CORE_VER = 'min_core_ver';
-
-    public const REQUEST_PARAM_PLUGIN_SLUG  = 'plugin_slug';
-
-    public const REQUEST_PARAM_PLUGIN_VER   = 'plugin_ver';
-
-    public const URL                        = 'https://my.eventespresso.com/';
-
-
-    /**
-     * successful license key API response example:
-     *  {
-     *      "success": true,
-     *      "license": "valid",
-     *      "item_id": false (or Item ID if passed)
-     *      "item_name": "EDD Product Name",
-     *      "license_limit": 0,
-     *      "site_count": 2,
-     *      "expires": "2020-06-30 23:59:59",
-     *      "activations_left": "unlimited",
-     *      "checksum": "<md5 checksum>",
-     *      "payment_id": 12345,
-     *      "customer_name": "John Doe",
-     *      "customer_email": "john@sample.org",
-     *      "price_id": "2"
-     *  }
-     * failed license key API response example:
-     *  {
-     *      "success": false,
-     *      "license": "invalid",
-     *      "item_id": false (or Item ID if passed)
-     *      "item_name": "EDD Product Name",
-     *      "error": "expired",
-     *      "expires": "2020-04-28 23:59:59",
-     *      "license_limit": 0,
-     *      "site_count": 1,
-     *      "activations_left": "unlimited",
-     *      "checksum": "<md5 checksum>",
-     *      "payment_id": 12345,
-     *      "customer_name": "John Doe",
-     *      "customer_email": "john@sample.com",
-     *      "price_id": "2"
-     *  }
-     *
-     * @param string $action
-     * @param string $license_key
-     * @param string $item_id
-     * @param string $item_name
-     * @param string $plugin_version
-     * @param string $min_core_version
-     * @return stdClass
-     */
-    public function postRequest(
-        string $action,
-        string $license_key,
-        string $item_id,
-        string $item_name,
-        string $plugin_version,
-        string $min_core_version = ''
-    ): stdClass {
-        $body = [
-            'edd_action'                  => $action,
-            'event_espresso_core_version' => EVENT_ESPRESSO_VERSION,
-            'min_core_version'            => $min_core_version,
-            'license'                     => $license_key,
-            'version'                     => $plugin_version,
-            'php_version'                 => phpversion(),
-            'url'                         => home_url(),
-            'wp_version'                  => get_bloginfo('version'),
-            'environment'                 => function_exists('wp_get_environment_type')
-                ? wp_get_environment_type()
-                : 'production',
-        ];
-        // change the item ID or item name based on the API_USES_ITEM_ID_OR_NAME constant
-        if (LicenseAPI::API_USES_ITEM_ID_OR_NAME === 'item_name') {
-            $body['item_name'] = $item_name;
-        } else {
-            $body['item_id'] = $item_id;
-        }
-
-        $response = $this->handleApiErrors(
-            wp_remote_post(
-                LicenseAPI::url(),
-                [
-                    'timeout' => 15,
-                    'body'    => $body,
-                ]
-            )
-        );
-        // decode the license data
-        return (object) json_decode(wp_remote_retrieve_body($response));
-    }
-
-
-    /**
-     * @param array|WP_Error $response
-     * @return array
-     */
-    private function handleApiErrors($response): array
-    {
-        // make sure the response came back okay
-        if (is_wp_error($response) || wp_remote_retrieve_response_code($response) !== 200) {
-            EE_Error::add_error($response->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
-            return ['success' => false, 'error' => true];
-        }
-        return $response;
-    }
-
-
-    public function getProductVersions(array $products): stdClass
-    {
-        $response = $this->handleApiErrors(
-            wp_remote_post(
-                LicenseAPI::url(),
-                [
-                    'timeout' => 15,
-                    'body'    => [
-                        'edd_action' => LicenseAPI::ACTION_GET_VERSION,
-                        'products'   => $products,
-                    ],
-                ]
-            )
-        );
-        // decode the license data
-        return (object) json_decode(wp_remote_retrieve_body($response));
-    }
-
-
-    public static function url(): string
-    {
-        return defined('EDD_LICENSE_API_URL') ? EDD_LICENSE_API_URL : LicenseAPI::URL;
-    }
+	public const ACTION_ACTIVATE            = 'activate_license';
+
+	public const ACTION_DEACTIVATE          = 'deactivate_license';
+
+	public const ACTION_CHECK               = 'check_license';
+
+	public const ACTION_GET_VERSION         = 'get_version';
+
+	public const ACTION_RESET               = 'reset_license';
+
+	public const API_USES_ITEM_ID_OR_NAME   = 'item_id';
+
+	public const AUTHOR                     = 'Event Espresso';
+
+	public const REQUEST_PARAM_ACTION       = 'license_action';
+
+	public const REQUEST_PARAM_ITEM_ID      = 'item_id';
+
+	public const REQUEST_PARAM_ITEM_NAME    = 'item_name';
+
+	public const REQUEST_PARAM_LICENSE_KEY  = 'license_key';
+
+	public const REQUEST_PARAM_MIN_CORE_VER = 'min_core_ver';
+
+	public const REQUEST_PARAM_PLUGIN_SLUG  = 'plugin_slug';
+
+	public const REQUEST_PARAM_PLUGIN_VER   = 'plugin_ver';
+
+	public const URL                        = 'https://my.eventespresso.com/';
+
+
+	/**
+	 * successful license key API response example:
+	 *  {
+	 *      "success": true,
+	 *      "license": "valid",
+	 *      "item_id": false (or Item ID if passed)
+	 *      "item_name": "EDD Product Name",
+	 *      "license_limit": 0,
+	 *      "site_count": 2,
+	 *      "expires": "2020-06-30 23:59:59",
+	 *      "activations_left": "unlimited",
+	 *      "checksum": "<md5 checksum>",
+	 *      "payment_id": 12345,
+	 *      "customer_name": "John Doe",
+	 *      "customer_email": "john@sample.org",
+	 *      "price_id": "2"
+	 *  }
+	 * failed license key API response example:
+	 *  {
+	 *      "success": false,
+	 *      "license": "invalid",
+	 *      "item_id": false (or Item ID if passed)
+	 *      "item_name": "EDD Product Name",
+	 *      "error": "expired",
+	 *      "expires": "2020-04-28 23:59:59",
+	 *      "license_limit": 0,
+	 *      "site_count": 1,
+	 *      "activations_left": "unlimited",
+	 *      "checksum": "<md5 checksum>",
+	 *      "payment_id": 12345,
+	 *      "customer_name": "John Doe",
+	 *      "customer_email": "john@sample.com",
+	 *      "price_id": "2"
+	 *  }
+	 *
+	 * @param string $action
+	 * @param string $license_key
+	 * @param string $item_id
+	 * @param string $item_name
+	 * @param string $plugin_version
+	 * @param string $min_core_version
+	 * @return stdClass
+	 */
+	public function postRequest(
+		string $action,
+		string $license_key,
+		string $item_id,
+		string $item_name,
+		string $plugin_version,
+		string $min_core_version = ''
+	): stdClass {
+		$body = [
+			'edd_action'                  => $action,
+			'event_espresso_core_version' => EVENT_ESPRESSO_VERSION,
+			'min_core_version'            => $min_core_version,
+			'license'                     => $license_key,
+			'version'                     => $plugin_version,
+			'php_version'                 => phpversion(),
+			'url'                         => home_url(),
+			'wp_version'                  => get_bloginfo('version'),
+			'environment'                 => function_exists('wp_get_environment_type')
+				? wp_get_environment_type()
+				: 'production',
+		];
+		// change the item ID or item name based on the API_USES_ITEM_ID_OR_NAME constant
+		if (LicenseAPI::API_USES_ITEM_ID_OR_NAME === 'item_name') {
+			$body['item_name'] = $item_name;
+		} else {
+			$body['item_id'] = $item_id;
+		}
+
+		$response = $this->handleApiErrors(
+			wp_remote_post(
+				LicenseAPI::url(),
+				[
+					'timeout' => 15,
+					'body'    => $body,
+				]
+			)
+		);
+		// decode the license data
+		return (object) json_decode(wp_remote_retrieve_body($response));
+	}
+
+
+	/**
+	 * @param array|WP_Error $response
+	 * @return array
+	 */
+	private function handleApiErrors($response): array
+	{
+		// make sure the response came back okay
+		if (is_wp_error($response) || wp_remote_retrieve_response_code($response) !== 200) {
+			EE_Error::add_error($response->get_error_message(), __FILE__, __FUNCTION__, __LINE__);
+			return ['success' => false, 'error' => true];
+		}
+		return $response;
+	}
+
+
+	public function getProductVersions(array $products): stdClass
+	{
+		$response = $this->handleApiErrors(
+			wp_remote_post(
+				LicenseAPI::url(),
+				[
+					'timeout' => 15,
+					'body'    => [
+						'edd_action' => LicenseAPI::ACTION_GET_VERSION,
+						'products'   => $products,
+					],
+				]
+			)
+		);
+		// decode the license data
+		return (object) json_decode(wp_remote_retrieve_body($response));
+	}
+
+
+	public static function url(): string
+	{
+		return defined('EDD_LICENSE_API_URL') ? EDD_LICENSE_API_URL : LicenseAPI::URL;
+	}
 }

core/services/licensing/LicenseKeyData.php

Indentation +70 added lines, -70 removed lines

@@ -16,85 +16,85 @@
  */
 class LicenseKeyData extends WordPressOption
 {
-    /**
-     * The name of the WordPress option where license data is stored.
-     */
-    const OPTION_NAME = 'event-espresso-license-keys';
+	/**
+	 * The name of the WordPress option where license data is stored.
+	 */
+	const OPTION_NAME = 'event-espresso-license-keys';
 
-    private static array $no_license = [
-        'item_id'     => false,
-        'item_name'   => '',
-        'license'     => 'none',
-        'license_key' => '',
-        'success'     => false,
-    ];
+	private static array $no_license = [
+		'item_id'     => false,
+		'item_name'   => '',
+		'license'     => 'none',
+		'license_key' => '',
+		'success'     => false,
+	];
 
 
-    public function __construct()
-    {
-        parent::__construct(LicenseKeyData::OPTION_NAME, [], true);
-    }
+	public function __construct()
+	{
+		parent::__construct(LicenseKeyData::OPTION_NAME, [], true);
+	}
 
 
-    /**
-     * Retrieves all stored license data for all plugins.
-     *
-     * @return array An associative array of all license data, keyed by plugin identifier.
-     */
-    public function getAllLicenses(): array
-    {
-        return $this->loadOption();
-    }
+	/**
+	 * Retrieves all stored license data for all plugins.
+	 *
+	 * @return array An associative array of all license data, keyed by plugin identifier.
+	 */
+	public function getAllLicenses(): array
+	{
+		return $this->loadOption();
+	}
 
 
-    /**
-     * Retrieves the license data for a specific plugin.
-     *
-     * @param string $plugin The plugin identifier.
-     * @return stdClass An object containing the license data for the specified plugin.
-     *                       Returns a default structure if no data exists.
-     */
-    public function getLicenseDataForPlugin(string $plugin): stdCLass
-    {
-        $licenses     = $this->loadOption();
-        $license_data = $licenses[ $plugin ] ?? LicenseKeyData::$no_license;
-        return (object) $license_data;
-    }
+	/**
+	 * Retrieves the license data for a specific plugin.
+	 *
+	 * @param string $plugin The plugin identifier.
+	 * @return stdClass An object containing the license data for the specified plugin.
+	 *                       Returns a default structure if no data exists.
+	 */
+	public function getLicenseDataForPlugin(string $plugin): stdCLass
+	{
+		$licenses     = $this->loadOption();
+		$license_data = $licenses[ $plugin ] ?? LicenseKeyData::$no_license;
+		return (object) $license_data;
+	}
 
 
-    /**
-     * Updates or adds the license data for a specific plugin.
-     *
-     * @param stdClass $license_data The new license data to store.
-     * @param string   $plugin       The plugin identifier.
-     * @param bool     $force_update Whether to force the update operation.
-     * @return int The result of the update operation.
-     */
-    public function updateLicenseDataForPlugin(stdCLass $license_data, string $plugin, bool $force_update = false): int
-    {
-        if (! isset($license_data->success) || (bool) $license_data->success !== true) {
-            return WordPressOption::UPDATE_NONE;
-        }
-        $licenses = $this->loadOption();
-        // convert objects to array and merge new data with old
-        $licenses[ $plugin ] = (array) $license_data;
-        // then sort by key and convert back to stdCLass
-        ksort($licenses[ $plugin ]);
-        $licenses[ $plugin ] = (object) $licenses[ $plugin ];
-        return $this->updateOption($licenses, $force_update);
-    }
+	/**
+	 * Updates or adds the license data for a specific plugin.
+	 *
+	 * @param stdClass $license_data The new license data to store.
+	 * @param string   $plugin       The plugin identifier.
+	 * @param bool     $force_update Whether to force the update operation.
+	 * @return int The result of the update operation.
+	 */
+	public function updateLicenseDataForPlugin(stdCLass $license_data, string $plugin, bool $force_update = false): int
+	{
+		if (! isset($license_data->success) || (bool) $license_data->success !== true) {
+			return WordPressOption::UPDATE_NONE;
+		}
+		$licenses = $this->loadOption();
+		// convert objects to array and merge new data with old
+		$licenses[ $plugin ] = (array) $license_data;
+		// then sort by key and convert back to stdCLass
+		ksort($licenses[ $plugin ]);
+		$licenses[ $plugin ] = (object) $licenses[ $plugin ];
+		return $this->updateOption($licenses, $force_update);
+	}
 
 
-    /**
-     * Removes the license data for a specific plugin.
-     *
-     * @param string $plugin The plugin identifier.
-     * @return int The result of the remove operation.
-     */
-    public function removeLicenseDataForPlugin(string $plugin): int
-    {
-        $licenses = $this->loadOption();
-        unset($licenses[ $plugin ]);
-        return $this->updateOption($licenses);
-    }
+	/**
+	 * Removes the license data for a specific plugin.
+	 *
+	 * @param string $plugin The plugin identifier.
+	 * @return int The result of the remove operation.
+	 */
+	public function removeLicenseDataForPlugin(string $plugin): int
+	{
+		$licenses = $this->loadOption();
+		unset($licenses[ $plugin ]);
+		return $this->updateOption($licenses);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -57,7 +57,7 @@ 
     public function getLicenseDataForPlugin(string $plugin): stdCLass
     {
         $licenses     = $this->loadOption();
-        $license_data = $licenses[ $plugin ] ?? LicenseKeyData::$no_license;
+        $license_data = $licenses[$plugin] ?? LicenseKeyData::$no_license;
         return (object) $license_data;
     }
 
@@ -72,15 +72,15 @@ 
      */
     public function updateLicenseDataForPlugin(stdCLass $license_data, string $plugin, bool $force_update = false): int
     {
-        if (! isset($license_data->success) || (bool) $license_data->success !== true) {
+        if ( ! isset($license_data->success) || (bool) $license_data->success !== true) {
             return WordPressOption::UPDATE_NONE;
         }
         $licenses = $this->loadOption();
         // convert objects to array and merge new data with old
-        $licenses[ $plugin ] = (array) $license_data;
+        $licenses[$plugin] = (array) $license_data;
         // then sort by key and convert back to stdCLass
-        ksort($licenses[ $plugin ]);
-        $licenses[ $plugin ] = (object) $licenses[ $plugin ];
+        ksort($licenses[$plugin]);
+        $licenses[$plugin] = (object) $licenses[$plugin];
         return $this->updateOption($licenses, $force_update);
     }
 
@@ -94,7 +94,7 @@ 
     public function removeLicenseDataForPlugin(string $plugin): int
     {
         $licenses = $this->loadOption();
-        unset($licenses[ $plugin ]);
+        unset($licenses[$plugin]);
         return $this->updateOption($licenses);
     }
 }