eventespresso / event-espresso-core

core/exceptions/InvalidInterfaceException.php

Spacing +4 added lines, -4 removed lines

@@ -25,14 +25,14 @@
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $interface_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($interface_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The "%1$s" Interface is either missing or invalid.', 'event_espresso' ),
+				__('The "%1$s" Interface is either missing or invalid.', 'event_espresso'),
 				$interface_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/exceptions/InvalidDataTypeException.php

Spacing +9 added lines, -9 removed lines

@@ -29,10 +29,10 @@ 
 	 * @param int        $code
 	 * @param Exception $previous
 	 */
-	public function __construct( $var_name, $variable, $expected, $message = '', $code = 0, Exception $previous = null ) {
-		if ( empty( $message ) ) {
-			$expected = strpos( ' was expected.', $expected ) === false
-				? $this->addIndefiniteArticle( $expected ) . ' was expected.'
+	public function __construct($var_name, $variable, $expected, $message = '', $code = 0, Exception $previous = null) {
+		if (empty($message)) {
+			$expected = strpos(' was expected.', $expected) === false
+				? $this->addIndefiniteArticle($expected).' was expected.'
 				: $expected;
 			$message = sprintf(
 				__(
@@ -40,11 +40,11 @@ 
 					'event_espresso'
 				),
 				$var_name,
-				$this->addIndefiniteArticle( gettype( $variable ) ),
+				$this->addIndefiniteArticle(gettype($variable)),
 				$expected
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 
@@ -53,11 +53,11 @@ 
 	 * @param $string
 	 * @return string
 	 */
-	protected function addIndefiniteArticle( $string ) {
-		if ( strtolower( $string ) === 'null' ) {
+	protected function addIndefiniteArticle($string) {
+		if (strtolower($string) === 'null') {
 			return $string;
 		}
-		return ( stripos( 'aeiou', $string[0] ) !== false ? 'an ' : 'a ' ) . $string;
+		return (stripos('aeiou', $string[0]) !== false ? 'an ' : 'a ').$string;
 	}
 }
 // End of file InvalidDataTypeException.php

core/exceptions/InvalidClassException.php

Spacing +4 added lines, -4 removed lines

@@ -24,14 +24,14 @@
 	 * @param int        $code
 	 * @param \Exception $previous
 	 */
-	public function __construct( $class_name, $message = '', $code = 0, \Exception $previous = null ) {
-		if ( empty( $message ) ) {
+	public function __construct($class_name, $message = '', $code = 0, \Exception $previous = null) {
+		if (empty($message)) {
 			$message = sprintf(
-				__( 'The "%1$s" Class is either missing or invalid.', 'event_espresso' ),
+				__('The "%1$s" Class is either missing or invalid.', 'event_espresso'),
 				$class_name
 			);
 		}
-		parent::__construct( $message, $code, $previous );
+		parent::__construct($message, $code, $previous);
 	}
 
 }

core/domain/DomainFactory.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments)
     {
-        if (! isset($arguments[0], $arguments[1])) {
+        if ( ! isset($arguments[0], $arguments[1])) {
             throw new InvalidArgumentException(
                 esc_html__(
                     'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
@@ -49,7 +49,7 @@ 
             );
         }
         $domain = LoaderFactory::getLoader()->getShared($domain_fqcn, $arguments);
-        if (! $domain instanceof $domain_fqcn && ! $domain instanceof DomainBase) {
+        if ( ! $domain instanceof $domain_fqcn && ! $domain instanceof DomainBase) {
             throw new DomainException(
                 sprintf(
                     esc_html__(

Indentation +38 added lines, -38 removed lines

@@ -24,44 +24,44 @@
 class DomainFactory
 {
 
-    /**
-     * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
-     * @param array $arguments                  [required] array of arguments to be passed to the Domain class
-     *                                          constructor. Must at least include the following two value objects:
-     *                                          array(
-     *                                              EventEspresso\core\domain\values\FilePath $plugin_file
-     *                                              EventEspresso\core\domain\values\Version $version
-     *                                          )
-     * @return mixed
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments)
-    {
-        if (! isset($arguments[0], $arguments[1])) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
-                    'event_espresso'
-                )
-            );
-        }
-        $domain = LoaderFactory::getLoader()->getShared($domain_fqcn, $arguments);
-        if (! $domain instanceof $domain_fqcn && ! $domain instanceof DomainBase) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The requested Domain class "%1$s" could not be loaded.',
-                        'event_espresso'
-                    ),
-                    $domain_fqcn
-                )
-            );
-        }
-        return $domain;
-    }
+	/**
+	 * @param FullyQualifiedName $domain_fqcn   [required] Fully Qualified Class Name for the Domain class
+	 * @param array $arguments                  [required] array of arguments to be passed to the Domain class
+	 *                                          constructor. Must at least include the following two value objects:
+	 *                                          array(
+	 *                                              EventEspresso\core\domain\values\FilePath $plugin_file
+	 *                                              EventEspresso\core\domain\values\Version $version
+	 *                                          )
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getShared(FullyQualifiedName $domain_fqcn, array $arguments)
+	{
+		if (! isset($arguments[0], $arguments[1])) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'You need to pass at least two arguments, representing the addon plugin file and version, in order to generate a Domain class',
+					'event_espresso'
+				)
+			);
+		}
+		$domain = LoaderFactory::getLoader()->getShared($domain_fqcn, $arguments);
+		if (! $domain instanceof $domain_fqcn && ! $domain instanceof DomainBase) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The requested Domain class "%1$s" could not be loaded.',
+						'event_espresso'
+					),
+					$domain_fqcn
+				)
+			);
+		}
+		return $domain;
+	}
 
 }
 

core/domain/values/FilePath.php

Indentation +36 added lines, -36 removed lines

@@ -20,42 +20,42 @@
 class FilePath
 {
 
-    /**
-     * @var string file_path
-     */
-    private $file_path;
-
-
-    /**
-     * FilePath constructor.
-     *
-     * @param string $file_path
-     * @throws InvalidDataTypeException
-     * @throws InvalidFilePathException
-     */
-    public function __construct($file_path)
-    {
-        if (! is_string($file_path)) {
-            throw new InvalidDataTypeException(
-                '$file_path',
-                $file_path,
-                'string'
-            );
-        }
-        if (! is_readable($file_path)) {
-            throw new InvalidFilePathException($file_path);
-        }
-        $this->file_path = $file_path;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->file_path;
-    }
+	/**
+	 * @var string file_path
+	 */
+	private $file_path;
+
+
+	/**
+	 * FilePath constructor.
+	 *
+	 * @param string $file_path
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFilePathException
+	 */
+	public function __construct($file_path)
+	{
+		if (! is_string($file_path)) {
+			throw new InvalidDataTypeException(
+				'$file_path',
+				$file_path,
+				'string'
+			);
+		}
+		if (! is_readable($file_path)) {
+			throw new InvalidFilePathException($file_path);
+		}
+		$this->file_path = $file_path;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->file_path;
+	}
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -35,14 +35,14 @@
      */
     public function __construct($file_path)
     {
-        if (! is_string($file_path)) {
+        if ( ! is_string($file_path)) {
             throw new InvalidDataTypeException(
                 '$file_path',
                 $file_path,
                 'string'
             );
         }
-        if (! is_readable($file_path)) {
+        if ( ! is_readable($file_path)) {
             throw new InvalidFilePathException($file_path);
         }
         $this->file_path = $file_path;

core/domain/values/FullyQualifiedName.php

Indentation +36 added lines, -36 removed lines

@@ -21,45 +21,45 @@
 class FullyQualifiedName
 {
 
-    /**
-     * @var string $fully_qualified_name
-     */
-    private $fully_qualified_name;
+	/**
+	 * @var string $fully_qualified_name
+	 */
+	private $fully_qualified_name;
 
 
-    /**
-     * FullyQualifiedName constructor.
-     *
-     * @param string $fully_qualified_name
-     * @throws InvalidClassException
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($fully_qualified_name)
-    {
-        if (! is_string($fully_qualified_name)) {
-            throw new InvalidDataTypeException(
-                '$fully_qualified_name',
-                $fully_qualified_name,
-                'string'
-            );
-        }
-        if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
-            if (strpos($fully_qualified_name, 'Interface') !== false) {
-                throw new InvalidInterfaceException($fully_qualified_name);
-            }
-            throw new InvalidClassException($fully_qualified_name);
-        }
-        $this->fully_qualified_name = $fully_qualified_name;
-    }
+	/**
+	 * FullyQualifiedName constructor.
+	 *
+	 * @param string $fully_qualified_name
+	 * @throws InvalidClassException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($fully_qualified_name)
+	{
+		if (! is_string($fully_qualified_name)) {
+			throw new InvalidDataTypeException(
+				'$fully_qualified_name',
+				$fully_qualified_name,
+				'string'
+			);
+		}
+		if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
+			if (strpos($fully_qualified_name, 'Interface') !== false) {
+				throw new InvalidInterfaceException($fully_qualified_name);
+			}
+			throw new InvalidClassException($fully_qualified_name);
+		}
+		$this->fully_qualified_name = $fully_qualified_name;
+	}
 
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->fully_qualified_name;
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->fully_qualified_name;
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -37,14 +37,14 @@
      */
     public function __construct($fully_qualified_name)
     {
-        if (! is_string($fully_qualified_name)) {
+        if ( ! is_string($fully_qualified_name)) {
             throw new InvalidDataTypeException(
                 '$fully_qualified_name',
                 $fully_qualified_name,
                 'string'
             );
         }
-        if (! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
+        if ( ! class_exists($fully_qualified_name) && ! interface_exists($fully_qualified_name)) {
             if (strpos($fully_qualified_name, 'Interface') !== false) {
                 throw new InvalidInterfaceException($fully_qualified_name);
             }

core/EE_Load_Espresso_Core.core.php

Indentation +206 added lines, -206 removed lines

@@ -28,219 +28,219 @@
 class EE_Load_Espresso_Core implements EEI_Request_Decorator, EEI_Request_Stack_Core_App
 {
 
-    /**
-     * @var EE_Request $request
-     */
-    protected $request;
+	/**
+	 * @var EE_Request $request
+	 */
+	protected $request;
 
-    /**
-     * @var EE_Response $response
-     */
-    protected $response;
+	/**
+	 * @var EE_Response $response
+	 */
+	protected $response;
 
-    /**
-     * @var EE_Dependency_Map $dependency_map
-     */
-    protected $dependency_map;
+	/**
+	 * @var EE_Dependency_Map $dependency_map
+	 */
+	protected $dependency_map;
 
-    /**
-     * @var EE_Registry $registry
-     */
-    protected $registry;
+	/**
+	 * @var EE_Registry $registry
+	 */
+	protected $registry;
 
 
 
-    /**
-     * EE_Load_Espresso_Core constructor
-     */
+	/**
+	 * EE_Load_Espresso_Core constructor
+	 */
 	public function __construct() {
-        // deprecated functions
-        espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
-    }
-
-
-
-    /**
-     * handle
-     * sets hooks for running rest of system
-     * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
-     * starting EE Addons from any other point may lead to problems
-     *
-     * @param EE_Request  $request
-     * @param EE_Response $response
-     * @return EE_Response
-     * @throws \EventEspresso\core\exceptions\InvalidFilePathException
-     * @throws \EventEspresso\core\exceptions\InvalidClassException
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     */
-    public function handle_request(EE_Request $request, EE_Response $response)
-    {
-        $this->request = $request;
-        $this->response = $response;
-        // info about how to load classes required by other classes
-        $this->dependency_map = $this->_load_dependency_map();
-        // central repository for classes
-        $this->registry = $this->_load_registry();
-        do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
-        $loader = LoaderFactory::getLoader($this->registry);
-        $this->dependency_map->setLoader($loader);
-        // instantiate core Domain class
-        DomainFactory::getShared(
-            new FullyQualifiedName(
-                'EventEspresso\core\domain\Domain'
-            ),
-            array(
-                new FilePath(EVENT_ESPRESSO_MAIN_FILE),
-                Version::fromString(espresso_version())
-            )
-        );
-        // build DI container
-        // $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
-        // $OpenCoffeeShop->addRecipes();
-        // $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
-        // workarounds for PHP < 5.3
-        $this->_load_class_tools();
-        // deprecated functions
-        espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
-        // WP cron jobs
-        $loader->getShared('EE_Cron_Tasks');
-        $loader->getShared('EE_Request_Handler');
-        $loader->getShared('EE_System');
-        return $this->response;
-    }
-
-
-
-    /**
-     * @return EE_Request
-     */
-    public function request()
-    {
-        return $this->request;
-    }
-
-
-
-    /**
-     * @return EE_Response
-     */
-    public function response()
-    {
-        return $this->response;
-    }
-
-
-
-    /**
-     * @return EE_Dependency_Map
-     * @throws EE_Error
-     */
-    public function dependency_map()
-    {
-        if (! $this->dependency_map instanceof EE_Dependency_Map) {
-            throw new EE_Error(
-                sprintf(
-                    __('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
-                    print_r($this->dependency_map, true)
-                )
-            );
-        }
-        return $this->dependency_map;
-    }
-
-
-
-    /**
-     * @return EE_Registry
-     * @throws EE_Error
-     */
-    public function registry()
-    {
-        if (! $this->registry instanceof EE_Registry) {
-            throw new EE_Error(
-                sprintf(
-                    __('Invalid EE_Registry: "%1$s"', 'event_espresso'),
-                    print_r($this->registry, true)
-                )
-            );
-        }
-        return $this->registry;
-    }
-
-
-
-    /**
-     * @return EE_Dependency_Map
-     */
-    private function _load_dependency_map()
-    {
-        if (! is_readable(EE_CORE . 'EE_Dependency_Map.core.php')) {
-            EE_Error::add_error(
-                __('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            wp_die(EE_Error::get_notices());
-        }
-        require_once(EE_CORE . 'EE_Dependency_Map.core.php');
-        return EE_Dependency_Map::instance($this->request, $this->response);
-    }
-
-
-
-    /**
-     * @return EE_Registry
-     * @throws \InvalidArgumentException
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    private function _load_registry()
-    {
-        if (! is_readable(EE_CORE . 'EE_Registry.core.php')) {
-            EE_Error::add_error(
-                __('The EE_Registry core class could not be loaded.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-            wp_die(EE_Error::get_notices());
-        }
-        require_once(EE_CORE . 'EE_Registry.core.php');
-        return EE_Registry::instance($this->dependency_map);
-    }
-
-
-
-    /**
-     * @return void
-     */
-    private function _load_class_tools()
-    {
-        if (! is_readable(EE_HELPERS . 'EEH_Class_Tools.helper.php')) {
-            EE_Error::add_error(
-                __('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
-                __FILE__, __FUNCTION__, __LINE__
-            );
-        }
-        require_once(EE_HELPERS . 'EEH_Class_Tools.helper.php');
-    }
-
-
-
-    /**
-     * called after the request stack has been fully processed
-     * if any of the middleware apps has requested the plugin be deactivated, then we do that now
-     *
-     * @param EE_Request  $request
-     * @param EE_Response $response
-     */
-    public function handle_response(EE_Request $request, EE_Response $response)
-    {
-        if ($response->plugin_deactivated()) {
-            espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
-        }
-    }
+		// deprecated functions
+		espresso_load_required('EE_Base', EE_CORE . 'EE_Base.core.php');
+		espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+	}
+
+
+
+	/**
+	 * handle
+	 * sets hooks for running rest of system
+	 * provides "AHEE__EE_System__construct__complete" hook for EE Addons to use as their starting point
+	 * starting EE Addons from any other point may lead to problems
+	 *
+	 * @param EE_Request  $request
+	 * @param EE_Response $response
+	 * @return EE_Response
+	 * @throws \EventEspresso\core\exceptions\InvalidFilePathException
+	 * @throws \EventEspresso\core\exceptions\InvalidClassException
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 */
+	public function handle_request(EE_Request $request, EE_Response $response)
+	{
+		$this->request = $request;
+		$this->response = $response;
+		// info about how to load classes required by other classes
+		$this->dependency_map = $this->_load_dependency_map();
+		// central repository for classes
+		$this->registry = $this->_load_registry();
+		do_action('EE_Load_Espresso_Core__handle_request__initialize_core_loading');
+		$loader = LoaderFactory::getLoader($this->registry);
+		$this->dependency_map->setLoader($loader);
+		// instantiate core Domain class
+		DomainFactory::getShared(
+			new FullyQualifiedName(
+				'EventEspresso\core\domain\Domain'
+			),
+			array(
+				new FilePath(EVENT_ESPRESSO_MAIN_FILE),
+				Version::fromString(espresso_version())
+			)
+		);
+		// build DI container
+		// $OpenCoffeeShop = new EventEspresso\core\services\container\OpenCoffeeShop();
+		// $OpenCoffeeShop->addRecipes();
+		// $CoffeeShop = $OpenCoffeeShop->CoffeeShop();
+		// workarounds for PHP < 5.3
+		$this->_load_class_tools();
+		// deprecated functions
+		espresso_load_required('EE_Deprecated', EE_CORE . 'EE_Deprecated.core.php');
+		// WP cron jobs
+		$loader->getShared('EE_Cron_Tasks');
+		$loader->getShared('EE_Request_Handler');
+		$loader->getShared('EE_System');
+		return $this->response;
+	}
+
+
+
+	/**
+	 * @return EE_Request
+	 */
+	public function request()
+	{
+		return $this->request;
+	}
+
+
+
+	/**
+	 * @return EE_Response
+	 */
+	public function response()
+	{
+		return $this->response;
+	}
+
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 * @throws EE_Error
+	 */
+	public function dependency_map()
+	{
+		if (! $this->dependency_map instanceof EE_Dependency_Map) {
+			throw new EE_Error(
+				sprintf(
+					__('Invalid EE_Dependency_Map: "%1$s"', 'event_espresso'),
+					print_r($this->dependency_map, true)
+				)
+			);
+		}
+		return $this->dependency_map;
+	}
+
+
+
+	/**
+	 * @return EE_Registry
+	 * @throws EE_Error
+	 */
+	public function registry()
+	{
+		if (! $this->registry instanceof EE_Registry) {
+			throw new EE_Error(
+				sprintf(
+					__('Invalid EE_Registry: "%1$s"', 'event_espresso'),
+					print_r($this->registry, true)
+				)
+			);
+		}
+		return $this->registry;
+	}
+
+
+
+	/**
+	 * @return EE_Dependency_Map
+	 */
+	private function _load_dependency_map()
+	{
+		if (! is_readable(EE_CORE . 'EE_Dependency_Map.core.php')) {
+			EE_Error::add_error(
+				__('The EE_Dependency_Map core class could not be loaded.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			wp_die(EE_Error::get_notices());
+		}
+		require_once(EE_CORE . 'EE_Dependency_Map.core.php');
+		return EE_Dependency_Map::instance($this->request, $this->response);
+	}
+
+
+
+	/**
+	 * @return EE_Registry
+	 * @throws \InvalidArgumentException
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	private function _load_registry()
+	{
+		if (! is_readable(EE_CORE . 'EE_Registry.core.php')) {
+			EE_Error::add_error(
+				__('The EE_Registry core class could not be loaded.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+			wp_die(EE_Error::get_notices());
+		}
+		require_once(EE_CORE . 'EE_Registry.core.php');
+		return EE_Registry::instance($this->dependency_map);
+	}
+
+
+
+	/**
+	 * @return void
+	 */
+	private function _load_class_tools()
+	{
+		if (! is_readable(EE_HELPERS . 'EEH_Class_Tools.helper.php')) {
+			EE_Error::add_error(
+				__('The EEH_Class_Tools helper could not be loaded.', 'event_espresso'),
+				__FILE__, __FUNCTION__, __LINE__
+			);
+		}
+		require_once(EE_HELPERS . 'EEH_Class_Tools.helper.php');
+	}
+
+
+
+	/**
+	 * called after the request stack has been fully processed
+	 * if any of the middleware apps has requested the plugin be deactivated, then we do that now
+	 *
+	 * @param EE_Request  $request
+	 * @param EE_Response $response
+	 */
+	public function handle_response(EE_Request $request, EE_Response $response)
+	{
+		if ($response->plugin_deactivated()) {
+			espresso_deactivate_plugin(EE_PLUGIN_BASENAME);
+		}
+	}
 
 
 

core/domain/DomainBase.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 
 
     /**
-     * @return Version
+     * @return string
      */
     public function versionValueObject()
     {

Indentation +106 added lines, -106 removed lines

@@ -21,112 +21,112 @@
 abstract class DomainBase implements DomainInterface
 {
 
-    /**
-     * Equivalent to `__FILE__` for main plugin file.
-     *
-     * @var FilePath
-     */
-    private $plugin_file;
-
-    /**
-     * String indicating version for plugin
-     *
-     * @var string
-     */
-    private $version;
-
-    /**
-     * @var string $plugin_basename
-     */
-    private $plugin_basename;
-
-    /**
-     * @var string $plugin_path
-     */
-    private $plugin_path;
-
-    /**
-     * @var string $plugin_url
-     */
-    private $plugin_url;
-
-
-
-    /**
-     * Initializes internal properties.
-     *
-     * @param FilePath $plugin_file
-     * @param Version  $version
-     * @throws InvalidArgumentException
-     * @throws DomainException
-     */
-    public function __construct(FilePath $plugin_file, Version $version)
-    {
-        $this->plugin_file = $plugin_file;
-        $this->version = $version;
-        $this->plugin_basename = plugin_basename($this->pluginFile());
-        $this->plugin_path = plugin_dir_path($this->pluginFile());
-        $this->plugin_url = plugin_dir_url($this->pluginFile());
-    }
-
-
-    /**
-     * @return string
-     */
-    public function pluginFile()
-    {
-        return (string) $this->plugin_file;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginBasename()
-    {
-        return $this->plugin_basename;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginPath()
-    {
-        return $this->plugin_path;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function pluginUrl()
-    {
-        return $this->plugin_url;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function version()
-    {
-        return (string) $this->version;
-    }
-
-
-
-    /**
-     * @return Version
-     */
-    public function versionValueObject()
-    {
-        return $this->version;
-    }
+	/**
+	 * Equivalent to `__FILE__` for main plugin file.
+	 *
+	 * @var FilePath
+	 */
+	private $plugin_file;
+
+	/**
+	 * String indicating version for plugin
+	 *
+	 * @var string
+	 */
+	private $version;
+
+	/**
+	 * @var string $plugin_basename
+	 */
+	private $plugin_basename;
+
+	/**
+	 * @var string $plugin_path
+	 */
+	private $plugin_path;
+
+	/**
+	 * @var string $plugin_url
+	 */
+	private $plugin_url;
+
+
+
+	/**
+	 * Initializes internal properties.
+	 *
+	 * @param FilePath $plugin_file
+	 * @param Version  $version
+	 * @throws InvalidArgumentException
+	 * @throws DomainException
+	 */
+	public function __construct(FilePath $plugin_file, Version $version)
+	{
+		$this->plugin_file = $plugin_file;
+		$this->version = $version;
+		$this->plugin_basename = plugin_basename($this->pluginFile());
+		$this->plugin_path = plugin_dir_path($this->pluginFile());
+		$this->plugin_url = plugin_dir_url($this->pluginFile());
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginFile()
+	{
+		return (string) $this->plugin_file;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginBasename()
+	{
+		return $this->plugin_basename;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginPath()
+	{
+		return $this->plugin_path;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function pluginUrl()
+	{
+		return $this->plugin_url;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function version()
+	{
+		return (string) $this->version;
+	}
+
+
+
+	/**
+	 * @return Version
+	 */
+	public function versionValueObject()
+	{
+		return $this->version;
+	}
 
 
 }

core/domain/values/Version.php

Indentation +291 added lines, -291 removed lines

@@ -20,297 +20,297 @@
 class Version
 {
 
-    const RELEASE_TYPE_RC    = 'rc';
-
-    const RELEASE_TYPE_BETA  = 'beta';
-
-    const RELEASE_TYPE_DECAF = 'decaf';
-
-    const RELEASE_TYPE_PROD  = 'p';
-
-    /**
-     * @var int $major
-     */
-    private $major;
-
-    /**
-     * @var int $minor
-     */
-    private $minor;
-
-    /**
-     * @var int $patch
-     */
-    private $patch;
-
-    /**
-     * @var string $release
-     */
-    private $release;
-
-    /**
-     * @var int $build
-     */
-    private $build;
-
-
-    /**
-     * Version constructor.
-     *
-     * @param int    $major
-     * @param int    $minor
-     * @param int    $patch
-     * @param string $release
-     * @param int    $build
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function __construct($major, $minor, $patch, $release = Version::RELEASE_TYPE_PROD, $build = 0)
-    {
-        $this->setMajor($major);
-        $this->setMinor($minor);
-        $this->setPatch($patch);
-        $this->setRelease($release);
-        $this->setBuild($build);
-    }
-
-
-    /**
-     * @param string $version_string
-     * @return Version
-     * @throws InvalidArgumentException
-     */
-    public static function fromString($version_string)
-    {
-        // compare incoming version string against the lowest possible valid version
-        if (version_compare($version_string, '0.0.1.dev.001', '<')) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__('"%1$s" is not a valid version string', 'event_espresso'),
-                    $version_string
-                )
-            );
-        }
-        // break apart incoming version string
-        $version_parts = explode('.', $version_string);
-        // verify that version string at least contains {major}.{minor}.{patch}
-        if (count($version_parts) < 3) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        'At minimum, a version string needs to be in a "{major}.{minor}.{patch}" format, therefore "%1$s" is not valid',
-                        'event_espresso'
-                    ),
-                    $version_string
-                )
-            );
-        }
-        // add defaults for missing pieces
-        $version_parts += array(0,0,0,'p',0);
-        // reassign to individual variables
-        list($major, $minor, $patch, $release, $build) = $version_parts;
-        return new Version(
-            (int) $major,
-            (int) $minor,
-            (int) $patch,
-            $release,
-            (int) $build
-        );
-    }
-
-
-    /**
-     * @return int
-     */
-    public function major()
-    {
-        return $this->major;
-    }
-
-
-    /**
-     * @param int|string $major
-     * @throws InvalidDataTypeException
-     */
-    private function setMajor($major)
-    {
-        if (! is_int($major)) {
-            throw new InvalidDataTypeException(
-                '$major',
-                $major,
-                'integer'
-            );
-        }
-        $this->major = absint($major);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function minor()
-    {
-        return $this->minor;
-    }
-
-
-    /**
-     * @param int|string $minor
-     * @throws InvalidDataTypeException
-     */
-    private function setMinor($minor)
-    {
-        if (! is_int($minor)) {
-            throw new InvalidDataTypeException(
-                '$minor',
-                $minor,
-                'integer'
-            );
-        }
-        $this->minor = absint($minor);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function patch()
-    {
-        return $this->patch;
-    }
-
-
-    /**
-     * @param int|string $patch
-     * @throws InvalidDataTypeException
-     */
-    private function setPatch($patch)
-    {
-        if (! is_int($patch)) {
-            throw new InvalidDataTypeException(
-                '$patch',
-                $patch,
-                'integer'
-            );
-        }
-        $this->patch = absint($patch);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function release()
-    {
-        return $this->release;
-    }
-
-
-    /**
-     * @param string $release
-     * @throws InvalidArgumentException
-     */
-    private function setRelease($release)
-    {
-        $valid_release_types = array(
-            Version::RELEASE_TYPE_RC,
-            Version::RELEASE_TYPE_BETA,
-            Version::RELEASE_TYPE_DECAF,
-            Version::RELEASE_TYPE_PROD,
-        );
-        if (! in_array($release, $valid_release_types, true)) {
-            throw new InvalidArgumentException(
-                sprintf(
-                    esc_html__(
-                        '"%1$s" is not a valid release type. Please use one of the following values: %2$s',
-                        'event_espresso'
-                    ),
-                    $release,
-                    implode(', ', $valid_release_types)
-                )
-            );
-        }
-        $this->release = $release;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function build()
-    {
-        return $this->build;
-    }
-
-
-    /**
-     * @param int|string $build
-     * @throws InvalidDataTypeException
-     */
-    private function setBuild($build)
-    {
-        if (! is_int($build)) {
-            throw new InvalidDataTypeException(
-                '$build',
-                $build,
-                'integer'
-            );
-        }
-        $this->build = absint($build);
-    }
-
-
-    /**
-     * @param Version $other_version
-     * @return int
-     */
-    public function compare(Version $other_version)
-    {
-        return version_compare((string) $this, (string) $other_version);
-    }
-
-
-    /**
-     * @param Version $other_version
-     * @return bool
-     */
-    public function equals(Version $other_version)
-    {
-        return version_compare((string) $this, (string) $other_version, '==');
-    }
-
-
-    /**
-     * @param Version $other_version
-     * @return bool
-     */
-    public function newerThan(Version $other_version)
-    {
-        return version_compare((string) $this, (string) $other_version, '>');
-    }
-
-
-    /**
-     * @param Version $other_version
-     * @return bool
-     */
-    public function olderThan(Version $other_version)
-    {
-        return version_compare((string) $this, (string) $other_version, '<');
-    }
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $version_string = "{$this->major}.{$this->minor}.{$this->patch}.{$this->release}";
-        if($this->release !== Version::RELEASE_TYPE_PROD && $this->release !== Version::RELEASE_TYPE_DECAF) {
-            $version_string .= '.' . str_pad($this->build, 3, '0', STR_PAD_LEFT);
-        }
-        return $version_string;
-    }
+	const RELEASE_TYPE_RC    = 'rc';
+
+	const RELEASE_TYPE_BETA  = 'beta';
+
+	const RELEASE_TYPE_DECAF = 'decaf';
+
+	const RELEASE_TYPE_PROD  = 'p';
+
+	/**
+	 * @var int $major
+	 */
+	private $major;
+
+	/**
+	 * @var int $minor
+	 */
+	private $minor;
+
+	/**
+	 * @var int $patch
+	 */
+	private $patch;
+
+	/**
+	 * @var string $release
+	 */
+	private $release;
+
+	/**
+	 * @var int $build
+	 */
+	private $build;
+
+
+	/**
+	 * Version constructor.
+	 *
+	 * @param int    $major
+	 * @param int    $minor
+	 * @param int    $patch
+	 * @param string $release
+	 * @param int    $build
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($major, $minor, $patch, $release = Version::RELEASE_TYPE_PROD, $build = 0)
+	{
+		$this->setMajor($major);
+		$this->setMinor($minor);
+		$this->setPatch($patch);
+		$this->setRelease($release);
+		$this->setBuild($build);
+	}
+
+
+	/**
+	 * @param string $version_string
+	 * @return Version
+	 * @throws InvalidArgumentException
+	 */
+	public static function fromString($version_string)
+	{
+		// compare incoming version string against the lowest possible valid version
+		if (version_compare($version_string, '0.0.1.dev.001', '<')) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__('"%1$s" is not a valid version string', 'event_espresso'),
+					$version_string
+				)
+			);
+		}
+		// break apart incoming version string
+		$version_parts = explode('.', $version_string);
+		// verify that version string at least contains {major}.{minor}.{patch}
+		if (count($version_parts) < 3) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'At minimum, a version string needs to be in a "{major}.{minor}.{patch}" format, therefore "%1$s" is not valid',
+						'event_espresso'
+					),
+					$version_string
+				)
+			);
+		}
+		// add defaults for missing pieces
+		$version_parts += array(0,0,0,'p',0);
+		// reassign to individual variables
+		list($major, $minor, $patch, $release, $build) = $version_parts;
+		return new Version(
+			(int) $major,
+			(int) $minor,
+			(int) $patch,
+			$release,
+			(int) $build
+		);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function major()
+	{
+		return $this->major;
+	}
+
+
+	/**
+	 * @param int|string $major
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMajor($major)
+	{
+		if (! is_int($major)) {
+			throw new InvalidDataTypeException(
+				'$major',
+				$major,
+				'integer'
+			);
+		}
+		$this->major = absint($major);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function minor()
+	{
+		return $this->minor;
+	}
+
+
+	/**
+	 * @param int|string $minor
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMinor($minor)
+	{
+		if (! is_int($minor)) {
+			throw new InvalidDataTypeException(
+				'$minor',
+				$minor,
+				'integer'
+			);
+		}
+		$this->minor = absint($minor);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function patch()
+	{
+		return $this->patch;
+	}
+
+
+	/**
+	 * @param int|string $patch
+	 * @throws InvalidDataTypeException
+	 */
+	private function setPatch($patch)
+	{
+		if (! is_int($patch)) {
+			throw new InvalidDataTypeException(
+				'$patch',
+				$patch,
+				'integer'
+			);
+		}
+		$this->patch = absint($patch);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function release()
+	{
+		return $this->release;
+	}
+
+
+	/**
+	 * @param string $release
+	 * @throws InvalidArgumentException
+	 */
+	private function setRelease($release)
+	{
+		$valid_release_types = array(
+			Version::RELEASE_TYPE_RC,
+			Version::RELEASE_TYPE_BETA,
+			Version::RELEASE_TYPE_DECAF,
+			Version::RELEASE_TYPE_PROD,
+		);
+		if (! in_array($release, $valid_release_types, true)) {
+			throw new InvalidArgumentException(
+				sprintf(
+					esc_html__(
+						'"%1$s" is not a valid release type. Please use one of the following values: %2$s',
+						'event_espresso'
+					),
+					$release,
+					implode(', ', $valid_release_types)
+				)
+			);
+		}
+		$this->release = $release;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function build()
+	{
+		return $this->build;
+	}
+
+
+	/**
+	 * @param int|string $build
+	 * @throws InvalidDataTypeException
+	 */
+	private function setBuild($build)
+	{
+		if (! is_int($build)) {
+			throw new InvalidDataTypeException(
+				'$build',
+				$build,
+				'integer'
+			);
+		}
+		$this->build = absint($build);
+	}
+
+
+	/**
+	 * @param Version $other_version
+	 * @return int
+	 */
+	public function compare(Version $other_version)
+	{
+		return version_compare((string) $this, (string) $other_version);
+	}
+
+
+	/**
+	 * @param Version $other_version
+	 * @return bool
+	 */
+	public function equals(Version $other_version)
+	{
+		return version_compare((string) $this, (string) $other_version, '==');
+	}
+
+
+	/**
+	 * @param Version $other_version
+	 * @return bool
+	 */
+	public function newerThan(Version $other_version)
+	{
+		return version_compare((string) $this, (string) $other_version, '>');
+	}
+
+
+	/**
+	 * @param Version $other_version
+	 * @return bool
+	 */
+	public function olderThan(Version $other_version)
+	{
+		return version_compare((string) $this, (string) $other_version, '<');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$version_string = "{$this->major}.{$this->minor}.{$this->patch}.{$this->release}";
+		if($this->release !== Version::RELEASE_TYPE_PROD && $this->release !== Version::RELEASE_TYPE_DECAF) {
+			$version_string .= '.' . str_pad($this->build, 3, '0', STR_PAD_LEFT);
+		}
+		return $version_string;
+	}
 
 
 

Spacing +8 added lines, -8 removed lines

@@ -106,7 +106,7 @@ 
             );
         }
         // add defaults for missing pieces
-        $version_parts += array(0,0,0,'p',0);
+        $version_parts += array(0, 0, 0, 'p', 0);
         // reassign to individual variables
         list($major, $minor, $patch, $release, $build) = $version_parts;
         return new Version(
@@ -134,7 +134,7 @@ 
      */
     private function setMajor($major)
     {
-        if (! is_int($major)) {
+        if ( ! is_int($major)) {
             throw new InvalidDataTypeException(
                 '$major',
                 $major,
@@ -160,7 +160,7 @@ 
      */
     private function setMinor($minor)
     {
-        if (! is_int($minor)) {
+        if ( ! is_int($minor)) {
             throw new InvalidDataTypeException(
                 '$minor',
                 $minor,
@@ -186,7 +186,7 @@ 
      */
     private function setPatch($patch)
     {
-        if (! is_int($patch)) {
+        if ( ! is_int($patch)) {
             throw new InvalidDataTypeException(
                 '$patch',
                 $patch,
@@ -218,7 +218,7 @@ 
             Version::RELEASE_TYPE_DECAF,
             Version::RELEASE_TYPE_PROD,
         );
-        if (! in_array($release, $valid_release_types, true)) {
+        if ( ! in_array($release, $valid_release_types, true)) {
             throw new InvalidArgumentException(
                 sprintf(
                     esc_html__(
@@ -249,7 +249,7 @@ 
      */
     private function setBuild($build)
     {
-        if (! is_int($build)) {
+        if ( ! is_int($build)) {
             throw new InvalidDataTypeException(
                 '$build',
                 $build,
@@ -306,8 +306,8 @@ 
     public function __toString()
     {
         $version_string = "{$this->major}.{$this->minor}.{$this->patch}.{$this->release}";
-        if($this->release !== Version::RELEASE_TYPE_PROD && $this->release !== Version::RELEASE_TYPE_DECAF) {
-            $version_string .= '.' . str_pad($this->build, 3, '0', STR_PAD_LEFT);
+        if ($this->release !== Version::RELEASE_TYPE_PROD && $this->release !== Version::RELEASE_TYPE_DECAF) {
+            $version_string .= '.'.str_pad($this->build, 3, '0', STR_PAD_LEFT);
         }
         return $version_string;
     }