eventespresso / event-espresso-core

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

Indentation +8 added lines, -8 removed lines

@@ -18,14 +18,14 @@
 interface EmailValidatorInterface
 {
 
-    /**
-     * Validates the supplied email address. If it is invalid, throws EmailValidationException
-     *
-     * @param string $email_address
-     * @return boolean
-     * @throws EmailValidationException
-     */
-    public function validate($email_address);
+	/**
+	 * Validates the supplied email address. If it is invalid, throws EmailValidationException
+	 *
+	 * @param string $email_address
+	 * @return boolean
+	 * @throws EmailValidationException
+	 */
+	public function validate($email_address);
 
 
 }

core/libraries/form_sections/strategies/validation/EE_Email_Validation_Strategy.strategy.php

Indentation +59 added lines, -59 removed lines

@@ -18,72 +18,72 @@
 {
 
 
-    /**
-     * @param string               $validation_error_message
-     */
-    public function __construct($validation_error_message = '')
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
-        }
-        parent::__construct($validation_error_message);
-    }
+	/**
+	 * @param string               $validation_error_message
+	 */
+	public function __construct($validation_error_message = '')
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
+		}
+		parent::__construct($validation_error_message);
+	}
 
 
 
-    /**
-     * just checks the field isn't blank
-     *
-     * @param $normalized_value
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Validation_Error
-     */
-    public function validate($normalized_value)
-    {
-        if ($normalized_value && ! $this->_validate_email($normalized_value)) {
-            throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
-        }
-        return true;
-    }
+	/**
+	 * just checks the field isn't blank
+	 *
+	 * @param $normalized_value
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Validation_Error
+	 */
+	public function validate($normalized_value)
+	{
+		if ($normalized_value && ! $this->_validate_email($normalized_value)) {
+			throw new EE_Validation_Error($this->get_validation_error_message(), 'required');
+		}
+		return true;
+	}
 
 
 
-    /**
-     * @return array
-     */
-    public function get_jquery_validation_rule_array()
-    {
-        return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message()));
-    }
+	/**
+	 * @return array
+	 */
+	public function get_jquery_validation_rule_array()
+	{
+		return array('email' => true, 'messages' => array('email' => $this->get_validation_error_message()));
+	}
 
 
 
-    /**
-     * Validate an email address.
-     * Provide email address (raw input)
-     *
-     * @param $email
-     * @return bool of whether the email is valid or not
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws EE_Validation_Error
-     */
-    private function _validate_email($email)
-    {
-        try {
-            EmailAddressFactory::create($email);
-        } catch (EmailValidationException $e) {
-            throw new EE_Validation_Error(
-                $e->getMessage(),
-                'invalid_email',
-                $this->_input,
-                $e
-            );
-        }
-        return true;
-    }
+	/**
+	 * Validate an email address.
+	 * Provide email address (raw input)
+	 *
+	 * @param $email
+	 * @return bool of whether the email is valid or not
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Validation_Error
+	 */
+	private function _validate_email($email)
+	{
+		try {
+			EmailAddressFactory::create($email);
+		} catch (EmailValidationException $e) {
+			throw new EE_Validation_Error(
+				$e->getMessage(),
+				'invalid_email',
+				$this->_input,
+				$e
+			);
+		}
+		return true;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      */
     public function __construct($validation_error_message = '')
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = esc_html__('Please enter a valid email address.', 'event_espresso');
         }
         parent::__construct($validation_error_message);

core/services/activation/ActivationHandler.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      */
     public function verifySystemActivated(ActivatableInterface $system_activated)
     {
-        if (! ($system_activated instanceof EE_System || $system_activated instanceof EE_Addon)) {
+        if ( ! ($system_activated instanceof EE_System || $system_activated instanceof EE_Addon)) {
             throw new InvalidArgumentException(
                 sprintf(
                     esc_html__(

Indentation +199 added lines, -199 removed lines

@@ -23,205 +23,205 @@
 class ActivationHandler
 {
 
-    /**
-     * @var EE_Maintenance_Mode $maintenance_mode
-     */
-    private $maintenance_mode;
-
-
-
-    /**
-     * ActivationHandler constructor.
-     *
-     * @param EE_Maintenance_Mode $maintenance_mode
-     */
-    public function __construct(EE_Maintenance_Mode $maintenance_mode)
-    {
-        $this->maintenance_mode = $maintenance_mode;
-    }
-
-
-
-    /**
-     * @param ActivatableInterface $system_activated
-     * @throws InvalidArgumentException
-     */
-    public function verifySystemActivated(ActivatableInterface $system_activated)
-    {
-        if (! ($system_activated instanceof EE_System || $system_activated instanceof EE_Addon)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'The %1$s parameter must either be an instance of EE_System for Core, or an EE_Addon class. The following was supplied: %2$s%3$s',
-                        'event_espresso'
-                    ),
-                    '$system',
-                    '<br />',
-                    var_export($system_activated, true)
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * switches handling based on activation type
-     *
-     * @param ActivatableInterface $system_activated
-     * @param ActivationType       $activation_type
-     * @param ActivationHistory    $activation_history
-     * @return bool
-     * @throws InvalidArgumentException
-     */
-    public function detectActivationOrVersionChange(
-        ActivatableInterface $system_activated,
-        ActivationType $activation_type,
-        ActivationHistory $activation_history
-    ) {
-        $this->verifySystemActivated($system_activated);
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__detectActivationOrVersionChange__before_detection',
-            $system_activated,
-            $this
-        );
-        switch ($activation_type->getActivationType()) {
-            case ActivationType::NEW_ACTIVATION:
-                $activation_detected = $this->handleNewActivation(
-                    $system_activated,
-                    $activation_history
-                );
-                break;
-            case ActivationType::REACTIVATION:
-                $activation_detected = $this->handleReactivation(
-                    $system_activated,
-                    $activation_history
-                );
-                break;
-            case ActivationType::UPGRADE:
-                $activation_detected = $this->handleUpgrade(
-                    $system_activated,
-                    $activation_history
-                );
-                break;
-            case ActivationType::DOWNGRADE:
-                $activation_detected = $this->handleDowngrade(
-                    $system_activated,
-                    $activation_history
-                );
-                break;
-            case ActivationType::NOT_ACTIVATION:
-            default:
-                $activation_detected = $this->handleNormalRequest($system_activated);
-                break;
-        }
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__detectActivationOrVersionChange__detection_complete',
-            $system_activated,
-            $this
-        );
-        return $activation_detected;
-    }
-
-
-
-    /**
-     * handling for new activations
-     *
-     * @param ActivatableInterface $system_activated
-     * @param ActivationHistory    $activation_history
-     * @return boolean
-     */
-    private function handleNewActivation(ActivatableInterface $system_activated, ActivationHistory $activation_history)
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleNewActivation',
-            $system_activated,
-            $this
-        );
-        $activation_history->updateActivationHistory();
-        return true;
-    }
-
-
-
-    /**
-     * handling for reactivations
-     *
-     * @param ActivatableInterface $system_activated
-     * @param ActivationHistory    $activation_history
-     * @return boolean
-     */
-    private function handleReactivation(ActivatableInterface $system_activated, ActivationHistory $activation_history)
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleReactivation',
-            $system_activated,
-            $this
-        );
-        $activation_history->updateActivationHistory();
-        return true;
-    }
-
-
-
-    /**
-     * handling for upgrades
-     *
-     * @param ActivatableInterface $system_activated
-     * @param ActivationHistory    $activation_history
-     * @return boolean
-     */
-    private function handleUpgrade(ActivatableInterface $system_activated, ActivationHistory $activation_history)
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleUpgrade',
-            $system_activated,
-            $this
-        );
-        $this->maintenance_mode->set_maintenance_mode_if_db_old();
-        $activation_history->updateActivationHistory();
-        return true;
-    }
-
-
-
-    /**
-     * handling for downgrades
-     *
-     * @param ActivatableInterface $system_activated
-     * @param ActivationHistory    $activation_history
-     * @return boolean
-     */
-    private function handleDowngrade(ActivatableInterface $system_activated, ActivationHistory $activation_history)
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleDowngrade',
-            $system_activated,
-            $this
-        );
-        $this->maintenance_mode->set_maintenance_mode_if_db_old();
-        $activation_history->updateActivationHistory();
-        return true;
-    }
-
-
-
-    /**
-     * handling for normal requests
-     *
-     * @param ActivatableInterface $system_activated
-     * @return boolean
-     */
-    private function handleNormalRequest(ActivatableInterface $system_activated)
-    {
-        do_action(
-            'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleNormalRequest',
-            $system_activated,
-            $this
-        );
-        return false;
-    }
+	/**
+	 * @var EE_Maintenance_Mode $maintenance_mode
+	 */
+	private $maintenance_mode;
+
+
+
+	/**
+	 * ActivationHandler constructor.
+	 *
+	 * @param EE_Maintenance_Mode $maintenance_mode
+	 */
+	public function __construct(EE_Maintenance_Mode $maintenance_mode)
+	{
+		$this->maintenance_mode = $maintenance_mode;
+	}
+
+
+
+	/**
+	 * @param ActivatableInterface $system_activated
+	 * @throws InvalidArgumentException
+	 */
+	public function verifySystemActivated(ActivatableInterface $system_activated)
+	{
+		if (! ($system_activated instanceof EE_System || $system_activated instanceof EE_Addon)) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'The %1$s parameter must either be an instance of EE_System for Core, or an EE_Addon class. The following was supplied: %2$s%3$s',
+						'event_espresso'
+					),
+					'$system',
+					'<br />',
+					var_export($system_activated, true)
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * switches handling based on activation type
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @param ActivationType       $activation_type
+	 * @param ActivationHistory    $activation_history
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 */
+	public function detectActivationOrVersionChange(
+		ActivatableInterface $system_activated,
+		ActivationType $activation_type,
+		ActivationHistory $activation_history
+	) {
+		$this->verifySystemActivated($system_activated);
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__detectActivationOrVersionChange__before_detection',
+			$system_activated,
+			$this
+		);
+		switch ($activation_type->getActivationType()) {
+			case ActivationType::NEW_ACTIVATION:
+				$activation_detected = $this->handleNewActivation(
+					$system_activated,
+					$activation_history
+				);
+				break;
+			case ActivationType::REACTIVATION:
+				$activation_detected = $this->handleReactivation(
+					$system_activated,
+					$activation_history
+				);
+				break;
+			case ActivationType::UPGRADE:
+				$activation_detected = $this->handleUpgrade(
+					$system_activated,
+					$activation_history
+				);
+				break;
+			case ActivationType::DOWNGRADE:
+				$activation_detected = $this->handleDowngrade(
+					$system_activated,
+					$activation_history
+				);
+				break;
+			case ActivationType::NOT_ACTIVATION:
+			default:
+				$activation_detected = $this->handleNormalRequest($system_activated);
+				break;
+		}
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__detectActivationOrVersionChange__detection_complete',
+			$system_activated,
+			$this
+		);
+		return $activation_detected;
+	}
+
+
+
+	/**
+	 * handling for new activations
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @param ActivationHistory    $activation_history
+	 * @return boolean
+	 */
+	private function handleNewActivation(ActivatableInterface $system_activated, ActivationHistory $activation_history)
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleNewActivation',
+			$system_activated,
+			$this
+		);
+		$activation_history->updateActivationHistory();
+		return true;
+	}
+
+
+
+	/**
+	 * handling for reactivations
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @param ActivationHistory    $activation_history
+	 * @return boolean
+	 */
+	private function handleReactivation(ActivatableInterface $system_activated, ActivationHistory $activation_history)
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleReactivation',
+			$system_activated,
+			$this
+		);
+		$activation_history->updateActivationHistory();
+		return true;
+	}
+
+
+
+	/**
+	 * handling for upgrades
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @param ActivationHistory    $activation_history
+	 * @return boolean
+	 */
+	private function handleUpgrade(ActivatableInterface $system_activated, ActivationHistory $activation_history)
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleUpgrade',
+			$system_activated,
+			$this
+		);
+		$this->maintenance_mode->set_maintenance_mode_if_db_old();
+		$activation_history->updateActivationHistory();
+		return true;
+	}
+
+
+
+	/**
+	 * handling for downgrades
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @param ActivationHistory    $activation_history
+	 * @return boolean
+	 */
+	private function handleDowngrade(ActivatableInterface $system_activated, ActivationHistory $activation_history)
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleDowngrade',
+			$system_activated,
+			$this
+		);
+		$this->maintenance_mode->set_maintenance_mode_if_db_old();
+		$activation_history->updateActivationHistory();
+		return true;
+	}
+
+
+
+	/**
+	 * handling for normal requests
+	 *
+	 * @param ActivatableInterface $system_activated
+	 * @return boolean
+	 */
+	private function handleNormalRequest(ActivatableInterface $system_activated)
+	{
+		do_action(
+			'AHEE__EventEspresso_core_services_activation_ActivationHandler__handleNormalRequest',
+			$system_activated,
+			$this
+		);
+		return false;
+	}
 
 
 

core/services/activation/InitializeInterface.php

Indentation +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@
 interface InitializeInterface
 {
 
-    /**
-     * @param bool $verify_schema    whether to verify the database's schema during this activation, or just its data.
-     *                               This is a resource-intensive job so we prefer to only do it when necessary
-     * @return void
-     */
-    public function initialize($verify_schema = true);
+	/**
+	 * @param bool $verify_schema    whether to verify the database's schema during this activation, or just its data.
+	 *                               This is a resource-intensive job so we prefer to only do it when necessary
+	 * @return void
+	 */
+	public function initialize($verify_schema = true);
 }

core/services/activation/ActivationsAndUpgradesManager.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
             }
         }
         // if no activations are scheduled, then just return false
-        if($this->activations === array()) {
+        if ($this->activations === array()) {
             return false;
         }
         add_action(
@@ -167,7 +167,7 @@ 
     {
         foreach ($this->activations as $activation) {
             $initializer = ActivationsFactory::createInitializer($activation);
-            if($initializer instanceof InitializeInterface){
+            if ($initializer instanceof InitializeInterface) {
                 $initializer->initialize();
             }
             do_action(
@@ -188,7 +188,7 @@ 
     private function deactivateIncompatibleAddons()
     {
         $incompatible_addons = get_option(ActivationsAndUpgradesManager::EE_INCOMPATIBLE_ADDONS_OPTION_NAME, array());
-        if (! empty($incompatible_addons)) {
+        if ( ! empty($incompatible_addons)) {
             $active_plugins = get_option('active_plugins', array());
             foreach ($active_plugins as $active_plugin) {
                 foreach ($incompatible_addons as $incompatible_addon) {

Indentation +175 added lines, -175 removed lines

@@ -24,181 +24,181 @@
 class ActivationsAndUpgradesManager
 {
 
-    /**
-     * option name for recording an array of addon names
-     * that are not compatible with the current version of core
-     */
-    const EE_INCOMPATIBLE_ADDONS_OPTION_NAME = 'ee_incompatible_addons';
-
-    /**
-     * @var ActivatableInterface[] $activations
-     */
-    private $activations = array();
-
-    /**
-     * @var ActivationHandler $activation_handler
-     */
-    private $activation_handler;
-
-    /**
-     * @var ActivationTypeDetector $activation_type_detector
-     */
-    private $activation_type_detector;
-
-
-
-    /**
-     * ActivationsAndUpgradesManager constructor.
-     *
-     * @param ActivationHandler      $activation_handler
-     * @param ActivationTypeDetector $activation_type_detector
-     */
-    public function __construct(
-        ActivationHandler $activation_handler,
-        ActivationTypeDetector $activation_type_detector
-    ) {
-        defined('EVENT_ESPRESSO_VERSION') || exit('No direct script access allowed');
-        $this->activation_handler       = $activation_handler;
-        $this->activation_type_detector = $activation_type_detector;
-    }
-
-
-
-    /**
-     * @param ActivatableInterface[] $activations
-     * @return bool
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function detectActivationsAndVersionChanges(array $activations): bool
-    {
-        foreach ($activations as $activation) {
-            if ( ! $activation instanceof ActivatableInterface) {
-                throw new InvalidEntityException(
-                    $activation,
-                    'EventEspresso\core\services\activation\ActivatableInterface'
-                );
-            }
-            $activation_history = $this->getActivationHistory($activation);
-            if (
-                $this->activation_handler->detectActivationOrVersionChange(
-                    $activation,
-                    $this->getActivationType($activation, $activation_history),
-                    $activation_history
-                )
-            ) {
-                $this->activations[] = $activation;
-            }
-        }
-        // if no activations are scheduled, then just return false
-        if($this->activations === array()) {
-            return false;
-        }
-        add_action(
-            'AHEE__EE_System__perform_activations_upgrades_and_migrations',
-            array($this, 'performActivationsAndUpgrades')
-        );
-        return true;
-    }
-
-
-
-    /**
-     * @param ActivatableInterface $activation
-     * @return ActivationHistory
-     * @throws InvalidArgumentException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws DomainException
-     */
-    private function getActivationHistory(ActivatableInterface $activation): ActivationHistory
-    {
-        // get activation history and set arguments array based on activation type
-        $activation_history = ActivationsFactory::createActivationHistory($activation);
-        if ($activation_history instanceof ActivationHistory) {
-            // convert EE Core activation history to the latest format
-            if ($activation instanceof EE_System) {
-                $migrate_activation_history = ActivationsFactory::getMigrateActivationHistory();
-                $activation_history = $migrate_activation_history->updateFormat($activation_history);
-            }
-            $activation->setActivationHistory($activation_history);
-            return $activation_history;
-        }
-        throw new DomainException(
-            sprintf(
-                esc_html__(
-                    'Could not obtain an ActivationHistory for the "%1$s" Activatable class.',
-                    'event_espresso'
-                ),
-                get_class($activation)
-            )
-        );
-    }
-
-
-
-    /**
-     * @param ActivatableInterface $activation
-     * @param ActivationHistory    $activation_history
-     * @return ActivationType
-     * @throws InvalidArgumentException
-     */
-    private function getActivationType(ActivatableInterface $activation, ActivationHistory $activation_history): ActivationType
-    {
-        // determine whether current request is new activation, upgrade, etc
-        $activation_type = $this->activation_type_detector->resolveActivationTypeFromActivationHistory(
-            $activation_history
-        );
-        $activation->setActivationType($activation_type);
-        return $activation_type;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function performActivationsAndUpgrades()
-    {
-        foreach ($this->activations as $activation) {
-            $initializer = ActivationsFactory::createInitializer($activation);
-            if($initializer instanceof InitializeInterface){
-                $initializer->initialize();
-            }
-            do_action(
-                'AHEE__EventEspresso_core_services_activation_ActivationsAndUpgradesManager__performActivationsAndUpgrades',
-                $activation,
-                $initializer
-            );
-        }
-        $this->deactivateIncompatibleAddons();
-    }
-
-
-
-    /**
-     * Using the information gathered in EE_System::_incompatible_addon_error,
-     * deactivates any addons considered incompatible with the current version of EE
-     */
-    private function deactivateIncompatibleAddons()
-    {
-        $incompatible_addons = get_option(ActivationsAndUpgradesManager::EE_INCOMPATIBLE_ADDONS_OPTION_NAME, array());
-        if (! empty($incompatible_addons)) {
-            $active_plugins = get_option('active_plugins', array());
-            foreach ($active_plugins as $active_plugin) {
-                foreach ($incompatible_addons as $incompatible_addon) {
-                    if (strpos($active_plugin, $incompatible_addon) !== false) {
-                        unset($_GET['activate']);
-                        espresso_deactivate_plugin($active_plugin);
-                    }
-                }
-            }
-        }
-    }
+	/**
+	 * option name for recording an array of addon names
+	 * that are not compatible with the current version of core
+	 */
+	const EE_INCOMPATIBLE_ADDONS_OPTION_NAME = 'ee_incompatible_addons';
+
+	/**
+	 * @var ActivatableInterface[] $activations
+	 */
+	private $activations = array();
+
+	/**
+	 * @var ActivationHandler $activation_handler
+	 */
+	private $activation_handler;
+
+	/**
+	 * @var ActivationTypeDetector $activation_type_detector
+	 */
+	private $activation_type_detector;
+
+
+
+	/**
+	 * ActivationsAndUpgradesManager constructor.
+	 *
+	 * @param ActivationHandler      $activation_handler
+	 * @param ActivationTypeDetector $activation_type_detector
+	 */
+	public function __construct(
+		ActivationHandler $activation_handler,
+		ActivationTypeDetector $activation_type_detector
+	) {
+		defined('EVENT_ESPRESSO_VERSION') || exit('No direct script access allowed');
+		$this->activation_handler       = $activation_handler;
+		$this->activation_type_detector = $activation_type_detector;
+	}
+
+
+
+	/**
+	 * @param ActivatableInterface[] $activations
+	 * @return bool
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function detectActivationsAndVersionChanges(array $activations): bool
+	{
+		foreach ($activations as $activation) {
+			if ( ! $activation instanceof ActivatableInterface) {
+				throw new InvalidEntityException(
+					$activation,
+					'EventEspresso\core\services\activation\ActivatableInterface'
+				);
+			}
+			$activation_history = $this->getActivationHistory($activation);
+			if (
+				$this->activation_handler->detectActivationOrVersionChange(
+					$activation,
+					$this->getActivationType($activation, $activation_history),
+					$activation_history
+				)
+			) {
+				$this->activations[] = $activation;
+			}
+		}
+		// if no activations are scheduled, then just return false
+		if($this->activations === array()) {
+			return false;
+		}
+		add_action(
+			'AHEE__EE_System__perform_activations_upgrades_and_migrations',
+			array($this, 'performActivationsAndUpgrades')
+		);
+		return true;
+	}
+
+
+
+	/**
+	 * @param ActivatableInterface $activation
+	 * @return ActivationHistory
+	 * @throws InvalidArgumentException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws DomainException
+	 */
+	private function getActivationHistory(ActivatableInterface $activation): ActivationHistory
+	{
+		// get activation history and set arguments array based on activation type
+		$activation_history = ActivationsFactory::createActivationHistory($activation);
+		if ($activation_history instanceof ActivationHistory) {
+			// convert EE Core activation history to the latest format
+			if ($activation instanceof EE_System) {
+				$migrate_activation_history = ActivationsFactory::getMigrateActivationHistory();
+				$activation_history = $migrate_activation_history->updateFormat($activation_history);
+			}
+			$activation->setActivationHistory($activation_history);
+			return $activation_history;
+		}
+		throw new DomainException(
+			sprintf(
+				esc_html__(
+					'Could not obtain an ActivationHistory for the "%1$s" Activatable class.',
+					'event_espresso'
+				),
+				get_class($activation)
+			)
+		);
+	}
+
+
+
+	/**
+	 * @param ActivatableInterface $activation
+	 * @param ActivationHistory    $activation_history
+	 * @return ActivationType
+	 * @throws InvalidArgumentException
+	 */
+	private function getActivationType(ActivatableInterface $activation, ActivationHistory $activation_history): ActivationType
+	{
+		// determine whether current request is new activation, upgrade, etc
+		$activation_type = $this->activation_type_detector->resolveActivationTypeFromActivationHistory(
+			$activation_history
+		);
+		$activation->setActivationType($activation_type);
+		return $activation_type;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function performActivationsAndUpgrades()
+	{
+		foreach ($this->activations as $activation) {
+			$initializer = ActivationsFactory::createInitializer($activation);
+			if($initializer instanceof InitializeInterface){
+				$initializer->initialize();
+			}
+			do_action(
+				'AHEE__EventEspresso_core_services_activation_ActivationsAndUpgradesManager__performActivationsAndUpgrades',
+				$activation,
+				$initializer
+			);
+		}
+		$this->deactivateIncompatibleAddons();
+	}
+
+
+
+	/**
+	 * Using the information gathered in EE_System::_incompatible_addon_error,
+	 * deactivates any addons considered incompatible with the current version of EE
+	 */
+	private function deactivateIncompatibleAddons()
+	{
+		$incompatible_addons = get_option(ActivationsAndUpgradesManager::EE_INCOMPATIBLE_ADDONS_OPTION_NAME, array());
+		if (! empty($incompatible_addons)) {
+			$active_plugins = get_option('active_plugins', array());
+			foreach ($active_plugins as $active_plugin) {
+				foreach ($incompatible_addons as $incompatible_addon) {
+					if (strpos($active_plugin, $incompatible_addon) !== false) {
+						unset($_GET['activate']);
+						espresso_deactivate_plugin($active_plugin);
+					}
+				}
+			}
+		}
+	}
 
 
 }

core/libraries/form_sections/inputs/EE_Float_Input.input.php

Indentation +29 added lines, -29 removed lines

@@ -11,33 +11,33 @@
 class EE_Float_Input extends EE_Form_Input_Base
 {
 
-    /**
-     * @param array $input_settings
-     * @throws InvalidArgumentException
-     */
-    public function __construct($input_settings = array())
-    {
-        $this->_set_display_strategy(
-            new EE_Number_Input_Display_Strategy(
-                isset($input_settings['min_value'])
-                    ? $input_settings['min_value']
-                    : null,
-                isset($input_settings['max_value'])
-                    ? $input_settings['max_value']
-                    : null,
-                isset($input_settings['step_value'])
-                    ? $input_settings['step_value']
-                    : null
-            )
-        );
-        $this->_set_normalization_strategy(new EE_Float_Normalization());
-        $this->_add_validation_strategy(
-            new EE_Float_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        parent::__construct($input_settings);
-    }
+	/**
+	 * @param array $input_settings
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($input_settings = array())
+	{
+		$this->_set_display_strategy(
+			new EE_Number_Input_Display_Strategy(
+				isset($input_settings['min_value'])
+					? $input_settings['min_value']
+					: null,
+				isset($input_settings['max_value'])
+					? $input_settings['max_value']
+					: null,
+				isset($input_settings['step_value'])
+					? $input_settings['step_value']
+					: null
+			)
+		);
+		$this->_set_normalization_strategy(new EE_Float_Normalization());
+		$this->_add_validation_strategy(
+			new EE_Float_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		parent::__construct($input_settings);
+	}
 }

acceptance_tests/tests/e-TestContextActivationToggleCept.php

Indentation +62 added lines, -62 removed lines

@@ -8,8 +8,8 @@ 
 $event_label = 'Testing Context Deactivation';
 
 $I->wantTo(
-    'Test that the context activation toggle for turning on or off specific contexts for message sending works as'
-    . ' expected'
+	'Test that the context activation toggle for turning on or off specific contexts for message sending works as'
+	. ' expected'
 );
 
 $I->loginAsAdmin();
@@ -34,7 +34,7 @@ 
 $I->see('The template for Primary Registrant Recipient is currently inactive.');
 
 $I->amGoingTo(
-    'Trigger Registration Approved Messages and verify primary registrant context is excluded from sent messages.'
+	'Trigger Registration Approved Messages and verify primary registrant context is excluded from sent messages.'
 );
 $I->amOnDefaultEventsListTablePage();
 $I->click(EventsAdmin::ADD_NEW_EVENT_BUTTON_SELECTOR);
@@ -44,9 +44,9 @@ 
 $event_link = $I->observeLinkUrlAt(EventsAdmin::EVENT_EDITOR_VIEW_LINK_AFTER_PUBLISH_SELECTOR);
 $event_id = $I->observeValueFromInputAt(EventsAdmin::EVENT_EDITOR_EVT_ID_SELECTOR);
 $test_registration_details = array(
-    'fname' => 'ContextTestGuy',
-    'lname' => 'ContextTestDude',
-    'email' => 'contexttestguy@example.org',
+	'fname' => 'ContextTestGuy',
+	'lname' => 'ContextTestDude',
+	'email' => 'contexttestguy@example.org',
 );
 $I->logOut();
 $I->amOnUrl($event_link);
@@ -63,48 +63,48 @@ 
 $I->amOnMessagesActivityListTablePage();
 //verify registrant context
 $I->see(
-    $test_registration_details['email'],
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Registrant'
-    )
+	$test_registration_details['email'],
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Registrant'
+	)
 );
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 //verify admin context
 $I->see(
-    'admin@example.com',
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT
-    )
+	'admin@example.com',
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT
+	)
 );
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved'
+	'Registration Approved'
 );
 //verify primary registrant context is NOT present.
 $I->dontSee(
-    $test_registration_details['email'],
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Primary Registrant'
-    )
+	$test_registration_details['email'],
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Primary Registrant'
+	)
 );
 
 $I->amGoingTo(
-    'Deactivate primary registrant context for Registration Approved Message Templates and restore the "To"'
-    . ' field to an empty string to verify the message does not send for that context.'
+	'Deactivate primary registrant context for Registration Approved Message Templates and restore the "To"'
+	. ' field to an empty string to verify the message does not send for that context.'
 );
 $I->amOnDefaultMessageTemplateListTablePage();
 $I->clickToEditMessageTemplateByMessageType('registration', 'primary_attendee');
@@ -128,41 +128,41 @@ 
 $I->amOnMessagesActivityListTablePage();
 //verify registrant context
 $I->see(
-    $test_registration_details['email'],
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Registrant'
-    )
+	$test_registration_details['email'],
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Registrant'
+	)
 );
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved',
-    MessagesAdmin::MESSAGE_STATUS_SENT,
-    'Email',
-    'Registrant'
+	'Registration Approved',
+	MessagesAdmin::MESSAGE_STATUS_SENT,
+	'Email',
+	'Registrant'
 );
 //verify admin context
 $I->see(
-    'admin@example.com',
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT
-    )
+	'admin@example.com',
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT
+	)
 );
 $I->deleteMessageInMessagesListTableFor(
-    'Registration Approved'
+	'Registration Approved'
 );
 //verify primary registrant context is NOT present.
 $I->dontSee(
-    $test_registration_details['email'],
-    MessagesAdmin::messagesActivityListTableCellSelectorFor(
-        'to',
-        'Registration Approved',
-        MessagesAdmin::MESSAGE_STATUS_SENT,
-        '',
-        'Primary Registrant'
-    )
+	$test_registration_details['email'],
+	MessagesAdmin::messagesActivityListTableCellSelectorFor(
+		'to',
+		'Registration Approved',
+		MessagesAdmin::MESSAGE_STATUS_SENT,
+		'',
+		'Primary Registrant'
+	)
 );
\ No newline at end of file

admin_pages/messages/help_tabs/messages_settings_messengers.help_tab.php

Spacing +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@
             'The green colored gear %s indicates that this messenger is currently active.',
             'event_espresso'
         ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '"'
-        . ' alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />'
+        '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-active.png'.'"'
+        . ' alt="'.esc_attr__('Active Email Tab', 'event_espresso').'" />'
     );
     printf(
         esc_html__(
             ' The white colored gear %s indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
             'event_espresso'
         ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png'
-        . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />'
+        '<img class="inline-text" src="'.EE_MSG_ASSETS_URL.'images/email-tab-inactive.png'
+        . '" alt="'.esc_attr__('Inactive Email Tab', 'event_espresso').'" />'
     ); ?>
 </p>
 <p>

Indentation +50 added lines, -50 removed lines

@@ -3,79 +3,79 @@
 </p>
 <p>
     <?php esc_html_e(
-        'You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
-        'event_espresso'
-    ); ?>
+		'You can select Messengers via the tabs across the top of the settings page. The available messengers you see depends on what version of Event Espresso you have and what addons are installed. Every install include an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
-        'event_espresso'
-    ); ?>
+		'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php printf(
-        esc_html__(
-            'The green colored gear %s indicates that this messenger is currently active.',
-            'event_espresso'
-        ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '"'
-        . ' alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />'
-    );
-    printf(
-        esc_html__(
-            ' The white colored gear %s indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
-            'event_espresso'
-        ),
-        '<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png'
-        . '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />'
-    ); ?>
+		esc_html__(
+			'The green colored gear %s indicates that this messenger is currently active.',
+			'event_espresso'
+		),
+		'<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-active.png' . '"'
+		. ' alt="' . esc_attr__('Active Email Tab', 'event_espresso') . '" />'
+	);
+	printf(
+		esc_html__(
+			' The white colored gear %s indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
+			'event_espresso'
+		),
+		'<img class="inline-text" src="' . EE_MSG_ASSETS_URL . 'images/email-tab-inactive.png'
+		. '" alt="' . esc_attr__('Inactive Email Tab', 'event_espresso') . '" />'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
-        'event_espresso'
-    ); ?>
+		'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php printf(
-        esc_html__(
-            '%1$s means of course that the messenger is active and %2$s means the messenger is inactive.',
-            'event_espresso'
-        ),
-        '<div class="switch">'
-        . '<input class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked disabled>'
-        . '<label for="ee-on-off-toggle-on"></label>'
-        . '</div>',
-        '<div class="switch">'
-        . '<input class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled>'
-        . '<label for="ee-on-off-toggle-on"></label>'
-        . '</div>'
-    ); ?>
+		esc_html__(
+			'%1$s means of course that the messenger is active and %2$s means the messenger is inactive.',
+			'event_espresso'
+		),
+		'<div class="switch">'
+		. '<input class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" checked disabled>'
+		. '<label for="ee-on-off-toggle-on"></label>'
+		. '</div>',
+		'<div class="switch">'
+		. '<input class="ee-on-off-toggle ee-toggle-round-flat" type="checkbox" disabled>'
+		. '<label for="ee-on-off-toggle-on"></label>'
+		. '</div>'
+	); ?>
 </p>
 <p>
     <?php
-    esc_html_e(
-        'The on/off toggle is also what you use to activate or deactivate a messenger.',
-        'event_espresso'
-    ); ?>
+	esc_html_e(
+		'The on/off toggle is also what you use to activate or deactivate a messenger.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
-        'event_espresso'
-    ); ?>
+		'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then. Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <?php esc_html_e(
-        'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
-        'event_espresso'
-    ); ?>
+		'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger. If there are you will be unable to deactivate the messenger. This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
+		'event_espresso'
+	); ?>
 </p>
 <p>
     <strong><?php esc_html_e('Important', 'event_espresso'); ?></strong><br />
     <?php esc_html_e(
-        'Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
-        'event_espresso'
-    ); ?>
+		'Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
+		'event_espresso'
+	); ?>
 </p>

core/libraries/form_sections/inputs/EE_Radio_Button_Input.input.php

Indentation +17 added lines, -17 removed lines

@@ -15,22 +15,22 @@
 class EE_Radio_Button_Input extends EE_Form_Input_With_Options_Base
 {
 
-    /**
-     * @param array $answer_options
-     * @param array $input_settings
-     */
-    public function __construct($answer_options, $input_settings = array())
-    {
-        $this->_set_display_strategy(new EE_Radio_Button_Display_Strategy());
-        $this->_add_validation_strategy(
-            new EE_Enum_Validation_Strategy(
-                isset($input_settings['validation_error_message'])
-                    ? $input_settings['validation_error_message']
-                    : null
-            )
-        );
-        $this->_multiple_selections = false;
-        parent::__construct($answer_options, $input_settings);
-    }
+	/**
+	 * @param array $answer_options
+	 * @param array $input_settings
+	 */
+	public function __construct($answer_options, $input_settings = array())
+	{
+		$this->_set_display_strategy(new EE_Radio_Button_Display_Strategy());
+		$this->_add_validation_strategy(
+			new EE_Enum_Validation_Strategy(
+				isset($input_settings['validation_error_message'])
+					? $input_settings['validation_error_message']
+					: null
+			)
+		);
+		$this->_multiple_selections = false;
+		parent::__construct($answer_options, $input_settings);
+	}
 
 }