eventespresso / event-espresso-core

core/services/licensing/LicenseManager.php

Indentation +113 added lines, -113 removed lines

@@ -6,117 +6,117 @@
 
 class LicenseManager
 {
-    private LicenseAPI $license_api;
-
-    private LicenseKeyData $license_key_data;
-
-    private PluginLicenseCollection $plugin_license_collection;
-
-
-    public function __construct(
-        LicenseAPI $license_api,
-        LicenseKeyData $license_key_data,
-        PluginLicenseCollection $plugin_license_collection
-    ) {
-        $this->license_api               = $license_api;
-        $this->license_key_data          = $license_key_data;
-        $this->plugin_license_collection = $plugin_license_collection;
-    }
-
-
-    public function activateLicense(
-        string $license_key,
-        string $item_id,
-        string $item_name,
-        string $plugin_slug,
-        string $plugin_version,
-        string $min_core_version = ''
-    ): stdCLass {
-        $license_data              = $this->license_api->postRequest(
-            LicenseAPI::ACTION_ACTIVATE,
-            $license_key,
-            $item_id,
-            $item_name,
-            $plugin_version,
-            $min_core_version
-        );
-        $license_data->license_key = $license_data->license === 'valid' ? $license_key : '';
-        $this->license_key_data->updateLicense($license_data, $plugin_slug);
-        return $license_data;
-    }
-
-
-    public function deactivateLicense(
-        string $license_key,
-        string $item_id,
-        string $item_name,
-        string $plugin_slug,
-        string $plugin_version,
-        string $min_core_version = ''
-    ): stdCLass {
-        $license_data = $this->license_api->postRequest(
-            LicenseAPI::ACTION_DEACTIVATE,
-            $license_key,
-            $item_id,
-            $item_name,
-            $plugin_version,
-            $min_core_version
-        );
-        $this->license_key_data->removeLicense($plugin_slug);
-        return $license_data;
-    }
-
-
-    public function resetLicenseKey(string $plugin_slug): stdCLass
-    {
-        $license_data              = $this->getLicenseData($plugin_slug);
-        $license_data->license_key = '';
-        $this->license_key_data->updateLicense($license_data, $plugin_slug, true);
-        return $license_data;
-    }
-
-
-    public function checkLicense(
-        string $license_key,
-        string $item_id,
-        string $item_name,
-        string $plugin_slug,
-        string $plugin_version,
-        string $min_core_version = ''
-    ): stdCLass {
-        $existing_license_data = $this->getLicenseData($plugin_slug);
-        $license_data          = $this->license_api->postRequest(
-            LicenseAPI::ACTION_CHECK,
-            $license_key,
-            $item_id,
-            $item_name,
-            $plugin_version,
-            $min_core_version
-        );
-        $license_data          = (array) $license_data + (array) $existing_license_data;
-        return (object) $license_data;
-    }
-
-
-    public function getLicenseData(string $plugin_slug): stdClass
-    {
-        return $this->license_key_data->getLicense($plugin_slug);
-    }
-
-
-    public function getVersionInfo(): stdClass
-    {
-        $products = [];
-        foreach ($this->plugin_license_collection as $plugin_license) {
-            if (! $plugin_license instanceof PluginLicense) {
-                continue;
-            }
-            $products[ $plugin_license->pluginSlug() ] = [
-                'item_id' => $plugin_license->itemId(),
-                'license' => $plugin_license->licenseKey(),
-                'url'     => LicenseAPI::url(),
-            ];
-        }
-        return $this->license_api->getProductVersions($products);
-    }
+	private LicenseAPI $license_api;
+
+	private LicenseKeyData $license_key_data;
+
+	private PluginLicenseCollection $plugin_license_collection;
+
+
+	public function __construct(
+		LicenseAPI $license_api,
+		LicenseKeyData $license_key_data,
+		PluginLicenseCollection $plugin_license_collection
+	) {
+		$this->license_api               = $license_api;
+		$this->license_key_data          = $license_key_data;
+		$this->plugin_license_collection = $plugin_license_collection;
+	}
+
+
+	public function activateLicense(
+		string $license_key,
+		string $item_id,
+		string $item_name,
+		string $plugin_slug,
+		string $plugin_version,
+		string $min_core_version = ''
+	): stdCLass {
+		$license_data              = $this->license_api->postRequest(
+			LicenseAPI::ACTION_ACTIVATE,
+			$license_key,
+			$item_id,
+			$item_name,
+			$plugin_version,
+			$min_core_version
+		);
+		$license_data->license_key = $license_data->license === 'valid' ? $license_key : '';
+		$this->license_key_data->updateLicense($license_data, $plugin_slug);
+		return $license_data;
+	}
+
+
+	public function deactivateLicense(
+		string $license_key,
+		string $item_id,
+		string $item_name,
+		string $plugin_slug,
+		string $plugin_version,
+		string $min_core_version = ''
+	): stdCLass {
+		$license_data = $this->license_api->postRequest(
+			LicenseAPI::ACTION_DEACTIVATE,
+			$license_key,
+			$item_id,
+			$item_name,
+			$plugin_version,
+			$min_core_version
+		);
+		$this->license_key_data->removeLicense($plugin_slug);
+		return $license_data;
+	}
+
+
+	public function resetLicenseKey(string $plugin_slug): stdCLass
+	{
+		$license_data              = $this->getLicenseData($plugin_slug);
+		$license_data->license_key = '';
+		$this->license_key_data->updateLicense($license_data, $plugin_slug, true);
+		return $license_data;
+	}
+
+
+	public function checkLicense(
+		string $license_key,
+		string $item_id,
+		string $item_name,
+		string $plugin_slug,
+		string $plugin_version,
+		string $min_core_version = ''
+	): stdCLass {
+		$existing_license_data = $this->getLicenseData($plugin_slug);
+		$license_data          = $this->license_api->postRequest(
+			LicenseAPI::ACTION_CHECK,
+			$license_key,
+			$item_id,
+			$item_name,
+			$plugin_version,
+			$min_core_version
+		);
+		$license_data          = (array) $license_data + (array) $existing_license_data;
+		return (object) $license_data;
+	}
+
+
+	public function getLicenseData(string $plugin_slug): stdClass
+	{
+		return $this->license_key_data->getLicense($plugin_slug);
+	}
+
+
+	public function getVersionInfo(): stdClass
+	{
+		$products = [];
+		foreach ($this->plugin_license_collection as $plugin_license) {
+			if (! $plugin_license instanceof PluginLicense) {
+				continue;
+			}
+			$products[ $plugin_license->pluginSlug() ] = [
+				'item_id' => $plugin_license->itemId(),
+				'license' => $plugin_license->licenseKey(),
+				'url'     => LicenseAPI::url(),
+			];
+		}
+		return $this->license_api->getProductVersions($products);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
         string $plugin_version,
         string $min_core_version = ''
     ): stdCLass {
-        $license_data              = $this->license_api->postRequest(
+        $license_data = $this->license_api->postRequest(
             LicenseAPI::ACTION_ACTIVATE,
             $license_key,
             $item_id,
@@ -93,7 +93,7 @@ 
             $plugin_version,
             $min_core_version
         );
-        $license_data          = (array) $license_data + (array) $existing_license_data;
+        $license_data = (array) $license_data + (array) $existing_license_data;
         return (object) $license_data;
     }
 
@@ -108,10 +108,10 @@ 
     {
         $products = [];
         foreach ($this->plugin_license_collection as $plugin_license) {
-            if (! $plugin_license instanceof PluginLicense) {
+            if ( ! $plugin_license instanceof PluginLicense) {
                 continue;
             }
-            $products[ $plugin_license->pluginSlug() ] = [
+            $products[$plugin_license->pluginSlug()] = [
                 'item_id' => $plugin_license->itemId(),
                 'license' => $plugin_license->licenseKey(),
                 'url'     => LicenseAPI::url(),

core/services/licensing/SamplePlugin.php

Spacing +96 added lines, -96 removed lines

@@ -16,20 +16,20 @@ 
  */
 
 // this is the URL our updater / license checker pings. This should be the URL of the site with EDD installed
-define( 'EDD_SAMPLE_STORE_URL', 'http://easydigitaldownloads.com' ); // you should use your own CONSTANT name, and be sure to replace it throughout this file
+define('EDD_SAMPLE_STORE_URL', 'http://easydigitaldownloads.com'); // you should use your own CONSTANT name, and be sure to replace it throughout this file
 
 // the download ID for the product in Easy Digital Downloads
-define( 'EDD_SAMPLE_ITEM_ID', 123 ); // you should use your own CONSTANT name, and be sure to replace it throughout this file
+define('EDD_SAMPLE_ITEM_ID', 123); // you should use your own CONSTANT name, and be sure to replace it throughout this file
 
 // the name of the product in Easy Digital Downloads
-define( 'EDD_SAMPLE_ITEM_NAME', 'Sample Plugin' ); // you should use your own CONSTANT name, and be sure to replace it throughout this file
+define('EDD_SAMPLE_ITEM_NAME', 'Sample Plugin'); // you should use your own CONSTANT name, and be sure to replace it throughout this file
 
 // the name of the settings page for the license input to be displayed
-define( 'EDD_SAMPLE_PLUGIN_LICENSE_PAGE', 'pluginname-license' );
+define('EDD_SAMPLE_PLUGIN_LICENSE_PAGE', 'pluginname-license');
 
-if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+if ( ! class_exists('EDD_SL_Plugin_Updater')) {
 	// load our custom updater
-	include dirname( __FILE__ ) . '/EDD_SL_Plugin_Updater.php';
+	include dirname(__FILE__).'/EDD_SL_Plugin_Updater.php';
 }
 
 /**
@@ -39,29 +39,29 @@ 
 function edd_sl_sample_plugin_updater() {
 
 	// To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
-	$doing_cron = defined( 'DOING_CRON' ) && DOING_CRON;
-	if ( ! current_user_can( 'manage_options' ) && ! $doing_cron ) {
+	$doing_cron = defined('DOING_CRON') && DOING_CRON;
+	if ( ! current_user_can('manage_options') && ! $doing_cron) {
 		return;
 	}
 
 	// retrieve our license key from the DB
-	$license_key = trim( get_option( 'edd_sample_license_key' ) );
+	$license_key = trim(get_option('edd_sample_license_key'));
 
 	// setup the updater
 	$edd_updater = new EDD_SL_Plugin_Updater(
 		EDD_SAMPLE_STORE_URL,
 		__FILE__,
 		array(
-			'version' => '1.0',                    // current version number
-			'license' => $license_key,             // license key (used get_option above to retrieve from DB)
-			'item_id' => EDD_SAMPLE_ITEM_ID,       // ID of the product
+			'version' => '1.0', // current version number
+			'license' => $license_key, // license key (used get_option above to retrieve from DB)
+			'item_id' => EDD_SAMPLE_ITEM_ID, // ID of the product
 			'author'  => 'Easy Digital Downloads', // author of this plugin
 			'beta'    => false,
 		)
 	);
 
 }
-add_action( 'init', 'edd_sl_sample_plugin_updater' );
+add_action('init', 'edd_sl_sample_plugin_updater');
 
 
 /************************************
@@ -77,37 +77,37 @@ 
  */
 function edd_sample_license_menu() {
 	add_plugins_page(
-		__( 'Plugin License' ),
-		__( 'Plugin License' ),
+		__('Plugin License'),
+		__('Plugin License'),
 		'manage_options',
 		EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
 		'edd_sample_license_page'
 	);
 }
-add_action( 'admin_menu', 'edd_sample_license_menu' );
+add_action('admin_menu', 'edd_sample_license_menu');
 
 function edd_sample_license_page() {
 	add_settings_section(
 		'edd_sample_license',
-		__( 'Plugin License' ),
+		__('Plugin License'),
 		'edd_sample_license_key_settings_section',
 		EDD_SAMPLE_PLUGIN_LICENSE_PAGE
 	);
 	add_settings_field(
 		'edd_sample_license_key',
-		'<label for="edd_sample_license_key">' . __( 'License Key' ) . '</label>',
+		'<label for="edd_sample_license_key">'.__('License Key').'</label>',
 		'edd_sample_license_key_settings_field',
 		EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
 		'edd_sample_license',
 	);
 	?>
 	<div class="wrap">
-		<h2><?php esc_html_e( 'Plugin License Options' ); ?></h2>
+		<h2><?php esc_html_e('Plugin License Options'); ?></h2>
 		<form method="post" action="options.php">
 
 			<?php
-			do_settings_sections( EDD_SAMPLE_PLUGIN_LICENSE_PAGE );
-			settings_fields( 'edd_sample_license' );
+			do_settings_sections(EDD_SAMPLE_PLUGIN_LICENSE_PAGE);
+			settings_fields('edd_sample_license');
 			submit_button();
 			?>
 
@@ -121,7 +121,7 @@ 
  * @return void
  */
 function edd_sample_license_key_settings_section() {
-	esc_html_e( 'This is where you enter your license key.' );
+	esc_html_e('This is where you enter your license key.');
 }
 
 /**
@@ -130,29 +130,29 @@ 
  * @return void
  */
 function edd_sample_license_key_settings_field() {
-	$license = get_option( 'edd_sample_license_key' );
-	$status  = get_option( 'edd_sample_license_status' );
+	$license = get_option('edd_sample_license_key');
+	$status  = get_option('edd_sample_license_status');
 
 	?>
-	<p class="description"><?php esc_html_e( 'Enter your license key.' ); ?></p>
+	<p class="description"><?php esc_html_e('Enter your license key.'); ?></p>
 	<?php
 	printf(
 		'<input type="text" class="regular-text" id="edd_sample_license_key" name="edd_sample_license_key" value="%s" />',
-		esc_attr( $license )
+		esc_attr($license)
 	);
 	$button = array(
 		'name'  => 'edd_license_deactivate',
-		'label' => __( 'Deactivate License' ),
+		'label' => __('Deactivate License'),
 	);
-	if ( 'valid' !== $status ) {
+	if ('valid' !== $status) {
 		$button = array(
 			'name'  => 'edd_license_activate',
-			'label' => __( 'Activate License' ),
+			'label' => __('Activate License'),
 		);
 	}
-	wp_nonce_field( 'edd_sample_nonce', 'edd_sample_nonce' );
+	wp_nonce_field('edd_sample_nonce', 'edd_sample_nonce');
 	?>
-	<input type="submit" class="button-secondary" name="<?php echo esc_attr( $button['name'] ); ?>" value="<?php echo esc_attr( $button['label'] ); ?>"/>
+	<input type="submit" class="button-secondary" name="<?php echo esc_attr($button['name']); ?>" value="<?php echo esc_attr($button['label']); ?>"/>
 	<?php
 }
 
@@ -162,9 +162,9 @@ 
  * @return void
  */
 function edd_sample_register_option() {
-	register_setting( 'edd_sample_license', 'edd_sample_license_key', 'edd_sanitize_license' );
+	register_setting('edd_sample_license', 'edd_sample_license_key', 'edd_sanitize_license');
 }
-add_action( 'admin_init', 'edd_sample_register_option' );
+add_action('admin_init', 'edd_sample_register_option');
 
 /**
  * Sanitizes the license key.
@@ -172,13 +172,13 @@ 
  * @param string  $new The license key.
  * @return string
  */
-function edd_sanitize_license( $new ) {
-	$old = get_option( 'edd_sample_license_key' );
-	if ( $old && $old !== $new ) {
-		delete_option( 'edd_sample_license_status' ); // new license has been entered, so must reactivate
+function edd_sanitize_license($new) {
+	$old = get_option('edd_sample_license_key');
+	if ($old && $old !== $new) {
+		delete_option('edd_sample_license_status'); // new license has been entered, so must reactivate
 	}
 
-	return sanitize_text_field( $new );
+	return sanitize_text_field($new);
 }
 
 /**
@@ -189,21 +189,21 @@ 
 function edd_sample_activate_license() {
 
 	// listen for our activate button to be clicked
-	if ( ! isset( $_POST['edd_license_activate'] ) ) {
+	if ( ! isset($_POST['edd_license_activate'])) {
 		return;
 	}
 
 	// run a quick security check
-	if ( ! check_admin_referer( 'edd_sample_nonce', 'edd_sample_nonce' ) ) {
+	if ( ! check_admin_referer('edd_sample_nonce', 'edd_sample_nonce')) {
 		return; // get out if we didn't click the Activate button
 	}
 
 	// retrieve the license from the database
-	$license = trim( get_option( 'edd_sample_license_key' ) );
-	if ( ! $license ) {
-		$license = ! empty( $_POST['edd_sample_license_key'] ) ? sanitize_text_field( $_POST['edd_sample_license_key'] ) : '';
+	$license = trim(get_option('edd_sample_license_key'));
+	if ( ! $license) {
+		$license = ! empty($_POST['edd_sample_license_key']) ? sanitize_text_field($_POST['edd_sample_license_key']) : '';
 	}
-	if ( ! $license ) {
+	if ( ! $license) {
 		return;
 	}
 
@@ -212,9 +212,9 @@ 
 		'edd_action'  => 'activate_license',
 		'license'     => $license,
 		'item_id'     => EDD_SAMPLE_ITEM_ID,
-		'item_name'   => rawurlencode( EDD_SAMPLE_ITEM_NAME ), // the name of our product in EDD
+		'item_name'   => rawurlencode(EDD_SAMPLE_ITEM_NAME), // the name of our product in EDD
 		'url'         => home_url(),
-		'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
+		'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
 	);
 
 	// Call the custom API.
@@ -228,83 +228,83 @@ 
 	);
 
 		// make sure the response came back okay
-	if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+	if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
 
-		if ( is_wp_error( $response ) ) {
+		if (is_wp_error($response)) {
 			$message = $response->get_error_message();
 		} else {
-			$message = __( 'An error occurred, please try again.' );
+			$message = __('An error occurred, please try again.');
 		}
 	} else {
 
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
-		if ( false === $license_data->success ) {
+		if (false === $license_data->success) {
 
-			switch ( $license_data->error ) {
+			switch ($license_data->error) {
 
 				case 'expired':
 					$message = sprintf(
 						/* translators: the license key expiration date */
-						__( 'Your license key expired on %s.', 'edd-sample-plugin' ),
-						date_i18n( get_option( 'date_format' ), strtotime( $license_data->expires, current_time( 'timestamp' ) ) )
+						__('Your license key expired on %s.', 'edd-sample-plugin'),
+						date_i18n(get_option('date_format'), strtotime($license_data->expires, current_time('timestamp')))
 					);
 					break;
 
 				case 'disabled':
 				case 'revoked':
-					$message = __( 'Your license key has been disabled.', 'edd-sample-plugin' );
+					$message = __('Your license key has been disabled.', 'edd-sample-plugin');
 					break;
 
 				case 'missing':
-					$message = __( 'Invalid license.', 'edd-sample-plugin' );
+					$message = __('Invalid license.', 'edd-sample-plugin');
 					break;
 
 				case 'invalid':
 				case 'site_inactive':
-					$message = __( 'Your license is not active for this URL.', 'edd-sample-plugin' );
+					$message = __('Your license is not active for this URL.', 'edd-sample-plugin');
 					break;
 
 				case 'item_name_mismatch':
 					/* translators: the plugin name */
-					$message = sprintf( __( 'This appears to be an invalid license key for %s.', 'edd-sample-plugin' ), EDD_SAMPLE_ITEM_NAME );
+					$message = sprintf(__('This appears to be an invalid license key for %s.', 'edd-sample-plugin'), EDD_SAMPLE_ITEM_NAME);
 					break;
 
 				case 'no_activations_left':
-					$message = __( 'Your license key has reached its activation limit.', 'edd-sample-plugin' );
+					$message = __('Your license key has reached its activation limit.', 'edd-sample-plugin');
 					break;
 
 				default:
-					$message = __( 'An error occurred, please try again.', 'edd-sample-plugin' );
+					$message = __('An error occurred, please try again.', 'edd-sample-plugin');
 					break;
 			}
 		}
 	}
 
 		// Check if anything passed on a message constituting a failure
-	if ( ! empty( $message ) ) {
+	if ( ! empty($message)) {
 		$redirect = add_query_arg(
 			array(
 				'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
 				'sl_activation' => 'false',
-				'message'       => rawurlencode( $message ),
+				'message'       => rawurlencode($message),
 			),
-			admin_url( 'plugins.php' )
+			admin_url('plugins.php')
 		);
 
-		wp_safe_redirect( $redirect );
+		wp_safe_redirect($redirect);
 		exit();
 	}
 
 	// $license_data->license will be either "valid" or "invalid"
-	if ( 'valid' === $license_data->license ) {
-		update_option( 'edd_sample_license_key', $license );
+	if ('valid' === $license_data->license) {
+		update_option('edd_sample_license_key', $license);
 	}
-	update_option( 'edd_sample_license_status', $license_data->license );
-	wp_safe_redirect( admin_url( 'plugins.php?page=' . EDD_SAMPLE_PLUGIN_LICENSE_PAGE ) );
+	update_option('edd_sample_license_status', $license_data->license);
+	wp_safe_redirect(admin_url('plugins.php?page='.EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
 	exit();
 }
-add_action( 'admin_init', 'edd_sample_activate_license' );
+add_action('admin_init', 'edd_sample_activate_license');
 
 /**
  * Deactivates the license key.
@@ -315,24 +315,24 @@ 
 function edd_sample_deactivate_license() {
 
 	// listen for our activate button to be clicked
-	if ( isset( $_POST['edd_license_deactivate'] ) ) {
+	if (isset($_POST['edd_license_deactivate'])) {
 
 		// run a quick security check
-		if ( ! check_admin_referer( 'edd_sample_nonce', 'edd_sample_nonce' ) ) {
+		if ( ! check_admin_referer('edd_sample_nonce', 'edd_sample_nonce')) {
 			return; // get out if we didn't click the Activate button
 		}
 
 		// retrieve the license from the database
-		$license = trim( get_option( 'edd_sample_license_key' ) );
+		$license = trim(get_option('edd_sample_license_key'));
 
 		// data to send in our API request
 		$api_params = array(
 			'edd_action'  => 'deactivate_license',
 			'license'     => $license,
 			'item_id'     => EDD_SAMPLE_ITEM_ID,
-			'item_name'   => rawurlencode( EDD_SAMPLE_ITEM_NAME ), // the name of our product in EDD
+			'item_name'   => rawurlencode(EDD_SAMPLE_ITEM_NAME), // the name of our product in EDD
 			'url'         => home_url(),
-			'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
+			'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
 		);
 
 		// Call the custom API.
@@ -346,41 +346,41 @@ 
 		);
 
 		// make sure the response came back okay
-		if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
 
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				$message = $response->get_error_message();
 			} else {
-				$message = __( 'An error occurred, please try again.' );
+				$message = __('An error occurred, please try again.');
 			}
 
 			$redirect = add_query_arg(
 				array(
 					'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
 					'sl_activation' => 'false',
-					'message'       => rawurlencode( $message ),
+					'message'       => rawurlencode($message),
 				),
-				admin_url( 'plugins.php' )
+				admin_url('plugins.php')
 			);
 
-			wp_safe_redirect( $redirect );
+			wp_safe_redirect($redirect);
 			exit();
 		}
 
 		// decode the license data
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
 
 		// $license_data->license will be either "deactivated" or "failed"
-		if ( 'deactivated' === $license_data->license ) {
-			delete_option( 'edd_sample_license_status' );
+		if ('deactivated' === $license_data->license) {
+			delete_option('edd_sample_license_status');
 		}
 
-		wp_safe_redirect( admin_url( 'plugins.php?page=' . EDD_SAMPLE_PLUGIN_LICENSE_PAGE ) );
+		wp_safe_redirect(admin_url('plugins.php?page='.EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
 		exit();
 
 	}
 }
-add_action( 'admin_init', 'edd_sample_deactivate_license' );
+add_action('admin_init', 'edd_sample_deactivate_license');
 
 /**
  * Checks if a license key is still valid.
@@ -391,15 +391,15 @@ 
  */
 function edd_sample_check_license() {
 
-	$license = trim( get_option( 'edd_sample_license_key' ) );
+	$license = trim(get_option('edd_sample_license_key'));
 
 	$api_params = array(
 		'edd_action'  => 'check_license',
 		'license'     => $license,
 		'item_id'     => EDD_SAMPLE_ITEM_ID,
-		'item_name'   => rawurlencode( EDD_SAMPLE_ITEM_NAME ),
+		'item_name'   => rawurlencode(EDD_SAMPLE_ITEM_NAME),
 		'url'         => home_url(),
-		'environment' => function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : 'production',
+		'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
 	);
 
 	// Call the custom API.
@@ -412,13 +412,13 @@ 
 		)
 	);
 
-	if ( is_wp_error( $response ) ) {
+	if (is_wp_error($response)) {
 		return false;
 	}
 
-	$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+	$license_data = json_decode(wp_remote_retrieve_body($response));
 
-	if ( 'valid' === $license_data->license ) {
+	if ('valid' === $license_data->license) {
 		echo 'valid';
 		exit;
 		// this license is still valid
@@ -433,15 +433,15 @@ 
  * This is a means of catching errors from the activation method above and displaying it to the customer
  */
 function edd_sample_admin_notices() {
-	if ( isset( $_GET['sl_activation'] ) && ! empty( $_GET['message'] ) ) {
+	if (isset($_GET['sl_activation']) && ! empty($_GET['message'])) {
 
-		switch ( $_GET['sl_activation'] ) {
+		switch ($_GET['sl_activation']) {
 
 			case 'false':
-				$message = urldecode( $_GET['message'] );
+				$message = urldecode($_GET['message']);
 				?>
 				<div class="error">
-					<p><?php echo wp_kses_post( $message ); ?></p>
+					<p><?php echo wp_kses_post($message); ?></p>
 				</div>
 				<?php
 				break;
@@ -454,4 +454,4 @@ 
 		}
 	}
 }
-add_action( 'admin_notices', 'edd_sample_admin_notices' );
+add_action('admin_notices', 'edd_sample_admin_notices');

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_name';
-
-    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/';
-
-
-    /**
-     * successfull 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_name';
+
+	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/';
+
+
+	/**
+	 * successfull 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/PluginLicense.php

Indentation +242 added lines, -242 removed lines

@@ -14,246 +14,246 @@
  */
 class PluginLicense
 {
-    private ?LicenseKeyData $license_key_data = null;
-
-    private ?PluginUpdater $updater = null;
-
-    private string $license_key = '';
-
-    private string $mainfile;
-
-    private string $min_core_version;
-
-    private string $plugin_id;
-
-    private string $plugin_name;
-
-    private string $plugin_slug;
-
-    private string $version;
-
-    private bool $beta;
-
-    private bool $wp_override;
-
-    private static array $slug_prefixes = ['ee-', 'eea-', 'eep-', 'espresso-', 'ee_', 'eea_', 'eep_', 'espresso_'];
-
-
-    public function __construct(
-        string $mainfile,
-        string $plugin_id,
-        string $plugin_name,
-        string $plugin_slug,
-        string $version,
-        bool $beta = false,
-        bool $wp_override = false,
-        string $min_core_version = ''
-    ) {
-        $this->mainfile         = $mainfile;
-        $this->plugin_id        = $plugin_id;
-        $this->plugin_name      = $plugin_name;
-        $this->version          = $version;
-        $this->beta             = $beta;
-        $this->wp_override      = $wp_override;
-        $this->plugin_slug      = $this->removePluginSlugPrefixes($plugin_slug);
-        $this->min_core_version = $min_core_version;
-
-        add_action('init', [$this, 'loadPluginUpdater']);
-        add_action(
-            'AHEE__EventEspresso_core_services_licensing_PluginLicenseCollection__loadPluginLicenses',
-            [$this, 'loadPluginLicense']
-        );
-        add_filter(
-            'FHEE__LicenseKeysAdminForm__generate__form_subsections',
-            [$this, 'addLicenseKeyFormSection']
-        );
-        add_filter(
-            'edd_sl_plugin_updater_api_params',
-            [$this, 'addCustomApiParams'],
-            10,
-            2
-        );
-    }
-
-
-    /**
-     * removes unnecessary prefixes from plugin slugs
-     *
-     * @param string $plugin_slug
-     * @return string
-     */
-    private function removePluginSlugPrefixes(string $plugin_slug): string
-    {
-        foreach (self::$slug_prefixes as $slug_prefix) {
-            if (strpos($plugin_slug, $slug_prefix) === 0) {
-                $plugin_slug = str_replace($slug_prefix, '', $plugin_slug);
-            }
-        }
-        return $plugin_slug;
-    }
-
-
-    /**
-     * @return PluginUpdater|null
-     */
-    public function updater(): ?PluginUpdater
-    {
-        return $this->updater;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function itemID(): string
-    {
-        return $this->plugin_id;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function itemName(): string
-    {
-        return $this->plugin_name;
-    }
-
-
-    private function getLicenseKeyData(): stdClass
-    {
-        if (! $this->license_key_data instanceof LicenseKeyData) {
-            $this->license_key_data = LoaderFactory::getShared(LicenseKeyData::class);
-        }
-        return $this->license_key_data->getLicense($this->pluginSlug());
-    }
-
-
-    /**
-     * @return string
-     */
-    public function licenseKey(): string
-    {
-        return $this->license_key;
-    }
-
-
-    /**
-     * @param string $license_key
-     */
-    public function updateLicenseKey(string $license_key): void
-    {
-        $this->license_key = sanitize_text_field($license_key);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function mainfile(): string
-    {
-        return $this->mainfile;
-    }
-
-
-    /**
-     * @return string
-     * @since 5.0.20.p
-     */
-    public function minCoreVersion(): string
-    {
-        return $this->min_core_version;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginSlug(): string
-    {
-        return $this->plugin_slug;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function version(): string
-    {
-        return $this->version;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isBeta(): bool
-    {
-        return $this->beta;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isWpOverride(): bool
-    {
-        return $this->wp_override;
-    }
-
-
-    public function loadPluginUpdater()
-    {
-        // To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
-        if (! current_user_can('manage_options') && ! (defined('DOING_CRON') && DOING_CRON)) {
-            return;
-        }
-
-        $license_key_data = $this->getLicenseKeyData();
-        $license_key      = $license_key_data->license_key ?? '';
-        if ($license_key) {
-            $this->updateLicenseKey($license_key);
-        }
-
-        $this->updater = new PluginUpdater(
-            LicenseAPI::url(),
-            $this->mainfile(),
-            [
-                'author'      => LicenseAPI::AUTHOR,
-                'beta'        => $this->isBeta(),
-                'item_id'     => $this->itemID(),
-                'item_name'   => $this->itemName(),
-                'license'     => $this->licenseKey(),
-                'version'     => $this->version(),
-                'wp_override' => $this->isWpOverride(),
-            ]
-        );
-    }
-
-
-    public function loadPluginLicense(PluginLicenseCollection $plugin_license_collection)
-    {
-        $plugin_license_collection->add($this, $this->pluginSlug());
-    }
-
-
-    public function addLicenseKeyFormSection(array $license_keys_form_subsections): array
-    {
-        if (is_main_site()) {
-            $license_keys_form_subsections[ $this->pluginSlug() ] = LoaderFactory::getNew(
-                LicenseKeyFormInput::class,
-                [$this]
-            );
-        }
-        return $license_keys_form_subsections;
-    }
-
-
-    public function addCustomApiParams($api_params, $api_data)
-    {
-        if ($api_data['item_name'] === $this->itemName()) {
-            $api_params['event_espresso_core_version'] = EVENT_ESPRESSO_VERSION;
-        }
-        return $api_params;
-    }
+	private ?LicenseKeyData $license_key_data = null;
+
+	private ?PluginUpdater $updater = null;
+
+	private string $license_key = '';
+
+	private string $mainfile;
+
+	private string $min_core_version;
+
+	private string $plugin_id;
+
+	private string $plugin_name;
+
+	private string $plugin_slug;
+
+	private string $version;
+
+	private bool $beta;
+
+	private bool $wp_override;
+
+	private static array $slug_prefixes = ['ee-', 'eea-', 'eep-', 'espresso-', 'ee_', 'eea_', 'eep_', 'espresso_'];
+
+
+	public function __construct(
+		string $mainfile,
+		string $plugin_id,
+		string $plugin_name,
+		string $plugin_slug,
+		string $version,
+		bool $beta = false,
+		bool $wp_override = false,
+		string $min_core_version = ''
+	) {
+		$this->mainfile         = $mainfile;
+		$this->plugin_id        = $plugin_id;
+		$this->plugin_name      = $plugin_name;
+		$this->version          = $version;
+		$this->beta             = $beta;
+		$this->wp_override      = $wp_override;
+		$this->plugin_slug      = $this->removePluginSlugPrefixes($plugin_slug);
+		$this->min_core_version = $min_core_version;
+
+		add_action('init', [$this, 'loadPluginUpdater']);
+		add_action(
+			'AHEE__EventEspresso_core_services_licensing_PluginLicenseCollection__loadPluginLicenses',
+			[$this, 'loadPluginLicense']
+		);
+		add_filter(
+			'FHEE__LicenseKeysAdminForm__generate__form_subsections',
+			[$this, 'addLicenseKeyFormSection']
+		);
+		add_filter(
+			'edd_sl_plugin_updater_api_params',
+			[$this, 'addCustomApiParams'],
+			10,
+			2
+		);
+	}
+
+
+	/**
+	 * removes unnecessary prefixes from plugin slugs
+	 *
+	 * @param string $plugin_slug
+	 * @return string
+	 */
+	private function removePluginSlugPrefixes(string $plugin_slug): string
+	{
+		foreach (self::$slug_prefixes as $slug_prefix) {
+			if (strpos($plugin_slug, $slug_prefix) === 0) {
+				$plugin_slug = str_replace($slug_prefix, '', $plugin_slug);
+			}
+		}
+		return $plugin_slug;
+	}
+
+
+	/**
+	 * @return PluginUpdater|null
+	 */
+	public function updater(): ?PluginUpdater
+	{
+		return $this->updater;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function itemID(): string
+	{
+		return $this->plugin_id;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function itemName(): string
+	{
+		return $this->plugin_name;
+	}
+
+
+	private function getLicenseKeyData(): stdClass
+	{
+		if (! $this->license_key_data instanceof LicenseKeyData) {
+			$this->license_key_data = LoaderFactory::getShared(LicenseKeyData::class);
+		}
+		return $this->license_key_data->getLicense($this->pluginSlug());
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function licenseKey(): string
+	{
+		return $this->license_key;
+	}
+
+
+	/**
+	 * @param string $license_key
+	 */
+	public function updateLicenseKey(string $license_key): void
+	{
+		$this->license_key = sanitize_text_field($license_key);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function mainfile(): string
+	{
+		return $this->mainfile;
+	}
+
+
+	/**
+	 * @return string
+	 * @since 5.0.20.p
+	 */
+	public function minCoreVersion(): string
+	{
+		return $this->min_core_version;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginSlug(): string
+	{
+		return $this->plugin_slug;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function version(): string
+	{
+		return $this->version;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isBeta(): bool
+	{
+		return $this->beta;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isWpOverride(): bool
+	{
+		return $this->wp_override;
+	}
+
+
+	public function loadPluginUpdater()
+	{
+		// To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
+		if (! current_user_can('manage_options') && ! (defined('DOING_CRON') && DOING_CRON)) {
+			return;
+		}
+
+		$license_key_data = $this->getLicenseKeyData();
+		$license_key      = $license_key_data->license_key ?? '';
+		if ($license_key) {
+			$this->updateLicenseKey($license_key);
+		}
+
+		$this->updater = new PluginUpdater(
+			LicenseAPI::url(),
+			$this->mainfile(),
+			[
+				'author'      => LicenseAPI::AUTHOR,
+				'beta'        => $this->isBeta(),
+				'item_id'     => $this->itemID(),
+				'item_name'   => $this->itemName(),
+				'license'     => $this->licenseKey(),
+				'version'     => $this->version(),
+				'wp_override' => $this->isWpOverride(),
+			]
+		);
+	}
+
+
+	public function loadPluginLicense(PluginLicenseCollection $plugin_license_collection)
+	{
+		$plugin_license_collection->add($this, $this->pluginSlug());
+	}
+
+
+	public function addLicenseKeyFormSection(array $license_keys_form_subsections): array
+	{
+		if (is_main_site()) {
+			$license_keys_form_subsections[ $this->pluginSlug() ] = LoaderFactory::getNew(
+				LicenseKeyFormInput::class,
+				[$this]
+			);
+		}
+		return $license_keys_form_subsections;
+	}
+
+
+	public function addCustomApiParams($api_params, $api_data)
+	{
+		if ($api_data['item_name'] === $this->itemName()) {
+			$api_params['event_espresso_core_version'] = EVENT_ESPRESSO_VERSION;
+		}
+		return $api_params;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -122,7 +122,7 @@ 
 
     private function getLicenseKeyData(): stdClass
     {
-        if (! $this->license_key_data instanceof LicenseKeyData) {
+        if ( ! $this->license_key_data instanceof LicenseKeyData) {
             $this->license_key_data = LoaderFactory::getShared(LicenseKeyData::class);
         }
         return $this->license_key_data->getLicense($this->pluginSlug());
@@ -205,7 +205,7 @@ 
     public function loadPluginUpdater()
     {
         // To support auto-updates, this needs to run during the wp_version_check cron job for privileged users.
-        if (! current_user_can('manage_options') && ! (defined('DOING_CRON') && DOING_CRON)) {
+        if ( ! current_user_can('manage_options') && ! (defined('DOING_CRON') && DOING_CRON)) {
             return;
         }
 
@@ -240,7 +240,7 @@ 
     public function addLicenseKeyFormSection(array $license_keys_form_subsections): array
     {
         if (is_main_site()) {
-            $license_keys_form_subsections[ $this->pluginSlug() ] = LoaderFactory::getNew(
+            $license_keys_form_subsections[$this->pluginSlug()] = LoaderFactory::getNew(
                 LicenseKeyFormInput::class,
                 [$this]
             );

core/services/licensing/LicenseKeyData.php

Indentation +34 added lines, -34 removed lines

@@ -7,49 +7,49 @@
 
 class LicenseKeyData extends WordPressOption
 {
-    const OPTION_NAME = 'event-espresso-license-keys';
+	const OPTION_NAME = 'event-espresso-license-keys';
 
 
-    /**
-     * SessionLifespanOption constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(LicenseKeyData::OPTION_NAME, [], true);
-    }
+	/**
+	 * SessionLifespanOption constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct(LicenseKeyData::OPTION_NAME, [], true);
+	}
 
 
-    public function getLicense(string $plugin): stdCLass
-    {
-        $licenses = $this->loadOption();
-        $license_data = $licenses[ $plugin ] ?? ['success' => false, 'error' => true];
-        return (object) $license_data;
-    }
+	public function getLicense(string $plugin): stdCLass
+	{
+		$licenses = $this->loadOption();
+		$license_data = $licenses[ $plugin ] ?? ['success' => false, 'error' => true];
+		return (object) $license_data;
+	}
 
 
 
-    public function getAllLicenses(): array
-    {
-        return $this->loadOption();
-    }
+	public function getAllLicenses(): array
+	{
+		return $this->loadOption();
+	}
 
 
-    public function updateLicense(stdCLass $license_data, string $plugin, bool $force_update = false): int
-    {
-        $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);
-    }
+	public function updateLicense(stdCLass $license_data, string $plugin, bool $force_update = false): int
+	{
+		$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);
+	}
 
 
-    public function removeLicense(string $plugin): int
-    {
-        $licenses = $this->loadOption();
-        unset($licenses[ $plugin ]);
-        return $this->updateOption($licenses);
-    }
+	public function removeLicense(string $plugin): int
+	{
+		$licenses = $this->loadOption();
+		unset($licenses[ $plugin ]);
+		return $this->updateOption($licenses);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
     public function getLicense(string $plugin): stdCLass
     {
         $licenses = $this->loadOption();
-        $license_data = $licenses[ $plugin ] ?? ['success' => false, 'error' => true];
+        $license_data = $licenses[$plugin] ?? ['success' => false, 'error' => true];
         return (object) $license_data;
     }
 
@@ -38,10 +38,10 @@ 
     {
         $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);
     }
 
@@ -49,7 +49,7 @@ 
     public function removeLicense(string $plugin): int
     {
         $licenses = $this->loadOption();
-        unset($licenses[ $plugin ]);
+        unset($licenses[$plugin]);
         return $this->updateOption($licenses);
     }
 }

core/services/licensing/PluginLicenseCollection.php

Indentation +13 added lines, -13 removed lines

@@ -6,21 +6,21 @@
 
 class PluginLicenseCollection extends Collection
 {
-    const COLLECTION_NAME = 'plugin licenses';
+	const COLLECTION_NAME = 'plugin licenses';
 
 
-    public function __construct()
-    {
-        parent::__construct(PluginLicense::class, PluginLicenseCollection::COLLECTION_NAME);
-        add_action('init', [$this, 'loadPluginLicenses'], 99);
-    }
+	public function __construct()
+	{
+		parent::__construct(PluginLicense::class, PluginLicenseCollection::COLLECTION_NAME);
+		add_action('init', [$this, 'loadPluginLicenses'], 99);
+	}
 
 
-    public function loadPluginLicenses()
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_licensing_PluginLicenseCollection__loadPluginLicenses',
-            $this
-        );
-    }
+	public function loadPluginLicenses()
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_licensing_PluginLicenseCollection__loadPluginLicenses',
+			$this
+		);
+	}
 }
\ No newline at end of file

core/services/json/JsonDataWordpressOption.php

Indentation +90 added lines, -90 removed lines

@@ -15,94 +15,94 @@
  */
 abstract class JsonDataWordpressOption extends WordPressOption
 {
-    private JsonDataHandler $json_data_handler;
-
-    /**
-     * @var array|mixed|stdClass
-     */
-    private $options = [];
-
-
-    /**
-     * JsonDataWordpressOption constructor.
-     *
-     * @param JsonDataHandler $json_data_handler
-     * @param string          $option_name
-     * @param                 $default_value
-     * @param bool            $autoload
-     */
-    public function __construct(
-        JsonDataHandler $json_data_handler,
-        string $option_name,
-        $default_value,
-        bool $autoload = false
-    ) {
-        $this->json_data_handler = $json_data_handler;
-        if (! $this->json_data_handler->dataType()) {
-            $this->json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
-        }
-        parent::__construct($option_name, $default_value, $autoload);
-    }
-
-
-    /**
-     * @param $value
-     * @return int
-     */
-    public function updateOption($value, bool $force_update = false): int
-    {
-        $update = parent::updateOption($this->json_data_handler->encodeData($value), $force_update);
-        if ($update === WordPressOption::UPDATE_SUCCESS) {
-            $this->options = $value;
-        }
-        return $update;
-    }
-
-
-    /**
-     * @param string $property
-     * @param mixed  $value
-     * @return void
-     */
-    public function addProperty(string $property, $value)
-    {
-        $options              = $this->getAll();
-        $options->{$property} = $value;
-        $this->updateOption($options);
-    }
-
-
-    /**
-     * @param string $property
-     * @return mixed
-     */
-    public function getProperty(string $property)
-    {
-        $options = $this->getAll();
-        return property_exists($options, $property) ? $options->{$property} : null;
-    }
-
-
-    /**
-     * @return array|mixed|stdClass
-     */
-    public function getAll()
-    {
-        if (empty($this->options)) {
-            $this->options = $this->json_data_handler->decodeJson($this->loadOption());
-        }
-        return $this->options;
-    }
-
-
-    /**
-     * @param string $property
-     * @return void
-     */
-    public function removeProperty(string $property)
-    {
-        $options = $this->getAll();
-        unset($options->{$property});
-        $this->updateOption($options);
-    }
+	private JsonDataHandler $json_data_handler;
+
+	/**
+	 * @var array|mixed|stdClass
+	 */
+	private $options = [];
+
+
+	/**
+	 * JsonDataWordpressOption constructor.
+	 *
+	 * @param JsonDataHandler $json_data_handler
+	 * @param string          $option_name
+	 * @param                 $default_value
+	 * @param bool            $autoload
+	 */
+	public function __construct(
+		JsonDataHandler $json_data_handler,
+		string $option_name,
+		$default_value,
+		bool $autoload = false
+	) {
+		$this->json_data_handler = $json_data_handler;
+		if (! $this->json_data_handler->dataType()) {
+			$this->json_data_handler->configure(JsonDataHandler::DATA_TYPE_OBJECT);
+		}
+		parent::__construct($option_name, $default_value, $autoload);
+	}
+
+
+	/**
+	 * @param $value
+	 * @return int
+	 */
+	public function updateOption($value, bool $force_update = false): int
+	{
+		$update = parent::updateOption($this->json_data_handler->encodeData($value), $force_update);
+		if ($update === WordPressOption::UPDATE_SUCCESS) {
+			$this->options = $value;
+		}
+		return $update;
+	}
+
+
+	/**
+	 * @param string $property
+	 * @param mixed  $value
+	 * @return void
+	 */
+	public function addProperty(string $property, $value)
+	{
+		$options              = $this->getAll();
+		$options->{$property} = $value;
+		$this->updateOption($options);
+	}
+
+
+	/**
+	 * @param string $property
+	 * @return mixed
+	 */
+	public function getProperty(string $property)
+	{
+		$options = $this->getAll();
+		return property_exists($options, $property) ? $options->{$property} : null;
+	}
+
+
+	/**
+	 * @return array|mixed|stdClass
+	 */
+	public function getAll()
+	{
+		if (empty($this->options)) {
+			$this->options = $this->json_data_handler->decodeJson($this->loadOption());
+		}
+		return $this->options;
+	}
+
+
+	/**
+	 * @param string $property
+	 * @return void
+	 */
+	public function removeProperty(string $property)
+	{
+		$options = $this->getAll();
+		unset($options->{$property});
+		$this->updateOption($options);
+	}
 }

core/services/shortcodes/ShortcodesManager.php

Indentation +215 added lines, -215 removed lines

@@ -30,219 +30,219 @@
  */
 class ShortcodesManager
 {
-    /**
-     * @type CurrentPage
-     */
-    protected $current_page;
-
-    /**
-     * @var LegacyShortcodesManager $legacy_shortcodes_manager
-     */
-    private $legacy_shortcodes_manager;
-
-    /**
-     * @var CollectionInterface|ShortcodeInterface[] $shortcodes
-     */
-    private $shortcodes;
-
-
-    /**
-     * ShortcodesManager constructor
-     *
-     * @param LegacyShortcodesManager $legacy_shortcodes_manager
-     * @param CurrentPage             $current_page
-     */
-    public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager, CurrentPage $current_page)
-    {
-        $this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
-        $this->current_page              = $current_page;
-        // assemble a list of installed and active shortcodes
-        add_action(
-            'AHEE__EE_System__register_shortcodes_modules_and_widgets',
-            [$this, 'registerShortcodes'],
-            999
-        );
-        //  call add_shortcode() for all installed shortcodes
-        add_action('AHEE__EE_System__core_loaded_and_ready', [$this, 'addShortcodes']);
-        // check content for shortcodes the old way
-        add_action('parse_query', [$this->legacy_shortcodes_manager, 'initializeShortcodes'], 5);
-        // check content for shortcodes the NEW more efficient way
-        add_action('template_redirect', [$this, 'templateRedirect'], 999);
-    }
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    public function getShortcodes()
-    {
-        if (! $this->shortcodes instanceof CollectionInterface) {
-            $this->shortcodes = $this->loadShortcodesCollection();
-        }
-        return $this->shortcodes;
-    }
-
-
-    /**
-     * @return CollectionInterface|ShortcodeInterface[]
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     */
-    protected function loadShortcodesCollection()
-    {
-        $loader = new CollectionLoader(
-            new CollectionDetails(
-            // collection name
-                'shortcodes',
-                // collection interface
-                'EventEspresso\core\services\shortcodes\ShortcodeInterface',
-                // FQCNs for classes to add (all classes within that namespace will be loaded)
-                ['EventEspresso\core\domain\entities\shortcodes'],
-                // filepaths to classes to add
-                [],
-                // file mask to use if parsing folder for files to add
-                '',
-                // what to use as identifier for collection entities
-                // using CLASS NAME prevents duplicates (works like a singleton)
-                CollectionDetails::ID_CLASS_NAME
-            )
-        );
-        return $loader->getCollection();
-    }
-
-
-    /**
-     * @return void
-     * @throws DomainException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidFilePathException
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws InvalidClassException
-     * @throws Exception
-     */
-    public function registerShortcodes()
-    {
-        try {
-            $this->shortcodes = apply_filters(
-                'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
-                $this->getShortcodes()
-            );
-            if (! $this->shortcodes instanceof CollectionInterface) {
-                throw new InvalidEntityException(
-                    $this->shortcodes,
-                    'CollectionInterface',
-                    sprintf(
-                        esc_html__(
-                            'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
-                            'event_espresso'
-                        ),
-                        is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
-                    )
-                );
-            }
-            $this->legacy_shortcodes_manager->registerShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function addShortcodes()
-    {
-        try {
-            // cycle thru shortcode folders
-            foreach ($this->shortcodes as $shortcode) {
-                if ($shortcode instanceof EnqueueAssetsInterface) {
-                    add_action('wp_enqueue_scripts', [$shortcode, 'registerScriptsAndStylesheets'], 10);
-                    add_action('wp_enqueue_scripts', [$shortcode, 'enqueueStylesheets'], 11);
-                }
-                // add_shortcode() if it has not already been added
-                if (! shortcode_exists($shortcode->getTag())) {
-                    add_shortcode($shortcode->getTag(), [$shortcode, 'processShortcodeCallback']);
-                }
-            }
-            $this->legacy_shortcodes_manager->addShortcodes();
-        } catch (Exception $exception) {
-            new ExceptionStackTraceDisplay($exception);
-        }
-    }
-
-
-    /**
-     * callback for the "template_redirect" hook point
-     * checks posts for EE shortcodes, and initializes them,
-     * then toggles filter switch that loads core default assets
-     *
-     * @return void
-     */
-    public function templateRedirect()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts)) {
-            return;
-        }
-        $load_assets = false;
-        // array of posts displayed in current request
-        $posts = is_array($wp_query->posts) ? $wp_query->posts : [$wp_query->posts];
-        foreach ($posts as $post) {
-            // now check post content and excerpt for EE shortcodes
-            $load_assets = $this->parseContentForShortcodes((string) $post->post_content, $post)
-                ? true
-                : $load_assets;
-        }
-        if ($load_assets) {
-            $this->current_page->setEspressoPage(true);
-            add_filter('FHEE_load_css', '__return_true');
-            add_filter('FHEE_load_js', '__return_true');
-        }
-    }
-
-
-    /**
-     * checks supplied content against list of shortcodes,
-     * then initializes any found shortcodes, and returns true.
-     * returns false if no shortcodes found.
-     *
-     * @param string  $content
-     * @param WP_Post $post
-     * @return bool
-     */
-    public function parseContentForShortcodes(string $content, WP_Post $post): bool
-    {
-        if (empty($this->shortcodes)) {
-            return false;
-        }
-        $has_shortcode = false;
-        foreach ($this->shortcodes as $shortcode) {
-            if (
-                apply_filters(
-                    'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__parseContentForShortcodes__has_shortcode',
-                    has_shortcode($content, $shortcode->getTag()),
-                    $content,
-                    $post,
-                    $shortcode
-                )
-            ) {
-                $shortcode->initializeShortcode();
-                $has_shortcode = true;
-            }
-        }
-        return $has_shortcode;
-    }
+	/**
+	 * @type CurrentPage
+	 */
+	protected $current_page;
+
+	/**
+	 * @var LegacyShortcodesManager $legacy_shortcodes_manager
+	 */
+	private $legacy_shortcodes_manager;
+
+	/**
+	 * @var CollectionInterface|ShortcodeInterface[] $shortcodes
+	 */
+	private $shortcodes;
+
+
+	/**
+	 * ShortcodesManager constructor
+	 *
+	 * @param LegacyShortcodesManager $legacy_shortcodes_manager
+	 * @param CurrentPage             $current_page
+	 */
+	public function __construct(LegacyShortcodesManager $legacy_shortcodes_manager, CurrentPage $current_page)
+	{
+		$this->legacy_shortcodes_manager = $legacy_shortcodes_manager;
+		$this->current_page              = $current_page;
+		// assemble a list of installed and active shortcodes
+		add_action(
+			'AHEE__EE_System__register_shortcodes_modules_and_widgets',
+			[$this, 'registerShortcodes'],
+			999
+		);
+		//  call add_shortcode() for all installed shortcodes
+		add_action('AHEE__EE_System__core_loaded_and_ready', [$this, 'addShortcodes']);
+		// check content for shortcodes the old way
+		add_action('parse_query', [$this->legacy_shortcodes_manager, 'initializeShortcodes'], 5);
+		// check content for shortcodes the NEW more efficient way
+		add_action('template_redirect', [$this, 'templateRedirect'], 999);
+	}
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	public function getShortcodes()
+	{
+		if (! $this->shortcodes instanceof CollectionInterface) {
+			$this->shortcodes = $this->loadShortcodesCollection();
+		}
+		return $this->shortcodes;
+	}
+
+
+	/**
+	 * @return CollectionInterface|ShortcodeInterface[]
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 */
+	protected function loadShortcodesCollection()
+	{
+		$loader = new CollectionLoader(
+			new CollectionDetails(
+			// collection name
+				'shortcodes',
+				// collection interface
+				'EventEspresso\core\services\shortcodes\ShortcodeInterface',
+				// FQCNs for classes to add (all classes within that namespace will be loaded)
+				['EventEspresso\core\domain\entities\shortcodes'],
+				// filepaths to classes to add
+				[],
+				// file mask to use if parsing folder for files to add
+				'',
+				// what to use as identifier for collection entities
+				// using CLASS NAME prevents duplicates (works like a singleton)
+				CollectionDetails::ID_CLASS_NAME
+			)
+		);
+		return $loader->getCollection();
+	}
+
+
+	/**
+	 * @return void
+	 * @throws DomainException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidFilePathException
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidClassException
+	 * @throws Exception
+	 */
+	public function registerShortcodes()
+	{
+		try {
+			$this->shortcodes = apply_filters(
+				'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection',
+				$this->getShortcodes()
+			);
+			if (! $this->shortcodes instanceof CollectionInterface) {
+				throw new InvalidEntityException(
+					$this->shortcodes,
+					'CollectionInterface',
+					sprintf(
+						esc_html__(
+							'The "FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__registerShortcodes__shortcode_collection" filter must return a Collection of EspressoShortcode objects. "%1$s" was received instead.',
+							'event_espresso'
+						),
+						is_object($this->shortcodes) ? get_class($this->shortcodes) : gettype($this->shortcodes)
+					)
+				);
+			}
+			$this->legacy_shortcodes_manager->registerShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function addShortcodes()
+	{
+		try {
+			// cycle thru shortcode folders
+			foreach ($this->shortcodes as $shortcode) {
+				if ($shortcode instanceof EnqueueAssetsInterface) {
+					add_action('wp_enqueue_scripts', [$shortcode, 'registerScriptsAndStylesheets'], 10);
+					add_action('wp_enqueue_scripts', [$shortcode, 'enqueueStylesheets'], 11);
+				}
+				// add_shortcode() if it has not already been added
+				if (! shortcode_exists($shortcode->getTag())) {
+					add_shortcode($shortcode->getTag(), [$shortcode, 'processShortcodeCallback']);
+				}
+			}
+			$this->legacy_shortcodes_manager->addShortcodes();
+		} catch (Exception $exception) {
+			new ExceptionStackTraceDisplay($exception);
+		}
+	}
+
+
+	/**
+	 * callback for the "template_redirect" hook point
+	 * checks posts for EE shortcodes, and initializes them,
+	 * then toggles filter switch that loads core default assets
+	 *
+	 * @return void
+	 */
+	public function templateRedirect()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts)) {
+			return;
+		}
+		$load_assets = false;
+		// array of posts displayed in current request
+		$posts = is_array($wp_query->posts) ? $wp_query->posts : [$wp_query->posts];
+		foreach ($posts as $post) {
+			// now check post content and excerpt for EE shortcodes
+			$load_assets = $this->parseContentForShortcodes((string) $post->post_content, $post)
+				? true
+				: $load_assets;
+		}
+		if ($load_assets) {
+			$this->current_page->setEspressoPage(true);
+			add_filter('FHEE_load_css', '__return_true');
+			add_filter('FHEE_load_js', '__return_true');
+		}
+	}
+
+
+	/**
+	 * checks supplied content against list of shortcodes,
+	 * then initializes any found shortcodes, and returns true.
+	 * returns false if no shortcodes found.
+	 *
+	 * @param string  $content
+	 * @param WP_Post $post
+	 * @return bool
+	 */
+	public function parseContentForShortcodes(string $content, WP_Post $post): bool
+	{
+		if (empty($this->shortcodes)) {
+			return false;
+		}
+		$has_shortcode = false;
+		foreach ($this->shortcodes as $shortcode) {
+			if (
+				apply_filters(
+					'FHEE__EventEspresso_core_services_shortcodes_ShortcodesManager__parseContentForShortcodes__has_shortcode',
+					has_shortcode($content, $shortcode->getTag()),
+					$content,
+					$post,
+					$shortcode
+				)
+			) {
+				$shortcode->initializeShortcode();
+				$has_shortcode = true;
+			}
+		}
+		return $has_shortcode;
+	}
 }

core/services/database/WordPressOption.php

Indentation +169 added lines, -169 removed lines

@@ -17,173 +17,173 @@
  */
 abstract class WordPressOption
 {
-    public const NOT_SET_YET = 'wordpress-option-value-not-yet-set';
-
-    /**
-     * WordPress makes it difficult to determine if an option successfully saved or not,
-     * which is sometimes really important to know, especially if the information you are saving is critical.
-     * The following options allow us to have a better chance of knowing when an update actually failed
-     * or when everything is OK but it just didn't update because the value hasn't changed.
-     */
-    public const UPDATE_SUCCESS = 1;
-
-    public const UPDATE_NONE    = 0;
-
-    public const UPDATE_ERROR   = -1;
-
-    private bool $autoload = false;
-
-    /**
-     * @var mixed
-     */
-    private $default_value = null;
-
-    private string $option_name = '';
-
-    /**
-     * @var mixed
-     */
-    private $value = WordPressOption::NOT_SET_YET;
-
-    private OptionEngine $option_engine;
-
-
-    /**
-     * WordPressOption constructor.
-     *
-     * @param string $option_name
-     * @param mixed  $default_value
-     * @param bool   $autoload          if true, will load the option on EVERY request
-     * @param bool   $is_network_option if true, will save the option to the network as opposed to the current blog
-     */
-    public function __construct(
-        string $option_name,
-        $default_value,
-        bool $autoload = false,
-        bool $is_network_option = false
-    ) {
-        $this->setAutoload($autoload);
-        $this->setDefaultValue($default_value);
-        $this->setOptionName($option_name);
-        $this->option_engine = new OptionEngine($is_network_option);
-    }
-
-
-    /**
-     * @param bool|string $autoload
-     */
-    public function setAutoload($autoload): void
-    {
-        $this->autoload = filter_var($autoload, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @param mixed $default_value
-     */
-    public function setDefaultValue($default_value): void
-    {
-        $this->default_value = $default_value;
-    }
-
-
-    /**
-     * @param string $option_name
-     */
-    public function setOptionName(string $option_name): void
-    {
-        $this->option_name = sanitize_key($option_name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function optionExists(): string
-    {
-        return $this->option_engine->getOption(
-            $this->getOptionName(),
-            WordPressOption::NOT_SET_YET
-        ) !== WordPressOption::NOT_SET_YET;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getOptionName(): string
-    {
-        return $this->option_name;
-    }
-
-
-    /**
-     * @return false|mixed|void
-     */
-    public function loadOption()
-    {
-        if ($this->value === WordPressOption::NOT_SET_YET) {
-            $this->value = $this->option_engine->getOption($this->getOptionName(), $this->default_value);
-        }
-        return $this->value;
-    }
-
-
-    /**
-     * @param $value
-     * @param bool $force_update
-     * @return int
-     */
-    public function updateOption($value, bool $force_update = false): int
-    {
-        // don't update if value has not changed since last update
-        if (! $force_update && $this->valueIsUnchanged($value)) {
-            return WordPressOption::UPDATE_NONE;
-        }
-        $this->value = $value;
-        // because the options for updating differ when adding an option for the first time
-        // we use the WordPressOption::NOT_SET_YET to determine if things already exist in the db
-        $updated = $this->optionExists()
-            ? $this->option_engine->updateOption($this->getOptionName(), $this->value)
-            : $this->option_engine->addOption($this->getOptionName(), $this->value, $this->autoload());
-
-        if ($updated) {
-            return WordPressOption::UPDATE_SUCCESS;
-        }
-        return WordPressOption::UPDATE_ERROR;
-    }
-
-
-    private function valueIsUnchanged($value): bool
-    {
-        if (is_array($value) && is_array($this->value)) {
-            $diff = EEH_Array::array_diff_recursive($value, $this->value);
-            // $diff = array_diff($value, $this->value);
-            return empty($diff);
-        }
-        // emulate WP's method for checking equality
-        return $value === $this->value && maybe_serialize($value) === maybe_serialize($this->value);
-    }
-
-
-    /**
-     * @return string
-     */
-    private function autoload(): string
-    {
-        return $this->autoload ? 'yes' : 'no';
-    }
-
-
-    /**
-     * Deletes the option from the database
-     * for the rest of the request
-     *
-     * @return bool
-     * @since  5.0.0.p
-     */
-    public function deleteOption(): bool
-    {
-        return $this->option_engine->deleteOption($this->getOptionName());
-    }
+	public const NOT_SET_YET = 'wordpress-option-value-not-yet-set';
+
+	/**
+	 * WordPress makes it difficult to determine if an option successfully saved or not,
+	 * which is sometimes really important to know, especially if the information you are saving is critical.
+	 * The following options allow us to have a better chance of knowing when an update actually failed
+	 * or when everything is OK but it just didn't update because the value hasn't changed.
+	 */
+	public const UPDATE_SUCCESS = 1;
+
+	public const UPDATE_NONE    = 0;
+
+	public const UPDATE_ERROR   = -1;
+
+	private bool $autoload = false;
+
+	/**
+	 * @var mixed
+	 */
+	private $default_value = null;
+
+	private string $option_name = '';
+
+	/**
+	 * @var mixed
+	 */
+	private $value = WordPressOption::NOT_SET_YET;
+
+	private OptionEngine $option_engine;
+
+
+	/**
+	 * WordPressOption constructor.
+	 *
+	 * @param string $option_name
+	 * @param mixed  $default_value
+	 * @param bool   $autoload          if true, will load the option on EVERY request
+	 * @param bool   $is_network_option if true, will save the option to the network as opposed to the current blog
+	 */
+	public function __construct(
+		string $option_name,
+		$default_value,
+		bool $autoload = false,
+		bool $is_network_option = false
+	) {
+		$this->setAutoload($autoload);
+		$this->setDefaultValue($default_value);
+		$this->setOptionName($option_name);
+		$this->option_engine = new OptionEngine($is_network_option);
+	}
+
+
+	/**
+	 * @param bool|string $autoload
+	 */
+	public function setAutoload($autoload): void
+	{
+		$this->autoload = filter_var($autoload, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @param mixed $default_value
+	 */
+	public function setDefaultValue($default_value): void
+	{
+		$this->default_value = $default_value;
+	}
+
+
+	/**
+	 * @param string $option_name
+	 */
+	public function setOptionName(string $option_name): void
+	{
+		$this->option_name = sanitize_key($option_name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function optionExists(): string
+	{
+		return $this->option_engine->getOption(
+			$this->getOptionName(),
+			WordPressOption::NOT_SET_YET
+		) !== WordPressOption::NOT_SET_YET;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getOptionName(): string
+	{
+		return $this->option_name;
+	}
+
+
+	/**
+	 * @return false|mixed|void
+	 */
+	public function loadOption()
+	{
+		if ($this->value === WordPressOption::NOT_SET_YET) {
+			$this->value = $this->option_engine->getOption($this->getOptionName(), $this->default_value);
+		}
+		return $this->value;
+	}
+
+
+	/**
+	 * @param $value
+	 * @param bool $force_update
+	 * @return int
+	 */
+	public function updateOption($value, bool $force_update = false): int
+	{
+		// don't update if value has not changed since last update
+		if (! $force_update && $this->valueIsUnchanged($value)) {
+			return WordPressOption::UPDATE_NONE;
+		}
+		$this->value = $value;
+		// because the options for updating differ when adding an option for the first time
+		// we use the WordPressOption::NOT_SET_YET to determine if things already exist in the db
+		$updated = $this->optionExists()
+			? $this->option_engine->updateOption($this->getOptionName(), $this->value)
+			: $this->option_engine->addOption($this->getOptionName(), $this->value, $this->autoload());
+
+		if ($updated) {
+			return WordPressOption::UPDATE_SUCCESS;
+		}
+		return WordPressOption::UPDATE_ERROR;
+	}
+
+
+	private function valueIsUnchanged($value): bool
+	{
+		if (is_array($value) && is_array($this->value)) {
+			$diff = EEH_Array::array_diff_recursive($value, $this->value);
+			// $diff = array_diff($value, $this->value);
+			return empty($diff);
+		}
+		// emulate WP's method for checking equality
+		return $value === $this->value && maybe_serialize($value) === maybe_serialize($this->value);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	private function autoload(): string
+	{
+		return $this->autoload ? 'yes' : 'no';
+	}
+
+
+	/**
+	 * Deletes the option from the database
+	 * for the rest of the request
+	 *
+	 * @return bool
+	 * @since  5.0.0.p
+	 */
+	public function deleteOption(): bool
+	{
+		return $this->option_engine->deleteOption($this->getOptionName());
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -137,7 +137,7 @@
     public function updateOption($value, bool $force_update = false): int
     {
         // don't update if value has not changed since last update
-        if (! $force_update && $this->valueIsUnchanged($value)) {
+        if ( ! $force_update && $this->valueIsUnchanged($value)) {
             return WordPressOption::UPDATE_NONE;
         }
         $this->value = $value;