eventespresso / event-espresso-core

core/services/address/formatters/AddressFormatter.php

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 class AddressFormatter
 {
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $formatted_address
-     * @param string $sub
-     * @return string
-     */
-    protected function parse_formatted_address(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $formatted_address,
-        string $sub
-    ) : string {
-        // swap address part placeholders for the real text
-        $formatted_address = str_replace(
-            // find
-            array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
-            // replace
-            array($address, $address2, $city, $state, $zip, $country),
-            // string
-            $formatted_address
-        );
-        // remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-        return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $formatted_address
+	 * @param string $sub
+	 * @return string
+	 */
+	protected function parse_formatted_address(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $formatted_address,
+		string $sub
+	) : string {
+		// swap address part placeholders for the real text
+		$formatted_address = str_replace(
+			// find
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
+			// replace
+			array($address, $address2, $city, $state, $zip, $country),
+			// string
+			$formatted_address
+		);
+		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
+	}
 }

core/services/address/formatters/MultiLineAddressFormatter.php

Indentation +41 added lines, -41 removed lines

@@ -15,45 +15,45 @@
  */
 class MultiLineAddressFormatter extends AddressFormatter implements EEI_Address_Formatter
 {
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return string
-     */
-    public function format(
-        string $address,
-        string $address2,
-        string $city,
-        string $state,
-        string $zip,
-        string $country,
-        string $CNT_ISO
-    ): string {
-        $address_formats = apply_filters(
-            'FHEE__EE_MultiLine_Address_Formatter__address_formats',
-            array(
-                'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}",
-                'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-                'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
-            )
-        );
-        // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
-        return $this->parse_formatted_address(
-            $address,
-            $address2,
-            $city,
-            $state,
-            $zip,
-            $country,
-            $formatted_address,
-            '<br />'
-        );
-    }
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $CNT_ISO
+	 * @return string
+	 */
+	public function format(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $CNT_ISO
+	): string {
+		$address_formats = apply_filters(
+			'FHEE__EE_MultiLine_Address_Formatter__address_formats',
+			array(
+				'CA' => "{address}%{address2}%{city}%{state}%{country}%{zip}",
+				'GB' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'US' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+				'ZZ' => "{address}%{address2}%{city}%{state}%{zip}%{country}",
+			)
+		);
+		// if the incoming country has a set format, use that, else use the default
+		$formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
+		return $this->parse_formatted_address(
+			$address,
+			$address2,
+			$city,
+			$state,
+			$zip,
+			$country,
+			$formatted_address,
+			'<br />'
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
             )
         );
         // if the incoming country has a set format, use that, else use the default
-        $formatted_address = $address_formats[ $CNT_ISO ] ?? $address_formats['ZZ'];
+        $formatted_address = $address_formats[$CNT_ISO] ?? $address_formats['ZZ'];
         return $this->parse_formatted_address(
             $address,
             $address2,

core/services/address/formatters/NullAddressFormatter.php

Indentation +21 added lines, -21 removed lines

@@ -12,25 +12,25 @@
  */
 class NullAddressFormatter implements \EEI_Address_Formatter
 {
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $CNT_ISO
-     * @return 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 null
+	 */
+	public function format(
+		string $address,
+		string $address2,
+		string $city,
+		string $state,
+		string $zip,
+		string $country,
+		string $CNT_ISO
+	): ?string {
+		return null;
+	}
 }

core/services/address/CountrySubRegionDao.php

Indentation +221 added lines, -221 removed lines

@@ -24,246 +24,246 @@
  */
 class CountrySubRegionDao
 {
-    const REPO_URL = 'https://raw.githubusercontent.com/eventespresso/countries-and-subregions/master/';
+	const REPO_URL = 'https://raw.githubusercontent.com/eventespresso/countries-and-subregions/master/';
 
-    const OPTION_NAME_COUNTRY_DATA_VERSION = 'espresso-country-sub-region-data-version';
+	const OPTION_NAME_COUNTRY_DATA_VERSION = 'espresso-country-sub-region-data-version';
 
-    /**
-     * @var EEM_State $state_model
-     */
-    private $state_model;
+	/**
+	 * @var EEM_State $state_model
+	 */
+	private $state_model;
 
-    /**
-     * @var JsonValidator $json_validator
-     */
-    private $json_validator;
+	/**
+	 * @var JsonValidator $json_validator
+	 */
+	private $json_validator;
 
-    /**
-     * @var string $data_version
-     */
-    private $data_version;
+	/**
+	 * @var string $data_version
+	 */
+	private $data_version;
 
-    /**
-     * @var array $countries
-     */
-    private $countries = array();
+	/**
+	 * @var array $countries
+	 */
+	private $countries = array();
 
 
-    /**
-     * CountrySubRegionDao constructor.
-     *
-     * @param EEM_State     $state_model
-     * @param JsonValidator $json_validator
-     */
-    public function __construct(EEM_State $state_model, JsonValidator $json_validator)
-    {
-        $this->state_model = $state_model;
-        $this->json_validator = $json_validator;
-    }
+	/**
+	 * CountrySubRegionDao constructor.
+	 *
+	 * @param EEM_State     $state_model
+	 * @param JsonValidator $json_validator
+	 */
+	public function __construct(EEM_State $state_model, JsonValidator $json_validator)
+	{
+		$this->state_model = $state_model;
+		$this->json_validator = $json_validator;
+	}
 
 
-    /**
-     * @param EE_Country $country_object
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function saveCountrySubRegions(EE_Country $country_object): bool
-    {
-        $CNT_ISO = $country_object->ID();
-        $has_sub_regions = $this->state_model->count(array(array('Country.CNT_ISO' => $CNT_ISO)));
-        $data = new stdClass();
-        if (empty($this->countries)) {
-            $this->data_version = $this->getCountrySubRegionDataVersion();
-            $data = $this->retrieveJsonData(self::REPO_URL . 'countries.json');
-        }
-        if (empty($data)) {
-            EE_Error::add_error(
-                'Country Subregion Data could not be retrieved',
-                __FILE__,
-                __METHOD__,
-                __LINE__
-            );
-        }
-        if (
-            ! $has_sub_regions
-            || (isset($data->version) && version_compare($data->version, $this->data_version))
-        ) {
-            if (
-                isset($data->countries)
-                && $this->processCountryData($CNT_ISO, $data->countries) > 0
-            ) {
-                $this->countries = $data->countries;
-                $this->updateCountrySubRegionDataVersion($data->version);
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * @param EE_Country $country_object
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function saveCountrySubRegions(EE_Country $country_object): bool
+	{
+		$CNT_ISO = $country_object->ID();
+		$has_sub_regions = $this->state_model->count(array(array('Country.CNT_ISO' => $CNT_ISO)));
+		$data = new stdClass();
+		if (empty($this->countries)) {
+			$this->data_version = $this->getCountrySubRegionDataVersion();
+			$data = $this->retrieveJsonData(self::REPO_URL . 'countries.json');
+		}
+		if (empty($data)) {
+			EE_Error::add_error(
+				'Country Subregion Data could not be retrieved',
+				__FILE__,
+				__METHOD__,
+				__LINE__
+			);
+		}
+		if (
+			! $has_sub_regions
+			|| (isset($data->version) && version_compare($data->version, $this->data_version))
+		) {
+			if (
+				isset($data->countries)
+				&& $this->processCountryData($CNT_ISO, $data->countries) > 0
+			) {
+				$this->countries = $data->countries;
+				$this->updateCountrySubRegionDataVersion($data->version);
+				return true;
+			}
+		}
+		return false;
+	}
 
 
-    /**
-     * @since 4.9.70.p
-     * @return string
-     */
-    private function getCountrySubRegionDataVersion(): string
-    {
-        return get_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, null);
-    }
+	/**
+	 * @since 4.9.70.p
+	 * @return string
+	 */
+	private function getCountrySubRegionDataVersion(): string
+	{
+		return get_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, null);
+	}
 
 
-    /**
-     * @param string $version
-     */
-    private function updateCountrySubRegionDataVersion(string $version = '')
-    {
-        // add version option if it has never been added before, or update existing
-        if ($this->data_version === null) {
-            add_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, $version, '', false);
-        } else {
-            update_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, $version);
-        }
-    }
+	/**
+	 * @param string $version
+	 */
+	private function updateCountrySubRegionDataVersion(string $version = '')
+	{
+		// add version option if it has never been added before, or update existing
+		if ($this->data_version === null) {
+			add_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, $version, '', false);
+		} else {
+			update_option(self::OPTION_NAME_COUNTRY_DATA_VERSION, $version);
+		}
+	}
 
 
-    /**
-     * @param string $CNT_ISO
-     * @param array  $countries
-     * @return int
-     * @throws EE_Error
-     * @since 4.9.70.p
-     */
-    private function processCountryData(string $CNT_ISO, array $countries = array()): int
-    {
-        if (! empty($countries)) {
-            foreach ($countries as $country) {
-                if (
-                    $country instanceof stdClass
-                    && $country->code === $CNT_ISO
-                    && empty($country->sub_regions)
-                    && ! empty($country->filename)
-                ) {
-                    $country->sub_regions = $this->retrieveJsonData(
-                        self::REPO_URL . 'countries/' . $country->filename . '.json'
-                    );
-                    return $this->saveSubRegionData($country, $country->sub_regions);
-                }
-            }
-        }
-        return 0;
-    }
+	/**
+	 * @param string $CNT_ISO
+	 * @param array  $countries
+	 * @return int
+	 * @throws EE_Error
+	 * @since 4.9.70.p
+	 */
+	private function processCountryData(string $CNT_ISO, array $countries = array()): int
+	{
+		if (! empty($countries)) {
+			foreach ($countries as $country) {
+				if (
+					$country instanceof stdClass
+					&& $country->code === $CNT_ISO
+					&& empty($country->sub_regions)
+					&& ! empty($country->filename)
+				) {
+					$country->sub_regions = $this->retrieveJsonData(
+						self::REPO_URL . 'countries/' . $country->filename . '.json'
+					);
+					return $this->saveSubRegionData($country, $country->sub_regions);
+				}
+			}
+		}
+		return 0;
+	}
 
 
-    /**
-     * @param string $url
-     * @return array
-     */
-    private function retrieveJsonData(string $url): array
-    {
-        if (empty($url)) {
-            EE_Error::add_error(
-                'No URL was provided!',
-                __FILE__,
-                __METHOD__,
-                __LINE__
-            );
-            return array();
-        }
-        $request = wp_safe_remote_get($url);
-        if ($request instanceof WP_Error) {
-            EE_Error::add_error(
-                $request->get_error_message(),
-                __FILE__,
-                __METHOD__,
-                __LINE__
-            );
-            return array();
-        }
-        $body = wp_remote_retrieve_body($request);
-        $json = json_decode($body);
-        if ($this->json_validator->isValid(__FILE__, __METHOD__, __LINE__)) {
-            return $json;
-        }
-        return array();
-    }
+	/**
+	 * @param string $url
+	 * @return array
+	 */
+	private function retrieveJsonData(string $url): array
+	{
+		if (empty($url)) {
+			EE_Error::add_error(
+				'No URL was provided!',
+				__FILE__,
+				__METHOD__,
+				__LINE__
+			);
+			return array();
+		}
+		$request = wp_safe_remote_get($url);
+		if ($request instanceof WP_Error) {
+			EE_Error::add_error(
+				$request->get_error_message(),
+				__FILE__,
+				__METHOD__,
+				__LINE__
+			);
+			return array();
+		}
+		$body = wp_remote_retrieve_body($request);
+		$json = json_decode($body);
+		if ($this->json_validator->isValid(__FILE__, __METHOD__, __LINE__)) {
+			return $json;
+		}
+		return array();
+	}
 
 
-    /**
-     * @param stdClass $country
-     * @param array    $sub_regions
-     * @return int
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private function saveSubRegionData(stdClass $country, array $sub_regions = array()): int
-    {
-        $results = 0;
-        if (is_array($sub_regions)) {
-            $existing_sub_regions = $this->getExistingStateAbbreviations($country->code);
-            foreach ($sub_regions as $sub_region) {
-                // remove country code from sub region code
-                $abbrev = str_replace(
-                    $country->code . '-',
-                    '',
-                    sanitize_text_field($sub_region->code)
-                );
-                // but NOT if sub region code results in only a number
-                if (absint($abbrev) !== 0) {
-                    $abbrev = sanitize_text_field($sub_region->code);
-                }
-                if (
-                    ! in_array($abbrev, $existing_sub_regions, true)
-                    && $this->state_model->insert(
-                        [
-                            // STA_ID CNT_ISO STA_abbrev STA_name STA_active
-                            'CNT_ISO'    => $country->code,
-                            'STA_abbrev' => $abbrev,
-                            'STA_name'   => sanitize_text_field($sub_region->name),
-                            'STA_active' => 1,
-                        ]
-                    )
-                ) {
-                    $results++;
-                }
-            }
-        }
-        return $results;
-    }
+	/**
+	 * @param stdClass $country
+	 * @param array    $sub_regions
+	 * @return int
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private function saveSubRegionData(stdClass $country, array $sub_regions = array()): int
+	{
+		$results = 0;
+		if (is_array($sub_regions)) {
+			$existing_sub_regions = $this->getExistingStateAbbreviations($country->code);
+			foreach ($sub_regions as $sub_region) {
+				// remove country code from sub region code
+				$abbrev = str_replace(
+					$country->code . '-',
+					'',
+					sanitize_text_field($sub_region->code)
+				);
+				// but NOT if sub region code results in only a number
+				if (absint($abbrev) !== 0) {
+					$abbrev = sanitize_text_field($sub_region->code);
+				}
+				if (
+					! in_array($abbrev, $existing_sub_regions, true)
+					&& $this->state_model->insert(
+						[
+							// STA_ID CNT_ISO STA_abbrev STA_name STA_active
+							'CNT_ISO'    => $country->code,
+							'STA_abbrev' => $abbrev,
+							'STA_name'   => sanitize_text_field($sub_region->name),
+							'STA_active' => 1,
+						]
+					)
+				) {
+					$results++;
+				}
+			}
+		}
+		return $results;
+	}
 
 
-    /**
-     * @param string $CNT_ISO
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     *@since 4.9.76.p
-     */
-    private function getExistingStateAbbreviations(string $CNT_ISO): array
-    {
-        $existing_sub_region_IDs = [];
-        $existing_sub_regions = $this->state_model->get_all(array(
-            array(
-                'Country.CNT_ISO' => array(
-                    'IN',
-                    [$CNT_ISO]
-                )
-            ),
-            'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')
-        ));
-        if (is_array($existing_sub_regions)) {
-            foreach ($existing_sub_regions as $existing_sub_region) {
-                if ($existing_sub_region instanceof EE_State) {
-                    $existing_sub_region_IDs[] = $existing_sub_region->abbrev();
-                }
-            }
-        }
-        return $existing_sub_region_IDs;
-    }
+	/**
+	 * @param string $CNT_ISO
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 *@since 4.9.76.p
+	 */
+	private function getExistingStateAbbreviations(string $CNT_ISO): array
+	{
+		$existing_sub_region_IDs = [];
+		$existing_sub_regions = $this->state_model->get_all(array(
+			array(
+				'Country.CNT_ISO' => array(
+					'IN',
+					[$CNT_ISO]
+				)
+			),
+			'order_by' => array('Country.CNT_name' => 'ASC', 'STA_name' => 'ASC')
+		));
+		if (is_array($existing_sub_regions)) {
+			foreach ($existing_sub_regions as $existing_sub_region) {
+				if ($existing_sub_region instanceof EE_State) {
+					$existing_sub_region_IDs[] = $existing_sub_region->abbrev();
+				}
+			}
+		}
+		return $existing_sub_region_IDs;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
         $data = new stdClass();
         if (empty($this->countries)) {
             $this->data_version = $this->getCountrySubRegionDataVersion();
-            $data = $this->retrieveJsonData(self::REPO_URL . 'countries.json');
+            $data = $this->retrieveJsonData(self::REPO_URL.'countries.json');
         }
         if (empty($data)) {
             EE_Error::add_error(
@@ -138,7 +138,7 @@ 
      */
     private function processCountryData(string $CNT_ISO, array $countries = array()): int
     {
-        if (! empty($countries)) {
+        if ( ! empty($countries)) {
             foreach ($countries as $country) {
                 if (
                     $country instanceof stdClass
@@ -147,7 +147,7 @@ 
                     && ! empty($country->filename)
                 ) {
                     $country->sub_regions = $this->retrieveJsonData(
-                        self::REPO_URL . 'countries/' . $country->filename . '.json'
+                        self::REPO_URL.'countries/'.$country->filename.'.json'
                     );
                     return $this->saveSubRegionData($country, $country->sub_regions);
                 }
@@ -208,7 +208,7 @@ 
             foreach ($sub_regions as $sub_region) {
                 // remove country code from sub region code
                 $abbrev = str_replace(
-                    $country->code . '-',
+                    $country->code.'-',
                     '',
                     sanitize_text_field($sub_region->code)
                 );

core/domain/services/custom_post_types/RewriteRules.php

Indentation +27 added lines, -27 removed lines

@@ -14,35 +14,35 @@
  */
 class RewriteRules implements InterminableInterface
 {
-    const OPTION_KEY_FLUSH_REWRITE_RULES = 'ee_flush_rewrite_rules';
+	const OPTION_KEY_FLUSH_REWRITE_RULES = 'ee_flush_rewrite_rules';
 
 
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true);
-    }
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @return void
+	 */
+	public function flush()
+	{
+		update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true);
+	}
 
 
-    /**
-     * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
-     *
-     * @return void
-     */
-    public function flushRewriteRules()
-    {
-        if (get_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true)) {
-            add_action(
-                'shutdown',
-                static function () {
-                    flush_rewrite_rules();
-                    update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, false);
-                }
-            );
-        }
-    }
+	/**
+	 * This will flush rewrite rules on demand.  This actually gets called around wp init priority level 100.
+	 *
+	 * @return void
+	 */
+	public function flushRewriteRules()
+	{
+		if (get_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, true)) {
+			add_action(
+				'shutdown',
+				static function () {
+					flush_rewrite_rules();
+					update_option(RewriteRules::OPTION_KEY_FLUSH_REWRITE_RULES, false);
+				}
+			);
+		}
+	}
 }

core/domain/services/contexts/RequestTypeContextFactoryInterface.php

Indentation +5 added lines, -5 removed lines

@@ -15,9 +15,9 @@
  */
 interface RequestTypeContextFactoryInterface extends InterminableInterface
 {
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create($slug);
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create($slug);
 }

core/domain/entities/custom_post_types/CustomTaxonomyDefinitions.php

Indentation +131 added lines, -131 removed lines

@@ -15,145 +15,145 @@
  */
 class CustomTaxonomyDefinitions implements InterminableInterface
 {
-    /**
-     * @var array $taxonomies
-     */
-    private $taxonomies;
+	/**
+	 * @var array $taxonomies
+	 */
+	private $taxonomies;
 
 
-    /**
-     * EspressoCustomPostTypeDefinitions constructor.
-     */
-    public function __construct()
-    {
-        $this->setTaxonomies();
-        add_filter('pre_term_description', array($this, 'filterCustomTermDescription'), 1, 2);
-    }
+	/**
+	 * EspressoCustomPostTypeDefinitions constructor.
+	 */
+	public function __construct()
+	{
+		$this->setTaxonomies();
+		add_filter('pre_term_description', array($this, 'filterCustomTermDescription'), 1, 2);
+	}
 
 
-    private function setTaxonomies()
-    {
-        $this->taxonomies = array(
-            'espresso_event_categories' => array(
-                'singular_name' => esc_html__('Event Category', 'event_espresso'),
-                'plural_name'   => esc_html__('Event Categories', 'event_espresso'),
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => true,
-                    'show_in_rest'      => true,
-                    'capabilities'      => array(
-                        'manage_terms' => 'ee_manage_event_categories',
-                        'edit_terms'   => 'ee_edit_event_category',
-                        'delete_terms' => 'ee_delete_event_category',
-                        'assign_terms' => 'ee_assign_event_category',
-                    ),
-                    'rewrite'           => array(
-                        'slug' => EEH_URL::slugify(
-                            esc_html__('event-category', 'event_espresso'),
-                            'event-category'
-                        )
-                    ),
-                ),
-            ),
-            'espresso_venue_categories' => array(
-                'singular_name' => esc_html__('Venue Category', 'event_espresso'),
-                'plural_name'   => esc_html__('Venue Categories', 'event_espresso'),
-                'args'          => array(
-                    'public'            => true,
-                    'show_in_nav_menus' => false, // by default this doesn't show for decaf
-                    'show_in_rest'      => true,
-                    'capabilities'      => array(
-                        'manage_terms' => 'ee_manage_venue_categories',
-                        'edit_terms'   => 'ee_edit_venue_category',
-                        'delete_terms' => 'ee_delete_venue_category',
-                        'assign_terms' => 'ee_assign_venue_category',
-                    ),
-                    'rewrite'           => array(
-                        'slug' => EEH_URL::slugify(
-                            esc_html__('venue-category', 'event_espresso'),
-                            'venue-category'
-                        )
-                    ),
-                ),
-            ),
-            'espresso_event_type'       => array(
-                'singular_name' => esc_html__('Event Type', 'event_espresso'),
-                'plural_name'   => esc_html__('Event Types', 'event_espresso'),
-                'args'          => array(
-                    'public'       => true,
-                    'show_ui'      => false,
-                    'show_in_rest' => true,
-                    'capabilities' => array(
-                        'manage_terms' => 'ee_read_event_type',
-                        'edit_terms'   => 'ee_edit_event_type',
-                        'delete_terms' => 'ee_delete_event_type',
-                        'assign_terms' => 'ee_assign_event_type',
-                    ),
-                    'rewrite'      => array(
-                        'slug' => EEH_URL::slugify(
-                            esc_html__('event-type', 'event_espresso'),
-                            'event-type'
-                        )
-                    ),
-                    'hierarchical' => true,
-                ),
-            ),
-        );
-    }
+	private function setTaxonomies()
+	{
+		$this->taxonomies = array(
+			'espresso_event_categories' => array(
+				'singular_name' => esc_html__('Event Category', 'event_espresso'),
+				'plural_name'   => esc_html__('Event Categories', 'event_espresso'),
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => true,
+					'show_in_rest'      => true,
+					'capabilities'      => array(
+						'manage_terms' => 'ee_manage_event_categories',
+						'edit_terms'   => 'ee_edit_event_category',
+						'delete_terms' => 'ee_delete_event_category',
+						'assign_terms' => 'ee_assign_event_category',
+					),
+					'rewrite'           => array(
+						'slug' => EEH_URL::slugify(
+							esc_html__('event-category', 'event_espresso'),
+							'event-category'
+						)
+					),
+				),
+			),
+			'espresso_venue_categories' => array(
+				'singular_name' => esc_html__('Venue Category', 'event_espresso'),
+				'plural_name'   => esc_html__('Venue Categories', 'event_espresso'),
+				'args'          => array(
+					'public'            => true,
+					'show_in_nav_menus' => false, // by default this doesn't show for decaf
+					'show_in_rest'      => true,
+					'capabilities'      => array(
+						'manage_terms' => 'ee_manage_venue_categories',
+						'edit_terms'   => 'ee_edit_venue_category',
+						'delete_terms' => 'ee_delete_venue_category',
+						'assign_terms' => 'ee_assign_venue_category',
+					),
+					'rewrite'           => array(
+						'slug' => EEH_URL::slugify(
+							esc_html__('venue-category', 'event_espresso'),
+							'venue-category'
+						)
+					),
+				),
+			),
+			'espresso_event_type'       => array(
+				'singular_name' => esc_html__('Event Type', 'event_espresso'),
+				'plural_name'   => esc_html__('Event Types', 'event_espresso'),
+				'args'          => array(
+					'public'       => true,
+					'show_ui'      => false,
+					'show_in_rest' => true,
+					'capabilities' => array(
+						'manage_terms' => 'ee_read_event_type',
+						'edit_terms'   => 'ee_edit_event_type',
+						'delete_terms' => 'ee_delete_event_type',
+						'assign_terms' => 'ee_assign_event_type',
+					),
+					'rewrite'      => array(
+						'slug' => EEH_URL::slugify(
+							esc_html__('event-type', 'event_espresso'),
+							'event-type'
+						)
+					),
+					'hierarchical' => true,
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomTaxonomyDefinitions(): array
-    {
-        return (array) apply_filters(
-            'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
-            // legacy filter applied for now,
-            // later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
-            apply_filters(
-                'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies',
-                $this->taxonomies
-            )
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomTaxonomyDefinitions(): array
+	{
+		return (array) apply_filters(
+			'FHEE__EventEspresso_core_domain_entities_custom_post_types_TaxonomyDefinitions__getTaxonomies',
+			// legacy filter applied for now,
+			// later on we'll run a has_filter($tag) check and throw a doing_it_wrong() notice
+			apply_filters(
+				'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies',
+				$this->taxonomies
+			)
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomTaxonomySlugs(): array
-    {
-        return array_keys($this->getCustomTaxonomyDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomTaxonomySlugs(): array
+	{
+		return array_keys($this->getCustomTaxonomyDefinitions());
+	}
 
 
-    /**
-     * By default, WordPress strips all html from term taxonomy description content.
-     * The purpose of this method is to remove that restriction
-     * and ensure that we still run ee term taxonomy descriptions
-     * through some full html sanitization equivalent to the post content field.
-     * So first we remove default filter for term description
-     * but we have to do this earlier before wp sets their own filter
-     * because they just set a global filter on all term descriptions
-     * before the custom term description filter.
-     * Really sux.
-     *
-     * @param string $description The description content.
-     * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
-     * @return string
-     */
-    public function filterCustomTermDescription(string $description, string $taxonomy): string
-    {
-        // get a list of EE taxonomies
-        $custom_taxonomies = $this->getCustomTaxonomySlugs();
-        // only do our own thing if the taxonomy listed is an ee taxonomy.
-        if (in_array($taxonomy, $custom_taxonomies, true)) {
-            // remove default wp filter
-            remove_filter('pre_term_description', 'wp_filter_kses');
-            // sanitize THIS content.
-            $description = wp_kses($description, wp_kses_allowed_html('post'));
-        }
-        return $description;
-    }
+	/**
+	 * By default, WordPress strips all html from term taxonomy description content.
+	 * The purpose of this method is to remove that restriction
+	 * and ensure that we still run ee term taxonomy descriptions
+	 * through some full html sanitization equivalent to the post content field.
+	 * So first we remove default filter for term description
+	 * but we have to do this earlier before wp sets their own filter
+	 * because they just set a global filter on all term descriptions
+	 * before the custom term description filter.
+	 * Really sux.
+	 *
+	 * @param string $description The description content.
+	 * @param string $taxonomy    The taxonomy name for the taxonomy being filtered.
+	 * @return string
+	 */
+	public function filterCustomTermDescription(string $description, string $taxonomy): string
+	{
+		// get a list of EE taxonomies
+		$custom_taxonomies = $this->getCustomTaxonomySlugs();
+		// only do our own thing if the taxonomy listed is an ee taxonomy.
+		if (in_array($taxonomy, $custom_taxonomies, true)) {
+			// remove default wp filter
+			remove_filter('pre_term_description', 'wp_filter_kses');
+			// sanitize THIS content.
+			$description = wp_kses($description, wp_kses_allowed_html('post'));
+		}
+		return $description;
+	}
 }

core/domain/values/session/SessionLifespan.php

Indentation +82 added lines, -82 removed lines

@@ -19,98 +19,98 @@
  */
 class SessionLifespan
 {
-    /**
-     * how long an EE session lasts in seconds
-     * default session lifespan of 1 hour (for not so instant IPNs)
-     *
-     * @var int $lifespan
-     */
-    private $lifespan;
+	/**
+	 * how long an EE session lasts in seconds
+	 * default session lifespan of 1 hour (for not so instant IPNs)
+	 *
+	 * @var int $lifespan
+	 */
+	private $lifespan;
 
 
-    /**
-     * SessionLifespan constructor.
-     *
-     * @param int $lifespan
-     * @throws DomainException
-     */
-    public function __construct(int $lifespan = 0)
-    {
-        $lifespan = absint($lifespan);
-        $lifespan = $lifespan > 0 ? $lifespan : (int) HOUR_IN_SECONDS;
-        $this->setLifespan($lifespan);
-    }
+	/**
+	 * SessionLifespan constructor.
+	 *
+	 * @param int $lifespan
+	 * @throws DomainException
+	 */
+	public function __construct(int $lifespan = 0)
+	{
+		$lifespan = absint($lifespan);
+		$lifespan = $lifespan > 0 ? $lifespan : (int) HOUR_IN_SECONDS;
+		$this->setLifespan($lifespan);
+	}
 
 
-    /**
-     * @param int $lifespan
-     * @throws DomainException
-     */
-    protected function setLifespan(int $lifespan)
-    {
-        if ($lifespan < 60) {
-            throw new DomainException(
-                esc_html__(
-                    'The session lifespan needs to be at least 60 seconds, and even that is extremely short',
-                    'event_espresso'
-                )
-            );
-        }
-        $this->lifespan = apply_filters(
-            'FHEE__EventEspresso_core_domain_values_session_SessionLifespan__setLifespan___lifespan',
-            // apply legacy filter for now but add doing it wrong notice in future
-            apply_filters(
-                'FHEE__EE_Session__construct___lifespan',
-                $lifespan
-            )
-        ) + 1;
-    }
+	/**
+	 * @param int $lifespan
+	 * @throws DomainException
+	 */
+	protected function setLifespan(int $lifespan)
+	{
+		if ($lifespan < 60) {
+			throw new DomainException(
+				esc_html__(
+					'The session lifespan needs to be at least 60 seconds, and even that is extremely short',
+					'event_espresso'
+				)
+			);
+		}
+		$this->lifespan = apply_filters(
+			'FHEE__EventEspresso_core_domain_values_session_SessionLifespan__setLifespan___lifespan',
+			// apply legacy filter for now but add doing it wrong notice in future
+			apply_filters(
+				'FHEE__EE_Session__construct___lifespan',
+				$lifespan
+			)
+		) + 1;
+	}
 
 
-    /**
-     * @return int
-     */
-    public function inSeconds(): int
-    {
-        return $this->lifespan;
-    }
+	/**
+	 * @return int
+	 */
+	public function inSeconds(): int
+	{
+		return $this->lifespan;
+	}
 
 
-    /**
-     * @param string $separator
-     * @return string
-     */
-    public function inHoursMinutesSeconds(string $separator = ':'): string
-    {
-        return sprintf(
-            '%02d%s%02d%s%02d',
-            floor($this->lifespan / 3600),
-            $separator,
-            ($this->lifespan / 60) % 60,
-            $separator,
-            $this->lifespan % 60
-        );
-    }
+	/**
+	 * @param string $separator
+	 * @return string
+	 */
+	public function inHoursMinutesSeconds(string $separator = ':'): string
+	{
+		return sprintf(
+			'%02d%s%02d%s%02d',
+			floor($this->lifespan / 3600),
+			$separator,
+			($this->lifespan / 60) % 60,
+			$separator,
+			$this->lifespan % 60
+		);
+	}
 
 
-    /**
-     * Returns a timestamp for when the session would expire based on this lifespan
-     *
-     * @param bool $utc If true, displays expiration in UTC
-     *                  If false, displays expiration in local time
-     * @return int
-     */
-    public function expiration(bool $utc = true): int
-    {
-        return (int) current_time('timestamp', $utc) - $this->lifespan;
-    }
+	/**
+	 * Returns a timestamp for when the session would expire based on this lifespan
+	 *
+	 * @param bool $utc If true, displays expiration in UTC
+	 *                  If false, displays expiration in local time
+	 * @return int
+	 */
+	public function expiration(bool $utc = true): int
+	{
+		return (int) current_time('timestamp', $utc) - $this->lifespan;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return (string) $this->inSeconds();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return (string) $this->inSeconds();
+	}
 }

core/db_models/EEM_WP_User.model.php

Indentation +123 added lines, -123 removed lines

@@ -12,133 +12,133 @@
  */
 class EEM_WP_User extends EEM_Base
 {
-    /**
-     * private instance of the EEM_WP_User object
-     *
-     * @type EEM_WP_User
-     */
-    protected static $_instance;
+	/**
+	 * private instance of the EEM_WP_User object
+	 *
+	 * @type EEM_WP_User
+	 */
+	protected static $_instance;
 
 
-    /**
-     *    constructor
-     *
-     * @param null              $timezone
-     * @param ModelFieldFactory $model_field_factory
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    protected function __construct($timezone, ModelFieldFactory $model_field_factory)
-    {
-        $this->singular_item = esc_html__('WP_User', 'event_espresso');
-        $this->plural_item = esc_html__('WP_Users', 'event_espresso');
-        global $wpdb;
-        $this->_tables = array(
-            'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
-        );
-        $this->_fields = array(
-            'WP_User' => array(
-                'ID'                  => $model_field_factory->createPrimaryKeyIntField(
-                    'ID',
-                    esc_html__('WP_User ID', 'event_espresso')
-                ),
-                'user_login'          => $model_field_factory->createPlainTextField(
-                    'user_login',
-                    esc_html__('User Login', 'event_espresso'),
-                    false
-                ),
-                'user_pass'           => $model_field_factory->createPlainTextField(
-                    'user_pass',
-                    esc_html__('User Password', 'event_espresso'),
-                    false
-                ),
-                'user_nicename'       => $model_field_factory->createPlainTextField(
-                    'user_nicename',
-                    esc_html__(' User Nice Name', 'event_espresso'),
-                    false
-                ),
-                'user_email'          => $model_field_factory->createEmailField(
-                    'user_email',
-                    esc_html__('User Email', 'event_espresso'),
-                    false
-                ),
-                'user_registered'     => $model_field_factory->createDatetimeField(
-                    'user_registered',
-                    esc_html__('Date User Registered', 'event_espresso'),
-                    $timezone,
-                    false
-                ),
-                'user_activation_key' => $model_field_factory->createPlainTextField(
-                    'user_activation_key',
-                    esc_html__('User Activation Key', 'event_espresso'),
-                    false
-                ),
-                'user_status'         => $model_field_factory->createIntegerField(
-                    'user_status',
-                    esc_html__('User Status', 'event_espresso')
-                ),
-                'display_name'        => $model_field_factory->createPlainTextField(
-                    'display_name',
-                    esc_html__('Display Name', 'event_espresso'),
-                    false
-                ),
-            ),
-        );
-        $this->_model_relations = array(
-            'Attendee'       => new EE_Has_Many_Relation(),
-            // all models are related to the change log
-            // 'Change_Log'     => new EE_Has_Many_Relation(),
-            'Event'          => new EE_Has_Many_Relation(),
-            'Message'        => new EE_Has_Many_Relation(),
-            'Payment_Method' => new EE_Has_Many_Relation(),
-            'Price'          => new EE_Has_Many_Relation(),
-            'Price_Type'     => new EE_Has_Many_Relation(),
-            'Question'       => new EE_Has_Many_Relation(),
-            'Question_Group' => new EE_Has_Many_Relation(),
-            'Ticket'         => new EE_Has_Many_Relation(),
-            'Venue'          => new EE_Has_Many_Relation(),
-        );
-        $this->foreign_key_aliases = [
-            'Event.EVT_wp_user'          => 'WP_User.ID',
-            'Payment_Method.PMD_wp_user' => 'WP_User.ID',
-            'Price.PRC_wp_user'          => 'WP_User.ID',
-            'Price_Type.PRT_wp_user'     => 'WP_User.ID',
-            'Question.QST_wp_user'       => 'WP_User.ID',
-            'Question_Group.QSG_wp_user' => 'WP_User.ID',
-            'Ticket.VNU_wp_user'         => 'WP_User.ID',
-            'Venue.TKT_wp_user'          => 'WP_User.ID',
-        ];
-        $this->_wp_core_model = true;
-        $this->_caps_slug = 'users';
-        $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
-        $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
-        foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
-        }
-        // @todo: account for create_users controls whether they can create users at all
-        parent::__construct($timezone);
-    }
+	/**
+	 *    constructor
+	 *
+	 * @param null              $timezone
+	 * @param ModelFieldFactory $model_field_factory
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	protected function __construct($timezone, ModelFieldFactory $model_field_factory)
+	{
+		$this->singular_item = esc_html__('WP_User', 'event_espresso');
+		$this->plural_item = esc_html__('WP_Users', 'event_espresso');
+		global $wpdb;
+		$this->_tables = array(
+			'WP_User' => new EE_Primary_Table($wpdb->users, 'ID', true),
+		);
+		$this->_fields = array(
+			'WP_User' => array(
+				'ID'                  => $model_field_factory->createPrimaryKeyIntField(
+					'ID',
+					esc_html__('WP_User ID', 'event_espresso')
+				),
+				'user_login'          => $model_field_factory->createPlainTextField(
+					'user_login',
+					esc_html__('User Login', 'event_espresso'),
+					false
+				),
+				'user_pass'           => $model_field_factory->createPlainTextField(
+					'user_pass',
+					esc_html__('User Password', 'event_espresso'),
+					false
+				),
+				'user_nicename'       => $model_field_factory->createPlainTextField(
+					'user_nicename',
+					esc_html__(' User Nice Name', 'event_espresso'),
+					false
+				),
+				'user_email'          => $model_field_factory->createEmailField(
+					'user_email',
+					esc_html__('User Email', 'event_espresso'),
+					false
+				),
+				'user_registered'     => $model_field_factory->createDatetimeField(
+					'user_registered',
+					esc_html__('Date User Registered', 'event_espresso'),
+					$timezone,
+					false
+				),
+				'user_activation_key' => $model_field_factory->createPlainTextField(
+					'user_activation_key',
+					esc_html__('User Activation Key', 'event_espresso'),
+					false
+				),
+				'user_status'         => $model_field_factory->createIntegerField(
+					'user_status',
+					esc_html__('User Status', 'event_espresso')
+				),
+				'display_name'        => $model_field_factory->createPlainTextField(
+					'display_name',
+					esc_html__('Display Name', 'event_espresso'),
+					false
+				),
+			),
+		);
+		$this->_model_relations = array(
+			'Attendee'       => new EE_Has_Many_Relation(),
+			// all models are related to the change log
+			// 'Change_Log'     => new EE_Has_Many_Relation(),
+			'Event'          => new EE_Has_Many_Relation(),
+			'Message'        => new EE_Has_Many_Relation(),
+			'Payment_Method' => new EE_Has_Many_Relation(),
+			'Price'          => new EE_Has_Many_Relation(),
+			'Price_Type'     => new EE_Has_Many_Relation(),
+			'Question'       => new EE_Has_Many_Relation(),
+			'Question_Group' => new EE_Has_Many_Relation(),
+			'Ticket'         => new EE_Has_Many_Relation(),
+			'Venue'          => new EE_Has_Many_Relation(),
+		);
+		$this->foreign_key_aliases = [
+			'Event.EVT_wp_user'          => 'WP_User.ID',
+			'Payment_Method.PMD_wp_user' => 'WP_User.ID',
+			'Price.PRC_wp_user'          => 'WP_User.ID',
+			'Price_Type.PRT_wp_user'     => 'WP_User.ID',
+			'Question.QST_wp_user'       => 'WP_User.ID',
+			'Question_Group.QSG_wp_user' => 'WP_User.ID',
+			'Ticket.VNU_wp_user'         => 'WP_User.ID',
+			'Venue.TKT_wp_user'          => 'WP_User.ID',
+		];
+		$this->_wp_core_model = true;
+		$this->_caps_slug = 'users';
+		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list';
+		$this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list';
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
+			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User();
+		}
+		// @todo: account for create_users controls whether they can create users at all
+		parent::__construct($timezone);
+	}
 
 
-    /**
-     * We don't need a foreign key to the WP_User model, we just need its primary key
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    public function wp_user_field_name(): string
-    {
-        return $this->primary_key_name();
-    }
+	/**
+	 * We don't need a foreign key to the WP_User model, we just need its primary key
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function wp_user_field_name(): string
+	{
+		return $this->primary_key_name();
+	}
 
 
-    /**
-     * This WP_User model IS owned, even though it doesn't have a foreign key to itself
-     *
-     * @return boolean
-     */
-    public function is_owned(): bool
-    {
-        return true;
-    }
+	/**
+	 * This WP_User model IS owned, even though it doesn't have a foreign key to itself
+	 *
+	 * @return boolean
+	 */
+	public function is_owned(): bool
+	{
+		return true;
+	}
 }