eventespresso / event-espresso-core

core/services/address/formatters/NullAddressFormatter.php

Indentation +21 added lines, -21 removed lines

@@ -12,25 +12,25 @@
  */
 class NullAddressFormatter implements AddressFormatterInterface
 {
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return string|null
-     */
-    public function format(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $CNT_ISO
-    ): ?string {
-        return null;
-    }
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 * @return string|null
+	 */
+	public function format(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $CNT_ISO
+	): ?string {
+		return null;
+	}
 }

core/domain/entities/GenericAddress.php

Indentation +236 added lines, -236 removed lines

@@ -19,240 +19,240 @@
  */
 class GenericAddress implements AddressInterface
 {
-    // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
-    /**
-     * @var string
-     */
-    private $_address;
-
-    /**
-     * @var string
-     */
-    private $_address2;
-
-    /**
-     * @var string
-     */
-    private $_city;
-
-    /**
-     * @var int
-     */
-    private $_state_ID = 0;
-
-    /**
-     * @var EE_State
-     */
-    private $_state_obj;
-
-    /**
-     * @var string
-     */
-    private $_zip;
-
-    /**
-     * @var string
-     */
-    private $_country_ID = '';
-
-    /**
-     * @var EE_Country
-     */
-    private $_country_obj;
-    // phpcs:enable
-
-
-    // phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
-    /**
-     * @param string            $address
-     * @param string            $address2
-     * @param string            $city
-     * @param EE_State|int      $state
-     * @param string            $zip
-     * @param EE_Country|string $country
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function __construct(string $address, string $address2, string $city, $state, string $zip, $country)
-    {
-        $this->_address  = $address;
-        $this->_address2 = $address2;
-        $this->_city     = $city;
-        if ($state instanceof EE_State) {
-            $this->_state_obj = $state;
-        } else {
-            $this->_state_ID  = $state;
-            $this->_state_obj = $this->_get_state_obj();
-        }
-        $this->_zip = $zip;
-        if ($country instanceof EE_Country) {
-            $this->_country_obj = $country;
-        } else {
-            $this->_country_ID  = $country;
-            $this->_country_obj = $this->_get_country_obj();
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function address(): string
-    {
-        return $this->_address;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function address2(): string
-    {
-        return $this->_address2;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function city(): string
-    {
-        return $this->_city;
-    }
-
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-
-
-    /**
-     * @return EE_State
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_state_obj(): EE_State
-    {
-        return $this->_state_obj instanceof EE_State
-            ? $this->_state_obj
-            : EE_Registry::instance()->load_model('State')->get_one_by_ID($this->_state_ID);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function state_ID(): int
-    {
-        return $this->_state_ID;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function state_abbrev(): string
-    {
-        return $this->state_obj() instanceof EE_State
-            ? $this->state_obj()->abbrev()
-            : '';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function state_name(): string
-    {
-        return $this->state_obj() instanceof EE_State
-            ? $this->state_obj()->name()
-            : '';
-    }
-
-
-    /**
-     * @return EE_State
-     */
-    public function state_obj(): EE_State
-    {
-        return $this->_state_obj;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function state(): string
-    {
-        if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
-            return $this->state_obj()->abbrev();
-        } else {
-            return $this->state_name();
-        }
-    }
-
-
-    /**
-     * @return EE_Country
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private function _get_country_obj(): EE_Country
-    {
-        return $this->_country_obj instanceof EE_Country
-            ? $this->_country_obj
-            : EE_Registry::instance()->load_model('Country')->get_one_by_ID($this->_country_ID);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function country_ID(): string
-    {
-        return $this->_country_ID;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function country_name(): string
-    {
-        return $this->country_obj() instanceof EE_Country
-            ? $this->country_obj()->name()
-            : '';
-    }
-
-
-    /**
-     * @return EE_Country
-     */
-    public function country_obj(): EE_Country
-    {
-        return $this->_country_obj;
-    }
-
-
-    /**
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function country(): string
-    {
-        if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
-            return $this->country_ID();
-        } else {
-            return $this->country_name();
-        }
-    }
-
-
-    /**
-     * @return string
-     */
-    public function zip(): string
-    {
-        return $this->_zip;
-    }
+	// phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
+	/**
+	 * @var string
+	 */
+	private $_address;
+
+	/**
+	 * @var string
+	 */
+	private $_address2;
+
+	/**
+	 * @var string
+	 */
+	private $_city;
+
+	/**
+	 * @var int
+	 */
+	private $_state_ID = 0;
+
+	/**
+	 * @var EE_State
+	 */
+	private $_state_obj;
+
+	/**
+	 * @var string
+	 */
+	private $_zip;
+
+	/**
+	 * @var string
+	 */
+	private $_country_ID = '';
+
+	/**
+	 * @var EE_Country
+	 */
+	private $_country_obj;
+	// phpcs:enable
+
+
+	// phpcs:disable PSR2.Methods.MethodDeclaration.Underscore
+	/**
+	 * @param string            $address
+	 * @param string            $address2
+	 * @param string            $city
+	 * @param EE_State|int      $state
+	 * @param string            $zip
+	 * @param EE_Country|string $country
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function __construct(string $address, string $address2, string $city, $state, string $zip, $country)
+	{
+		$this->_address  = $address;
+		$this->_address2 = $address2;
+		$this->_city     = $city;
+		if ($state instanceof EE_State) {
+			$this->_state_obj = $state;
+		} else {
+			$this->_state_ID  = $state;
+			$this->_state_obj = $this->_get_state_obj();
+		}
+		$this->_zip = $zip;
+		if ($country instanceof EE_Country) {
+			$this->_country_obj = $country;
+		} else {
+			$this->_country_ID  = $country;
+			$this->_country_obj = $this->_get_country_obj();
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function address(): string
+	{
+		return $this->_address;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function address2(): string
+	{
+		return $this->_address2;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function city(): string
+	{
+		return $this->_city;
+	}
+
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+
+
+	/**
+	 * @return EE_State
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_state_obj(): EE_State
+	{
+		return $this->_state_obj instanceof EE_State
+			? $this->_state_obj
+			: EE_Registry::instance()->load_model('State')->get_one_by_ID($this->_state_ID);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function state_ID(): int
+	{
+		return $this->_state_ID;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function state_abbrev(): string
+	{
+		return $this->state_obj() instanceof EE_State
+			? $this->state_obj()->abbrev()
+			: '';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function state_name(): string
+	{
+		return $this->state_obj() instanceof EE_State
+			? $this->state_obj()->name()
+			: '';
+	}
+
+
+	/**
+	 * @return EE_State
+	 */
+	public function state_obj(): EE_State
+	{
+		return $this->_state_obj;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function state(): string
+	{
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
+			return $this->state_obj()->abbrev();
+		} else {
+			return $this->state_name();
+		}
+	}
+
+
+	/**
+	 * @return EE_Country
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private function _get_country_obj(): EE_Country
+	{
+		return $this->_country_obj instanceof EE_Country
+			? $this->_country_obj
+			: EE_Registry::instance()->load_model('Country')->get_one_by_ID($this->_country_ID);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function country_ID(): string
+	{
+		return $this->_country_ID;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function country_name(): string
+	{
+		return $this->country_obj() instanceof EE_Country
+			? $this->country_obj()->name()
+			: '';
+	}
+
+
+	/**
+	 * @return EE_Country
+	 */
+	public function country_obj(): EE_Country
+	{
+		return $this->_country_obj;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function country(): string
+	{
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
+			return $this->country_ID();
+		} else {
+			return $this->country_name();
+		}
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function zip(): string
+	{
+		return $this->_zip;
+	}
 }

core/libraries/iframe_display/iframe_wrapper.template.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
                 <?php echo esc_js($eei18n); ?>
             </script>
         <?php foreach ($header_js as $key => $url) :?>
-            <?php $header_attributes = isset($header_js_attributes[ $key ]) ? $header_js_attributes[ $key ] : ''; ?>
+            <?php $header_attributes = isset($header_js_attributes[$key]) ? $header_js_attributes[$key] : ''; ?>
         <script type="text/javascript" src="<?php echo esc_url_raw($url); ?>" <?php echo AttributesSanitizer::clean($header_attributes, AllowedTags::getAllowedTags(), 'script'); ?>></script>
         <?php endforeach; ?>
     <?php endif; ?>
@@ -47,7 +47,7 @@ 
     <?php echo wp_kses($content, AllowedTags::getWithFullTags()); ?>
 </div>
 <?php foreach ($footer_js as $key => $url) : ?>
-    <?php $footer_attributes = isset($footer_js_attributes[ $key ]) ? $footer_js_attributes[ $key ] : ''; ?>
+    <?php $footer_attributes = isset($footer_js_attributes[$key]) ? $footer_js_attributes[$key] : ''; ?>
     <script type="text/javascript" src="<?php echo esc_url_raw($url); ?>" <?php echo AttributesSanitizer::clean($footer_attributes, AllowedTags::getAllowedTags(), 'script'); ?>></script>
 <?php endforeach; ?>
 <?php if ($enqueue_wp_assets) : ?>

Braces +5 added lines, -2 removed lines

@@ -28,9 +28,12 @@
     <title><?php echo wp_strip_all_tags($title); ?></title>
     <?php if ($enqueue_wp_assets) : ?>
         <?php wp_head(); ?>
-    <?php else : ?>
+    <?php else {
+	: ?>
         <?php foreach ($css as $url) :?>
-    <link rel="stylesheet" type="text/css" href="<?php echo esc_url_raw($url); ?>">
+    <link rel="stylesheet" type="text/css" href="<?php echo esc_url_raw($url);
+}
+?>">
         <?php endforeach; ?>
             <script type="text/javascript">
                 <?php echo esc_js($eei18n); ?>

core/libraries/payment_methods/templates/payment_details_content.template.php

Indentation +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
  */
 $gateway_response = $payment->gateway_response();
 if (! empty($gateway_response)) {
-    echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
+	echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
 }

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @var EE_Payment_Method $payment_method
  */
 $gateway_response = $payment->gateway_response();
-if (! empty($gateway_response)) {
-    echo '<span class="error payment-problem">' . esc_html($gateway_response) . '</span>';
+if ( ! empty($gateway_response)) {
+    echo '<span class="error payment-problem">'.esc_html($gateway_response).'</span>';
 }

core/EE_Load_Textdomain.core.php

Indentation +95 added lines, -95 removed lines

@@ -12,110 +12,110 @@
  */
 class EE_Load_Textdomain extends EE_Base
 {
-    /**
-     * holds the current lang in WP
-     *
-     * @var string
-     */
-    private static $locale;
+	/**
+	 * holds the current lang in WP
+	 *
+	 * @var string
+	 */
+	private static $locale;
 
 
-    /**
-     * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
-     * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function load_textdomain()
-    {
-        EE_Load_Textdomain::loadTranslationsForLocale();
-        // now load the textdomain
-        if (!empty(EE_Load_Textdomain::$locale)) {
-            $github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
-            if (is_readable($github_mo_path)) {
-                load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
-                return;
-            }
-            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
-            if (is_readable($glotpress_mo_path)) {
-                load_textdomain('event_espresso', $glotpress_mo_path);
-                return;
-            }
-        }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
-    }
+	/**
+	 * this takes care of retrieving a matching textdomain for event espresso for the current WPLANG from EE GitHub
+	 * repo (if necessary) and then loading it for translations. should only be called in wp plugins_loaded callback
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function load_textdomain()
+	{
+		EE_Load_Textdomain::loadTranslationsForLocale();
+		// now load the textdomain
+		if (!empty(EE_Load_Textdomain::$locale)) {
+			$github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
+			if (is_readable($github_mo_path)) {
+				load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
+				return;
+			}
+			$glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
+			if (is_readable($glotpress_mo_path)) {
+				load_textdomain('event_espresso', $glotpress_mo_path);
+				return;
+			}
+		}
+		load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+	}
 
 
-    /**
-     * The purpose of this method is to sideload all of the lang files for EE, this includes the POT file and also the PO/MO files for the given WPLANG locale (if necessary).
-     *
-     * @access private
-     * @static
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function loadTranslationsForLocale()
-    {
-        EE_Load_Textdomain::$locale = get_locale();
-        // can't download a language file if a language isn't set <taps temple>
-        if (empty(EE_Load_Textdomain::$locale)) {
-            return;
-        }
-        $language_check_option_name = 'ee_lang_check_' . EE_Load_Textdomain::$locale . '_' . EVENT_ESPRESSO_VERSION;
-        // check if language files has already been sideloaded
-        if (get_option($language_check_option_name)) {
-            return;
-        }
+	/**
+	 * The purpose of this method is to sideload all of the lang files for EE, this includes the POT file and also the PO/MO files for the given WPLANG locale (if necessary).
+	 *
+	 * @access private
+	 * @static
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function loadTranslationsForLocale()
+	{
+		EE_Load_Textdomain::$locale = get_locale();
+		// can't download a language file if a language isn't set <taps temple>
+		if (empty(EE_Load_Textdomain::$locale)) {
+			return;
+		}
+		$language_check_option_name = 'ee_lang_check_' . EE_Load_Textdomain::$locale . '_' . EVENT_ESPRESSO_VERSION;
+		// check if language files has already been sideloaded
+		if (get_option($language_check_option_name)) {
+			return;
+		}
 
-        $repo_base_URL = 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso';
+		$repo_base_URL = 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso';
 
-        // Create directory if not exists
-        if (! is_dir(EE_PLUGIN_DIR_PATH . 'languages/')) {
-            wp_mkdir_p(EE_PLUGIN_DIR_PATH . 'languages/');
-        }
+		// Create directory if not exists
+		if (! is_dir(EE_PLUGIN_DIR_PATH . 'languages/')) {
+			wp_mkdir_p(EE_PLUGIN_DIR_PATH . 'languages/');
+		}
 
-        // load sideloader and sideload the .POT file as this should always be included.
-        $sideloader_args = array(
-            '_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
-            '_download_from'   => $repo_base_URL . '.pot?raw=true',
-            '_new_file_name' => 'event_espresso.pot',
-        );
-        /** @var EEH_Sideloader $sideloader */
-        $sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false);
-        // sideload the .POT file only for main site of the network, or if not running Multisite.
-        if (is_main_site()) {
-            $sideloader->sideload();
-        }
+		// load sideloader and sideload the .POT file as this should always be included.
+		$sideloader_args = array(
+			'_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
+			'_download_from'   => $repo_base_URL . '.pot?raw=true',
+			'_new_file_name' => 'event_espresso.pot',
+		);
+		/** @var EEH_Sideloader $sideloader */
+		$sideloader = EE_Registry::instance()->load_helper('Sideloader', $sideloader_args, false);
+		// sideload the .POT file only for main site of the network, or if not running Multisite.
+		if (is_main_site()) {
+			$sideloader->sideload();
+		}
 
-        // if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
-        if (EE_Load_Textdomain::$locale === 'en_US') {
-            // but set option first else we'll forever be downloading the pot file
-            update_option($language_check_option_name, 1);
-            return;
-        }
-        $repo_locale_URL = $repo_base_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
+		// if locale is "en_US" then lets just get out, since Event Espresso core is already "en_US"
+		if (EE_Load_Textdomain::$locale === 'en_US') {
+			// but set option first else we'll forever be downloading the pot file
+			update_option($language_check_option_name, 1);
+			return;
+		}
+		$repo_locale_URL = $repo_base_URL . '-' . EE_Load_Textdomain::$locale;
+		$file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
 
-        // made it here so let's get the language files from the github repo, first the .mo file
-        $sideloader->set_download_from("{$repo_locale_URL}.mo?raw=true");
-        $sideloader->set_new_file_name("{$file_name_base}.mo");
-        $sideloader->sideload();
+		// made it here so let's get the language files from the github repo, first the .mo file
+		$sideloader->set_download_from("{$repo_locale_URL}.mo?raw=true");
+		$sideloader->set_new_file_name("{$file_name_base}.mo");
+		$sideloader->sideload();
 
-        // now the .po file:
-        $sideloader->set_download_from("{$repo_locale_URL}.po?raw=true");
-        $sideloader->set_new_file_name("{$file_name_base}.po");
-        $sideloader->sideload();
+		// now the .po file:
+		$sideloader->set_download_from("{$repo_locale_URL}.po?raw=true");
+		$sideloader->set_new_file_name("{$file_name_base}.po");
+		$sideloader->sideload();
 
-        // set option so the above only runs when EE updates.
-        update_option($language_check_option_name, 1);
-    }
+		// set option so the above only runs when EE updates.
+		update_option($language_check_option_name, 1);
+	}
 }

Spacing +11 added lines, -11 removed lines

@@ -35,19 +35,19 @@ 
     {
         EE_Load_Textdomain::loadTranslationsForLocale();
         // now load the textdomain
-        if (!empty(EE_Load_Textdomain::$locale)) {
-            $github_mo_path = EE_LANGUAGES_SAFE_DIR . 'event_espresso-' . EE_Load_Textdomain::$locale . '.mo';
+        if ( ! empty(EE_Load_Textdomain::$locale)) {
+            $github_mo_path = EE_LANGUAGES_SAFE_DIR.'event_espresso-'.EE_Load_Textdomain::$locale.'.mo';
             if (is_readable($github_mo_path)) {
                 load_plugin_textdomain('event_espresso', false, EE_LANGUAGES_SAFE_LOC);
                 return;
             }
-            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR . 'event-espresso-4-' . EE_Load_Textdomain::$locale . '.mo';
+            $glotpress_mo_path = EE_LANGUAGES_SAFE_DIR.'event-espresso-4-'.EE_Load_Textdomain::$locale.'.mo';
             if (is_readable($glotpress_mo_path)) {
                 load_textdomain('event_espresso', $glotpress_mo_path);
                 return;
             }
         }
-        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME) . '/languages/');
+        load_plugin_textdomain('event_espresso', false, dirname(EE_PLUGIN_BASENAME).'/languages/');
     }
 
 
@@ -70,7 +70,7 @@ 
         if (empty(EE_Load_Textdomain::$locale)) {
             return;
         }
-        $language_check_option_name = 'ee_lang_check_' . EE_Load_Textdomain::$locale . '_' . EVENT_ESPRESSO_VERSION;
+        $language_check_option_name = 'ee_lang_check_'.EE_Load_Textdomain::$locale.'_'.EVENT_ESPRESSO_VERSION;
         // check if language files has already been sideloaded
         if (get_option($language_check_option_name)) {
             return;
@@ -79,14 +79,14 @@ 
         $repo_base_URL = 'https://github.com/eventespresso/languages-ee4/blob/master/event_espresso';
 
         // Create directory if not exists
-        if (! is_dir(EE_PLUGIN_DIR_PATH . 'languages/')) {
-            wp_mkdir_p(EE_PLUGIN_DIR_PATH . 'languages/');
+        if ( ! is_dir(EE_PLUGIN_DIR_PATH.'languages/')) {
+            wp_mkdir_p(EE_PLUGIN_DIR_PATH.'languages/');
         }
 
         // load sideloader and sideload the .POT file as this should always be included.
         $sideloader_args = array(
-            '_upload_to'     => EE_PLUGIN_DIR_PATH . 'languages/',
-            '_download_from'   => $repo_base_URL . '.pot?raw=true',
+            '_upload_to'     => EE_PLUGIN_DIR_PATH.'languages/',
+            '_download_from'   => $repo_base_URL.'.pot?raw=true',
             '_new_file_name' => 'event_espresso.pot',
         );
         /** @var EEH_Sideloader $sideloader */
@@ -102,8 +102,8 @@ 
             update_option($language_check_option_name, 1);
             return;
         }
-        $repo_locale_URL = $repo_base_URL . '-' . EE_Load_Textdomain::$locale;
-        $file_name_base = 'event_espresso-' . EE_Load_Textdomain::$locale;
+        $repo_locale_URL = $repo_base_URL.'-'.EE_Load_Textdomain::$locale;
+        $file_name_base = 'event_espresso-'.EE_Load_Textdomain::$locale;
 
         // made it here so let's get the language files from the github repo, first the .mo file
         $sideloader->set_download_from("{$repo_locale_URL}.mo?raw=true");

core/EE_Psr4AutoloaderInit.core.php

Indentation +34 added lines, -34 removed lines

@@ -15,42 +15,42 @@
  */
 class EE_Psr4AutoloaderInit
 {
-    /**
-     * @type Psr4Autoloader
-     */
-    protected static $psr4_loader;
+	/**
+	 * @type Psr4Autoloader
+	 */
+	protected static $psr4_loader;
 
 
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public function initializeAutoloader()
-    {
-        static $initialized = false;
-        if (! $initialized) {
-            // register the base directories for the namespace prefix
-            EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
-            EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
-            EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
-            $initialized = true;
-        }
-    }
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public function initializeAutoloader()
+	{
+		static $initialized = false;
+		if (! $initialized) {
+			// register the base directories for the namespace prefix
+			EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
+			EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
+			EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
+			$initialized = true;
+		}
+	}
 
 
-    /**
-     * @return Psr4Autoloader
-     * @throws EE_Error
-     */
-    public static function psr4_loader(): Psr4Autoloader
-    {
-        if (! EE_Psr4AutoloaderInit::$psr4_loader instanceof Psr4Autoloader) {
-            // instantiate PSR4 autoloader
-            espresso_load_required('Psr4Autoloader', __DIR__ . '/Psr4Autoloader.php');
-            EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
-            // register the autoloader
-            EE_Psr4AutoloaderInit::psr4_loader()->register();
-        }
-        return EE_Psr4AutoloaderInit::$psr4_loader;
-    }
+	/**
+	 * @return Psr4Autoloader
+	 * @throws EE_Error
+	 */
+	public static function psr4_loader(): Psr4Autoloader
+	{
+		if (! EE_Psr4AutoloaderInit::$psr4_loader instanceof Psr4Autoloader) {
+			// instantiate PSR4 autoloader
+			espresso_load_required('Psr4Autoloader', __DIR__ . '/Psr4Autoloader.php');
+			EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
+			// register the autoloader
+			EE_Psr4AutoloaderInit::psr4_loader()->register();
+		}
+		return EE_Psr4AutoloaderInit::$psr4_loader;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -28,10 +28,10 @@ 
     public function initializeAutoloader()
     {
         static $initialized = false;
-        if (! $initialized) {
+        if ( ! $initialized) {
             // register the base directories for the namespace prefix
             EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH);
-            EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES . 'batch');
+            EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES.'batch');
             EE_Psr4AutoloaderInit::psr4_loader()->addNamespace('EventEspressoVendor', EE_THIRD_PARTY);
             $initialized = true;
         }
@@ -44,9 +44,9 @@ 
      */
     public static function psr4_loader(): Psr4Autoloader
     {
-        if (! EE_Psr4AutoloaderInit::$psr4_loader instanceof Psr4Autoloader) {
+        if ( ! EE_Psr4AutoloaderInit::$psr4_loader instanceof Psr4Autoloader) {
             // instantiate PSR4 autoloader
-            espresso_load_required('Psr4Autoloader', __DIR__ . '/Psr4Autoloader.php');
+            espresso_load_required('Psr4Autoloader', __DIR__.'/Psr4Autoloader.php');
             EE_Psr4AutoloaderInit::$psr4_loader = new Psr4Autoloader();
             // register the autoloader
             EE_Psr4AutoloaderInit::psr4_loader()->register();

core/bootstrap_espresso.php

Indentation +90 added lines, -90 removed lines

@@ -14,33 +14,33 @@ 
  */
 function espresso_load_error_handling()
 {
-    static $error_handling_loaded = false;
-    if ($error_handling_loaded) {
-        return;
-    }
-    // load debugging tools
-    if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-        require_once EE_HELPERS . 'EEH_Debug_Tools.helper.php';
-        EEH_Debug_Tools::instance();
-    }
-    // load error handling
-    if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-        require_once EE_CORE . 'EE_Error.core.php';
-        // if you're a dev and want to receive all errors via email
-        // add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
-        if (
-            defined('WP_DEBUG')
-            && WP_DEBUG === true
-            && defined('EE_ERROR_EMAILS')
-            && EE_ERROR_EMAILS === true
-        ) {
-            set_error_handler(['EE_Error', 'error_handler']);
-            register_shutdown_function(['EE_Error', 'fatal_error_handler']);
-        }
-    } else {
-        wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-    }
-    $error_handling_loaded = true;
+	static $error_handling_loaded = false;
+	if ($error_handling_loaded) {
+		return;
+	}
+	// load debugging tools
+	if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+		require_once EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+		EEH_Debug_Tools::instance();
+	}
+	// load error handling
+	if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+		require_once EE_CORE . 'EE_Error.core.php';
+		// if you're a dev and want to receive all errors via email
+		// add this to your wp-config.php: define( 'EE_ERROR_EMAILS', TRUE );
+		if (
+			defined('WP_DEBUG')
+			&& WP_DEBUG === true
+			&& defined('EE_ERROR_EMAILS')
+			&& EE_ERROR_EMAILS === true
+		) {
+			set_error_handler(['EE_Error', 'error_handler']);
+			register_shutdown_function(['EE_Error', 'fatal_error_handler']);
+		}
+	} else {
+		wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+	}
+	$error_handling_loaded = true;
 }
 
 
@@ -54,21 +54,21 @@ 
  */
 function espresso_load_required(string $classname, string $full_path_to_file)
 {
-    if (is_readable($full_path_to_file)) {
-        require_once $full_path_to_file;
-    } else {
-        throw new EE_Error(
-            sprintf(
-                esc_html__(
-                    'The %1$s class file could not be located or is not readable due to file permissions. %3$s supplied path: %2$s',
-                    'event_espresso'
-                ),
-                $classname,
-                $full_path_to_file,
-                '<br>'
-            )
-        );
-    }
+	if (is_readable($full_path_to_file)) {
+		require_once $full_path_to_file;
+	} else {
+		throw new EE_Error(
+			sprintf(
+				esc_html__(
+					'The %1$s class file could not be located or is not readable due to file permissions. %3$s supplied path: %2$s',
+					'event_espresso'
+				),
+				$classname,
+				$full_path_to_file,
+				'<br>'
+			)
+		);
+	}
 }
 
 
@@ -86,52 +86,52 @@ 
  */
 function bootstrap_espresso()
 {
-    require_once __DIR__ . '/espresso_definitions.php';
-    try {
-        espresso_load_error_handling();
-        // include WordPress shims for functions introduced in later versions of WordPress
-        espresso_load_required(
-            '',
-            EE_CORE . 'wordpress-shims.php'
-        );
-        espresso_load_required(
-            '',
-            EE_CORE . 'third-party-compatibility.php'
-        );
-        espresso_load_required(
-            'EEH_Base',
-            EE_CORE . 'helpers/EEH_Base.helper.php'
-        );
-        espresso_load_required(
-            'EEH_File',
-            EE_CORE . 'interfaces/EEHI_File.interface.php'
-        );
-        espresso_load_required(
-            'EEH_File',
-            EE_CORE . 'helpers/EEH_File.helper.php'
-        );
-        espresso_load_required(
-            'EEH_Array',
-            EE_CORE . 'helpers/EEH_Array.helper.php'
-        );
-        espresso_load_required(
-            'EE_Base',
-            EE_CORE . 'EE_Base.core.php'
-        );
-        // instantiate and configure PSR4 autoloader
-        espresso_load_required(
-            'Psr4Autoloader',
-            EE_CORE . 'Psr4Autoloader.php'
-        );
-        espresso_load_required(
-            'EE_Psr4AutoloaderInit',
-            EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
-        );
-        $AutoloaderInit = new EE_Psr4AutoloaderInit();
-        $AutoloaderInit->initializeAutoloader();
-        new EventEspresso\core\services\bootstrap\BootstrapCore();
-    } catch (Exception $e) {
-        require_once EE_CORE . 'exceptions/ExceptionStackTraceDisplay.php';
-        new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
-    }
+	require_once __DIR__ . '/espresso_definitions.php';
+	try {
+		espresso_load_error_handling();
+		// include WordPress shims for functions introduced in later versions of WordPress
+		espresso_load_required(
+			'',
+			EE_CORE . 'wordpress-shims.php'
+		);
+		espresso_load_required(
+			'',
+			EE_CORE . 'third-party-compatibility.php'
+		);
+		espresso_load_required(
+			'EEH_Base',
+			EE_CORE . 'helpers/EEH_Base.helper.php'
+		);
+		espresso_load_required(
+			'EEH_File',
+			EE_CORE . 'interfaces/EEHI_File.interface.php'
+		);
+		espresso_load_required(
+			'EEH_File',
+			EE_CORE . 'helpers/EEH_File.helper.php'
+		);
+		espresso_load_required(
+			'EEH_Array',
+			EE_CORE . 'helpers/EEH_Array.helper.php'
+		);
+		espresso_load_required(
+			'EE_Base',
+			EE_CORE . 'EE_Base.core.php'
+		);
+		// instantiate and configure PSR4 autoloader
+		espresso_load_required(
+			'Psr4Autoloader',
+			EE_CORE . 'Psr4Autoloader.php'
+		);
+		espresso_load_required(
+			'EE_Psr4AutoloaderInit',
+			EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+		);
+		$AutoloaderInit = new EE_Psr4AutoloaderInit();
+		$AutoloaderInit->initializeAutoloader();
+		new EventEspresso\core\services\bootstrap\BootstrapCore();
+	} catch (Exception $e) {
+		require_once EE_CORE . 'exceptions/ExceptionStackTraceDisplay.php';
+		new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
+	}
 }

core/Psr4Autoloader.php

Indentation +132 added lines, -132 removed lines

@@ -44,149 +44,149 @@
  */
 class Psr4Autoloader
 {
-    /**
-     * namespace separator
-     */
-    public const NS = '\\';
+	/**
+	 * namespace separator
+	 */
+	public const NS = '\\';
 
-    /**
-     * An associative array where the key is a namespace prefix and the value
-     * is an array of base directories for classes in that namespace.
-     *
-     * @var array
-     */
-    protected $prefixes = array();
+	/**
+	 * An associative array where the key is a namespace prefix and the value
+	 * is an array of base directories for classes in that namespace.
+	 *
+	 * @var array
+	 */
+	protected $prefixes = array();
 
 
-    /**
-     * returns an array of registered namespace prefixes
-     *
-     * @param string $prefix
-     * @return array
-     */
-    public function prefixes(string $prefix = ''): array
-    {
-        if (! empty($prefix)) {
-            // are there any base directories for this namespace prefix?
-            return $this->prefixes[ $prefix ] ?? [];
-        }
-        return $this->prefixes;
-    }
+	/**
+	 * returns an array of registered namespace prefixes
+	 *
+	 * @param string $prefix
+	 * @return array
+	 */
+	public function prefixes(string $prefix = ''): array
+	{
+		if (! empty($prefix)) {
+			// are there any base directories for this namespace prefix?
+			return $this->prefixes[ $prefix ] ?? [];
+		}
+		return $this->prefixes;
+	}
 
 
-    /**
-     * Register loader with SPL autoloader stack.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        spl_autoload_register(array($this, 'loadClass'));
-    }
+	/**
+	 * Register loader with SPL autoloader stack.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		spl_autoload_register(array($this, 'loadClass'));
+	}
 
 
-    /**
-     * Adds a base directory for a namespace prefix.
-     *
-     * @param string $prefix   The namespace prefix.
-     * @param string $base_dir A base directory for class files in the
-     *                         namespace.
-     * @param bool   $prepend  If true, prepend the base directory to the stack
-     *                         instead of appending it; this causes it to be searched first rather
-     *                         than last.
-     * @return void
-     */
-    public function addNamespace(string $prefix, string $base_dir, bool $prepend = false)
-    {
-        // normalize namespace prefix
-        $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
-        // normalize the base directory with a trailing separator
-        $base_dir = str_replace(['\\', '/'], '/', $base_dir);
-        $base_dir = rtrim($base_dir, '/\\') . '/';
-        // initialize the namespace prefix array
-        if (isset($this->prefixes[ $prefix ]) === false) {
-            $this->prefixes[ $prefix ] = array();
-        }
-        // retain the base directory for the namespace prefix
-        if ($prepend) {
-            array_unshift($this->prefixes[ $prefix ], $base_dir);
-        } else {
-            $this->prefixes[ $prefix ][] = $base_dir;
-        }
-    }
+	/**
+	 * Adds a base directory for a namespace prefix.
+	 *
+	 * @param string $prefix   The namespace prefix.
+	 * @param string $base_dir A base directory for class files in the
+	 *                         namespace.
+	 * @param bool   $prepend  If true, prepend the base directory to the stack
+	 *                         instead of appending it; this causes it to be searched first rather
+	 *                         than last.
+	 * @return void
+	 */
+	public function addNamespace(string $prefix, string $base_dir, bool $prepend = false)
+	{
+		// normalize namespace prefix
+		$prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
+		// normalize the base directory with a trailing separator
+		$base_dir = str_replace(['\\', '/'], '/', $base_dir);
+		$base_dir = rtrim($base_dir, '/\\') . '/';
+		// initialize the namespace prefix array
+		if (isset($this->prefixes[ $prefix ]) === false) {
+			$this->prefixes[ $prefix ] = array();
+		}
+		// retain the base directory for the namespace prefix
+		if ($prepend) {
+			array_unshift($this->prefixes[ $prefix ], $base_dir);
+		} else {
+			$this->prefixes[ $prefix ][] = $base_dir;
+		}
+	}
 
 
-    /**
-     * Loads the class file for a given class name.
-     *
-     * @param string $class The fully-qualified class name.
-     * @return false|string The mapped file name on success or boolean false on failure.
-     */
-    public function loadClass(string $class)
-    {
-        // the current namespace prefix
-        $prefix = $class;
-        // work backwards through the namespace names of the fully-qualified
-        // class name to find a mapped file name
-        while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
-            // retain the trailing namespace separator in the prefix
-            $prefix = substr($class, 0, $pos + 1);
-            // the rest is the relative class name
-            $relative_class = substr($class, $pos + 1);
-            // try to load a mapped file for the prefix and relative class
-            $mapped_file = $this->loadMappedFile($prefix, $relative_class);
-            if ($mapped_file) {
-                return $mapped_file;
-            }
-            // remove the trailing namespace separator for the next iteration of strrpos()
-            $prefix = rtrim($prefix, Psr4Autoloader::NS);
-        }
-        // never found a mapped file
-        return false;
-    }
+	/**
+	 * Loads the class file for a given class name.
+	 *
+	 * @param string $class The fully-qualified class name.
+	 * @return false|string The mapped file name on success or boolean false on failure.
+	 */
+	public function loadClass(string $class)
+	{
+		// the current namespace prefix
+		$prefix = $class;
+		// work backwards through the namespace names of the fully-qualified
+		// class name to find a mapped file name
+		while (false !== $pos = strrpos($prefix, Psr4Autoloader::NS)) {
+			// retain the trailing namespace separator in the prefix
+			$prefix = substr($class, 0, $pos + 1);
+			// the rest is the relative class name
+			$relative_class = substr($class, $pos + 1);
+			// try to load a mapped file for the prefix and relative class
+			$mapped_file = $this->loadMappedFile($prefix, $relative_class);
+			if ($mapped_file) {
+				return $mapped_file;
+			}
+			// remove the trailing namespace separator for the next iteration of strrpos()
+			$prefix = rtrim($prefix, Psr4Autoloader::NS);
+		}
+		// never found a mapped file
+		return false;
+	}
 
 
-    /**
-     * Load the mapped file for a namespace prefix and relative class.
-     *
-     * @param string $prefix         The namespace prefix.
-     * @param string $relative_class The relative class name.
-     * @return string|null           null if no mapped file can be loaded,
-     *                               or the name of the mapped file that was loaded.
-     */
-    protected function loadMappedFile(string $prefix, string $relative_class): ?string
-    {
-        // look through base directories for this namespace prefix
-        foreach ($this->prefixes($prefix) as $base_dir) {
-            // replace the namespace prefix with the base directory,
-            // replace namespace separators with directory separators
-            // in the relative class name, append with .php
-            $file = $base_dir
-                    . str_replace(Psr4Autoloader::NS, '/', $relative_class)
-                    . '.php';
-            // if the mapped file exists, require it
-            if ($this->requireFile($file)) {
-                // yes, we're done
-                return $file;
-            }
-        }
-        // never found it
-        return null;
-    }
+	/**
+	 * Load the mapped file for a namespace prefix and relative class.
+	 *
+	 * @param string $prefix         The namespace prefix.
+	 * @param string $relative_class The relative class name.
+	 * @return string|null           null if no mapped file can be loaded,
+	 *                               or the name of the mapped file that was loaded.
+	 */
+	protected function loadMappedFile(string $prefix, string $relative_class): ?string
+	{
+		// look through base directories for this namespace prefix
+		foreach ($this->prefixes($prefix) as $base_dir) {
+			// replace the namespace prefix with the base directory,
+			// replace namespace separators with directory separators
+			// in the relative class name, append with .php
+			$file = $base_dir
+					. str_replace(Psr4Autoloader::NS, '/', $relative_class)
+					. '.php';
+			// if the mapped file exists, require it
+			if ($this->requireFile($file)) {
+				// yes, we're done
+				return $file;
+			}
+		}
+		// never found it
+		return null;
+	}
 
 
-    /**
-     * If a file exists, require it from the file system.
-     *
-     * @param string $file The file to require.
-     * @return bool True if the file exists, false if not.
-     */
-    protected function requireFile(string $file): bool
-    {
-        if (file_exists($file)) {
-            require $file;
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * If a file exists, require it from the file system.
+	 *
+	 * @param string $file The file to require.
+	 * @return bool True if the file exists, false if not.
+	 */
+	protected function requireFile(string $file): bool
+	{
+		if (file_exists($file)) {
+			require $file;
+			return true;
+		}
+		return false;
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -66,9 +66,9 @@ 
      */
     public function prefixes(string $prefix = ''): array
     {
-        if (! empty($prefix)) {
+        if ( ! empty($prefix)) {
             // are there any base directories for this namespace prefix?
-            return $this->prefixes[ $prefix ] ?? [];
+            return $this->prefixes[$prefix] ?? [];
         }
         return $this->prefixes;
     }
@@ -99,19 +99,19 @@ 
     public function addNamespace(string $prefix, string $base_dir, bool $prepend = false)
     {
         // normalize namespace prefix
-        $prefix = trim($prefix, Psr4Autoloader::NS) . Psr4Autoloader::NS;
+        $prefix = trim($prefix, Psr4Autoloader::NS).Psr4Autoloader::NS;
         // normalize the base directory with a trailing separator
         $base_dir = str_replace(['\\', '/'], '/', $base_dir);
-        $base_dir = rtrim($base_dir, '/\\') . '/';
+        $base_dir = rtrim($base_dir, '/\\').'/';
         // initialize the namespace prefix array
-        if (isset($this->prefixes[ $prefix ]) === false) {
-            $this->prefixes[ $prefix ] = array();
+        if (isset($this->prefixes[$prefix]) === false) {
+            $this->prefixes[$prefix] = array();
         }
         // retain the base directory for the namespace prefix
         if ($prepend) {
-            array_unshift($this->prefixes[ $prefix ], $base_dir);
+            array_unshift($this->prefixes[$prefix], $base_dir);
         } else {
-            $this->prefixes[ $prefix ][] = $base_dir;
+            $this->prefixes[$prefix][] = $base_dir;
         }
     }
 

core/helpers/EEH_Autoloader.helper.php

Indentation +280 added lines, -280 removed lines

@@ -11,284 +11,284 @@
  */
 class EEH_Autoloader extends EEH_Base
 {
-    /**
-     * instance of the EE_System object
-     *
-     * @var $_instance
-     */
-    private static $_instance = null;
-
-    /**
-     * @var array $_autoloaders
-     */
-    private static $_autoloaders;
-
-    /**
-     * set to "paths" to display autoloader class => path mappings
-     * set to "times" to display autoloader loading times
-     * set to "all" to display both
-     *
-     * @var string $debug
-     */
-    public static $debug = false;
-
-
-    /**
-     * @return void
-     * @throws Exception
-     */
-    private function __construct()
-    {
-        if (self::$_autoloaders === null) {
-            self::$_autoloaders = [];
-            $this->_register_custom_autoloaders();
-            spl_autoload_register([$this, 'espresso_autoloader']);
-        }
-    }
-
-
-    /**
-     * @return EEH_Autoloader
-     */
-    public static function instance(): ?EEH_Autoloader
-    {
-        // check if class object is instantiated
-        if (! self::$_instance instanceof EEH_Autoloader) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     *    espresso_autoloader
-     *
-     * @param   $class_name
-     * @return  void
-     * @internal  param string $class_name - simple class name ie: session
-     * @internal  param $className
-     */
-    public static function espresso_autoloader($class_name)
-    {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            require_once(self::$_autoloaders[ $class_name ]);
-        }
-    }
-
-
-    /**
-     *    register_autoloader
-     *
-     * @param array | string $class_paths - array of key => value pairings between class names and paths
-     * @param bool           $read_check  true if we need to check whether the file is readable or not.
-     * @param bool           $debug       **deprecated**
-     * @throws EE_Error
-     */
-    public static function register_autoloader($class_paths, bool $read_check = true, bool $debug = false)
-    {
-        $class_paths = is_array($class_paths) ? $class_paths : [$class_paths];
-        foreach ($class_paths as $class => $path) {
-            // skip all files that are not PHP
-            if (substr($path, strlen($path) - 3) !== 'php') {
-                continue;
-            }
-            // don't give up! you gotta...
-            // get some class
-            if (empty($class)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'No Class name was specified while registering an autoloader for the following path: %s.',
-                            'event_espresso'
-                        ),
-                        $path
-                    )
-                );
-            }
-            // one day you will find the path young grasshopper
-            if (empty($path)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'No path was specified while registering an autoloader for the %s class.',
-                            'event_espresso'
-                        ),
-                        $class
-                    )
-                );
-            }
-            // is file readable ?
-            if ($read_check && ! is_readable($path)) {
-                throw new EE_Error(
-                    sprintf(
-                        esc_html__(
-                            'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
-                            'event_espresso'
-                        ),
-                        $class,
-                        $path
-                    )
-                );
-            }
-            if (! isset(self::$_autoloaders[ $class ])) {
-                self::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
-                if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
-                    EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
-                }
-            }
-        }
-    }
-
-
-    /**
-     *  get_autoloaders
-     *
-     * @return array
-     */
-    public static function get_autoloaders(): array
-    {
-        return self::$_autoloaders;
-    }
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    private function _register_custom_autoloaders()
-    {
-        EEH_Autoloader::$debug = '';
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            EEH_Debug_Tools::instance()->show_times();
-        }
-    }
-
-
-    public static function register_helpers_autoloaders()
-    {
-        // EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
-    }
-
-    public static function register_form_sections_autoloaders()
-    {
-        // EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
-    }
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_line_item_display_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
-    }
-
-
-    /**
-     *  register core, model and class 'autoloaders'
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_line_item_filter_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
-    }
-
-
-    /**
-     *  register template part 'autoloaders'
-     *
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_template_part_autoloaders()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     */
-    public static function register_business_classes()
-    {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
-    }
-
-
-    /**
-     * Assumes all the files in this folder have the normal naming scheme (namely that their classname
-     * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
-     * If that's not the case, you'll need to improve this function or just use
-     * EEH_File::get_classname_from_filepath_with_standard_filename() directly. Yes this has to scan the directory for
-     * files, but it only does it once -- not on EACH time the autoloader is used
-     *
-     * @param string $folder name, with or without trailing /, doesn't matter
-     * @param bool   $recursive
-     * @param bool   $debug  **deprecated**
-     * @throws EE_Error
-     */
-    public static function register_autoloaders_for_each_file_in_folder(
-        string $folder,
-        bool $recursive = false,
-        bool $debug = false
-    ) {
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
-            EEH_Debug_Tools::instance()->start_timer(basename($folder));
-        }
-        // make sure last char is a /
-        $folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
-        $class_to_filepath_map = [];
-        $exclude = ['index'];
-        // get all the files in that folder that end in php
-        $filepaths = glob($folder . '*');
-
-        if (empty($filepaths)) {
-            return;
-        }
-
-        foreach ($filepaths as $filepath) {
-            if (substr($filepath, -4, 4) === '.php') {
-                $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
-                }
-            } elseif ($recursive) {
-                EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
-            }
-        }
-        // we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
-        self::register_autoloader($class_to_filepath_map, false, $debug);
-        if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
-            EEH_Debug_Tools::instance()->stop_timer(basename($folder));
-        }
-    }
-
-
-    /**
-     * register additional autoloader based on variation of the classname for an existing autoloader
-     *
-     * @param string $class_name - simple class name ie: EE_Session
-     * @param string $alias      - variation on class name ie: EE_session, session, etc
-     */
-    public static function add_alias(string $class_name, string $alias)
-    {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
-        }
-    }
+	/**
+	 * instance of the EE_System object
+	 *
+	 * @var $_instance
+	 */
+	private static $_instance = null;
+
+	/**
+	 * @var array $_autoloaders
+	 */
+	private static $_autoloaders;
+
+	/**
+	 * set to "paths" to display autoloader class => path mappings
+	 * set to "times" to display autoloader loading times
+	 * set to "all" to display both
+	 *
+	 * @var string $debug
+	 */
+	public static $debug = false;
+
+
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	private function __construct()
+	{
+		if (self::$_autoloaders === null) {
+			self::$_autoloaders = [];
+			$this->_register_custom_autoloaders();
+			spl_autoload_register([$this, 'espresso_autoloader']);
+		}
+	}
+
+
+	/**
+	 * @return EEH_Autoloader
+	 */
+	public static function instance(): ?EEH_Autoloader
+	{
+		// check if class object is instantiated
+		if (! self::$_instance instanceof EEH_Autoloader) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 *    espresso_autoloader
+	 *
+	 * @param   $class_name
+	 * @return  void
+	 * @internal  param string $class_name - simple class name ie: session
+	 * @internal  param $className
+	 */
+	public static function espresso_autoloader($class_name)
+	{
+		if (isset(self::$_autoloaders[ $class_name ])) {
+			require_once(self::$_autoloaders[ $class_name ]);
+		}
+	}
+
+
+	/**
+	 *    register_autoloader
+	 *
+	 * @param array | string $class_paths - array of key => value pairings between class names and paths
+	 * @param bool           $read_check  true if we need to check whether the file is readable or not.
+	 * @param bool           $debug       **deprecated**
+	 * @throws EE_Error
+	 */
+	public static function register_autoloader($class_paths, bool $read_check = true, bool $debug = false)
+	{
+		$class_paths = is_array($class_paths) ? $class_paths : [$class_paths];
+		foreach ($class_paths as $class => $path) {
+			// skip all files that are not PHP
+			if (substr($path, strlen($path) - 3) !== 'php') {
+				continue;
+			}
+			// don't give up! you gotta...
+			// get some class
+			if (empty($class)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'No Class name was specified while registering an autoloader for the following path: %s.',
+							'event_espresso'
+						),
+						$path
+					)
+				);
+			}
+			// one day you will find the path young grasshopper
+			if (empty($path)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'No path was specified while registering an autoloader for the %s class.',
+							'event_espresso'
+						),
+						$class
+					)
+				);
+			}
+			// is file readable ?
+			if ($read_check && ! is_readable($path)) {
+				throw new EE_Error(
+					sprintf(
+						esc_html__(
+							'The file for the %s class could not be found or is not readable due to file permissions. Please ensure the following path is correct: %s',
+							'event_espresso'
+						),
+						$class,
+						$path
+					)
+				);
+			}
+			if (! isset(self::$_autoloaders[ $class ])) {
+				self::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
+				if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
+					EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 *  get_autoloaders
+	 *
+	 * @return array
+	 */
+	public static function get_autoloaders(): array
+	{
+		return self::$_autoloaders;
+	}
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	private function _register_custom_autoloaders()
+	{
+		EEH_Autoloader::$debug = '';
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_INTERFACES, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			EEH_Debug_Tools::instance()->show_times();
+		}
+	}
+
+
+	public static function register_helpers_autoloaders()
+	{
+		// EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
+	}
+
+	public static function register_form_sections_autoloaders()
+	{
+		// EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_FORM_SECTIONS, true );
+	}
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_line_item_display_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+	}
+
+
+	/**
+	 *  register core, model and class 'autoloaders'
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_line_item_filter_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+	}
+
+
+	/**
+	 *  register template part 'autoloaders'
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_template_part_autoloaders()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 */
+	public static function register_business_classes()
+	{
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
+	}
+
+
+	/**
+	 * Assumes all the files in this folder have the normal naming scheme (namely that their classname
+	 * is the file's name, plus ".whatever.php".) and adds each of them to the autoloader list.
+	 * If that's not the case, you'll need to improve this function or just use
+	 * EEH_File::get_classname_from_filepath_with_standard_filename() directly. Yes this has to scan the directory for
+	 * files, but it only does it once -- not on EACH time the autoloader is used
+	 *
+	 * @param string $folder name, with or without trailing /, doesn't matter
+	 * @param bool   $recursive
+	 * @param bool   $debug  **deprecated**
+	 * @throws EE_Error
+	 */
+	public static function register_autoloaders_for_each_file_in_folder(
+		string $folder,
+		bool $recursive = false,
+		bool $debug = false
+	) {
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all' || $debug) {
+			EEH_Debug_Tools::instance()->start_timer(basename($folder));
+		}
+		// make sure last char is a /
+		$folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
+		$class_to_filepath_map = [];
+		$exclude = ['index'];
+		// get all the files in that folder that end in php
+		$filepaths = glob($folder . '*');
+
+		if (empty($filepaths)) {
+			return;
+		}
+
+		foreach ($filepaths as $filepath) {
+			if (substr($filepath, -4, 4) === '.php') {
+				$class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
+				if (! in_array($class_name, $exclude)) {
+					$class_to_filepath_map [ $class_name ] = $filepath;
+				}
+			} elseif ($recursive) {
+				EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
+			}
+		}
+		// we remove the necessity to do a is_readable() check via the $read_check flag because glob by nature will not return non_readable files/directories.
+		self::register_autoloader($class_to_filepath_map, false, $debug);
+		if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
+			EEH_Debug_Tools::instance()->stop_timer(basename($folder));
+		}
+	}
+
+
+	/**
+	 * register additional autoloader based on variation of the classname for an existing autoloader
+	 *
+	 * @param string $class_name - simple class name ie: EE_Session
+	 * @param string $alias      - variation on class name ie: EE_session, session, etc
+	 */
+	public static function add_alias(string $class_name, string $alias)
+	{
+		if (isset(self::$_autoloaders[ $class_name ])) {
+			self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
+		}
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -53,7 +53,7 @@ 
     public static function instance(): ?EEH_Autoloader
     {
         // check if class object is instantiated
-        if (! self::$_instance instanceof EEH_Autoloader) {
+        if ( ! self::$_instance instanceof EEH_Autoloader) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -70,8 +70,8 @@ 
      */
     public static function espresso_autoloader($class_name)
     {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            require_once(self::$_autoloaders[ $class_name ]);
+        if (isset(self::$_autoloaders[$class_name])) {
+            require_once(self::$_autoloaders[$class_name]);
         }
     }
 
@@ -130,10 +130,10 @@ 
                     )
                 );
             }
-            if (! isset(self::$_autoloaders[ $class ])) {
-                self::$_autoloaders[ $class ] = str_replace(['/', '\\'], '/', $path);
+            if ( ! isset(self::$_autoloaders[$class])) {
+                self::$_autoloaders[$class] = str_replace(['/', '\\'], '/', $path);
                 if (EE_DEBUG && (EEH_Autoloader::$debug === 'paths' || EEH_Autoloader::$debug === 'all' || $debug)) {
-                    EEH_Debug_Tools::printr(self::$_autoloaders[ $class ], $class, __FILE__, __LINE__);
+                    EEH_Debug_Tools::printr(self::$_autoloaders[$class], $class, __FILE__, __LINE__);
                 }
             }
         }
@@ -166,7 +166,7 @@ 
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_MODELS, true);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CLASSES);
         EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_FORM_SECTIONS, true);
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'messages');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'messages');
         if (EEH_Autoloader::$debug === 'times' || EEH_Autoloader::$debug === 'all') {
             EEH_Debug_Tools::instance()->show_times();
         }
@@ -192,7 +192,7 @@ 
      */
     public static function register_line_item_display_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_display', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_display', true);
     }
 
 
@@ -204,7 +204,7 @@ 
      */
     public static function register_line_item_filter_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'line_item_filters', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'line_item_filters', true);
     }
 
 
@@ -216,7 +216,7 @@ 
      */
     public static function register_template_part_autoloaders()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES . 'template_parts', true);
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_LIBRARIES.'template_parts', true);
     }
 
 
@@ -226,7 +226,7 @@ 
      */
     public static function register_business_classes()
     {
-        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE . 'business');
+        EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'business');
     }
 
 
@@ -251,11 +251,11 @@ 
             EEH_Debug_Tools::instance()->start_timer(basename($folder));
         }
         // make sure last char is a /
-        $folder .= $folder[ strlen($folder) - 1 ] !== '/' ? '/' : '';
+        $folder .= $folder[strlen($folder) - 1] !== '/' ? '/' : '';
         $class_to_filepath_map = [];
         $exclude = ['index'];
         // get all the files in that folder that end in php
-        $filepaths = glob($folder . '*');
+        $filepaths = glob($folder.'*');
 
         if (empty($filepaths)) {
             return;
@@ -264,8 +264,8 @@ 
         foreach ($filepaths as $filepath) {
             if (substr($filepath, -4, 4) === '.php') {
                 $class_name = EEH_File::get_classname_from_filepath_with_standard_filename($filepath);
-                if (! in_array($class_name, $exclude)) {
-                    $class_to_filepath_map [ $class_name ] = $filepath;
+                if ( ! in_array($class_name, $exclude)) {
+                    $class_to_filepath_map [$class_name] = $filepath;
                 }
             } elseif ($recursive) {
                 EEH_Autoloader::register_autoloaders_for_each_file_in_folder($filepath, $recursive, $debug);
@@ -287,8 +287,8 @@ 
      */
     public static function add_alias(string $class_name, string $alias)
     {
-        if (isset(self::$_autoloaders[ $class_name ])) {
-            self::$_autoloaders[ $alias ] = self::$_autoloaders[ $class_name ];
+        if (isset(self::$_autoloaders[$class_name])) {
+            self::$_autoloaders[$alias] = self::$_autoloaders[$class_name];
         }
     }
 }