eventespresso / event-espresso-core

core/domain/RequiresRegistryInterface.php

Indentation +4 added lines, -4 removed lines

@@ -15,8 +15,8 @@
 interface RequiresRegistryInterface
 {
 
-    /**
-     * @param EE_Registry $registry
-     */
-    public function setRegistry($registry);
+	/**
+	 * @param EE_Registry $registry
+	 */
+	public function setRegistry($registry);
 }

core/domain/entities/DbSafeDateTime.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
             DbSafeDateTime::db_safe_timestamp_format,
             $this->_datetime_string
         );
-        if (! $date instanceof DateTime) {
+        if ( ! $date instanceof DateTime) {
             try {
                 // we want a stack trace to determine where the malformed date came from, so...
                 throw new DomainException('');
@@ -118,7 +118,7 @@ 
             DbSafeDateTime::db_safe_timestamp_format,
             $this->_datetime_string
         );
-        if (! $date instanceof DateTime) {
+        if ( ! $date instanceof DateTime) {
             $this->writeToErrorLog(
                 sprintf(
                     __(
@@ -160,7 +160,7 @@ 
      */
     private function writeToErrorLog($message)
     {
-        if (! empty($this->_error_log_dir)) {
+        if ( ! empty($this->_error_log_dir)) {
             /** @noinspection ForgottenDebugOutputInspection */
             error_log($message, 3, $this->_error_log_dir);
         } else {

Indentation +152 added lines, -152 removed lines

@@ -18,156 +18,156 @@
 class DbSafeDateTime extends DateTime
 {
 
-    // phpcs:disable Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
-    /**
-     * @type string db_safe_timestamp_format
-     */
-    const db_safe_timestamp_format = 'Y-m-d H:i:s O e';
-    // phpcs:enable
-
-    // phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
-    /**
-     * DateTime object converted to a string that includes the date, time, UTC offset, and timezone identifier
-     *
-     * @type string $_datetime_string
-     */
-    protected $_datetime_string = '';
-
-    /**
-     * where to write the error log to
-     *
-     * @type string $_error_log_dir
-     */
-    protected $_error_log_dir = '';
-    // phpcs:enable
-
-
-    /**
-     * @param string $error_log_dir
-     */
-    public function setErrorLogDir($error_log_dir)
-    {
-        // if the folder path is writable, then except the path + filename, else keep empty
-        $this->_error_log_dir = is_writable(str_replace(basename($error_log_dir), '', $error_log_dir))
-            ? $error_log_dir
-            : '';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->format(DbSafeDateTime::db_safe_timestamp_format);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->_datetime_string = $this->format(DbSafeDateTime::db_safe_timestamp_format);
-        $date = DateTime::createFromFormat(
-            DbSafeDateTime::db_safe_timestamp_format,
-            $this->_datetime_string
-        );
-        if (! $date instanceof DateTime) {
-            try {
-                // we want a stack trace to determine where the malformed date came from, so...
-                throw new DomainException('');
-            } catch (DomainException $e) {
-                $stack_trace = $e->getTraceAsString();
-            }
-            $this->writeToErrorLog(
-                sprintf(
-                    __(
-                        'A valid DateTime could not be generated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s %2$s Stack Trace: %5$s',
-                        'event_espresso'
-                    ),
-                    $this->_datetime_string,
-                    '<br />',
-                    print_r(DateTime::getLastErrors(), true),
-                    PHP_VERSION,
-                    $stack_trace
-                )
-            );
-        }
-        return array('_datetime_string');
-    }
-
-
-    /**
-     * if an empty or null value got saved to the db for a datetime,
-     * then some servers and/or PHP itself will incorrectly convert that date string
-     * resulting in "-0001-11-30" for the year-month-day.
-     * see the Notes section
-     *
-     * @link http://php.net/manual/en/datetime.formats.date.php
-     * We'll replace those with "0000-00-00" which will allow a valid DateTime object to be created,
-     * but still result in the internal date for that object being set to "-0001-11-30 10:00:00.000000".
-     * so we're no better off, but at least things won't go fatal on us.
-     */
-    public function __wakeup()
-    {
-        $this->_datetime_string = str_replace(
-            array('-0001-11-29', '-0001-11-30'),
-            '0000-00-00',
-            $this->_datetime_string
-        );
-        $date = DateTime::createFromFormat(
-            DbSafeDateTime::db_safe_timestamp_format,
-            $this->_datetime_string
-        );
-        if (! $date instanceof DateTime) {
-            $this->writeToErrorLog(
-                sprintf(
-                    __(
-                        'A valid DateTime could not be recreated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s',
-                        'event_espresso'
-                    ),
-                    $this->_datetime_string,
-                    '<br />',
-                    print_r(DateTime::getLastErrors(), true),
-                    PHP_VERSION
-                )
-            );
-        } else {
-            $this->__construct(
-                $date->format(\EE_Datetime_Field::mysql_timestamp_format),
-                new DateTimeZone($date->format('e'))
-            );
-        }
-    }
-
-
-    /**
-     * Creates a DbSafeDateTime from ye old DateTime
-     *
-     * @param DateTime $datetime
-     * @return \EventEspresso\core\domain\entities\DbSafeDateTime
-     */
-    public static function createFromDateTime(DateTime $datetime)
-    {
-        return new DbSafeDateTime(
-            $datetime->format(\EE_Datetime_Field::mysql_timestamp_format),
-            new DateTimeZone($datetime->format('e'))
-        );
-    }
-
-
-    /**
-     * @param string $message
-     */
-    private function writeToErrorLog($message)
-    {
-        if (! empty($this->_error_log_dir)) {
-            /** @noinspection ForgottenDebugOutputInspection */
-            error_log($message, 3, $this->_error_log_dir);
-        } else {
-            /** @noinspection ForgottenDebugOutputInspection */
-            error_log($message);
-        }
-    }
+	// phpcs:disable Generic.NamingConventions.UpperCaseConstantName.ClassConstantNotUpperCase
+	/**
+	 * @type string db_safe_timestamp_format
+	 */
+	const db_safe_timestamp_format = 'Y-m-d H:i:s O e';
+	// phpcs:enable
+
+	// phpcs:disable PSR2.Classes.PropertyDeclaration.Underscore
+	/**
+	 * DateTime object converted to a string that includes the date, time, UTC offset, and timezone identifier
+	 *
+	 * @type string $_datetime_string
+	 */
+	protected $_datetime_string = '';
+
+	/**
+	 * where to write the error log to
+	 *
+	 * @type string $_error_log_dir
+	 */
+	protected $_error_log_dir = '';
+	// phpcs:enable
+
+
+	/**
+	 * @param string $error_log_dir
+	 */
+	public function setErrorLogDir($error_log_dir)
+	{
+		// if the folder path is writable, then except the path + filename, else keep empty
+		$this->_error_log_dir = is_writable(str_replace(basename($error_log_dir), '', $error_log_dir))
+			? $error_log_dir
+			: '';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->format(DbSafeDateTime::db_safe_timestamp_format);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->_datetime_string = $this->format(DbSafeDateTime::db_safe_timestamp_format);
+		$date = DateTime::createFromFormat(
+			DbSafeDateTime::db_safe_timestamp_format,
+			$this->_datetime_string
+		);
+		if (! $date instanceof DateTime) {
+			try {
+				// we want a stack trace to determine where the malformed date came from, so...
+				throw new DomainException('');
+			} catch (DomainException $e) {
+				$stack_trace = $e->getTraceAsString();
+			}
+			$this->writeToErrorLog(
+				sprintf(
+					__(
+						'A valid DateTime could not be generated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s %2$s Stack Trace: %5$s',
+						'event_espresso'
+					),
+					$this->_datetime_string,
+					'<br />',
+					print_r(DateTime::getLastErrors(), true),
+					PHP_VERSION,
+					$stack_trace
+				)
+			);
+		}
+		return array('_datetime_string');
+	}
+
+
+	/**
+	 * if an empty or null value got saved to the db for a datetime,
+	 * then some servers and/or PHP itself will incorrectly convert that date string
+	 * resulting in "-0001-11-30" for the year-month-day.
+	 * see the Notes section
+	 *
+	 * @link http://php.net/manual/en/datetime.formats.date.php
+	 * We'll replace those with "0000-00-00" which will allow a valid DateTime object to be created,
+	 * but still result in the internal date for that object being set to "-0001-11-30 10:00:00.000000".
+	 * so we're no better off, but at least things won't go fatal on us.
+	 */
+	public function __wakeup()
+	{
+		$this->_datetime_string = str_replace(
+			array('-0001-11-29', '-0001-11-30'),
+			'0000-00-00',
+			$this->_datetime_string
+		);
+		$date = DateTime::createFromFormat(
+			DbSafeDateTime::db_safe_timestamp_format,
+			$this->_datetime_string
+		);
+		if (! $date instanceof DateTime) {
+			$this->writeToErrorLog(
+				sprintf(
+					__(
+						'A valid DateTime could not be recreated from "%1$s" because the following errors occurred: %2$s %3$s %2$s PHP version: %4$s',
+						'event_espresso'
+					),
+					$this->_datetime_string,
+					'<br />',
+					print_r(DateTime::getLastErrors(), true),
+					PHP_VERSION
+				)
+			);
+		} else {
+			$this->__construct(
+				$date->format(\EE_Datetime_Field::mysql_timestamp_format),
+				new DateTimeZone($date->format('e'))
+			);
+		}
+	}
+
+
+	/**
+	 * Creates a DbSafeDateTime from ye old DateTime
+	 *
+	 * @param DateTime $datetime
+	 * @return \EventEspresso\core\domain\entities\DbSafeDateTime
+	 */
+	public static function createFromDateTime(DateTime $datetime)
+	{
+		return new DbSafeDateTime(
+			$datetime->format(\EE_Datetime_Field::mysql_timestamp_format),
+			new DateTimeZone($datetime->format('e'))
+		);
+	}
+
+
+	/**
+	 * @param string $message
+	 */
+	private function writeToErrorLog($message)
+	{
+		if (! empty($this->_error_log_dir)) {
+			/** @noinspection ForgottenDebugOutputInspection */
+			error_log($message, 3, $this->_error_log_dir);
+		} else {
+			/** @noinspection ForgottenDebugOutputInspection */
+			error_log($message);
+		}
+	}
 }

core/domain/entities/notifications/PersistentAdminNotice.php

Indentation +311 added lines, -311 removed lines

@@ -24,315 +24,315 @@
 class PersistentAdminNotice implements RequiresCapCheckInterface
 {
 
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $message
-     */
-    protected $message = '';
-
-    /**
-     * @var boolean $force_update
-     */
-    protected $force_update = false;
-
-    /**
-     * @var string $capability
-     */
-    protected $capability = 'manage_options';
-
-    /**
-     * @var string $cap_context
-     */
-    protected $cap_context = 'view persistent admin notice';
-
-    /**
-     * @var boolean $dismissed
-     */
-    protected $dismissed = false;
-
-    /**
-     * @var CapCheckInterface $cap_check
-     */
-    protected $cap_check;
-
-    /**
-     * if true, then this notice will be deleted from the database
-     *
-     * @var boolean $purge
-     */
-    protected $purge = false;
-
-    /**
-     * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
-     * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
-     *
-     * @var boolean $registered
-     */
-    private $registered = false;
-
-
-    /**
-     * PersistentAdminNotice constructor
-     *
-     * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
-     * @param string $message      [required] the message to be stored persistently until dismissed
-     * @param bool   $force_update enforce the reappearance of a persistent message
-     * @param string $capability   user capability required to view this notice
-     * @param string $cap_context  description for why the cap check is being performed
-     * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(
-        $name,
-        $message,
-        $force_update = false,
-        $capability = 'manage_options',
-        $cap_context = 'view persistent admin notice',
-        $dismissed = false
-    ) {
-        $this->setName($name);
-        $this->setMessage($message);
-        $this->setForceUpdate($force_update);
-        $this->setCapability($capability);
-        $this->setCapContext($cap_context);
-        $this->setDismissed($dismissed);
-        add_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            array($this, 'registerPersistentAdminNotice')
-        );
-        add_action('shutdown', array($this, 'confirmRegistered'), 999);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     * @throws InvalidDataTypeException
-     */
-    private function setName($name)
-    {
-        if (! is_string($name)) {
-            throw new InvalidDataTypeException('$name', $name, 'string');
-        }
-        $this->name = sanitize_key($name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * @param string $message
-     * @throws InvalidDataTypeException
-     */
-    private function setMessage($message)
-    {
-        if (! is_string($message)) {
-            throw new InvalidDataTypeException('$message', $message, 'string');
-        }
-        global $allowedtags;
-        $allowedtags['br'] = array();
-        $this->message = wp_kses($message, $allowedtags);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getForceUpdate()
-    {
-        return $this->force_update;
-    }
-
-
-    /**
-     * @param bool $force_update
-     */
-    private function setForceUpdate($force_update)
-    {
-        $this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapability()
-    {
-        return $this->capability;
-    }
-
-
-    /**
-     * @param string $capability
-     * @throws InvalidDataTypeException
-     */
-    private function setCapability($capability)
-    {
-        if (! is_string($capability)) {
-            throw new InvalidDataTypeException('$capability', $capability, 'string');
-        }
-        $this->capability = ! empty($capability) ? $capability : 'manage_options';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapContext()
-    {
-        return $this->cap_context;
-    }
-
-
-    /**
-     * @param string $cap_context
-     * @throws InvalidDataTypeException
-     */
-    private function setCapContext($cap_context)
-    {
-        if (! is_string($cap_context)) {
-            throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
-        }
-        $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getDismissed()
-    {
-        return $this->dismissed;
-    }
-
-
-    /**
-     * @param bool $dismissed
-     */
-    public function setDismissed($dismissed)
-    {
-        $this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        if (! $this->cap_check instanceof CapCheckInterface) {
-            $this->setCapCheck(
-                new CapCheck(
-                    $this->capability,
-                    $this->cap_context
-                )
-            );
-        }
-        return $this->cap_check;
-    }
-
-
-    /**
-     * @param CapCheckInterface $cap_check
-     */
-    private function setCapCheck(CapCheckInterface $cap_check)
-    {
-        $this->cap_check = $cap_check;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getPurge()
-    {
-        return $this->purge;
-    }
-
-
-    /**
-     * @param bool $purge
-     */
-    public function setPurge($purge)
-    {
-        $this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * given a valid PersistentAdminNotice Collection,
-     * this notice will be added if it is not already found in the collection (using its name as the identifier)
-     * if an existing notice is found that has already been dismissed,
-     * but we are overriding with a forced update, then we will toggle its dismissed state,
-     * so that the notice is displayed again
-     *
-     * @param Collection $persistent_admin_notice_collection
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     */
-    public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
-    {
-        if ($this->registered) {
-            return;
-        }
-        // first check if this notice has already been added to the collection
-        if ($persistent_admin_notice_collection->has($this->name)) {
-            /** @var PersistentAdminNotice $existing */
-            $existing = $persistent_admin_notice_collection->get($this->name);
-            // we don't need to add it again (we can't actually)
-            // but if it has already been dismissed, and we are overriding with a forced update
-            if ($existing->getDismissed() && $this->getForceUpdate()) {
-                // then toggle the notice's dismissed state to true
-                // so that it gets displayed again
-                $existing->setDismissed(false);
-                // and make sure the message is set
-                $existing->setMessage($this->message);
-            }
-        } else {
-            $persistent_admin_notice_collection->add($this, $this->name);
-        }
-        $this->registered = true;
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function confirmRegistered()
-    {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
-            PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
-        }
-        if (! $this->registered && WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
-                        'event_espresso'
-                    ),
-                    $this->name
-                )
-            );
-        }
-    }
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $message
+	 */
+	protected $message = '';
+
+	/**
+	 * @var boolean $force_update
+	 */
+	protected $force_update = false;
+
+	/**
+	 * @var string $capability
+	 */
+	protected $capability = 'manage_options';
+
+	/**
+	 * @var string $cap_context
+	 */
+	protected $cap_context = 'view persistent admin notice';
+
+	/**
+	 * @var boolean $dismissed
+	 */
+	protected $dismissed = false;
+
+	/**
+	 * @var CapCheckInterface $cap_check
+	 */
+	protected $cap_check;
+
+	/**
+	 * if true, then this notice will be deleted from the database
+	 *
+	 * @var boolean $purge
+	 */
+	protected $purge = false;
+
+	/**
+	 * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
+	 * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
+	 *
+	 * @var boolean $registered
+	 */
+	private $registered = false;
+
+
+	/**
+	 * PersistentAdminNotice constructor
+	 *
+	 * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
+	 * @param string $message      [required] the message to be stored persistently until dismissed
+	 * @param bool   $force_update enforce the reappearance of a persistent message
+	 * @param string $capability   user capability required to view this notice
+	 * @param string $cap_context  description for why the cap check is being performed
+	 * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(
+		$name,
+		$message,
+		$force_update = false,
+		$capability = 'manage_options',
+		$cap_context = 'view persistent admin notice',
+		$dismissed = false
+	) {
+		$this->setName($name);
+		$this->setMessage($message);
+		$this->setForceUpdate($force_update);
+		$this->setCapability($capability);
+		$this->setCapContext($cap_context);
+		$this->setDismissed($dismissed);
+		add_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			array($this, 'registerPersistentAdminNotice')
+		);
+		add_action('shutdown', array($this, 'confirmRegistered'), 999);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 * @throws InvalidDataTypeException
+	 */
+	private function setName($name)
+	{
+		if (! is_string($name)) {
+			throw new InvalidDataTypeException('$name', $name, 'string');
+		}
+		$this->name = sanitize_key($name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
+
+
+	/**
+	 * @param string $message
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMessage($message)
+	{
+		if (! is_string($message)) {
+			throw new InvalidDataTypeException('$message', $message, 'string');
+		}
+		global $allowedtags;
+		$allowedtags['br'] = array();
+		$this->message = wp_kses($message, $allowedtags);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getForceUpdate()
+	{
+		return $this->force_update;
+	}
+
+
+	/**
+	 * @param bool $force_update
+	 */
+	private function setForceUpdate($force_update)
+	{
+		$this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapability()
+	{
+		return $this->capability;
+	}
+
+
+	/**
+	 * @param string $capability
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapability($capability)
+	{
+		if (! is_string($capability)) {
+			throw new InvalidDataTypeException('$capability', $capability, 'string');
+		}
+		$this->capability = ! empty($capability) ? $capability : 'manage_options';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapContext()
+	{
+		return $this->cap_context;
+	}
+
+
+	/**
+	 * @param string $cap_context
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapContext($cap_context)
+	{
+		if (! is_string($cap_context)) {
+			throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
+		}
+		$this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getDismissed()
+	{
+		return $this->dismissed;
+	}
+
+
+	/**
+	 * @param bool $dismissed
+	 */
+	public function setDismissed($dismissed)
+	{
+		$this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		if (! $this->cap_check instanceof CapCheckInterface) {
+			$this->setCapCheck(
+				new CapCheck(
+					$this->capability,
+					$this->cap_context
+				)
+			);
+		}
+		return $this->cap_check;
+	}
+
+
+	/**
+	 * @param CapCheckInterface $cap_check
+	 */
+	private function setCapCheck(CapCheckInterface $cap_check)
+	{
+		$this->cap_check = $cap_check;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getPurge()
+	{
+		return $this->purge;
+	}
+
+
+	/**
+	 * @param bool $purge
+	 */
+	public function setPurge($purge)
+	{
+		$this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * given a valid PersistentAdminNotice Collection,
+	 * this notice will be added if it is not already found in the collection (using its name as the identifier)
+	 * if an existing notice is found that has already been dismissed,
+	 * but we are overriding with a forced update, then we will toggle its dismissed state,
+	 * so that the notice is displayed again
+	 *
+	 * @param Collection $persistent_admin_notice_collection
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 */
+	public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
+	{
+		if ($this->registered) {
+			return;
+		}
+		// first check if this notice has already been added to the collection
+		if ($persistent_admin_notice_collection->has($this->name)) {
+			/** @var PersistentAdminNotice $existing */
+			$existing = $persistent_admin_notice_collection->get($this->name);
+			// we don't need to add it again (we can't actually)
+			// but if it has already been dismissed, and we are overriding with a forced update
+			if ($existing->getDismissed() && $this->getForceUpdate()) {
+				// then toggle the notice's dismissed state to true
+				// so that it gets displayed again
+				$existing->setDismissed(false);
+				// and make sure the message is set
+				$existing->setMessage($this->message);
+			}
+		} else {
+			$persistent_admin_notice_collection->add($this, $this->name);
+		}
+		$this->registered = true;
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function confirmRegistered()
+	{
+		if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+			PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
+		}
+		if (! $this->registered && WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
+						'event_espresso'
+					),
+					$this->name
+				)
+			);
+		}
+	}
 }

core/domain/entities/contexts/RequestTypeContext.php

Indentation +133 added lines, -133 removed lines

@@ -16,137 +16,137 @@
 class RequestTypeContext extends Context
 {
 
-    /**
-     * indicates that the current request involves some form of activation
-     */
-    const ACTIVATION = 'activation-request';
-
-    /**
-     * indicates that the current request is for the admin but is not being made via AJAX
-     */
-    const ADMIN = 'non-ajax-admin-request';
-
-    /**
-     * indicates that the current request is for the admin AND is being made via AJAX
-     */
-    const AJAX_ADMIN = 'admin-ajax-request';
-
-    /**
-     * indicates that the current request is for the frontend AND is being made via AJAX
-     */
-    const AJAX_FRONT = 'frontend-ajax-request';
-
-    /**
-     * indicates that the current request is being made via AJAX, but is NOT for EE
-     */
-    const AJAX_OTHER = 'other-ajax-request';
-
-    /**
-     * indicates that the current request is for the EE REST API
-     */
-    const API = 'rest-api';
-
-    /**
-     * indicates that the current request is from the command line
-     */
-    const CLI = 'command-line';
-
-    /**
-     * indicates that the current request is for a WP_Cron
-     */
-    const CRON = 'wp-cron';
-
-    /**
-     * indicates that the current request is for a feed (ie: RSS)
-     */
-    const FEED = 'feed-request';
-
-    /**
-     * indicates that the current request is for the frontend but is not being made via AJAX
-     */
-    const FRONTEND = 'non-ajax-frontend-request';
-
-    /**
-     * indicates that the current request is for content that is to be displayed within an iframe
-     */
-    const IFRAME = 'iframe-request';
-
-    /**
-     * @var boolean $is_activation
-     */
-    private $is_activation = false;
-
-    /**
-     * @var array $valid_request_types
-     */
-    private $valid_request_types = array();
-
-
-    /**
-     * RequestTypeContext constructor.
-     *
-     * @param string $slug
-     * @param string $description
-     * @throws InvalidArgumentException
-     */
-    public function __construct($slug, $description)
-    {
-        parent::__construct($slug, $description);
-        if (! in_array($this->slug(), $this->validRequestTypes(), true)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'The RequestTypeContext slug must be one of the following values: %1$s %2$s',
-                        'event_espresso'
-                    ),
-                    var_export($this->validRequestTypes(), true)
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return array
-     */
-    public function validRequestTypes()
-    {
-        if (empty($this->valid_request_types)) {
-            $this->valid_request_types = apply_filters(
-                'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes',
-                array(
-                    RequestTypeContext::ACTIVATION,
-                    RequestTypeContext::ADMIN,
-                    RequestTypeContext::AJAX_ADMIN,
-                    RequestTypeContext::AJAX_FRONT,
-                    RequestTypeContext::AJAX_OTHER,
-                    RequestTypeContext::API,
-                    RequestTypeContext::CLI,
-                    RequestTypeContext::CRON,
-                    RequestTypeContext::FEED,
-                    RequestTypeContext::FRONTEND,
-                    RequestTypeContext::IFRAME,
-                )
-            );
-        }
-        return $this->valid_request_types;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isActivation()
-    {
-        return $this->is_activation;
-    }
-
-
-    /**
-     * @param bool $is_activation
-     */
-    public function setIsActivation($is_activation)
-    {
-        $this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN);
-    }
+	/**
+	 * indicates that the current request involves some form of activation
+	 */
+	const ACTIVATION = 'activation-request';
+
+	/**
+	 * indicates that the current request is for the admin but is not being made via AJAX
+	 */
+	const ADMIN = 'non-ajax-admin-request';
+
+	/**
+	 * indicates that the current request is for the admin AND is being made via AJAX
+	 */
+	const AJAX_ADMIN = 'admin-ajax-request';
+
+	/**
+	 * indicates that the current request is for the frontend AND is being made via AJAX
+	 */
+	const AJAX_FRONT = 'frontend-ajax-request';
+
+	/**
+	 * indicates that the current request is being made via AJAX, but is NOT for EE
+	 */
+	const AJAX_OTHER = 'other-ajax-request';
+
+	/**
+	 * indicates that the current request is for the EE REST API
+	 */
+	const API = 'rest-api';
+
+	/**
+	 * indicates that the current request is from the command line
+	 */
+	const CLI = 'command-line';
+
+	/**
+	 * indicates that the current request is for a WP_Cron
+	 */
+	const CRON = 'wp-cron';
+
+	/**
+	 * indicates that the current request is for a feed (ie: RSS)
+	 */
+	const FEED = 'feed-request';
+
+	/**
+	 * indicates that the current request is for the frontend but is not being made via AJAX
+	 */
+	const FRONTEND = 'non-ajax-frontend-request';
+
+	/**
+	 * indicates that the current request is for content that is to be displayed within an iframe
+	 */
+	const IFRAME = 'iframe-request';
+
+	/**
+	 * @var boolean $is_activation
+	 */
+	private $is_activation = false;
+
+	/**
+	 * @var array $valid_request_types
+	 */
+	private $valid_request_types = array();
+
+
+	/**
+	 * RequestTypeContext constructor.
+	 *
+	 * @param string $slug
+	 * @param string $description
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($slug, $description)
+	{
+		parent::__construct($slug, $description);
+		if (! in_array($this->slug(), $this->validRequestTypes(), true)) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'The RequestTypeContext slug must be one of the following values: %1$s %2$s',
+						'event_espresso'
+					),
+					var_export($this->validRequestTypes(), true)
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function validRequestTypes()
+	{
+		if (empty($this->valid_request_types)) {
+			$this->valid_request_types = apply_filters(
+				'FHEE__EventEspresso_core_domain_entities_contexts_RequestTypeContext__validRequestTypes',
+				array(
+					RequestTypeContext::ACTIVATION,
+					RequestTypeContext::ADMIN,
+					RequestTypeContext::AJAX_ADMIN,
+					RequestTypeContext::AJAX_FRONT,
+					RequestTypeContext::AJAX_OTHER,
+					RequestTypeContext::API,
+					RequestTypeContext::CLI,
+					RequestTypeContext::CRON,
+					RequestTypeContext::FEED,
+					RequestTypeContext::FRONTEND,
+					RequestTypeContext::IFRAME,
+				)
+			);
+		}
+		return $this->valid_request_types;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isActivation()
+	{
+		return $this->is_activation;
+	}
+
+
+	/**
+	 * @param bool $is_activation
+	 */
+	public function setIsActivation($is_activation)
+	{
+		$this->is_activation = filter_var($is_activation, FILTER_VALIDATE_BOOLEAN);
+	}
 }

core/domain/entities/contexts/Context.php

Indentation +47 added lines, -47 removed lines

@@ -14,62 +14,62 @@
 class Context implements ContextInterface
 {
 
-    /**
-     * @var string $slug
-     */
-    private $slug;
+	/**
+	 * @var string $slug
+	 */
+	private $slug;
 
-    /**
-     * @var string $description
-     */
-    private $description;
+	/**
+	 * @var string $description
+	 */
+	private $description;
 
 
-    /**
-     * Context constructor.
-     *
-     * @param string $slug
-     * @param string $description
-     */
-    public function __construct($slug, $description)
-    {
-        $this->setSlug($slug);
-        $this->setDescription($description);
-    }
+	/**
+	 * Context constructor.
+	 *
+	 * @param string $slug
+	 * @param string $description
+	 */
+	public function __construct($slug, $description)
+	{
+		$this->setSlug($slug);
+		$this->setDescription($description);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function slug()
-    {
-        return $this->slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function slug()
+	{
+		return $this->slug;
+	}
 
 
-    /**
-     * @param string $slug
-     */
-    private function setSlug($slug)
-    {
-        $this->slug = sanitize_key($slug);
-    }
+	/**
+	 * @param string $slug
+	 */
+	private function setSlug($slug)
+	{
+		$this->slug = sanitize_key($slug);
+	}
 
 
-    /**
-     * @return string
-     */
-    public function description()
-    {
-        return $this->description;
-    }
+	/**
+	 * @return string
+	 */
+	public function description()
+	{
+		return $this->description;
+	}
 
 
-    /**
-     * @param string $description
-     */
-    private function setDescription($description)
-    {
-        $this->description = sanitize_text_field($description);
-    }
+	/**
+	 * @param string $description
+	 */
+	private function setDescription($description)
+	{
+		$this->description = sanitize_text_field($description);
+	}
 }

core/domain/entities/custom_post_types/CustomTaxonomyTerm.php

Indentation +46 added lines, -46 removed lines

@@ -13,60 +13,60 @@
 class CustomTaxonomyTerm
 {
 
-    /**
-     * @var string $taxonomy_slug
-     */
-    public $taxonomy_slug;
+	/**
+	 * @var string $taxonomy_slug
+	 */
+	public $taxonomy_slug;
 
-    /**
-     * @var string $term_slug
-     */
-    public $term_slug;
+	/**
+	 * @var string $term_slug
+	 */
+	public $term_slug;
 
-    /**
-     * @var array $custom_post_type_slugs
-     */
-    public $custom_post_type_slugs;
+	/**
+	 * @var array $custom_post_type_slugs
+	 */
+	public $custom_post_type_slugs;
 
 
-    /**
-     * CustomTaxonomyTerm constructor.
-     *
-     * @param string $taxonomy_slug
-     * @param string $term_slug
-     * @param array  $custom_post_type_slugs
-     */
-    public function __construct($taxonomy_slug, $term_slug, array $custom_post_type_slugs = array())
-    {
-        $this->taxonomy_slug = $taxonomy_slug;
-        $this->term_slug = $term_slug;
-        $this->custom_post_type_slugs = $custom_post_type_slugs;
-    }
+	/**
+	 * CustomTaxonomyTerm constructor.
+	 *
+	 * @param string $taxonomy_slug
+	 * @param string $term_slug
+	 * @param array  $custom_post_type_slugs
+	 */
+	public function __construct($taxonomy_slug, $term_slug, array $custom_post_type_slugs = array())
+	{
+		$this->taxonomy_slug = $taxonomy_slug;
+		$this->term_slug = $term_slug;
+		$this->custom_post_type_slugs = $custom_post_type_slugs;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function taxonomySlug()
-    {
-        return $this->taxonomy_slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function taxonomySlug()
+	{
+		return $this->taxonomy_slug;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function termSlug()
-    {
-        return $this->term_slug;
-    }
+	/**
+	 * @return string
+	 */
+	public function termSlug()
+	{
+		return $this->term_slug;
+	}
 
 
-    /**
-     * @return array
-     */
-    public function customPostTypeSlugs()
-    {
-        return $this->custom_post_type_slugs;
-    }
+	/**
+	 * @return array
+	 */
+	public function customPostTypeSlugs()
+	{
+		return $this->custom_post_type_slugs;
+	}
 }

core/domain/entities/custom_post_types/CustomTaxonomyDefinitions.php

Indentation +116 added lines, -116 removed lines

@@ -13,130 +13,130 @@
 class CustomTaxonomyDefinitions
 {
 
-    /**
-     * @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' => esc_html__('event-category', 'event_espresso')),
-                ),
-            ),
-            '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' => esc_html__('venue-category', 'event_espresso')),
-                ),
-            ),
-            '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' => esc_html__('event-type', 'event_espresso')),
-                    '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' => esc_html__('event-category', 'event_espresso')),
+				),
+			),
+			'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' => esc_html__('venue-category', 'event_espresso')),
+				),
+			),
+			'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' => esc_html__('event-type', 'event_espresso')),
+					'hierarchical' => true,
+				),
+			),
+		);
+	}
 
 
-    /**
-     * @return array
-     */
-    public function getCustomTaxonomyDefinitions()
-    {
-        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()
+	{
+		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()
-    {
-        return array_keys($this->getCustomTaxonomyDefinitions());
-    }
+	/**
+	 * @return array
+	 */
+	public function getCustomTaxonomySlugs()
+	{
+		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($description, $taxonomy)
-    {
-        // 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($description, $taxonomy)
+	{
+		// 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/entities/RegCode.php

Indentation +43 added lines, -43 removed lines

@@ -14,49 +14,49 @@
 {
 
 
-    /*
+	/*
      * @var string $reg_code
      */
-    private $reg_code;
-
-
-    /**
-     * RegCode constructor.
-     *
-     * @param RegUrlLink      $reg_url_link
-     * @param \EE_Transaction $transaction
-     * @param \EE_Ticket      $ticket
-     */
-    public function __construct(
-        RegUrlLink $reg_url_link,
-        \EE_Transaction $transaction,
-        \EE_Ticket $ticket
-    ) {
-        // figure out where to start parsing the reg code
-        $chars = strpos($reg_url_link, '-') + 5;
-        // TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
-        $this->reg_code = array(
-            $transaction->ID(),
-            $ticket->ID(),
-            substr($reg_url_link, 0, $chars),
-        );
-        // now put it all together
-        $this->reg_code = apply_filters(
-            'FHEE__Create__regCode__new_reg_code',
-            implode('-', $this->reg_code),
-            $transaction,
-            $ticket
-        );
-    }
-
-
-    /**
-     * Return the object as a string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->reg_code;
-    }
+	private $reg_code;
+
+
+	/**
+	 * RegCode constructor.
+	 *
+	 * @param RegUrlLink      $reg_url_link
+	 * @param \EE_Transaction $transaction
+	 * @param \EE_Ticket      $ticket
+	 */
+	public function __construct(
+		RegUrlLink $reg_url_link,
+		\EE_Transaction $transaction,
+		\EE_Ticket $ticket
+	) {
+		// figure out where to start parsing the reg code
+		$chars = strpos($reg_url_link, '-') + 5;
+		// TXN_ID + TKT_ID + first 3 and last 3 chars of reg_url_link
+		$this->reg_code = array(
+			$transaction->ID(),
+			$ticket->ID(),
+			substr($reg_url_link, 0, $chars),
+		);
+		// now put it all together
+		$this->reg_code = apply_filters(
+			'FHEE__Create__regCode__new_reg_code',
+			implode('-', $this->reg_code),
+			$transaction,
+			$ticket
+		);
+	}
+
+
+	/**
+	 * Return the object as a string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->reg_code;
+	}
 }

core/domain/entities/shortcodes/EspressoThankYou.php

Indentation +60 added lines, -60 removed lines

@@ -16,71 +16,71 @@
 class EspressoThankYou extends EspressoShortcode
 {
 
-    /**
-     * @var boolean $is_thank_you_page
-     */
-    private $is_thank_you_page = false;
+	/**
+	 * @var boolean $is_thank_you_page
+	 */
+	private $is_thank_you_page = false;
 
-    /**
-     * the actual shortcode tag that gets registered with WordPress
-     *
-     * @return string
-     */
-    public function getTag()
-    {
-        return 'ESPRESSO_THANK_YOU';
-    }
+	/**
+	 * the actual shortcode tag that gets registered with WordPress
+	 *
+	 * @return string
+	 */
+	public function getTag()
+	{
+		return 'ESPRESSO_THANK_YOU';
+	}
 
 
-    /**
-     * the time in seconds to cache the results of the processShortcode() method
-     * 0 means the processShortcode() results will NOT be cached at all
-     *
-     * @return int
-     */
-    public function cacheExpiration()
-    {
-        return 0;
-    }
+	/**
+	 * the time in seconds to cache the results of the processShortcode() method
+	 * 0 means the processShortcode() results will NOT be cached at all
+	 *
+	 * @return int
+	 */
+	public function cacheExpiration()
+	{
+		return 0;
+	}
 
 
-    /**
-     * a place for adding any initialization code that needs to run prior to wp_header().
-     * this may be required for shortcodes that utilize a corresponding module,
-     * and need to enqueue assets for that module
-     *
-     * @return void
-     * @throws \EE_Error
-     */
-    public function initializeShortcode()
-    {
-        global $wp_query;
-        if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
-            return;
-        }
-        $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
-            return;
-        }
-        $this->is_thank_you_page = true;
-        \EED_Thank_You_Page::instance()->load_resources();
-        $this->shortcodeHasBeenInitialized();
-    }
+	/**
+	 * a place for adding any initialization code that needs to run prior to wp_header().
+	 * this may be required for shortcodes that utilize a corresponding module,
+	 * and need to enqueue assets for that module
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
+	public function initializeShortcode()
+	{
+		global $wp_query;
+		if (empty($wp_query->posts) || count($wp_query->posts) > 1) {
+			return;
+		}
+		$post = reset($wp_query->posts);
+		if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+			return;
+		}
+		$this->is_thank_you_page = true;
+		\EED_Thank_You_Page::instance()->load_resources();
+		$this->shortcodeHasBeenInitialized();
+	}
 
 
-    /**
-     * callback that runs when the shortcode is encountered in post content.
-     * IMPORTANT !!!
-     * remember that shortcode content should be RETURNED and NOT echoed out
-     *
-     * @param array $attributes
-     * @return string
-     * @throws \EE_Error
-     */
-    public function processShortcode($attributes = array())
-    {
-        return $this->is_thank_you_page
-            ? \EED_Thank_You_Page::instance()->thank_you_page_results()
-            : '';
-    }
+	/**
+	 * callback that runs when the shortcode is encountered in post content.
+	 * IMPORTANT !!!
+	 * remember that shortcode content should be RETURNED and NOT echoed out
+	 *
+	 * @param array $attributes
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function processShortcode($attributes = array())
+	{
+		return $this->is_thank_you_page
+			? \EED_Thank_You_Page::instance()->thank_you_page_results()
+			: '';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
             return;
         }
         $post = reset($wp_query->posts);
-        if (! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
+        if ( ! $post instanceof WP_Post || $post->ID !== EE_Registry::instance()->CFG->core->thank_you_page_id) {
             return;
         }
         $this->is_thank_you_page = true;