eventespresso / event-espresso-core

core/domain/services/validation/email/strategies/InternationalDNS.php

Indentation +39 added lines, -39 removed lines

@@ -15,43 +15,43 @@
 class InternationalDNS extends International
 {
 
-    /**
-     * Validates the email in teh same way as the parent, but also
-     * verifies the domain exists.
-     *
-     * @param string $email_address
-     * @return bool
-     * @throws EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        parent::validate($email_address);
-        $domain = $this->getDomainPartOfEmail(
-            $email_address,
-            $this->getAtIndex($email_address)
-        );
-        if (! checkdnsrr($domain, 'MX')) {
-            // domain not found in MX records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        if (! checkdnsrr($domain, 'A')) {
-            // domain not found in A records
-            throw new EmailValidationException(
-                __(
-                // @codingStandardsIgnoreStart
-                    'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
-                    // @codingStandardsIgnoreEnd
-                    'event_espresso'
-                )
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validates the email in teh same way as the parent, but also
+	 * verifies the domain exists.
+	 *
+	 * @param string $email_address
+	 * @return bool
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		parent::validate($email_address);
+		$domain = $this->getDomainPartOfEmail(
+			$email_address,
+			$this->getAtIndex($email_address)
+		);
+		if (! checkdnsrr($domain, 'MX')) {
+			// domain not found in MX records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "MX record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		if (! checkdnsrr($domain, 'A')) {
+			// domain not found in A records
+			throw new EmailValidationException(
+				__(
+				// @codingStandardsIgnoreStart
+					'Although the email address provided is formatted correctly, a valid "A record" could not be located for that address and domain. Please enter a valid email address.',
+					// @codingStandardsIgnoreEnd
+					'event_espresso'
+				)
+			);
+		}
+		return true;
+	}
 }

core/domain/services/validation/email/strategies/Basic.php

Indentation +102 added lines, -102 removed lines

@@ -15,112 +15,112 @@
 class Basic implements EmailValidatorInterface
 {
 
-    /**
-     * @param string $email_address
-     * @return bool
-     * @throws EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        if (! preg_match('/^.+\@\S+$/', $email_address)) {
-            // email not in correct {string}@{string} format
-            throw new EmailValidationException(
-                esc_html__('Email does not have the required @ sign.', 'event_espresso')
-            );
-        }
-        $atIndex = $this->getAtIndex($email_address);
-        $local = $this->getLocalPartOfEmail($email_address, $atIndex);
-        $localLen = strlen($local);
-        if ($localLen < 1) {
-            // no local part
-            throw new EmailValidationException(
-                esc_html__('Email local-part (before the @) is required.', 'event_espresso')
-            );
-        }
-        if ($localLen > 64) {
-            // local part length exceeded
-            throw new EmailValidationException(
-                esc_html__('Email local-part (before the @) is too long.', 'event_espresso')
-            );
-        }
-        if ($local[0] === '.') {
-            // local part starts with '.'
-            throw new EmailValidationException(
-                esc_html__('Email local-part (before the @) must not begin with a period.', 'event_espresso')
-            );
-        }
-        if ($local[$localLen - 1] === '.') {
-            // local part starts or ends with '.'
-            throw new EmailValidationException(
-                esc_html__('Email local-part (before the @) must not end with a period.', 'event_espresso')
-            );
-        }
-        if (preg_match('/\\.\\./', $local)) {
-            // local part has two consecutive dots
-            throw new EmailValidationException(
-                esc_html__(
-                    'Email local-part (before the @) must not have two consecutive periods.',
-                    'event_espresso'
-                )
-            );
-        }
-        $domain = $this->getDomainPartOfEmail($email_address, $atIndex);
-        $domainLen = strlen($domain);
-        if ($domainLen < 1) {
-            throw new EmailValidationException(
-                esc_html__('Email domain (after the @) is required.', 'event_espresso')
-            );
-        }
-        if ($domainLen > 255) {
-            // domain part length exceeded
-            throw new EmailValidationException(
-                esc_html__('Email domain (after the @) is too long.', 'event_espresso')
-            );
-        }
-        if (preg_match('/\\.\\./', $domain)) {
-            // domain part has two consecutive dots
-            throw new EmailValidationException(
-                esc_html__('Email domain (after the @) must not have two consecutive periods.', 'event_espresso')
-            );
-        }
-        return true;
-    }
+	/**
+	 * @param string $email_address
+	 * @return bool
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		if (! preg_match('/^.+\@\S+$/', $email_address)) {
+			// email not in correct {string}@{string} format
+			throw new EmailValidationException(
+				esc_html__('Email does not have the required @ sign.', 'event_espresso')
+			);
+		}
+		$atIndex = $this->getAtIndex($email_address);
+		$local = $this->getLocalPartOfEmail($email_address, $atIndex);
+		$localLen = strlen($local);
+		if ($localLen < 1) {
+			// no local part
+			throw new EmailValidationException(
+				esc_html__('Email local-part (before the @) is required.', 'event_espresso')
+			);
+		}
+		if ($localLen > 64) {
+			// local part length exceeded
+			throw new EmailValidationException(
+				esc_html__('Email local-part (before the @) is too long.', 'event_espresso')
+			);
+		}
+		if ($local[0] === '.') {
+			// local part starts with '.'
+			throw new EmailValidationException(
+				esc_html__('Email local-part (before the @) must not begin with a period.', 'event_espresso')
+			);
+		}
+		if ($local[$localLen - 1] === '.') {
+			// local part starts or ends with '.'
+			throw new EmailValidationException(
+				esc_html__('Email local-part (before the @) must not end with a period.', 'event_espresso')
+			);
+		}
+		if (preg_match('/\\.\\./', $local)) {
+			// local part has two consecutive dots
+			throw new EmailValidationException(
+				esc_html__(
+					'Email local-part (before the @) must not have two consecutive periods.',
+					'event_espresso'
+				)
+			);
+		}
+		$domain = $this->getDomainPartOfEmail($email_address, $atIndex);
+		$domainLen = strlen($domain);
+		if ($domainLen < 1) {
+			throw new EmailValidationException(
+				esc_html__('Email domain (after the @) is required.', 'event_espresso')
+			);
+		}
+		if ($domainLen > 255) {
+			// domain part length exceeded
+			throw new EmailValidationException(
+				esc_html__('Email domain (after the @) is too long.', 'event_espresso')
+			);
+		}
+		if (preg_match('/\\.\\./', $domain)) {
+			// domain part has two consecutive dots
+			throw new EmailValidationException(
+				esc_html__('Email domain (after the @) must not have two consecutive periods.', 'event_espresso')
+			);
+		}
+		return true;
+	}
 
 
-    /**
-     * returns the location of the @ symbol
-     *
-     * @param string $email_address
-     * @return bool|string
-     */
-    protected function getAtIndex($email_address)
-    {
-        return strrpos($email_address, '@');
-    }
+	/**
+	 * returns the location of the @ symbol
+	 *
+	 * @param string $email_address
+	 * @return bool|string
+	 */
+	protected function getAtIndex($email_address)
+	{
+		return strrpos($email_address, '@');
+	}
 
 
-    /**
-     * Gets the local part of the email
-     *
-     * @param string   $email_address
-     * @param bool|int $atIndex
-     * @return bool|string
-     */
-    protected function getLocalPartOfEmail($email_address, $atIndex)
-    {
-        return substr($email_address, 0, $atIndex);
-    }
+	/**
+	 * Gets the local part of the email
+	 *
+	 * @param string   $email_address
+	 * @param bool|int $atIndex
+	 * @return bool|string
+	 */
+	protected function getLocalPartOfEmail($email_address, $atIndex)
+	{
+		return substr($email_address, 0, $atIndex);
+	}
 
 
-    /**
-     * Gets the domain part of the email
-     *
-     * @param string   $email_address
-     * @param bool|int $atIndex
-     * @return bool|string
-     */
-    protected function getDomainPartOfEmail($email_address, $atIndex)
-    {
-        return substr($email_address, $atIndex + 1);
-    }
+	/**
+	 * Gets the domain part of the email
+	 *
+	 * @param string   $email_address
+	 * @param bool|int $atIndex
+	 * @return bool|string
+	 */
+	protected function getDomainPartOfEmail($email_address, $atIndex)
+	{
+		return substr($email_address, $atIndex + 1);
+	}
 }

core/domain/services/validation/email/strategies/International.php

Indentation +22 added lines, -22 removed lines

@@ -15,26 +15,26 @@
 class International extends Basic
 {
 
-    /**
-     * @param string $email_address
-     * @return bool
-     * @throws \EventEspresso\core\domain\services\validation\email\EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        parent::validate($email_address);
-        if (// plz see http://stackoverflow.com/a/24817336 re: the following regex
-        ! preg_match(
-        // @codingStandardsIgnoreStart
-            '/^(?!\.)((?!.*\.{2})[a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\.!#$%&\'*+-\/=?^_`{|}~\-\d]+)@(?!\.)([a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\-\.\d]+)((\.([a-zA-Z\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}]){2,63})+)$/u',
-            // @codingStandardsIgnoreEnd
-            $email_address
-        )
-        ) {
-            throw new EmailValidationException(
-                esc_html__('Email address is invalid.', 'event_espresso')
-            );
-        }
-        return true;
-    }
+	/**
+	 * @param string $email_address
+	 * @return bool
+	 * @throws \EventEspresso\core\domain\services\validation\email\EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		parent::validate($email_address);
+		if (// plz see http://stackoverflow.com/a/24817336 re: the following regex
+		! preg_match(
+		// @codingStandardsIgnoreStart
+			'/^(?!\.)((?!.*\.{2})[a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\.!#$%&\'*+-\/=?^_`{|}~\-\d]+)@(?!\.)([a-zA-Z0-9\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}\-\.\d]+)((\.([a-zA-Z\x{0080}-\x{00FF}\x{0100}-\x{017F}\x{0180}-\x{024F}\x{0250}-\x{02AF}\x{0300}-\x{036F}\x{0370}-\x{03FF}\x{0400}-\x{04FF}\x{0500}-\x{052F}\x{0530}-\x{058F}\x{0590}-\x{05FF}\x{0600}-\x{06FF}\x{0700}-\x{074F}\x{0750}-\x{077F}\x{0780}-\x{07BF}\x{07C0}-\x{07FF}\x{0900}-\x{097F}\x{0980}-\x{09FF}\x{0A00}-\x{0A7F}\x{0A80}-\x{0AFF}\x{0B00}-\x{0B7F}\x{0B80}-\x{0BFF}\x{0C00}-\x{0C7F}\x{0C80}-\x{0CFF}\x{0D00}-\x{0D7F}\x{0D80}-\x{0DFF}\x{0E00}-\x{0E7F}\x{0E80}-\x{0EFF}\x{0F00}-\x{0FFF}\x{1000}-\x{109F}\x{10A0}-\x{10FF}\x{1100}-\x{11FF}\x{1200}-\x{137F}\x{1380}-\x{139F}\x{13A0}-\x{13FF}\x{1400}-\x{167F}\x{1680}-\x{169F}\x{16A0}-\x{16FF}\x{1700}-\x{171F}\x{1720}-\x{173F}\x{1740}-\x{175F}\x{1760}-\x{177F}\x{1780}-\x{17FF}\x{1800}-\x{18AF}\x{1900}-\x{194F}\x{1950}-\x{197F}\x{1980}-\x{19DF}\x{19E0}-\x{19FF}\x{1A00}-\x{1A1F}\x{1B00}-\x{1B7F}\x{1D00}-\x{1D7F}\x{1D80}-\x{1DBF}\x{1DC0}-\x{1DFF}\x{1E00}-\x{1EFF}\x{1F00}-\x{1FFF}\x{20D0}-\x{20FF}\x{2100}-\x{214F}\x{2C00}-\x{2C5F}\x{2C60}-\x{2C7F}\x{2C80}-\x{2CFF}\x{2D00}-\x{2D2F}\x{2D30}-\x{2D7F}\x{2D80}-\x{2DDF}\x{2F00}-\x{2FDF}\x{2FF0}-\x{2FFF}\x{3040}-\x{309F}\x{30A0}-\x{30FF}\x{3100}-\x{312F}\x{3130}-\x{318F}\x{3190}-\x{319F}\x{31C0}-\x{31EF}\x{31F0}-\x{31FF}\x{3200}-\x{32FF}\x{3300}-\x{33FF}\x{3400}-\x{4DBF}\x{4DC0}-\x{4DFF}\x{4E00}-\x{9FFF}\x{A000}-\x{A48F}\x{A490}-\x{A4CF}\x{A700}-\x{A71F}\x{A800}-\x{A82F}\x{A840}-\x{A87F}\x{AC00}-\x{D7AF}\x{F900}-\x{FAFF}]){2,63})+)$/u',
+			// @codingStandardsIgnoreEnd
+			$email_address
+		)
+		) {
+			throw new EmailValidationException(
+				esc_html__('Email address is invalid.', 'event_espresso')
+			);
+		}
+		return true;
+	}
 }

core/domain/services/validation/email/EmailValidationService.php

Indentation +56 added lines, -56 removed lines

@@ -16,65 +16,65 @@
 class EmailValidationService implements EmailValidatorInterface
 {
 
-    /**
-     * @var EE_Registration_Config $registration_config
-     */
-    protected $registration_config;
+	/**
+	 * @var EE_Registration_Config $registration_config
+	 */
+	protected $registration_config;
 
-    /**
-     * @var Loader $loader
-     */
-    protected $loader;
+	/**
+	 * @var Loader $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * EmailValidationService constructor.
-     * Accepts an \EE_Config as an argument.
-     *
-     * @param EE_Registration_Config $config
-     * @param Loader                 $loader
-     */
-    public function __construct(EE_Registration_Config $config, Loader $loader)
-    {
-        $this->registration_config = $config;
-        $this->loader = $loader;
-    }
+	/**
+	 * EmailValidationService constructor.
+	 * Accepts an \EE_Config as an argument.
+	 *
+	 * @param EE_Registration_Config $config
+	 * @param Loader                 $loader
+	 */
+	public function __construct(EE_Registration_Config $config, Loader $loader)
+	{
+		$this->registration_config = $config;
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * Validates the email address. If it's invalid, an EmailValidationException
-     * is thrown that describes why its invalid.
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate($email_address)
-    {
-        // pick the correct validator according to the config
-        switch ($this->registration_config->email_validation_level) {
-            case 'basic':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\Basic'
-                );
-                break;
-            case 'i18n':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\International'
-                );
-                break;
-            case 'i18n_dns':
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
-                );
-                break;
-            case 'wp_default':
-            default:
-                $validator = $this->loader->getShared(
-                    'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
-                );
-                break;
-        }
-        return $validator->validate($email_address);
-    }
+	/**
+	 * Validates the email address. If it's invalid, an EmailValidationException
+	 * is thrown that describes why its invalid.
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address)
+	{
+		// pick the correct validator according to the config
+		switch ($this->registration_config->email_validation_level) {
+			case 'basic':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\Basic'
+				);
+				break;
+			case 'i18n':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\International'
+				);
+				break;
+			case 'i18n_dns':
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\InternationalDNS'
+				);
+				break;
+			case 'wp_default':
+			default:
+				$validator = $this->loader->getShared(
+					'EventEspresso\core\domain\services\validation\email\strategies\WordPress'
+				);
+				break;
+		}
+		return $validator->validate($email_address);
+	}
 }

core/domain/services/contexts/RequestTypeContextChecker.php

Indentation +180 added lines, -180 removed lines

@@ -16,184 +16,184 @@
 class RequestTypeContextChecker extends ContextChecker implements RequestTypeContextCheckerInterface
 {
 
-    /**
-     * @var RequestTypeContext $request_type
-     */
-    private $request_type;
-
-
-    /**
-     * RequestTypeContextChecker constructor.
-     *
-     * @param RequestTypeContext $request_type
-     */
-    public function __construct(RequestTypeContext $request_type)
-    {
-        $this->request_type = $request_type;
-        parent::__construct(
-            'RequestTypeContextChecker',
-            $this->request_type->validRequestTypes()
-        );
-    }
-
-
-    /**
-     * true if the current request involves some form of activation
-     *
-     * @return bool
-     */
-    public function isActivation()
-    {
-        return $this->request_type->isActivation();
-    }
-
-
-    /**
-     * @param $is_activation
-     * @return bool
-     */
-    public function setIsActivation($is_activation)
-    {
-        return $this->request_type->setIsActivation($is_activation);
-    }
-
-
-    /**
-     * true if the current request is for the admin and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdmin()
-    {
-        return $this->request_type->slug() === RequestTypeContext::ADMIN;
-    }
-
-
-    /**
-     * true if the current request is for the admin AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isAdminAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN;
-    }
-
-
-    /**
-     * true if the current request is being made via AJAX... any AJAX
-     *
-     * @return bool
-     */
-    public function isAjax()
-    {
-        return $this->isEeAjax() || $this->isOtherAjax();
-    }
-
-
-    /**
-     * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isEeAjax()
-    {
-        return $this->isAdminAjax() || $this->isFrontAjax();
-    }
-
-
-    /**
-     * true if the current request is being made via AJAX but is NOT for EE related logic
-     *
-     * @return bool
-     */
-    public function isOtherAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER;
-    }
-
-    /**
-     * true if the current request is for the EE REST API
-     *
-     * @return bool
-     */
-    public function isApi()
-    {
-        return $this->request_type->slug() === RequestTypeContext::API;
-    }
-
-
-    /**
-     * true if the current request is from the command line
-     *
-     * @return bool
-     */
-    public function isCli()
-    {
-        return $this->request_type->slug() === RequestTypeContext::CLI;
-    }
-
-
-    /**
-     * true if the current request is for a WP_Cron
-     *
-     * @return bool
-     */
-    public function isCron()
-    {
-        return $this->request_type->slug() === RequestTypeContext::CRON;
-    }
-
-
-    /**
-     * true if the current request is for a feed (ie: RSS)
-     *
-     * @return bool
-     */
-    public function isFeed()
-    {
-        return $this->request_type->slug() === RequestTypeContext::FEED;
-    }
-
-
-    /**
-     * true if the current request is for the frontend and is not being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontend()
-    {
-        return $this->request_type->slug() === RequestTypeContext::FRONTEND;
-    }
-
-
-    /**
-     * true if the current request is for the frontend AND is being made via AJAX
-     *
-     * @return bool
-     */
-    public function isFrontAjax()
-    {
-        return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT;
-    }
-
-
-    /**
-     * true if the current request is for content that is to be displayed within an iframe
-     *
-     * @return bool
-     */
-    public function isIframe()
-    {
-        return $this->request_type->slug() === RequestTypeContext::IFRAME;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->request_type->slug();
-    }
+	/**
+	 * @var RequestTypeContext $request_type
+	 */
+	private $request_type;
+
+
+	/**
+	 * RequestTypeContextChecker constructor.
+	 *
+	 * @param RequestTypeContext $request_type
+	 */
+	public function __construct(RequestTypeContext $request_type)
+	{
+		$this->request_type = $request_type;
+		parent::__construct(
+			'RequestTypeContextChecker',
+			$this->request_type->validRequestTypes()
+		);
+	}
+
+
+	/**
+	 * true if the current request involves some form of activation
+	 *
+	 * @return bool
+	 */
+	public function isActivation()
+	{
+		return $this->request_type->isActivation();
+	}
+
+
+	/**
+	 * @param $is_activation
+	 * @return bool
+	 */
+	public function setIsActivation($is_activation)
+	{
+		return $this->request_type->setIsActivation($is_activation);
+	}
+
+
+	/**
+	 * true if the current request is for the admin and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdmin()
+	{
+		return $this->request_type->slug() === RequestTypeContext::ADMIN;
+	}
+
+
+	/**
+	 * true if the current request is for the admin AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAdminAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_ADMIN;
+	}
+
+
+	/**
+	 * true if the current request is being made via AJAX... any AJAX
+	 *
+	 * @return bool
+	 */
+	public function isAjax()
+	{
+		return $this->isEeAjax() || $this->isOtherAjax();
+	}
+
+
+	/**
+	 * true if the current request is for either the EE admin or EE frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isEeAjax()
+	{
+		return $this->isAdminAjax() || $this->isFrontAjax();
+	}
+
+
+	/**
+	 * true if the current request is being made via AJAX but is NOT for EE related logic
+	 *
+	 * @return bool
+	 */
+	public function isOtherAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_OTHER;
+	}
+
+	/**
+	 * true if the current request is for the EE REST API
+	 *
+	 * @return bool
+	 */
+	public function isApi()
+	{
+		return $this->request_type->slug() === RequestTypeContext::API;
+	}
+
+
+	/**
+	 * true if the current request is from the command line
+	 *
+	 * @return bool
+	 */
+	public function isCli()
+	{
+		return $this->request_type->slug() === RequestTypeContext::CLI;
+	}
+
+
+	/**
+	 * true if the current request is for a WP_Cron
+	 *
+	 * @return bool
+	 */
+	public function isCron()
+	{
+		return $this->request_type->slug() === RequestTypeContext::CRON;
+	}
+
+
+	/**
+	 * true if the current request is for a feed (ie: RSS)
+	 *
+	 * @return bool
+	 */
+	public function isFeed()
+	{
+		return $this->request_type->slug() === RequestTypeContext::FEED;
+	}
+
+
+	/**
+	 * true if the current request is for the frontend and is not being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontend()
+	{
+		return $this->request_type->slug() === RequestTypeContext::FRONTEND;
+	}
+
+
+	/**
+	 * true if the current request is for the frontend AND is being made via AJAX
+	 *
+	 * @return bool
+	 */
+	public function isFrontAjax()
+	{
+		return $this->request_type->slug() === RequestTypeContext::AJAX_FRONT;
+	}
+
+
+	/**
+	 * true if the current request is for content that is to be displayed within an iframe
+	 *
+	 * @return bool
+	 */
+	public function isIframe()
+	{
+		return $this->request_type->slug() === RequestTypeContext::IFRAME;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->request_type->slug();
+	}
 }

core/domain/services/contexts/RequestTypeContextDetector.php

Indentation +127 added lines, -127 removed lines

@@ -19,131 +19,131 @@
 class RequestTypeContextDetector
 {
 
-    /**
-     * @var RequestTypeContextFactory $factory
-     */
-    private $factory;
-
-    /**
-     * @var RequestInterface $request
-     */
-    private $request;
-
-
-    /**
-     * RequestTypeContextDetector constructor.
-     *
-     * @param RequestInterface          $request
-     * @param RequestTypeContextFactory $factory
-     */
-    public function __construct(RequestInterface $request, RequestTypeContextFactory $factory)
-    {
-        $this->request = $request;
-        $this->factory = $factory;
-    }
-
-
-    /**
-     * @return RequestTypeContext
-     * @throws InvalidArgumentException
-     */
-    public function detectRequestTypeContext()
-    {
-        // Detect EE REST API
-        if ($this->isEspressoRestApiRequest()) {
-            return $this->factory->create(RequestTypeContext::API);
-        }
-        // Detect AJAX
-        if (defined('DOING_AJAX') && DOING_AJAX) {
-            if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_FRONT);
-            }
-            if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
-                return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
-            }
-            return $this->factory->create(RequestTypeContext::AJAX_OTHER);
-        }
-        // Detect WP_Cron
-        if ($this->isCronRequest()) {
-            return $this->factory->create(RequestTypeContext::CRON);
-        }
-        // Detect command line requests
-        if (defined('WP_CLI') && WP_CLI) {
-            return $this->factory->create(RequestTypeContext::CLI);
-        }
-        // detect WordPress admin (ie: "Dashboard")
-        if (is_admin()) {
-            return $this->factory->create(RequestTypeContext::ADMIN);
-        }
-        // Detect iFrames
-        if ($this->isIframeRoute()) {
-            return $this->factory->create(RequestTypeContext::IFRAME);
-        }
-        // Detect Feeds
-        if ($this->isFeedRequest()) {
-            return $this->factory->create(RequestTypeContext::FEED);
-        }
-        // and by process of elimination...
-        return $this->factory->create(RequestTypeContext::FRONTEND);
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isEspressoRestApiRequest()
-    {
-        $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
-            ? trim(rest_get_url_prefix(), '/')
-            : 'wp-json';
-        $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
-        return $this->uriPathMatches($ee_rest_url_prefix);
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isCronRequest()
-    {
-        return $this->uriPathMatches('wp-cron.php');
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isFeedRequest()
-    {
-        return $this->uriPathMatches('feed');
-    }
-
-
-    /**
-     * @param string $component
-     * @return bool
-     */
-    private function uriPathMatches($component)
-    {
-        $request_uri = $this->request->requestUri();
-        $parts = explode('?', $request_uri);
-        $path = trim(reset($parts), '/');
-        return strpos($path, $component) === 0;
-    }
-
-
-    /**
-     * @return bool
-     */
-    private function isIframeRoute()
-    {
-        $is_iframe_route = apply_filters(
-            'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
-            $this->request->getRequestParam('event_list', '') === 'iframe'
-            || $this->request->getRequestParam('ticket_selector', '') === 'iframe'
-            || $this->request->getRequestParam('calendar', '') === 'iframe',
-            $this
-        );
-        return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * @var RequestTypeContextFactory $factory
+	 */
+	private $factory;
+
+	/**
+	 * @var RequestInterface $request
+	 */
+	private $request;
+
+
+	/**
+	 * RequestTypeContextDetector constructor.
+	 *
+	 * @param RequestInterface          $request
+	 * @param RequestTypeContextFactory $factory
+	 */
+	public function __construct(RequestInterface $request, RequestTypeContextFactory $factory)
+	{
+		$this->request = $request;
+		$this->factory = $factory;
+	}
+
+
+	/**
+	 * @return RequestTypeContext
+	 * @throws InvalidArgumentException
+	 */
+	public function detectRequestTypeContext()
+	{
+		// Detect EE REST API
+		if ($this->isEspressoRestApiRequest()) {
+			return $this->factory->create(RequestTypeContext::API);
+		}
+		// Detect AJAX
+		if (defined('DOING_AJAX') && DOING_AJAX) {
+			if (filter_var($this->request->getRequestParam('ee_front_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_FRONT);
+			}
+			if (filter_var($this->request->getRequestParam('ee_admin_ajax'), FILTER_VALIDATE_BOOLEAN)) {
+				return $this->factory->create(RequestTypeContext::AJAX_ADMIN);
+			}
+			return $this->factory->create(RequestTypeContext::AJAX_OTHER);
+		}
+		// Detect WP_Cron
+		if ($this->isCronRequest()) {
+			return $this->factory->create(RequestTypeContext::CRON);
+		}
+		// Detect command line requests
+		if (defined('WP_CLI') && WP_CLI) {
+			return $this->factory->create(RequestTypeContext::CLI);
+		}
+		// detect WordPress admin (ie: "Dashboard")
+		if (is_admin()) {
+			return $this->factory->create(RequestTypeContext::ADMIN);
+		}
+		// Detect iFrames
+		if ($this->isIframeRoute()) {
+			return $this->factory->create(RequestTypeContext::IFRAME);
+		}
+		// Detect Feeds
+		if ($this->isFeedRequest()) {
+			return $this->factory->create(RequestTypeContext::FEED);
+		}
+		// and by process of elimination...
+		return $this->factory->create(RequestTypeContext::FRONTEND);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isEspressoRestApiRequest()
+	{
+		$ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
+			? trim(rest_get_url_prefix(), '/')
+			: 'wp-json';
+		$ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
+		return $this->uriPathMatches($ee_rest_url_prefix);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isCronRequest()
+	{
+		return $this->uriPathMatches('wp-cron.php');
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isFeedRequest()
+	{
+		return $this->uriPathMatches('feed');
+	}
+
+
+	/**
+	 * @param string $component
+	 * @return bool
+	 */
+	private function uriPathMatches($component)
+	{
+		$request_uri = $this->request->requestUri();
+		$parts = explode('?', $request_uri);
+		$path = trim(reset($parts), '/');
+		return strpos($path, $component) === 0;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	private function isIframeRoute()
+	{
+		$is_iframe_route = apply_filters(
+			'FHEE__EventEspresso_core_domain_services_contexts_RequestTypeContextDetector__isIframeRoute',
+			$this->request->getRequestParam('event_list', '') === 'iframe'
+			|| $this->request->getRequestParam('ticket_selector', '') === 'iframe'
+			|| $this->request->getRequestParam('calendar', '') === 'iframe',
+			$this
+		);
+		return filter_var($is_iframe_route, FILTER_VALIDATE_BOOLEAN);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         $ee_rest_url_prefix = RecommendedVersions::compareWordPressVersion('4.4.0')
             ? trim(rest_get_url_prefix(), '/')
             : 'wp-json';
-        $ee_rest_url_prefix .= '/' . Domain::API_NAMESPACE;
+        $ee_rest_url_prefix .= '/'.Domain::API_NAMESPACE;
         return $this->uriPathMatches($ee_rest_url_prefix);
     }
 

core/domain/services/contexts/RequestTypeContextFactory.php

Indentation +96 added lines, -96 removed lines

@@ -17,104 +17,104 @@
 class RequestTypeContextFactory
 {
 
-    /**
-     * @var LoaderInterface $loader
-     */
-    private $loader;
+	/**
+	 * @var LoaderInterface $loader
+	 */
+	private $loader;
 
 
-    /**
-     * RequestTypeContextFactory constructor.
-     *
-     * @param LoaderInterface $loader
-     */
-    public function __construct(LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * RequestTypeContextFactory constructor.
+	 *
+	 * @param LoaderInterface $loader
+	 */
+	public function __construct(LoaderInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 
 
-    /**
-     * @param string $slug
-     * @return RequestTypeContext
-     */
-    public function create($slug)
-    {
-        switch ($slug) {
-            case RequestTypeContext::ACTIVATION:
-                $description = esc_html__(
-                    'The current request is for some form of activation',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::API:
-                $description = esc_html__(
-                    'The current request is for the REST API',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_FRONT:
-                $description = esc_html__(
-                    'The current request is for the frontend via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::AJAX_OTHER:
-                $description = esc_html__(
-                    'The current request is for non-EE related code via AJAX',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CRON:
-                $description = esc_html__(
-                    'The current request is for a WP_Cron',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::CLI:
-                $description = esc_html__(
-                    'The current request is from the command line',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::ADMIN:
-                $description = esc_html__(
-                    'The current request is for the admin',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::IFRAME:
-                $description = esc_html__(
-                    'The current request is for an iframe',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FEED:
-                $description = esc_html__(
-                    'The current request is for a feed (ie: RSS)',
-                    'event_espresso'
-                );
-                break;
-            case RequestTypeContext::FRONTEND:
-            default:
-                $description = esc_html__(
-                    'The current request is for the frontend',
-                    'event_espresso'
-                );
-                break;
-        }
-        // we're using the Loader with sharing turned on,
-        // so that the generated RequestTypeContext object is accessible anywhere
-        // by simply requesting it again from the loader
-        return $this->loader->getShared(
-            'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
-            array($slug, $description)
-        );
-    }
+	/**
+	 * @param string $slug
+	 * @return RequestTypeContext
+	 */
+	public function create($slug)
+	{
+		switch ($slug) {
+			case RequestTypeContext::ACTIVATION:
+				$description = esc_html__(
+					'The current request is for some form of activation',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::API:
+				$description = esc_html__(
+					'The current request is for the REST API',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_FRONT:
+				$description = esc_html__(
+					'The current request is for the frontend via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::AJAX_OTHER:
+				$description = esc_html__(
+					'The current request is for non-EE related code via AJAX',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CRON:
+				$description = esc_html__(
+					'The current request is for a WP_Cron',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::CLI:
+				$description = esc_html__(
+					'The current request is from the command line',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::ADMIN:
+				$description = esc_html__(
+					'The current request is for the admin',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::IFRAME:
+				$description = esc_html__(
+					'The current request is for an iframe',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FEED:
+				$description = esc_html__(
+					'The current request is for a feed (ie: RSS)',
+					'event_espresso'
+				);
+				break;
+			case RequestTypeContext::FRONTEND:
+			default:
+				$description = esc_html__(
+					'The current request is for the frontend',
+					'event_espresso'
+				);
+				break;
+		}
+		// we're using the Loader with sharing turned on,
+		// so that the generated RequestTypeContext object is accessible anywhere
+		// by simply requesting it again from the loader
+		return $this->loader->getShared(
+			'EventEspresso\core\domain\entities\contexts\RequestTypeContext',
+			array($slug, $description)
+		);
+	}
 }

core/domain/services/DomainService.php

Indentation +6 added lines, -6 removed lines

@@ -20,10 +20,10 @@
 abstract class DomainService implements DomainServiceInterface
 {
 
-    /**
-     * DomainService constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * DomainService constructor.
+	 */
+	public function __construct()
+	{
+	}
 }

core/domain/services/custom_post_types/RegisterCustomPostTypes.php

Indentation +221 added lines, -221 removed lines

@@ -18,240 +18,240 @@
 class RegisterCustomPostTypes
 {
 
-    /**
-     * @var CustomPostTypeDefinitions $custom_post_types
-     */
-    public $custom_post_types;
+	/**
+	 * @var CustomPostTypeDefinitions $custom_post_types
+	 */
+	public $custom_post_types;
 
-    /**
-     * @var WP_Post_Type[] $wp_post_types
-     */
-    public $wp_post_types = array();
+	/**
+	 * @var WP_Post_Type[] $wp_post_types
+	 */
+	public $wp_post_types = array();
 
 
-    /**
-     * RegisterCustomPostTypes constructor.
-     *
-     * @param CustomPostTypeDefinitions $custom_post_types
-     */
-    public function __construct(CustomPostTypeDefinitions $custom_post_types)
-    {
-        $this->custom_post_types = $custom_post_types;
-    }
+	/**
+	 * RegisterCustomPostTypes constructor.
+	 *
+	 * @param CustomPostTypeDefinitions $custom_post_types
+	 */
+	public function __construct(CustomPostTypeDefinitions $custom_post_types)
+	{
+		$this->custom_post_types = $custom_post_types;
+	}
 
 
-    /**
-     * @return WP_Post_Type[]
-     */
-    public function getRegisteredCustomPostTypes()
-    {
-        return $this->wp_post_types;
-    }
+	/**
+	 * @return WP_Post_Type[]
+	 */
+	public function getRegisteredCustomPostTypes()
+	{
+		return $this->wp_post_types;
+	}
 
 
-    /**
-     * @return void
-     * @throws DomainException
-     */
-    public function registerCustomPostTypes()
-    {
-        $custom_post_types = $this->custom_post_types->getDefinitions();
-        foreach ($custom_post_types as $custom_post_type => $CPT) {
-            $this->wp_post_types[$custom_post_type] = $this->registerCustomPostType(
-                $custom_post_type,
-                $CPT['singular_name'],
-                $CPT['plural_name'],
-                $CPT['singular_slug'],
-                $CPT['plural_slug'],
-                $CPT['args']
-            );
-        }
-    }
+	/**
+	 * @return void
+	 * @throws DomainException
+	 */
+	public function registerCustomPostTypes()
+	{
+		$custom_post_types = $this->custom_post_types->getDefinitions();
+		foreach ($custom_post_types as $custom_post_type => $CPT) {
+			$this->wp_post_types[$custom_post_type] = $this->registerCustomPostType(
+				$custom_post_type,
+				$CPT['singular_name'],
+				$CPT['plural_name'],
+				$CPT['singular_slug'],
+				$CPT['plural_slug'],
+				$CPT['args']
+			);
+		}
+	}
 
 
-    /**
-     * Registers a new custom post type. Sets default settings given only the following params.
-     * Returns the registered post type object, or an error object.
-     *
-     * @param string $post_type          the actual post type name
-     *                                   IMPORTANT:
-     *                                   this must match what the slug is for admin pages related to this CPT
-     *                                   Also any models must use this slug as well
-     * @param string $singular_name      a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name        a pre-internationalized string for the plural name of the objects
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @param array  $override_arguments exactly like $args as described in
-     *                                   http://codex.wordpress.org/Function_Reference/register_post_type
-     * @return WP_Post_Type|WP_Error
-     * @throws DomainException
-     */
-    public function registerCustomPostType(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $singular_slug = '',
-        $plural_slug = '',
-        array $override_arguments = array()
-    ) {
-        $wp_post_type = register_post_type(
-            $post_type,
-            $this->prepareArguments(
-                $post_type,
-                $singular_name,
-                $plural_name,
-                $singular_slug,
-                $plural_slug,
-                $override_arguments
-            )
-        );
-        if ($wp_post_type instanceof WP_Error) {
-            throw new DomainException($wp_post_type->get_error_message());
-        }
-        return $wp_post_type;
-    }
+	/**
+	 * Registers a new custom post type. Sets default settings given only the following params.
+	 * Returns the registered post type object, or an error object.
+	 *
+	 * @param string $post_type          the actual post type name
+	 *                                   IMPORTANT:
+	 *                                   this must match what the slug is for admin pages related to this CPT
+	 *                                   Also any models must use this slug as well
+	 * @param string $singular_name      a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name        a pre-internationalized string for the plural name of the objects
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @param array  $override_arguments exactly like $args as described in
+	 *                                   http://codex.wordpress.org/Function_Reference/register_post_type
+	 * @return WP_Post_Type|WP_Error
+	 * @throws DomainException
+	 */
+	public function registerCustomPostType(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$singular_slug = '',
+		$plural_slug = '',
+		array $override_arguments = array()
+	) {
+		$wp_post_type = register_post_type(
+			$post_type,
+			$this->prepareArguments(
+				$post_type,
+				$singular_name,
+				$plural_name,
+				$singular_slug,
+				$plural_slug,
+				$override_arguments
+			)
+		);
+		if ($wp_post_type instanceof WP_Error) {
+			throw new DomainException($wp_post_type->get_error_message());
+		}
+		return $wp_post_type;
+	}
 
 
-    /**
-     * @param string $post_type          the actual post type name
-     * @param string $singular_name      a pre-internationalized string for the singular name of the objects
-     * @param string $plural_name        a pre-internationalized string for the plural name of the objects
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @param array  $override_arguments The default values set in this function will be overridden
-     *                                   by whatever you set in $override_arguments
-     * @return array
-     */
-    protected function prepareArguments(
-        $post_type,
-        $singular_name,
-        $plural_name,
-        $singular_slug,
-        $plural_slug,
-        array $override_arguments = array()
-    ) {
-        // verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
-        $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
-        $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
-        $labels = $this->getLabels(
-            $singular_name,
-            $plural_name,
-            $singular_slug,
-            $plural_slug
-        );
-        // note the page_templates arg in the supports index is something specific to EE.
-        // WordPress doesn't actually have that in their register_post_type api.
-        $arguments = $this->getDefaultArguments($labels, $post_type, $plural_slug);
-        if ($override_arguments) {
-            if (isset($override_arguments['labels'])) {
-                $labels = array_merge($arguments['labels'], $override_arguments['labels']);
-            }
-            $arguments = array_merge($arguments, $override_arguments);
-            $arguments['labels'] = $labels;
-        }
-        return $arguments;
-    }
+	/**
+	 * @param string $post_type          the actual post type name
+	 * @param string $singular_name      a pre-internationalized string for the singular name of the objects
+	 * @param string $plural_name        a pre-internationalized string for the plural name of the objects
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @param array  $override_arguments The default values set in this function will be overridden
+	 *                                   by whatever you set in $override_arguments
+	 * @return array
+	 */
+	protected function prepareArguments(
+		$post_type,
+		$singular_name,
+		$plural_name,
+		$singular_slug,
+		$plural_slug,
+		array $override_arguments = array()
+	) {
+		// verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
+		$singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
+		$plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
+		$labels = $this->getLabels(
+			$singular_name,
+			$plural_name,
+			$singular_slug,
+			$plural_slug
+		);
+		// note the page_templates arg in the supports index is something specific to EE.
+		// WordPress doesn't actually have that in their register_post_type api.
+		$arguments = $this->getDefaultArguments($labels, $post_type, $plural_slug);
+		if ($override_arguments) {
+			if (isset($override_arguments['labels'])) {
+				$labels = array_merge($arguments['labels'], $override_arguments['labels']);
+			}
+			$arguments = array_merge($arguments, $override_arguments);
+			$arguments['labels'] = $labels;
+		}
+		return $arguments;
+	}
 
 
-    /**
-     * @param string $singular_name
-     * @param string $plural_name
-     * @param string $singular_slug
-     * @param string $plural_slug
-     * @return array
-     */
-    private function getLabels($singular_name, $plural_name, $singular_slug, $plural_slug)
-    {
-        return array(
-            'name'               => $plural_name,
-            'singular_name'      => $singular_name,
-            'singular_slug'      => $singular_slug,
-            'plural_slug'        => $plural_slug,
-            'add_new'            => sprintf(
-                esc_html_x('Add %s', 'Add Event', 'event_espresso'),
-                $singular_name
-            ),
-            'add_new_item'       => sprintf(
-                esc_html_x('Add New %s', 'Add New Event', 'event_espresso'),
-                $singular_name
-            ),
-            'edit_item'          => sprintf(
-                esc_html_x('Edit %s', 'Edit Event', 'event_espresso'),
-                $singular_name
-            ),
-            'new_item'           => sprintf(
-                esc_html_x('New %s', 'New Event', 'event_espresso'),
-                $singular_name
-            ),
-            'all_items'          => sprintf(
-                esc_html_x('All %s', 'All Events', 'event_espresso'),
-                $plural_name
-            ),
-            'view_item'          => sprintf(
-                esc_html_x('View %s', 'View Event', 'event_espresso'),
-                $singular_name
-            ),
-            'search_items'       => sprintf(
-                esc_html_x('Search %s', 'Search Events', 'event_espresso'),
-                $plural_name
-            ),
-            'not_found'          => sprintf(
-                esc_html_x('No %s found', 'No Events found', 'event_espresso'),
-                $plural_name
-            ),
-            'not_found_in_trash' => sprintf(
-                esc_html_x('No %s found in Trash', 'No Events found in Trash', 'event_espresso'),
-                $plural_name
-            ),
-            'parent_item_colon'  => '',
-            'menu_name'          => $plural_name,
-        );
-    }
+	/**
+	 * @param string $singular_name
+	 * @param string $plural_name
+	 * @param string $singular_slug
+	 * @param string $plural_slug
+	 * @return array
+	 */
+	private function getLabels($singular_name, $plural_name, $singular_slug, $plural_slug)
+	{
+		return array(
+			'name'               => $plural_name,
+			'singular_name'      => $singular_name,
+			'singular_slug'      => $singular_slug,
+			'plural_slug'        => $plural_slug,
+			'add_new'            => sprintf(
+				esc_html_x('Add %s', 'Add Event', 'event_espresso'),
+				$singular_name
+			),
+			'add_new_item'       => sprintf(
+				esc_html_x('Add New %s', 'Add New Event', 'event_espresso'),
+				$singular_name
+			),
+			'edit_item'          => sprintf(
+				esc_html_x('Edit %s', 'Edit Event', 'event_espresso'),
+				$singular_name
+			),
+			'new_item'           => sprintf(
+				esc_html_x('New %s', 'New Event', 'event_espresso'),
+				$singular_name
+			),
+			'all_items'          => sprintf(
+				esc_html_x('All %s', 'All Events', 'event_espresso'),
+				$plural_name
+			),
+			'view_item'          => sprintf(
+				esc_html_x('View %s', 'View Event', 'event_espresso'),
+				$singular_name
+			),
+			'search_items'       => sprintf(
+				esc_html_x('Search %s', 'Search Events', 'event_espresso'),
+				$plural_name
+			),
+			'not_found'          => sprintf(
+				esc_html_x('No %s found', 'No Events found', 'event_espresso'),
+				$plural_name
+			),
+			'not_found_in_trash' => sprintf(
+				esc_html_x('No %s found in Trash', 'No Events found in Trash', 'event_espresso'),
+				$plural_name
+			),
+			'parent_item_colon'  => '',
+			'menu_name'          => $plural_name,
+		);
+	}
 
 
-    /**
-     * @param array  $labels
-     * @param string $post_type
-     * @param string $plural_slug
-     * @return array
-     */
-    private function getDefaultArguments(array $labels, $post_type, $plural_slug)
-    {
-        return array(
-            'labels'             => $labels,
-            'public'             => true,
-            'publicly_queryable' => true,
-            'show_ui'            => false,
-            'show_ee_ui'         => true,
-            'show_in_menu'       => false,
-            'show_in_nav_menus'  => false,
-            'query_var'          => true,
-            'rewrite'            => apply_filters(
-                'FHEE__EventEspresso_core_domain_entities_custom_post_types_RegisterCustomPostTypes__getDefaultArguments__rewrite',
-                // 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__register_CPT__rewrite',
-                    array('slug' => $plural_slug),
-                    $post_type
-                ),
-                $post_type,
-                $plural_slug
-            ),
-            'capability_type'    => 'post',
-            'map_meta_cap'       => true,
-            'has_archive'        => true,
-            'hierarchical'       => false,
-            'menu_position'      => null,
-            'supports'           => array(
-                'title',
-                'editor',
-                'author',
-                'thumbnail',
-                'excerpt',
-                'custom-fields',
-                'comments',
-            ),
-        );
-    }
+	/**
+	 * @param array  $labels
+	 * @param string $post_type
+	 * @param string $plural_slug
+	 * @return array
+	 */
+	private function getDefaultArguments(array $labels, $post_type, $plural_slug)
+	{
+		return array(
+			'labels'             => $labels,
+			'public'             => true,
+			'publicly_queryable' => true,
+			'show_ui'            => false,
+			'show_ee_ui'         => true,
+			'show_in_menu'       => false,
+			'show_in_nav_menus'  => false,
+			'query_var'          => true,
+			'rewrite'            => apply_filters(
+				'FHEE__EventEspresso_core_domain_entities_custom_post_types_RegisterCustomPostTypes__getDefaultArguments__rewrite',
+				// 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__register_CPT__rewrite',
+					array('slug' => $plural_slug),
+					$post_type
+				),
+				$post_type,
+				$plural_slug
+			),
+			'capability_type'    => 'post',
+			'map_meta_cap'       => true,
+			'has_archive'        => true,
+			'hierarchical'       => false,
+			'menu_position'      => null,
+			'supports'           => array(
+				'title',
+				'editor',
+				'author',
+				'thumbnail',
+				'excerpt',
+				'custom-fields',
+				'comments',
+			),
+		);
+	}
 }