eventespresso / event-espresso-core

core/services/admin/AdminListTableFilters.php

Indentation +105 added lines, -105 removed lines

@@ -12,74 +12,74 @@ 
  */
 class AdminListTableFilters
 {
-    /**
-     * @var RequestInterface
-     */
-    protected RequestInterface $request;
-
-    protected string $search_term;
-
-    protected ?string $orderby;
-
-    protected ?string $order;
-
-    protected ?string $detached;
-
-    protected ?string $post_mime_type;
-
-
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-        // add_action('admin_enqueue_scripts', [$this, 'loadScriptsStyles']);
-    }
-
-
-    public function loadScriptsStyles()
-    {
-        wp_enqueue_script(EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN);
-    }
-
-
-    /**
-     * Sets the parameters from request
-     *
-     * @return void
-     */
-    private function setRequestParams(): void
-    {
-        $this->search_term    = $this->request->getRequestParam('s', '');
-        $this->orderby        = $this->request->getRequestParam('orderby');
-        $this->order          = $this->request->getRequestParam('order');
-        $this->post_mime_type = $this->request->getRequestParam('post_mime_type');
-        $this->detached       = $this->request->getRequestParam('detached');
-    }
-
-
-    /**
-     * Displays the search box with reset button
-     *
-     * @param string $text     The 'submit' button label.
-     * @param string $input_id ID attribute value for the search input field.
-     * @param string $url      Reset URL
-     * @return void
-     */
-    public function searchBox(string $text, string $input_id, string $url): void
-    {
-        $this->setRequestParams();
-        if (! empty($this->orderby)) {
-            echo '<input type="hidden" name="orderby" value="' . esc_attr($this->orderby) . '" />';
-        }
-        if (! empty($this->order)) {
-            echo '<input type="hidden" name="order" value="' . esc_attr($this->order) . '" />';
-        }
-        if (! empty($this->post_mime_type)) {
-            echo '<input type="hidden" name="post_mime_type" value="' . esc_attr($this->post_mime_type) . '" />';
-        }
-        if (! empty($this->detached)) {
-            echo '<input type="hidden" name="detached" value="' . esc_attr($this->detached) . '" />';
-        }
-        ?>
+	/**
+	 * @var RequestInterface
+	 */
+	protected RequestInterface $request;
+
+	protected string $search_term;
+
+	protected ?string $orderby;
+
+	protected ?string $order;
+
+	protected ?string $detached;
+
+	protected ?string $post_mime_type;
+
+
+	public function __construct(RequestInterface $request)
+	{
+		$this->request = $request;
+		// add_action('admin_enqueue_scripts', [$this, 'loadScriptsStyles']);
+	}
+
+
+	public function loadScriptsStyles()
+	{
+		wp_enqueue_script(EspressoLegacyAdminAssetManager::JS_HANDLE_EE_ADMIN);
+	}
+
+
+	/**
+	 * Sets the parameters from request
+	 *
+	 * @return void
+	 */
+	private function setRequestParams(): void
+	{
+		$this->search_term    = $this->request->getRequestParam('s', '');
+		$this->orderby        = $this->request->getRequestParam('orderby');
+		$this->order          = $this->request->getRequestParam('order');
+		$this->post_mime_type = $this->request->getRequestParam('post_mime_type');
+		$this->detached       = $this->request->getRequestParam('detached');
+	}
+
+
+	/**
+	 * Displays the search box with reset button
+	 *
+	 * @param string $text     The 'submit' button label.
+	 * @param string $input_id ID attribute value for the search input field.
+	 * @param string $url      Reset URL
+	 * @return void
+	 */
+	public function searchBox(string $text, string $input_id, string $url): void
+	{
+		$this->setRequestParams();
+		if (! empty($this->orderby)) {
+			echo '<input type="hidden" name="orderby" value="' . esc_attr($this->orderby) . '" />';
+		}
+		if (! empty($this->order)) {
+			echo '<input type="hidden" name="order" value="' . esc_attr($this->order) . '" />';
+		}
+		if (! empty($this->post_mime_type)) {
+			echo '<input type="hidden" name="post_mime_type" value="' . esc_attr($this->post_mime_type) . '" />';
+		}
+		if (! empty($this->detached)) {
+			echo '<input type="hidden" name="detached" value="' . esc_attr($this->detached) . '" />';
+		}
+		?>
         <p class="search-box">
             <label class="screen-reader-text" for="<?php echo esc_attr($input_id); ?>"><?php echo $text; ?>:</label>
             <input type="search"
@@ -94,36 +94,36 @@ 
             </button>
             <?php // submit_button($text, '', '', false, ['id' => 'search-submit']); ?>
             <?php
-            if (! empty($this->search_term)) {
-                echo wp_kses($this->generateResetButton($url), AllowedTags::getAllowedTags());
-            }
-            ?>
+			if (! empty($this->search_term)) {
+				echo wp_kses($this->generateResetButton($url), AllowedTags::getAllowedTags());
+			}
+			?>
         </p>
         <?php
-    }
-
-
-    /**
-     * filters
-     * This receives the filters array from children _get_table_filters() and assembles the string including the filter
-     * button.
-     *
-     * @param string[] $filters
-     * @param string   $url Reset URL
-     * @return void  echos html showing filters
-     */
-    public function filters(array $filters, string $url): void
-    {
-        $use_filters = $this->request->getRequestParam('use_filters', false, DataType::BOOL);
-        $use_filters = $use_filters ? 'yes' : 'no';
-
-        $filters_html = '';
-        foreach ($filters as $filter) {
-            $filters_html .= wp_kses($filter, AllowedTags::getWithFormTags());
-        }
-        $filter_submit_btn_text = esc_html__('Filter', 'event_espresso');
-
-        echo "
+	}
+
+
+	/**
+	 * filters
+	 * This receives the filters array from children _get_table_filters() and assembles the string including the filter
+	 * button.
+	 *
+	 * @param string[] $filters
+	 * @param string   $url Reset URL
+	 * @return void  echos html showing filters
+	 */
+	public function filters(array $filters, string $url): void
+	{
+		$use_filters = $this->request->getRequestParam('use_filters', false, DataType::BOOL);
+		$use_filters = $use_filters ? 'yes' : 'no';
+
+		$filters_html = '';
+		foreach ($filters as $filter) {
+			$filters_html .= wp_kses($filter, AllowedTags::getWithFormTags());
+		}
+		$filter_submit_btn_text = esc_html__('Filter', 'event_espresso');
+
+		echo "
         <div id='ee-list-table-filters-dv' class='ee-list-table-filters actions alignleft'>
            $filters_html
             <span class='ee-list-table-filters__submit-buttons'>
@@ -146,20 +146,20 @@ 
             <span class='ee-list-table-filters-toggle-text'>" . esc_html__('show filters', 'event_espresso') . "</span>
         </button>
         ";
-    }
+	}
 
 
-    /**
-     * @param string $url Reset URL
-     * @return string
-     */
-    private function generateResetButton(string $url): string
-    {
-        return '<a class="ee-aria-tooltip button button--icon-only"
+	/**
+	 * @param string $url Reset URL
+	 * @return string
+	 */
+	private function generateResetButton(string $url): string
+	{
+		return '<a class="ee-aria-tooltip button button--icon-only"
             href="' . esc_url_raw($url) . '"
             aria-label="' . esc_attr__('Reset Filters', 'event_espresso') . '"
         >
             <span class="dashicons dashicons-update"></span>
         </a>';
-    }
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -67,17 +67,17 @@ 
     public function searchBox(string $text, string $input_id, string $url): void
     {
         $this->setRequestParams();
-        if (! empty($this->orderby)) {
-            echo '<input type="hidden" name="orderby" value="' . esc_attr($this->orderby) . '" />';
+        if ( ! empty($this->orderby)) {
+            echo '<input type="hidden" name="orderby" value="'.esc_attr($this->orderby).'" />';
         }
-        if (! empty($this->order)) {
-            echo '<input type="hidden" name="order" value="' . esc_attr($this->order) . '" />';
+        if ( ! empty($this->order)) {
+            echo '<input type="hidden" name="order" value="'.esc_attr($this->order).'" />';
         }
-        if (! empty($this->post_mime_type)) {
-            echo '<input type="hidden" name="post_mime_type" value="' . esc_attr($this->post_mime_type) . '" />';
+        if ( ! empty($this->post_mime_type)) {
+            echo '<input type="hidden" name="post_mime_type" value="'.esc_attr($this->post_mime_type).'" />';
         }
-        if (! empty($this->detached)) {
-            echo '<input type="hidden" name="detached" value="' . esc_attr($this->detached) . '" />';
+        if ( ! empty($this->detached)) {
+            echo '<input type="hidden" name="detached" value="'.esc_attr($this->detached).'" />';
         }
         ?>
         <p class="search-box">
@@ -94,7 +94,7 @@ 
             </button>
             <?php // submit_button($text, '', '', false, ['id' => 'search-submit']); ?>
             <?php
-            if (! empty($this->search_term)) {
+            if ( ! empty($this->search_term)) {
                 echo wp_kses($this->generateResetButton($url), AllowedTags::getAllowedTags());
             }
             ?>
@@ -133,17 +133,17 @@ 
                        value='$filter_submit_btn_text'
                 />
                 <input type='hidden' id='ee-list-table-use-filters' name='use_filters' value='$use_filters' />
-                " . wp_kses($this->generateResetButton($url), AllowedTags::getAllowedTags()) . "
+                ".wp_kses($this->generateResetButton($url), AllowedTags::getAllowedTags())."
             </span>
         </div>
         <button id='ee-list-table-filters-toggle'
             class='button button--secondary button--small'
             data-target='ee-list-table-filters'
-            data-hide-text='" . esc_html__('hide filters', 'event_espresso') . "'
-            data-show-text='" . esc_html__('show filters', 'event_espresso') . "'
+            data-hide-text='" . esc_html__('hide filters', 'event_espresso')."'
+            data-show-text='" . esc_html__('show filters', 'event_espresso')."'
         >
             <span class='dashicons dashicons-filter'></span>
-            <span class='ee-list-table-filters-toggle-text'>" . esc_html__('show filters', 'event_espresso') . "</span>
+            <span class='ee-list-table-filters-toggle-text'>" . esc_html__('show filters', 'event_espresso')."</span>
         </button>
         ";
     }
@@ -156,8 +156,8 @@ 
     private function generateResetButton(string $url): string
     {
         return '<a class="ee-aria-tooltip button button--icon-only"
-            href="' . esc_url_raw($url) . '"
-            aria-label="' . esc_attr__('Reset Filters', 'event_espresso') . '"
+            href="' . esc_url_raw($url).'"
+            aria-label="' . esc_attr__('Reset Filters', 'event_espresso').'"
         >
             <span class="dashicons dashicons-update"></span>
         </a>';

core/services/licensing/AddonLicense.php

Indentation +93 added lines, -93 removed lines

@@ -17,102 +17,102 @@
  */
 class AddonLicense
 {
-    /**
-     * add-on names indexed by plugin slug.
-     * Duplicates are because the plugin slugs used in the license data
-     * sometimes differ from those used in the register add-on API
-     *
-     * @var array|string[]
-     */
-    private static array $addon_names = [
-        // Add-ons
-        'eea-affiliate-wp'                          => 'AffiliateWP Integration',
-        'eea-attendee-mover'                        => 'Attendee Mover',
-        'eea-automated-upcoming-event-notification' => 'Automatic Event Notifications',
-        'espresso-barcode-scanner'                  => 'Barcode Scanner',
-        'espresso_calendar'                         => 'Calendar',
-        'eea-event-app-customization'               => 'Event Mobile App Customization',
-        'espresso-grid-template'                    => 'Events List Grid Template',
-        'espresso-events-table-template'            => 'Events List Table Template',
-        'eea-importer'                              => 'Importer',
-        'espresso_importer'                         => 'Importer',
-        'espresso-infusionsoft'                     => 'Keap Integration',
-        'ee4-mailchimp'                             => 'MailChimp Integration',
-        'eea-multi-event-registration'              => 'Event Cart',
-        'eea-people-addon'                          => 'People Manager',
-        'eea-promotions'                            => 'Promotion and Discount Codes',
-        'eea-recurring-events-manager'              => 'Recurring Events',
-        'eea-events-social-sharing'                 => 'Social Sharing',
-        'eea-ticketing'                             => 'Scannable Tickets',
-        'eea-utf8-variation'                        => 'Font Pack for DOMPDF',
-        'eea-wait-lists'                            => 'Wait List Manager',
-        'eea-wpuser-integration'                    => 'WordPress User Integration',
-        'eea-payment-methods-pro'                   => 'Payment Methods Manager',
-        // Payment Methods
-        'eea-authnet-accept'                        => 'Authorize.net Accept Integration',
-        'eea-aim-echeck'                            => 'Authorize.net eCheck Integration',
-        'eea-braintree-gateway'                     => 'Braintree Integration',
-        'eea-chase-orbital'                         => 'Chase Paymentech Orbital Integration',
-        'eea-cybersource-gateway'                   => 'CyberSource Integration',
-        'eea-payeezy'                               => 'First Data Payeezy Integration',
-        'eea-flexible-payment-method'               => 'Flexible Payment Method',
-        'eea-ipay88-gateway'                        => 'iPay88 Integration',
-        'eea-migs-payment-method'                   => 'Mastercard Gateway Integration',
-        'eea-ideal-mollie-gateway'                  => 'Mollie Integration',
-        'eea-payflow-pro-gateway'                   => 'Payflow Pro Integration',
-        'eea-paypal-smart-buttons'                  => 'PayPal Smart Buttons Integration',
-        'eea-quickbooks-gateway'                    => 'QuickBooks Payment Gateway Integration',
-        'eea-sage-pay-gateway'                      => 'Opayo Integration',
-        'eea-square-gateway'                        => 'Square Integration',
-        'eea-stripe-gateway'                        => 'Stripe Integration',
-        'espresso-transfirst'                       => 'TSYS TransFirst Integration',
-        'eea-vanco-payment-method'                  => 'Vanco Integration',
-    ];
+	/**
+	 * add-on names indexed by plugin slug.
+	 * Duplicates are because the plugin slugs used in the license data
+	 * sometimes differ from those used in the register add-on API
+	 *
+	 * @var array|string[]
+	 */
+	private static array $addon_names = [
+		// Add-ons
+		'eea-affiliate-wp'                          => 'AffiliateWP Integration',
+		'eea-attendee-mover'                        => 'Attendee Mover',
+		'eea-automated-upcoming-event-notification' => 'Automatic Event Notifications',
+		'espresso-barcode-scanner'                  => 'Barcode Scanner',
+		'espresso_calendar'                         => 'Calendar',
+		'eea-event-app-customization'               => 'Event Mobile App Customization',
+		'espresso-grid-template'                    => 'Events List Grid Template',
+		'espresso-events-table-template'            => 'Events List Table Template',
+		'eea-importer'                              => 'Importer',
+		'espresso_importer'                         => 'Importer',
+		'espresso-infusionsoft'                     => 'Keap Integration',
+		'ee4-mailchimp'                             => 'MailChimp Integration',
+		'eea-multi-event-registration'              => 'Event Cart',
+		'eea-people-addon'                          => 'People Manager',
+		'eea-promotions'                            => 'Promotion and Discount Codes',
+		'eea-recurring-events-manager'              => 'Recurring Events',
+		'eea-events-social-sharing'                 => 'Social Sharing',
+		'eea-ticketing'                             => 'Scannable Tickets',
+		'eea-utf8-variation'                        => 'Font Pack for DOMPDF',
+		'eea-wait-lists'                            => 'Wait List Manager',
+		'eea-wpuser-integration'                    => 'WordPress User Integration',
+		'eea-payment-methods-pro'                   => 'Payment Methods Manager',
+		// Payment Methods
+		'eea-authnet-accept'                        => 'Authorize.net Accept Integration',
+		'eea-aim-echeck'                            => 'Authorize.net eCheck Integration',
+		'eea-braintree-gateway'                     => 'Braintree Integration',
+		'eea-chase-orbital'                         => 'Chase Paymentech Orbital Integration',
+		'eea-cybersource-gateway'                   => 'CyberSource Integration',
+		'eea-payeezy'                               => 'First Data Payeezy Integration',
+		'eea-flexible-payment-method'               => 'Flexible Payment Method',
+		'eea-ipay88-gateway'                        => 'iPay88 Integration',
+		'eea-migs-payment-method'                   => 'Mastercard Gateway Integration',
+		'eea-ideal-mollie-gateway'                  => 'Mollie Integration',
+		'eea-payflow-pro-gateway'                   => 'Payflow Pro Integration',
+		'eea-paypal-smart-buttons'                  => 'PayPal Smart Buttons Integration',
+		'eea-quickbooks-gateway'                    => 'QuickBooks Payment Gateway Integration',
+		'eea-sage-pay-gateway'                      => 'Opayo Integration',
+		'eea-square-gateway'                        => 'Square Integration',
+		'eea-stripe-gateway'                        => 'Stripe Integration',
+		'espresso-transfirst'                       => 'TSYS TransFirst Integration',
+		'eea-vanco-payment-method'                  => 'Vanco Integration',
+	];
 
 
-    public static function register(string $addon_name, array $license_data)
-    {
-        if (! $addon_name || ! $license_data) {
-            return;
-        }
-        // also bail if the feature flag is not enabled
-        $feature = LoaderFactory::getShared(FeatureFlags::class);
-        if (! $feature->allowed('use_edd_plugin_licensing')) {
-            return;
-        }
-        // Get the plugin name.
-        $plugin_name = $license_data['plugin_name'] ?? AddonLicense::derivePluginNameFromMainFile($license_data);
-        // Bail if we still don't have a plugin name.
-        if (empty($plugin_name)) {
-            return;
-        }
-        // ensure defaults are set
-        $license_data += [
-            'beta'             => false,
-            'main_file_path'   => $license_data['main_file_path'] ?? '',
-            'min_core_version' => $license_data['min_core_version'] ?? '',
-            'plugin_id'        => $license_data['plugin_id'] ?? 0,
-            'plugin_name'      => $plugin_name,
-            'plugin_slug'      => $license_data['plugin_slug'] ?? '',
-            'version'          => $license_data['version'],
-            'wp_override'      => false,
-        ];
+	public static function register(string $addon_name, array $license_data)
+	{
+		if (! $addon_name || ! $license_data) {
+			return;
+		}
+		// also bail if the feature flag is not enabled
+		$feature = LoaderFactory::getShared(FeatureFlags::class);
+		if (! $feature->allowed('use_edd_plugin_licensing')) {
+			return;
+		}
+		// Get the plugin name.
+		$plugin_name = $license_data['plugin_name'] ?? AddonLicense::derivePluginNameFromMainFile($license_data);
+		// Bail if we still don't have a plugin name.
+		if (empty($plugin_name)) {
+			return;
+		}
+		// ensure defaults are set
+		$license_data += [
+			'beta'             => false,
+			'main_file_path'   => $license_data['main_file_path'] ?? '',
+			'min_core_version' => $license_data['min_core_version'] ?? '',
+			'plugin_id'        => $license_data['plugin_id'] ?? 0,
+			'plugin_name'      => $plugin_name,
+			'plugin_slug'      => $license_data['plugin_slug'] ?? '',
+			'version'          => $license_data['version'],
+			'wp_override'      => false,
+		];
 
-        new PluginLicense(
-            $license_data['main_file_path'] ?? '',
-            $license_data['plugin_id'] ?? 0,
-            $license_data['plugin_name'] ?? '',
-            $license_data['plugin_slug'] ?? '',
-            $license_data['version'] ?? '',
-            $license_data['beta'] ?? '',
-            $license_data['wp_override'] ?? '',
-            $license_data['min_core_version'] ?? ''
-        );
-    }
+		new PluginLicense(
+			$license_data['main_file_path'] ?? '',
+			$license_data['plugin_id'] ?? 0,
+			$license_data['plugin_name'] ?? '',
+			$license_data['plugin_slug'] ?? '',
+			$license_data['version'] ?? '',
+			$license_data['beta'] ?? '',
+			$license_data['wp_override'] ?? '',
+			$license_data['min_core_version'] ?? ''
+		);
+	}
 
 
-    private static function derivePluginNameFromMainFile(array $license_data): string
-    {
-        return AddonLicense::$addon_names[ wp_basename($license_data['main_file_path'], '.php') ] ?? '';
-    }
+	private static function derivePluginNameFromMainFile(array $license_data): string
+	{
+		return AddonLicense::$addon_names[ wp_basename($license_data['main_file_path'], '.php') ] ?? '';
+	}
 }

core/services/licensing/SamplePlugin.php

Indentation +296 added lines, -296 removed lines

@@ -28,8 +28,8 @@ 
 define('EDD_SAMPLE_PLUGIN_LICENSE_PAGE', 'pluginname-license');
 
 if (! class_exists('EDD_SL_Plugin_Updater')) {
-    // load our custom updater
-    include dirname(__FILE__) . '/EDD_SL_Plugin_Updater.php';
+	// load our custom updater
+	include dirname(__FILE__) . '/EDD_SL_Plugin_Updater.php';
 }
 
 /**
@@ -39,27 +39,27 @@ 
 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) {
-        return;
-    }
-
-    // retrieve our license key from the DB
-    $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
-            'author'  => 'Easy Digital Downloads', // author of this plugin
-            'beta'    => false,
-        )
-    );
+	// 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) {
+		return;
+	}
+
+	// retrieve our license key from the DB
+	$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
+			'author'  => 'Easy Digital Downloads', // author of this plugin
+			'beta'    => false,
+		)
+	);
 }
 add_action('init', 'edd_sl_sample_plugin_updater');
 
@@ -77,41 +77,41 @@ 
  */
 function edd_sample_license_menu()
 {
-    add_plugins_page(
-        __('Plugin License'),
-        __('Plugin License'),
-        'manage_options',
-        EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
-        'edd_sample_license_page'
-    );
+	add_plugins_page(
+		__('Plugin License'),
+		__('Plugin License'),
+		'manage_options',
+		EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
+		'edd_sample_license_page'
+	);
 }
 add_action('admin_menu', 'edd_sample_license_menu');
 
 function edd_sample_license_page()
 {
-    add_settings_section(
-        'edd_sample_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>',
-        'edd_sample_license_key_settings_field',
-        EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
-        'edd_sample_license',
-    );
-    ?>
+	add_settings_section(
+		'edd_sample_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>',
+		'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>
         <form method="post" action="options.php">
 
             <?php
-            do_settings_sections(EDD_SAMPLE_PLUGIN_LICENSE_PAGE);
-            settings_fields('edd_sample_license');
-            submit_button();
-            ?>
+			do_settings_sections(EDD_SAMPLE_PLUGIN_LICENSE_PAGE);
+			settings_fields('edd_sample_license');
+			submit_button();
+			?>
 
         </form>
     <?php
@@ -124,7 +124,7 @@ 
  */
 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.');
 }
 
 /**
@@ -134,28 +134,28 @@ 
  */
 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>
     <?php
-    printf(
-        '<input type="text" class="regular-text" id="edd_sample_license_key" name="edd_sample_license_key" value="%s" />',
-        esc_attr($license)
-    );
-    $button = array(
-        'name'  => 'edd_license_deactivate',
-        'label' => __('Deactivate License'),
-    );
-    if ('valid' !== $status) {
-        $button = array(
-            'name'  => 'edd_license_activate',
-            'label' => __('Activate License'),
-        );
-    }
-    wp_nonce_field('edd_sample_nonce', 'edd_sample_nonce');
-    ?>
+	printf(
+		'<input type="text" class="regular-text" id="edd_sample_license_key" name="edd_sample_license_key" value="%s" />',
+		esc_attr($license)
+	);
+	$button = array(
+		'name'  => 'edd_license_deactivate',
+		'label' => __('Deactivate License'),
+	);
+	if ('valid' !== $status) {
+		$button = array(
+			'name'  => 'edd_license_activate',
+			'label' => __('Activate License'),
+		);
+	}
+	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']); ?>"/>
     <?php
 }
@@ -167,7 +167,7 @@ 
  */
 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');
 
@@ -179,12 +179,12 @@ 
  */
 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
-    }
+	$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);
 }
 
 /**
@@ -195,117 +195,117 @@ 
 function edd_sample_activate_license()
 {
 
-    // listen for our activate button to be clicked
-    if (! isset($_POST['edd_license_activate'])) {
-        return;
-    }
-
-    // run a quick security check
-    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']) : '';
-    }
-    if (! $license) {
-        return;
-    }
-
-    // data to send in our API request
-    $api_params = array(
-        '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
-        'url'         => home_url(),
-        'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
-    );
-
-    // Call the custom API.
-    $response = wp_remote_post(
-        EDD_SAMPLE_STORE_URL,
-        array(
-            'timeout'   => 15,
-            'sslverify' => false,
-            'body'      => $api_params,
-        )
-    );
-
-        // make sure the response came back okay
-    if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
-        if (is_wp_error($response)) {
-            $message = $response->get_error_message();
-        } else {
-            $message = __('An error occurred, please try again.');
-        }
-    } else {
-        $license_data = json_decode(wp_remote_retrieve_body($response));
-
-        if (false === $license_data->success) {
-            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')))
-                    );
-                    break;
-
-                case 'disabled':
-                case 'revoked':
-                    $message = __('Your license key has been disabled.', 'edd-sample-plugin');
-                    break;
-
-                case 'missing':
-                    $message = __('Invalid license.', 'edd-sample-plugin');
-                    break;
-
-                case 'invalid':
-                case 'site_inactive':
-                    $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);
-                    break;
-
-                case 'no_activations_left':
-                    $message = __('Your license key has reached its activation limit.', 'edd-sample-plugin');
-                    break;
-
-                default:
-                    $message = __('An error occurred, please try again.', 'edd-sample-plugin');
-                    break;
-            }
-        }
-    }
-
-        // Check if anything passed on a message constituting a failure
-    if (! empty($message)) {
-        $redirect = add_query_arg(
-            array(
-                'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
-                'sl_activation' => 'false',
-                'message'       => rawurlencode($message),
-            ),
-            admin_url('plugins.php')
-        );
-
-        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);
-    }
-    update_option('edd_sample_license_status', $license_data->license);
-    wp_safe_redirect(admin_url('plugins.php?page=' . EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
-    exit();
+	// listen for our activate button to be clicked
+	if (! isset($_POST['edd_license_activate'])) {
+		return;
+	}
+
+	// run a quick security check
+	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']) : '';
+	}
+	if (! $license) {
+		return;
+	}
+
+	// data to send in our API request
+	$api_params = array(
+		'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
+		'url'         => home_url(),
+		'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
+	);
+
+	// Call the custom API.
+	$response = wp_remote_post(
+		EDD_SAMPLE_STORE_URL,
+		array(
+			'timeout'   => 15,
+			'sslverify' => false,
+			'body'      => $api_params,
+		)
+	);
+
+		// make sure the response came back okay
+	if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
+		if (is_wp_error($response)) {
+			$message = $response->get_error_message();
+		} else {
+			$message = __('An error occurred, please try again.');
+		}
+	} else {
+		$license_data = json_decode(wp_remote_retrieve_body($response));
+
+		if (false === $license_data->success) {
+			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')))
+					);
+					break;
+
+				case 'disabled':
+				case 'revoked':
+					$message = __('Your license key has been disabled.', 'edd-sample-plugin');
+					break;
+
+				case 'missing':
+					$message = __('Invalid license.', 'edd-sample-plugin');
+					break;
+
+				case 'invalid':
+				case 'site_inactive':
+					$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);
+					break;
+
+				case 'no_activations_left':
+					$message = __('Your license key has reached its activation limit.', 'edd-sample-plugin');
+					break;
+
+				default:
+					$message = __('An error occurred, please try again.', 'edd-sample-plugin');
+					break;
+			}
+		}
+	}
+
+		// Check if anything passed on a message constituting a failure
+	if (! empty($message)) {
+		$redirect = add_query_arg(
+			array(
+				'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
+				'sl_activation' => 'false',
+				'message'       => rawurlencode($message),
+			),
+			admin_url('plugins.php')
+		);
+
+		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);
+	}
+	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');
 
@@ -318,68 +318,68 @@ 
 function edd_sample_deactivate_license()
 {
 
-    // listen for our activate button to be clicked
-    if (isset($_POST['edd_license_deactivate'])) {
-        // run a quick security check
-        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'));
-
-        // 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
-            'url'         => home_url(),
-            'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
-        );
-
-        // Call the custom API.
-        $response = wp_remote_post(
-            EDD_SAMPLE_STORE_URL,
-            array(
-                'timeout'   => 15,
-                'sslverify' => false,
-                'body'      => $api_params,
-            )
-        );
-
-        // make sure the response came back okay
-        if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
-            if (is_wp_error($response)) {
-                $message = $response->get_error_message();
-            } else {
-                $message = __('An error occurred, please try again.');
-            }
-
-            $redirect = add_query_arg(
-                array(
-                    'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
-                    'sl_activation' => 'false',
-                    'message'       => rawurlencode($message),
-                ),
-                admin_url('plugins.php')
-            );
-
-            wp_safe_redirect($redirect);
-            exit();
-        }
-
-        // decode the license data
-        $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');
-        }
-
-        wp_safe_redirect(admin_url('plugins.php?page=' . EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
-        exit();
-    }
+	// listen for our activate button to be clicked
+	if (isset($_POST['edd_license_deactivate'])) {
+		// run a quick security check
+		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'));
+
+		// 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
+			'url'         => home_url(),
+			'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
+		);
+
+		// Call the custom API.
+		$response = wp_remote_post(
+			EDD_SAMPLE_STORE_URL,
+			array(
+				'timeout'   => 15,
+				'sslverify' => false,
+				'body'      => $api_params,
+			)
+		);
+
+		// make sure the response came back okay
+		if (is_wp_error($response) || 200 !== wp_remote_retrieve_response_code($response)) {
+			if (is_wp_error($response)) {
+				$message = $response->get_error_message();
+			} else {
+				$message = __('An error occurred, please try again.');
+			}
+
+			$redirect = add_query_arg(
+				array(
+					'page'          => EDD_SAMPLE_PLUGIN_LICENSE_PAGE,
+					'sl_activation' => 'false',
+					'message'       => rawurlencode($message),
+				),
+				admin_url('plugins.php')
+			);
+
+			wp_safe_redirect($redirect);
+			exit();
+		}
+
+		// decode the license data
+		$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');
+		}
+
+		wp_safe_redirect(admin_url('plugins.php?page=' . EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
+		exit();
+	}
 }
 add_action('admin_init', 'edd_sample_deactivate_license');
 
@@ -393,42 +393,42 @@ 
 function edd_sample_check_license()
 {
 
-    $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),
-        'url'         => home_url(),
-        'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
-    );
-
-    // Call the custom API.
-    $response = wp_remote_post(
-        EDD_SAMPLE_STORE_URL,
-        array(
-            'timeout'   => 15,
-            'sslverify' => false,
-            'body'      => $api_params,
-        )
-    );
-
-    if (is_wp_error($response)) {
-        return false;
-    }
-
-    $license_data = json_decode(wp_remote_retrieve_body($response));
-
-    if ('valid' === $license_data->license) {
-        echo 'valid';
-        exit;
-        // this license is still valid
-    } else {
-        echo 'invalid';
-        exit;
-        // this license is no longer valid
-    }
+	$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),
+		'url'         => home_url(),
+		'environment' => function_exists('wp_get_environment_type') ? wp_get_environment_type() : 'production',
+	);
+
+	// Call the custom API.
+	$response = wp_remote_post(
+		EDD_SAMPLE_STORE_URL,
+		array(
+			'timeout'   => 15,
+			'sslverify' => false,
+			'body'      => $api_params,
+		)
+	);
+
+	if (is_wp_error($response)) {
+		return false;
+	}
+
+	$license_data = json_decode(wp_remote_retrieve_body($response));
+
+	if ('valid' === $license_data->license) {
+		echo 'valid';
+		exit;
+		// this license is still valid
+	} else {
+		echo 'invalid';
+		exit;
+		// this license is no longer valid
+	}
 }
 
 /**
@@ -436,22 +436,22 @@ 
  */
 function edd_sample_admin_notices()
 {
-    if (isset($_GET['sl_activation']) && ! empty($_GET['message'])) {
-        switch ($_GET['sl_activation']) {
-            case 'false':
-                $message = urldecode($_GET['message']);
-                ?>
+	if (isset($_GET['sl_activation']) && ! empty($_GET['message'])) {
+		switch ($_GET['sl_activation']) {
+			case 'false':
+				$message = urldecode($_GET['message']);
+				?>
                 <div class="error">
                     <p><?php echo wp_kses_post($message); ?></p>
                 </div>
                 <?php
-                break;
-
-            case 'true':
-            default:
-                // Developers can put a custom success message here for when activation is successful if they way.
-                break;
-        }
-    }
+				break;
+
+			case 'true':
+			default:
+				// Developers can put a custom success message here for when activation is successful if they way.
+				break;
+		}
+	}
 }
 add_action('admin_notices', 'edd_sample_admin_notices');

Spacing +15 added lines, -15 removed lines

@@ -27,9 +27,9 @@ 
 // the name of the settings page for the license input to be displayed
 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';
 }
 
 /**
@@ -41,7 +41,7 @@ 
 
     // 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) {
+    if ( ! current_user_can('manage_options') && ! $doing_cron) {
         return;
     }
 
@@ -53,9 +53,9 @@ 
         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,
         )
@@ -97,7 +97,7 @@ 
     );
     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',
@@ -196,21 +196,21 @@ 
 {
 
     // 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) {
+    if ( ! $license) {
         $license = ! empty($_POST['edd_sample_license_key']) ? sanitize_text_field($_POST['edd_sample_license_key']) : '';
     }
-    if (! $license) {
+    if ( ! $license) {
         return;
     }
 
@@ -285,7 +285,7 @@ 
     }
 
         // 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,
@@ -304,7 +304,7 @@ 
         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));
+    wp_safe_redirect(admin_url('plugins.php?page='.EDD_SAMPLE_PLUGIN_LICENSE_PAGE));
     exit();
 }
 add_action('admin_init', 'edd_sample_activate_license');
@@ -321,7 +321,7 @@ 
     // listen for our activate button to be clicked
     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
         }
 
@@ -377,7 +377,7 @@ 
             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();
     }
 }

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

core/services/helpers/DebugDisplay.php

Indentation +26 added lines, -26 removed lines

@@ -4,34 +4,34 @@
 
 trait DebugDisplay
 {
-    /**
-     * used for controlling how much data is displayed when debugging
-     * threshold is set to 0 by default, but can be set to 1, 2, 3, or 4
-     * where higher numbers display more data
-     *
-     * @var int
-     */
-    private int $threshold = 0;
+	/**
+	 * used for controlling how much data is displayed when debugging
+	 * threshold is set to 0 by default, but can be set to 1, 2, 3, or 4
+	 * where higher numbers display more data
+	 *
+	 * @var int
+	 */
+	private int $threshold = 0;
 
-    private array $levels = [
-        0 => 'none',
-        1 => 'low',
-        2 => 'medium',
-        3 => 'high',
-        4 => 'all'
-    ];
+	private array $levels = [
+		0 => 'none',
+		1 => 'low',
+		2 => 'medium',
+		3 => 'high',
+		4 => 'all'
+	];
 
 
-    public function initializeDebugDisplay(int $threshold = 0, ?array $levels = null)
-    {
-        $this->threshold = defined('WP_DEBUG') && WP_DEBUG ? $threshold : 0;
-        $this->levels = $levels ?: $this->levels;
-    }
+	public function initializeDebugDisplay(int $threshold = 0, ?array $levels = null)
+	{
+		$this->threshold = defined('WP_DEBUG') && WP_DEBUG ? $threshold : 0;
+		$this->levels = $levels ?: $this->levels;
+	}
 
-    public function debugLog(string $text, int $level = 1)
-    {
-        if ($this->threshold && $this->threshold >= $level) {
-            error_log($text);
-        }
-    }
+	public function debugLog(string $text, int $level = 1)
+	{
+		if ($this->threshold && $this->threshold >= $level) {
+			error_log($text);
+		}
+	}
 }

core/services/helpers/WordPressHooks.php

Indentation +31 added lines, -31 removed lines

@@ -4,35 +4,35 @@
 
 class WordPressHooks
 {
-    /**
-     * returns an array of names for all classes that have methods registered as callbacks for the given action or
-     * filter hook
-     *
-     * @param string $hook
-     * @return array
-     */
-    public static function getClassNamesForAllCallbacksOnHook(string $hook): array
-    {
-        global $wp_filter;
-        $class_names = [];
-        // are any callbacks registered for this hook ?
-        if (isset($wp_filter[ $hook ])) {
-            // loop thru all of the callbacks attached to the deprecated hookpoint
-            foreach ($wp_filter[ $hook ] as $priority) {
-                foreach ($priority as $callback) {
-                    // is the callback a non-static class method ?
-                    if (isset($callback['function']) && is_array($callback['function'])) {
-                        if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
-                            $class_names[] = get_class($callback['function'][0]);
-                        }
-                        // test for static method
-                    } elseif (strpos($callback['function'], '::') !== false) {
-                        $class         = explode('::', $callback['function']);
-                        $class_names[] = $class[0];
-                    }
-                }
-            }
-        }
-        return $class_names;
-    }
+	/**
+	 * returns an array of names for all classes that have methods registered as callbacks for the given action or
+	 * filter hook
+	 *
+	 * @param string $hook
+	 * @return array
+	 */
+	public static function getClassNamesForAllCallbacksOnHook(string $hook): array
+	{
+		global $wp_filter;
+		$class_names = [];
+		// are any callbacks registered for this hook ?
+		if (isset($wp_filter[ $hook ])) {
+			// loop thru all of the callbacks attached to the deprecated hookpoint
+			foreach ($wp_filter[ $hook ] as $priority) {
+				foreach ($priority as $callback) {
+					// is the callback a non-static class method ?
+					if (isset($callback['function']) && is_array($callback['function'])) {
+						if (isset($callback['function'][0]) && is_object($callback['function'][0])) {
+							$class_names[] = get_class($callback['function'][0]);
+						}
+						// test for static method
+					} elseif (strpos($callback['function'], '::') !== false) {
+						$class         = explode('::', $callback['function']);
+						$class_names[] = $class[0];
+					}
+				}
+			}
+		}
+		return $class_names;
+	}
 }

core/services/request/RequestStack.php

Indentation +42 added lines, -42 removed lines

@@ -14,47 +14,47 @@
  */
 class RequestStack
 {
-    protected RequestDecoratorInterface $request_stack_app;
-
-    protected RequestInterface $request;
-
-    protected RequestStackCoreAppInterface $core_app;
-
-    protected ResponseInterface $response;
-
-
-    /**
-     * @param RequestDecoratorInterface    $request_stack_app
-     * @param RequestStackCoreAppInterface $core_app
-     */
-    public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
-    {
-        $this->request_stack_app = $request_stack_app;
-        $this->core_app          = $core_app;
-    }
-
-
-    /**
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @return ResponseInterface
-     */
-    public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
-    {
-        $this->request  = $request;
-        $this->response = $response;
-        return $this->request_stack_app->handleRequest($request, $response);
-    }
-
-
-    /**
-     * handle_response
-     * executes the handle_response() method on the RequestStackCoreAppInterface object
-     * after the request stack has been fully processed
-     */
-    public function handleResponse()
-    {
-        $this->core_app->handleResponse($this->request, $this->response);
-    }
+	protected RequestDecoratorInterface $request_stack_app;
+
+	protected RequestInterface $request;
+
+	protected RequestStackCoreAppInterface $core_app;
+
+	protected ResponseInterface $response;
+
+
+	/**
+	 * @param RequestDecoratorInterface    $request_stack_app
+	 * @param RequestStackCoreAppInterface $core_app
+	 */
+	public function __construct(RequestDecoratorInterface $request_stack_app, RequestStackCoreAppInterface $core_app)
+	{
+		$this->request_stack_app = $request_stack_app;
+		$this->core_app          = $core_app;
+	}
+
+
+	/**
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @return ResponseInterface
+	 */
+	public function handleRequest(RequestInterface $request, ResponseInterface $response): ResponseInterface
+	{
+		$this->request  = $request;
+		$this->response = $response;
+		return $this->request_stack_app->handleRequest($request, $response);
+	}
+
+
+	/**
+	 * handle_response
+	 * executes the handle_response() method on the RequestStackCoreAppInterface object
+	 * after the request stack has been fully processed
+	 */
+	public function handleResponse()
+	{
+		$this->core_app->handleResponse($this->request, $this->response);
+	}
 }
 // Location: RequestStack.php

core/services/request/CurrentPage.php

Indentation +295 added lines, -295 removed lines

@@ -22,299 +22,299 @@
  */
 class CurrentPage
 {
-    private EE_CPT_Strategy $cpt_strategy;
-
-    private bool $initialized;
-
-    private ?bool $is_espresso_page = null;
-
-    private int $post_id          = 0;
-
-    private string $post_name        = '';
-
-    private array $post_type        = [];
-
-    private RequestInterface $request;
-
-
-    /**
-     * CurrentPage constructor.
-     *
-     * @param EE_CPT_Strategy  $cpt_strategy
-     * @param RequestInterface $request
-     */
-    public function __construct(EE_CPT_Strategy $cpt_strategy, RequestInterface $request)
-    {
-        $this->cpt_strategy = $cpt_strategy;
-        $this->request      = $request;
-        $this->initialized  = is_admin();
-        // analyse the incoming WP request
-        add_action('parse_request', [$this, 'parseQueryVars'], 2);
-    }
-
-
-    /**
-     * @param WP|null $WP
-     * @return void
-     */
-    public function parseQueryVars(WP $WP = null)
-    {
-        if ($this->initialized) {
-            return;
-        }
-        // if somebody forgot to provide us with WP, that's ok because its global
-        if (! $WP instanceof WP) {
-            global $WP;
-        }
-        $this->post_id   = $this->getPostId($WP);
-        $this->post_name = $this->getPostName($WP);
-        $this->post_type = $this->getPostType($WP);
-        // true or false ? is this page being used by EE ?
-        $this->setEspressoPage();
-        remove_action('parse_request', [$this, 'parseQueryVars'], 2);
-        $this->initialized = true;
-    }
-
-
-    /**
-     * Just a helper method for getting the url for the displayed page.
-     *
-     * @param WP|null $WP
-     * @return string
-     */
-    public function getPermalink(WP $WP = null): string
-    {
-        $post_id = $this->post_id ?: $this->getPostId($WP);
-        if ($post_id) {
-            return get_permalink($post_id);
-        }
-        if (! $WP instanceof WP) {
-            global $WP;
-        }
-        if ($WP instanceof WP && $WP->request) {
-            return site_url($WP->request);
-        }
-        return esc_url_raw(site_url($_SERVER['REQUEST_URI']));
-    }
-
-
-    /**
-     * @return array
-     */
-    public function espressoPostType(): array
-    {
-        return array_filter(
-            $this->post_type,
-            function ($post_type) {
-                return strpos($post_type, 'espresso_') === 0;
-            }
-        );
-    }
-
-
-    /**
-     * pokes and prods the WP object query_vars in an attempt to shake out a page/post ID
-     *
-     * @param WP|null $WP $WP
-     * @return int
-     */
-    private function getPostId(WP $WP = null): ?int
-    {
-        $post_id = 0;
-        if ($WP instanceof WP) {
-            // look for the post ID in the aptly named 'p' query var
-            if (isset($WP->query_vars['p'])) {
-                $post_id = $WP->query_vars['p'];
-            }
-            // not a post? what about a page?
-            if (! $post_id && isset($WP->query_vars['page_id'])) {
-                $post_id = $WP->query_vars['page_id'];
-            }
-            // ok... maybe pretty permalinks are off and the ID is set in the raw request...
-            // but hasn't been processed yet ie: this method is being called too early :\
-            if (! $post_id && $WP->request !== null && is_numeric(basename($WP->request))) {
-                $post_id = basename($WP->request);
-            }
-        }
-        // none of the above? ok what about an explicit "post_id" URL parameter?
-        if (! $post_id && $this->request->requestParamIsSet('post_id')) {
-            $post_id = $this->request->getRequestParam('post_id', 0, DataType::INT);
-        }
-        return (int) $post_id;
-    }
-
-
-    /**
-     * similar to getPostId() above but attempts to obtain the "name" for the current page/post
-     *
-     * @param WP|null $WP $WP
-     * @return string|null
-     */
-    private function getPostName(WP $WP = null): ?string
-    {
-        global $wpdb;
-        $post_name = '';
-        if ($WP instanceof WP) {
-            // if this is a post, then is the post name set?
-            if (isset($WP->query_vars['name']) && ! empty($WP->query_vars['name'])) {
-                $post_name = is_array($WP->query_vars['name']) ? $WP->query_vars['name'][0] : $WP->query_vars['name'];
-            }
-            // what about the page name?
-            if (! $post_name && isset($WP->query_vars['pagename']) && ! empty($WP->query_vars['pagename'])) {
-                $post_name = is_array($WP->query_vars['pagename']) ? $WP->query_vars['pagename'][0]
-                    : $WP->query_vars['pagename'];
-            }
-            // this stinks but let's run a query to try and get the post name from the URL
-            // (assuming pretty permalinks are on)
-            if (! $post_name && ! empty($WP->request)) {
-                $possible_post_name = basename($WP->request);
-                if (! is_numeric($possible_post_name)) {
-                    $SQL                = "SELECT ID from $wpdb->posts";
-                    $SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
-                    $SQL                .= ' AND post_name=%s';
-                    $possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
-                    if ($possible_post_name) {
-                        $post_name = $possible_post_name;
-                    }
-                }
-            }
-        }
-        // ug... ok... nothing yet... but do we have a post ID?
-        // if so then... sigh... run a query to get the post name :\
-        if (! $post_name && $this->post_id) {
-            $SQL                = "SELECT post_name from $wpdb->posts";
-            $SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
-            $SQL                .= ' AND ID=%d';
-            $possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->post_id));
-            if ($possible_post_name) {
-                $post_name = $possible_post_name;
-            }
-        }
-        // still nothing? ok what about an explicit 'post_name' URL parameter?
-        if (! $post_name && $this->request->requestParamIsSet('post_name')) {
-            $post_name = $this->request->getRequestParam('post_name');
-        }
-        return $post_name;
-    }
-
-
-    /**
-     * also similar to getPostId() and getPostName() above but not as insane
-     *
-     * @param WP|null $WP $WP
-     * @return array
-     */
-    private function getPostType(WP $WP = null): array
-    {
-        $post_types = [];
-        if ($WP instanceof WP) {
-            $post_types = isset($WP->query_vars['post_type'])
-                ? (array) $WP->query_vars['post_type']
-                : [];
-        }
-        if (empty($post_types) && $this->request->requestParamIsSet('post_type')) {
-            $post_types = $this->request->getRequestParam('post_type', [], DataType::STRING, true);
-        }
-        return (array) $post_types;
-    }
-
-
-    /**
-     * if TRUE, then the current page is somehow utilizing EE logic
-     *
-     * @return bool
-     */
-    public function isEspressoPage(): bool
-    {
-        if ($this->is_espresso_page === null) {
-            $this->setEspressoPage();
-        }
-        return $this->is_espresso_page;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function postId(): int
-    {
-        return $this->post_id;
-    }
-
-
-    /**
-     * @return string|null
-     */
-    public function postName(): ?string
-    {
-        return $this->post_name;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function postType(): array
-    {
-        return $this->post_type;
-    }
-
-
-    /**
-     * for manually indicating the current page will utilize EE logic
-     *
-     * @param bool|int|string|null $value
-     * @return void
-     */
-    public function setEspressoPage($value = null)
-    {
-        $this->is_espresso_page = $value !== null
-            ? filter_var($value, FILTER_VALIDATE_BOOLEAN)
-            : $this->testForEspressoPage();
-    }
-
-
-    /**
-     * attempts to determine if the current page/post is an EE related page/post
-     * because it utilizes one of our CPT taxonomies, endpoints, or post types
-     *
-     * @return bool
-     */
-    private function testForEspressoPage(): bool
-    {
-        // in case it has already been set
-        if ($this->is_espresso_page) {
-            return true;
-        }
-        global $WP;
-        $espresso_CPT_taxonomies = $this->cpt_strategy->get_CPT_taxonomies();
-        if (is_array($espresso_CPT_taxonomies)) {
-            foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy => $details) {
-                if (isset($WP->query_vars, $WP->query_vars[ $espresso_CPT_taxonomy ])) {
-                    return true;
-                }
-            }
-        }
-        // load espresso CPT endpoints
-        $espresso_CPT_endpoints  = $this->cpt_strategy->get_CPT_endpoints();
-        $post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
-        foreach ($this->post_type as $post_type) {
-            // was a post name passed ?
-            if (isset($post_type_CPT_endpoints[ $post_type ])) {
-                // kk we know this is an espresso page, but is it a specific post ?
-                if (! $this->post_name) {
-                    $espresso_post_type = $this->request->getRequestParam('post_type');
-                    // there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
-                    // this essentially sets the post_name to "events" (or whatever EE CPT)
-                    $post_name = $post_type_CPT_endpoints[ $espresso_post_type ] ?? '';
-                    // if the post type matches one of ours then set the post name to the endpoint
-                    if ($post_name) {
-                        $this->post_name = $post_name;
-                    }
-                }
-                return true;
-            }
-        }
-        return false;
-    }
+	private EE_CPT_Strategy $cpt_strategy;
+
+	private bool $initialized;
+
+	private ?bool $is_espresso_page = null;
+
+	private int $post_id          = 0;
+
+	private string $post_name        = '';
+
+	private array $post_type        = [];
+
+	private RequestInterface $request;
+
+
+	/**
+	 * CurrentPage constructor.
+	 *
+	 * @param EE_CPT_Strategy  $cpt_strategy
+	 * @param RequestInterface $request
+	 */
+	public function __construct(EE_CPT_Strategy $cpt_strategy, RequestInterface $request)
+	{
+		$this->cpt_strategy = $cpt_strategy;
+		$this->request      = $request;
+		$this->initialized  = is_admin();
+		// analyse the incoming WP request
+		add_action('parse_request', [$this, 'parseQueryVars'], 2);
+	}
+
+
+	/**
+	 * @param WP|null $WP
+	 * @return void
+	 */
+	public function parseQueryVars(WP $WP = null)
+	{
+		if ($this->initialized) {
+			return;
+		}
+		// if somebody forgot to provide us with WP, that's ok because its global
+		if (! $WP instanceof WP) {
+			global $WP;
+		}
+		$this->post_id   = $this->getPostId($WP);
+		$this->post_name = $this->getPostName($WP);
+		$this->post_type = $this->getPostType($WP);
+		// true or false ? is this page being used by EE ?
+		$this->setEspressoPage();
+		remove_action('parse_request', [$this, 'parseQueryVars'], 2);
+		$this->initialized = true;
+	}
+
+
+	/**
+	 * Just a helper method for getting the url for the displayed page.
+	 *
+	 * @param WP|null $WP
+	 * @return string
+	 */
+	public function getPermalink(WP $WP = null): string
+	{
+		$post_id = $this->post_id ?: $this->getPostId($WP);
+		if ($post_id) {
+			return get_permalink($post_id);
+		}
+		if (! $WP instanceof WP) {
+			global $WP;
+		}
+		if ($WP instanceof WP && $WP->request) {
+			return site_url($WP->request);
+		}
+		return esc_url_raw(site_url($_SERVER['REQUEST_URI']));
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function espressoPostType(): array
+	{
+		return array_filter(
+			$this->post_type,
+			function ($post_type) {
+				return strpos($post_type, 'espresso_') === 0;
+			}
+		);
+	}
+
+
+	/**
+	 * pokes and prods the WP object query_vars in an attempt to shake out a page/post ID
+	 *
+	 * @param WP|null $WP $WP
+	 * @return int
+	 */
+	private function getPostId(WP $WP = null): ?int
+	{
+		$post_id = 0;
+		if ($WP instanceof WP) {
+			// look for the post ID in the aptly named 'p' query var
+			if (isset($WP->query_vars['p'])) {
+				$post_id = $WP->query_vars['p'];
+			}
+			// not a post? what about a page?
+			if (! $post_id && isset($WP->query_vars['page_id'])) {
+				$post_id = $WP->query_vars['page_id'];
+			}
+			// ok... maybe pretty permalinks are off and the ID is set in the raw request...
+			// but hasn't been processed yet ie: this method is being called too early :\
+			if (! $post_id && $WP->request !== null && is_numeric(basename($WP->request))) {
+				$post_id = basename($WP->request);
+			}
+		}
+		// none of the above? ok what about an explicit "post_id" URL parameter?
+		if (! $post_id && $this->request->requestParamIsSet('post_id')) {
+			$post_id = $this->request->getRequestParam('post_id', 0, DataType::INT);
+		}
+		return (int) $post_id;
+	}
+
+
+	/**
+	 * similar to getPostId() above but attempts to obtain the "name" for the current page/post
+	 *
+	 * @param WP|null $WP $WP
+	 * @return string|null
+	 */
+	private function getPostName(WP $WP = null): ?string
+	{
+		global $wpdb;
+		$post_name = '';
+		if ($WP instanceof WP) {
+			// if this is a post, then is the post name set?
+			if (isset($WP->query_vars['name']) && ! empty($WP->query_vars['name'])) {
+				$post_name = is_array($WP->query_vars['name']) ? $WP->query_vars['name'][0] : $WP->query_vars['name'];
+			}
+			// what about the page name?
+			if (! $post_name && isset($WP->query_vars['pagename']) && ! empty($WP->query_vars['pagename'])) {
+				$post_name = is_array($WP->query_vars['pagename']) ? $WP->query_vars['pagename'][0]
+					: $WP->query_vars['pagename'];
+			}
+			// this stinks but let's run a query to try and get the post name from the URL
+			// (assuming pretty permalinks are on)
+			if (! $post_name && ! empty($WP->request)) {
+				$possible_post_name = basename($WP->request);
+				if (! is_numeric($possible_post_name)) {
+					$SQL                = "SELECT ID from $wpdb->posts";
+					$SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
+					$SQL                .= ' AND post_name=%s';
+					$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $possible_post_name));
+					if ($possible_post_name) {
+						$post_name = $possible_post_name;
+					}
+				}
+			}
+		}
+		// ug... ok... nothing yet... but do we have a post ID?
+		// if so then... sigh... run a query to get the post name :\
+		if (! $post_name && $this->post_id) {
+			$SQL                = "SELECT post_name from $wpdb->posts";
+			$SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
+			$SQL                .= ' AND ID=%d';
+			$possible_post_name = $wpdb->get_var($wpdb->prepare($SQL, $this->post_id));
+			if ($possible_post_name) {
+				$post_name = $possible_post_name;
+			}
+		}
+		// still nothing? ok what about an explicit 'post_name' URL parameter?
+		if (! $post_name && $this->request->requestParamIsSet('post_name')) {
+			$post_name = $this->request->getRequestParam('post_name');
+		}
+		return $post_name;
+	}
+
+
+	/**
+	 * also similar to getPostId() and getPostName() above but not as insane
+	 *
+	 * @param WP|null $WP $WP
+	 * @return array
+	 */
+	private function getPostType(WP $WP = null): array
+	{
+		$post_types = [];
+		if ($WP instanceof WP) {
+			$post_types = isset($WP->query_vars['post_type'])
+				? (array) $WP->query_vars['post_type']
+				: [];
+		}
+		if (empty($post_types) && $this->request->requestParamIsSet('post_type')) {
+			$post_types = $this->request->getRequestParam('post_type', [], DataType::STRING, true);
+		}
+		return (array) $post_types;
+	}
+
+
+	/**
+	 * if TRUE, then the current page is somehow utilizing EE logic
+	 *
+	 * @return bool
+	 */
+	public function isEspressoPage(): bool
+	{
+		if ($this->is_espresso_page === null) {
+			$this->setEspressoPage();
+		}
+		return $this->is_espresso_page;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function postId(): int
+	{
+		return $this->post_id;
+	}
+
+
+	/**
+	 * @return string|null
+	 */
+	public function postName(): ?string
+	{
+		return $this->post_name;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function postType(): array
+	{
+		return $this->post_type;
+	}
+
+
+	/**
+	 * for manually indicating the current page will utilize EE logic
+	 *
+	 * @param bool|int|string|null $value
+	 * @return void
+	 */
+	public function setEspressoPage($value = null)
+	{
+		$this->is_espresso_page = $value !== null
+			? filter_var($value, FILTER_VALIDATE_BOOLEAN)
+			: $this->testForEspressoPage();
+	}
+
+
+	/**
+	 * attempts to determine if the current page/post is an EE related page/post
+	 * because it utilizes one of our CPT taxonomies, endpoints, or post types
+	 *
+	 * @return bool
+	 */
+	private function testForEspressoPage(): bool
+	{
+		// in case it has already been set
+		if ($this->is_espresso_page) {
+			return true;
+		}
+		global $WP;
+		$espresso_CPT_taxonomies = $this->cpt_strategy->get_CPT_taxonomies();
+		if (is_array($espresso_CPT_taxonomies)) {
+			foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy => $details) {
+				if (isset($WP->query_vars, $WP->query_vars[ $espresso_CPT_taxonomy ])) {
+					return true;
+				}
+			}
+		}
+		// load espresso CPT endpoints
+		$espresso_CPT_endpoints  = $this->cpt_strategy->get_CPT_endpoints();
+		$post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
+		foreach ($this->post_type as $post_type) {
+			// was a post name passed ?
+			if (isset($post_type_CPT_endpoints[ $post_type ])) {
+				// kk we know this is an espresso page, but is it a specific post ?
+				if (! $this->post_name) {
+					$espresso_post_type = $this->request->getRequestParam('post_type');
+					// there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
+					// this essentially sets the post_name to "events" (or whatever EE CPT)
+					$post_name = $post_type_CPT_endpoints[ $espresso_post_type ] ?? '';
+					// if the post type matches one of ours then set the post name to the endpoint
+					if ($post_name) {
+						$this->post_name = $post_name;
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
 }

Spacing +18 added lines, -18 removed lines

@@ -28,11 +28,11 @@ 
 
     private ?bool $is_espresso_page = null;
 
-    private int $post_id          = 0;
+    private int $post_id = 0;
 
-    private string $post_name        = '';
+    private string $post_name = '';
 
-    private array $post_type        = [];
+    private array $post_type = [];
 
     private RequestInterface $request;
 
@@ -63,7 +63,7 @@ 
             return;
         }
         // if somebody forgot to provide us with WP, that's ok because its global
-        if (! $WP instanceof WP) {
+        if ( ! $WP instanceof WP) {
             global $WP;
         }
         $this->post_id   = $this->getPostId($WP);
@@ -88,7 +88,7 @@ 
         if ($post_id) {
             return get_permalink($post_id);
         }
-        if (! $WP instanceof WP) {
+        if ( ! $WP instanceof WP) {
             global $WP;
         }
         if ($WP instanceof WP && $WP->request) {
@@ -105,7 +105,7 @@ 
     {
         return array_filter(
             $this->post_type,
-            function ($post_type) {
+            function($post_type) {
                 return strpos($post_type, 'espresso_') === 0;
             }
         );
@@ -127,17 +127,17 @@ 
                 $post_id = $WP->query_vars['p'];
             }
             // not a post? what about a page?
-            if (! $post_id && isset($WP->query_vars['page_id'])) {
+            if ( ! $post_id && isset($WP->query_vars['page_id'])) {
                 $post_id = $WP->query_vars['page_id'];
             }
             // ok... maybe pretty permalinks are off and the ID is set in the raw request...
             // but hasn't been processed yet ie: this method is being called too early :\
-            if (! $post_id && $WP->request !== null && is_numeric(basename($WP->request))) {
+            if ( ! $post_id && $WP->request !== null && is_numeric(basename($WP->request))) {
                 $post_id = basename($WP->request);
             }
         }
         // none of the above? ok what about an explicit "post_id" URL parameter?
-        if (! $post_id && $this->request->requestParamIsSet('post_id')) {
+        if ( ! $post_id && $this->request->requestParamIsSet('post_id')) {
             $post_id = $this->request->getRequestParam('post_id', 0, DataType::INT);
         }
         return (int) $post_id;
@@ -160,15 +160,15 @@ 
                 $post_name = is_array($WP->query_vars['name']) ? $WP->query_vars['name'][0] : $WP->query_vars['name'];
             }
             // what about the page name?
-            if (! $post_name && isset($WP->query_vars['pagename']) && ! empty($WP->query_vars['pagename'])) {
+            if ( ! $post_name && isset($WP->query_vars['pagename']) && ! empty($WP->query_vars['pagename'])) {
                 $post_name = is_array($WP->query_vars['pagename']) ? $WP->query_vars['pagename'][0]
                     : $WP->query_vars['pagename'];
             }
             // this stinks but let's run a query to try and get the post name from the URL
             // (assuming pretty permalinks are on)
-            if (! $post_name && ! empty($WP->request)) {
+            if ( ! $post_name && ! empty($WP->request)) {
                 $possible_post_name = basename($WP->request);
-                if (! is_numeric($possible_post_name)) {
+                if ( ! is_numeric($possible_post_name)) {
                     $SQL                = "SELECT ID from $wpdb->posts";
                     $SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
                     $SQL                .= ' AND post_name=%s';
@@ -181,7 +181,7 @@ 
         }
         // ug... ok... nothing yet... but do we have a post ID?
         // if so then... sigh... run a query to get the post name :\
-        if (! $post_name && $this->post_id) {
+        if ( ! $post_name && $this->post_id) {
             $SQL                = "SELECT post_name from $wpdb->posts";
             $SQL                .= " WHERE post_status NOT IN ('auto-draft', 'inherit', 'trash')";
             $SQL                .= ' AND ID=%d';
@@ -191,7 +191,7 @@ 
             }
         }
         // still nothing? ok what about an explicit 'post_name' URL parameter?
-        if (! $post_name && $this->request->requestParamIsSet('post_name')) {
+        if ( ! $post_name && $this->request->requestParamIsSet('post_name')) {
             $post_name = $this->request->getRequestParam('post_name');
         }
         return $post_name;
@@ -290,7 +290,7 @@ 
         $espresso_CPT_taxonomies = $this->cpt_strategy->get_CPT_taxonomies();
         if (is_array($espresso_CPT_taxonomies)) {
             foreach ($espresso_CPT_taxonomies as $espresso_CPT_taxonomy => $details) {
-                if (isset($WP->query_vars, $WP->query_vars[ $espresso_CPT_taxonomy ])) {
+                if (isset($WP->query_vars, $WP->query_vars[$espresso_CPT_taxonomy])) {
                     return true;
                 }
             }
@@ -300,13 +300,13 @@ 
         $post_type_CPT_endpoints = array_flip($espresso_CPT_endpoints);
         foreach ($this->post_type as $post_type) {
             // was a post name passed ?
-            if (isset($post_type_CPT_endpoints[ $post_type ])) {
+            if (isset($post_type_CPT_endpoints[$post_type])) {
                 // kk we know this is an espresso page, but is it a specific post ?
-                if (! $this->post_name) {
+                if ( ! $this->post_name) {
                     $espresso_post_type = $this->request->getRequestParam('post_type');
                     // there's no specific post name set, so maybe it's one of our endpoints like www.domain.com/events
                     // this essentially sets the post_name to "events" (or whatever EE CPT)
-                    $post_name = $post_type_CPT_endpoints[ $espresso_post_type ] ?? '';
+                    $post_name = $post_type_CPT_endpoints[$espresso_post_type] ?? '';
                     // if the post type matches one of ours then set the post name to the endpoint
                     if ($post_name) {
                         $this->post_name = $post_name;

core/services/request/Response.php

Indentation +135 added lines, -135 removed lines

@@ -14,139 +14,139 @@
  */
 class Response implements ResponseInterface, ReservedInstanceInterface
 {
-    protected bool $deactivate_plugin = false;
-
-    protected array $notice            = [];
-
-    /**
-     * rendered output to be returned to WP
-     */
-    protected array $output             = [];
-
-    protected array $request_headers    = [];
-
-    protected bool $request_terminated = false;
-
-
-    /**
-     * EE_Response constructor.
-     */
-    public function __construct()
-    {
-        $this->terminateRequest(false);
-    }
-
-
-    /**
-     * @param $key
-     * @param $value
-     * @return    void
-     */
-    public function setNotice($key, $value)
-    {
-        $this->notice[ $key ] = $value;
-    }
-
-
-    /**
-     * @param $key
-     * @return    mixed
-     */
-    public function getNotice($key)
-    {
-        return $this->notice[ $key ] ?? null;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getNotices(): array
-    {
-        return $this->notice;
-    }
-
-
-    /**
-     * @param string $string
-     * @param bool   $append
-     */
-    public function addOutput(string $string, bool $append = true)
-    {
-        if ($append) {
-            $this->output[] = $string;
-            return;
-        }
-        array_unshift($this->output, $string);
-    }
-
-
-    /**
-     * @param bool   $as_string
-     * @param string $separator
-     * @return array|string
-     */
-    public function getOutput(bool $as_string = true, string $separator = PHP_EOL)
-    {
-        return $as_string
-            ? implode($separator, $this->output)
-            : $this->output;
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function requestTerminated(): bool
-    {
-        return $this->request_terminated;
-    }
-
-
-    /**
-     * @param bool|int|string|null $request_terminated
-     */
-    public function terminateRequest($request_terminated = true)
-    {
-        $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function pluginDeactivated(): bool
-    {
-        return $this->deactivate_plugin;
-    }
-
-
-    /**
-     * sets $deactivate_plugin to true
-     */
-    public function deactivatePlugin()
-    {
-        $this->deactivate_plugin = true;
-    }
-
-
-    /**
-     * @return array
-     * @since 5.0.0.p
-     */
-    public function requestHeaders(): array
-    {
-        return $this->request_headers;
-    }
-
-
-    /**
-     * @param string $request_header
-     * @return void
-     * @since 5.0.0.p
-     */
-    public function setRequestHeader(string $request_header): void
-    {
-        $this->request_headers[] = $request_header;
-    }
+	protected bool $deactivate_plugin = false;
+
+	protected array $notice            = [];
+
+	/**
+	 * rendered output to be returned to WP
+	 */
+	protected array $output             = [];
+
+	protected array $request_headers    = [];
+
+	protected bool $request_terminated = false;
+
+
+	/**
+	 * EE_Response constructor.
+	 */
+	public function __construct()
+	{
+		$this->terminateRequest(false);
+	}
+
+
+	/**
+	 * @param $key
+	 * @param $value
+	 * @return    void
+	 */
+	public function setNotice($key, $value)
+	{
+		$this->notice[ $key ] = $value;
+	}
+
+
+	/**
+	 * @param $key
+	 * @return    mixed
+	 */
+	public function getNotice($key)
+	{
+		return $this->notice[ $key ] ?? null;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getNotices(): array
+	{
+		return $this->notice;
+	}
+
+
+	/**
+	 * @param string $string
+	 * @param bool   $append
+	 */
+	public function addOutput(string $string, bool $append = true)
+	{
+		if ($append) {
+			$this->output[] = $string;
+			return;
+		}
+		array_unshift($this->output, $string);
+	}
+
+
+	/**
+	 * @param bool   $as_string
+	 * @param string $separator
+	 * @return array|string
+	 */
+	public function getOutput(bool $as_string = true, string $separator = PHP_EOL)
+	{
+		return $as_string
+			? implode($separator, $this->output)
+			: $this->output;
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function requestTerminated(): bool
+	{
+		return $this->request_terminated;
+	}
+
+
+	/**
+	 * @param bool|int|string|null $request_terminated
+	 */
+	public function terminateRequest($request_terminated = true)
+	{
+		$this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function pluginDeactivated(): bool
+	{
+		return $this->deactivate_plugin;
+	}
+
+
+	/**
+	 * sets $deactivate_plugin to true
+	 */
+	public function deactivatePlugin()
+	{
+		$this->deactivate_plugin = true;
+	}
+
+
+	/**
+	 * @return array
+	 * @since 5.0.0.p
+	 */
+	public function requestHeaders(): array
+	{
+		return $this->request_headers;
+	}
+
+
+	/**
+	 * @param string $request_header
+	 * @return void
+	 * @since 5.0.0.p
+	 */
+	public function setRequestHeader(string $request_header): void
+	{
+		$this->request_headers[] = $request_header;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 {
     protected bool $deactivate_plugin = false;
 
-    protected array $notice            = [];
+    protected array $notice = [];
 
     /**
      * rendered output to be returned to WP
@@ -44,7 +44,7 @@ 
      */
     public function setNotice($key, $value)
     {
-        $this->notice[ $key ] = $value;
+        $this->notice[$key] = $value;
     }
 
 
@@ -54,7 +54,7 @@ 
      */
     public function getNotice($key)
     {
-        return $this->notice[ $key ] ?? null;
+        return $this->notice[$key] ?? null;
     }