eventespresso / event-espresso-core

espresso.php

Indentation +192 added lines, -192 removed lines

@@ -38,217 +38,217 @@
  * @since       4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.3.9');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.9.50.rc.014');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.9.50.rc.014');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
-        /**
-         *    espresso_load_error_handling
-         *    this function loads EE's class for handling exceptions and errors
-         */
-        function espresso_load_error_handling()
-        {
-            static $error_handling_loaded = false;
-            if ($error_handling_loaded) {
-                return;
-            }
-            // load debugging tools
-            if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
-                require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
-                \EEH_Debug_Tools::instance();
-            }
-            // load error handling
-            if (is_readable(EE_CORE . 'EE_Error.core.php')) {
-                require_once EE_CORE . 'EE_Error.core.php';
-            } else {
-                wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
-            }
-            $error_handling_loaded = true;
-        }
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		/**
+		 *    espresso_load_error_handling
+		 *    this function loads EE's class for handling exceptions and errors
+		 */
+		function espresso_load_error_handling()
+		{
+			static $error_handling_loaded = false;
+			if ($error_handling_loaded) {
+				return;
+			}
+			// load debugging tools
+			if (WP_DEBUG === true && is_readable(EE_HELPERS . 'EEH_Debug_Tools.helper.php')) {
+				require_once   EE_HELPERS . 'EEH_Debug_Tools.helper.php';
+				\EEH_Debug_Tools::instance();
+			}
+			// load error handling
+			if (is_readable(EE_CORE . 'EE_Error.core.php')) {
+				require_once EE_CORE . 'EE_Error.core.php';
+			} else {
+				wp_die(esc_html__('The EE_Error core class could not be loaded.', 'event_espresso'));
+			}
+			$error_handling_loaded = true;
+		}
 
-        /**
-         *    espresso_load_required
-         *    given a class name and path, this function will load that file or throw an exception
-         *
-         * @param    string $classname
-         * @param    string $full_path_to_file
-         * @throws    EE_Error
-         */
-        function espresso_load_required($classname, $full_path_to_file)
-        {
-            if (is_readable($full_path_to_file)) {
-                require_once $full_path_to_file;
-            } else {
-                throw new \EE_Error (
-                    sprintf(
-                        esc_html__(
-                            'The %s class file could not be located or is not readable due to file permissions.',
-                            'event_espresso'
-                        ),
-                        $classname
-                    )
-                );
-            }
-        }
+		/**
+		 *    espresso_load_required
+		 *    given a class name and path, this function will load that file or throw an exception
+		 *
+		 * @param    string $classname
+		 * @param    string $full_path_to_file
+		 * @throws    EE_Error
+		 */
+		function espresso_load_required($classname, $full_path_to_file)
+		{
+			if (is_readable($full_path_to_file)) {
+				require_once $full_path_to_file;
+			} else {
+				throw new \EE_Error (
+					sprintf(
+						esc_html__(
+							'The %s class file could not be located or is not readable due to file permissions.',
+							'event_espresso'
+						),
+						$classname
+					)
+				);
+			}
+		}
 
-        /**
-         * @since 4.9.27
-         * @throws \EE_Error
-         * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-         * @throws \EventEspresso\core\exceptions\InvalidEntityException
-         * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
-         * @throws \EventEspresso\core\exceptions\InvalidClassException
-         * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
-         * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
-         * @throws \OutOfBoundsException
-         */
-        function bootstrap_espresso()
-        {
-            require_once __DIR__ . '/core/espresso_definitions.php';
-            try {
-                espresso_load_error_handling();
-                espresso_load_required(
-                    'EEH_Base',
-                    EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
-                );
-                espresso_load_required(
-                    'EEH_File',
-                    EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
-                );
-                espresso_load_required(
-                    'EEH_Array',
-                    EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
-                );
-                // instantiate and configure PSR4 autoloader
-                espresso_load_required(
-                    'Psr4Autoloader',
-                    EE_CORE . 'Psr4Autoloader.php'
-                );
-                espresso_load_required(
-                    'EE_Psr4AutoloaderInit',
-                    EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
-                );
-                $AutoloaderInit = new EE_Psr4AutoloaderInit();
-                $AutoloaderInit->initializeAutoloader();
-                espresso_load_required(
-                    'EE_Request',
-                    EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
-                );
-                espresso_load_required(
-                    'EE_Response',
-                    EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
-                );
-                espresso_load_required(
-                    'EE_Bootstrap',
-                    EE_CORE . 'EE_Bootstrap.core.php'
-                );
-                // bootstrap EE and the request stack
-                new EE_Bootstrap(
-                    new EE_Request($_GET, $_POST, $_COOKIE),
-                    new EE_Response()
-                );
-            } catch (Exception $e) {
-                require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
-                new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
-            }
-        }
-        bootstrap_espresso();
-    }
+		/**
+		 * @since 4.9.27
+		 * @throws \EE_Error
+		 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+		 * @throws \EventEspresso\core\exceptions\InvalidEntityException
+		 * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
+		 * @throws \EventEspresso\core\exceptions\InvalidClassException
+		 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceExistsException
+		 * @throws \EventEspresso\core\services\container\exceptions\ServiceNotFoundException
+		 * @throws \OutOfBoundsException
+		 */
+		function bootstrap_espresso()
+		{
+			require_once __DIR__ . '/core/espresso_definitions.php';
+			try {
+				espresso_load_error_handling();
+				espresso_load_required(
+					'EEH_Base',
+					EE_CORE . 'helpers' . DS . 'EEH_Base.helper.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'interfaces' . DS . 'EEHI_File.interface.php'
+				);
+				espresso_load_required(
+					'EEH_File',
+					EE_CORE . 'helpers' . DS . 'EEH_File.helper.php'
+				);
+				espresso_load_required(
+					'EEH_Array',
+					EE_CORE . 'helpers' . DS . 'EEH_Array.helper.php'
+				);
+				// instantiate and configure PSR4 autoloader
+				espresso_load_required(
+					'Psr4Autoloader',
+					EE_CORE . 'Psr4Autoloader.php'
+				);
+				espresso_load_required(
+					'EE_Psr4AutoloaderInit',
+					EE_CORE . 'EE_Psr4AutoloaderInit.core.php'
+				);
+				$AutoloaderInit = new EE_Psr4AutoloaderInit();
+				$AutoloaderInit->initializeAutoloader();
+				espresso_load_required(
+					'EE_Request',
+					EE_CORE . 'request_stack' . DS . 'EE_Request.core.php'
+				);
+				espresso_load_required(
+					'EE_Response',
+					EE_CORE . 'request_stack' . DS . 'EE_Response.core.php'
+				);
+				espresso_load_required(
+					'EE_Bootstrap',
+					EE_CORE . 'EE_Bootstrap.core.php'
+				);
+				// bootstrap EE and the request stack
+				new EE_Bootstrap(
+					new EE_Request($_GET, $_POST, $_COOKIE),
+					new EE_Response()
+				);
+			} catch (Exception $e) {
+				require_once EE_CORE . 'exceptions' . DS . 'ExceptionStackTraceDisplay.php';
+				new EventEspresso\core\exceptions\ExceptionStackTraceDisplay($e);
+			}
+		}
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }

core/domain/values/currency/Money.php

Doc Comments +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
      * Returns the money amount as an unformatted string
      * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
      *
-     * @return string
+     * @return double
      */
     public function amount()
     {
@@ -178,7 +178,7 @@ 
     /**
      * Returns the money SUBUNITS amount as an INTEGER
      *
-     * @return integer
+     * @return double
      */
     public function amountInSubunits()
     {

Indentation +357 added lines, -357 removed lines

@@ -26,363 +26,363 @@
 class Money
 {
 
-    /**
-     * number of decimal places to be added to currencies for internal computations,
-     * but removed before any output or formatting is applied.
-     * This allows us to avoid rounding errors during calculations.
-     */
-    const EXTRA_PRECISION = 3;
-
-    /**
-     * @var int $amount
-     */
-    private $amount;
-
-    /**
-     * @var Currency $currency
-     */
-    private $currency;
-
-    /**
-     * @var Calculator $calculator
-     */
-    protected $calculator;
-
-    /**
-     * @var MoneyFormatter[] $formatters
-     */
-    protected $formatters;
-
-
-
-    /**
-     * Money constructor.
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param Currency         $currency
-     * @param Calculator       $calculator
-     * @param MoneyFormatter[] $formatters
-     * @throws InvalidDataTypeException
-     */
-    public function __construct($amount, Currency $currency, Calculator $calculator, array $formatters)
-    {
-        $this->currency   = $currency;
-        $this->amount     = (string) $this->parseAmount($amount);
-        $this->calculator = $calculator;
-        $this->formatters = $formatters;
-    }
-
-
-
-    /**
-     * @return Calculator
-     */
-    protected function calculator()
-    {
-        return $this->calculator;
-    }
-
-
-
-    /**
-     * @return MoneyFormatter[]
-     */
-    protected function formatters()
-    {
-        return $this->formatters;
-    }
-
-
-
-    /**
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @return float|int|number|string
-     * @throws InvalidDataTypeException
-     */
-    private function parseAmount($amount)
-    {
-        $type = gettype($amount);
-        switch ($type) {
-            case 'integer' :
-            case 'double' :
-            case 'string' :
-                break;
-            default  :
-                throw new InvalidDataTypeException(
-                    '$amount',
-                    $amount,
-                    'integer (or float or string)'
-                );
-        }
-        if ($this->currency->decimalMark() !== '.') {
-            // remove thousands separator and replace decimal place with standard decimal.
-            $amount = str_replace(
-                array(
-                    $this->currency->thousands(),
-                    $this->currency->decimalMark(),
-                ),
-                array(
-                    '',
-                    '.',
-                ),
-                $amount
-            );
-        }
-        // remove any non numeric values but leave the decimal
-        $amount = (float) preg_replace('/([^0-9\\.])/', '', $amount);
-        // shift the decimal position by the number of decimal places used internally
-        // ex: 12.5 for a currency using 2 decimal places, would become 1250
-        // then if our extra internal precision was 3, it would become 1250000
-        $amount *= pow(10, $this->precision());
-        // then round up the remaining value if there is still a fractional amount left
-        $amount = round($amount);
-        return $amount;
-    }
-
-
-
-    /**
-     * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
-     *
-     * @param bool $positive
-     * @return int
-     */
-    private function precision($positive = true)
-    {
-        $sign = $positive ? 1 : -1;
-        return ((int) $this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
-    }
-
-
-
-    /**
-     * Returns the money amount as an unformatted string
-     * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
-     *
-     * @return string
-     */
-    public function amount()
-    {
-        // shift the decimal position BACK by the number of decimal places used internally
-        // ex: 1250 for a currency using 2 decimal places, would become 12.50
-        $amount = (string) $this->amount * pow(10, $this->precision(false));
-        // then shave off our extra internal precision using the number of decimal places for the currency
-        $amount = round($amount, $this->currency->decimalPlaces());
-        return $amount;
-    }
-
-
-
-    /**
-     * Returns the money SUBUNITS amount as an INTEGER
-     *
-     * @return integer
-     */
-    public function amountInSubunits()
-    {
-        // shift the decimal position BACK
-        // by the number of decimal places used internally by the extra internal precision
-        // ex: if our extra internal precision was 3,
-        // then 1250000 would become 1250
-        $amount = (string) $this->amount * pow(10, Money::EXTRA_PRECISION * -1);
-        // then shave off anything after the decimal
-        $amount = round($amount);
-        return $amount;
-    }
-
-
-
-    /**
-     * applies formatting based on the specified formatting level
-     * corresponding to one of the constants on \EventEspresso\core\services\currency\MoneyFormatter
-     *
-     * @param int $formatting_level
-     * @return string
-     */
-    public function format($formatting_level = MoneyFormatter::ADD_THOUSANDS)
-    {
-        $formatted_amount = $this->amount();
-        $formatters       = $this->formatters();
-        // if we are applying thousands formatting...
-        if ($formatting_level >= MoneyFormatter::ADD_THOUSANDS) {
-            // then let's remove decimal formatting since it's included in thousands formatting
-            unset($formatters[ MoneyFormatter::DECIMAL_ONLY ]);
-        }
-        for ($x = 1; $x <= $formatting_level; $x++) {
-            if (isset($formatters[ $x ]) && $formatters[ $x ] instanceof MoneyFormatter) {
-                $formatted_amount = $formatters[ $x ]->format($formatted_amount, $this->currency);
-            }
-        }
-        return $formatted_amount;
-    }
-
-
-
-    /**
-     * Returns the Currency object for this money
-     *
-     * @return Currency
-     */
-    public function currency()
-    {
-        return $this->currency;
-    }
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function add(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->add(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency(),
-            $this->calculator(),
-            $this->formatters()
-        );
-    }
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param Money $other
-     * @return Money
-     * @throws InvalidArgumentException
-     */
-    public function subtract(Money $other)
-    {
-        $this->verifySameCurrency($other->currency());
-        return new Money(
-            $this->calculator()->subtract(
-                $this->amount(),
-                $other->amount()
-            ),
-            $this->currency(),
-            $this->calculator(),
-            $this->formatters()
-        );
-    }
-
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param float|int|string $multiplier
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->multiply(
-                $this->amount(),
-                $multiplier,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency(),
-            $this->calculator(),
-            $this->formatters()
-        );
-    }
-
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param float|int|string $divisor
-     * @param int              $rounding_mode
-     * @return Money
-     * @throws InvalidDataTypeException
-     */
-    public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return new Money(
-            $this->calculator()->divide(
-                $this->amount(),
-                $divisor,
-                $this->precision(),
-                $rounding_mode
-            ),
-            $this->currency(),
-            $this->calculator(),
-            $this->formatters()
-        );
-    }
-
-
-
-    /**
-     * @param Currency $other_currency
-     * @throws InvalidArgumentException
-     */
-    public function verifySameCurrency(Currency $other_currency)
-    {
-        if ($this->currency()->equals($other_currency) !== true) {
-            throw new InvalidArgumentException(
-                esc_html__(
-                    'Currencies must be the same in order to add or subtract their values.',
-                    'event_espresso'
-                )
-            );
-        }
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->format(MoneyFormatter::DECIMAL_ONLY);
-    }
-
-
-
-    /**
-     * factory method that returns a Money object for the currency specified as if it were a class method
-     * example: Money::USD(12.5);
-     * money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     * example: $12.5 USD would equate to a value amount of 12.50
-     *
-     * @param string $currency_code
-     * @param array  $arguments
-     * @return Money
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws EE_Error
-     * @throws InvalidInterfaceException
-     */
-    public static function __callStatic($currency_code, $arguments)
-    {
-        return new Money(
-            $arguments[0],
-            CreateCurrency::fromCode($currency_code),
-            CreateMoney::calculator(),
-            CreateMoney::formatters()
-        );
-    }
+	/**
+	 * number of decimal places to be added to currencies for internal computations,
+	 * but removed before any output or formatting is applied.
+	 * This allows us to avoid rounding errors during calculations.
+	 */
+	const EXTRA_PRECISION = 3;
+
+	/**
+	 * @var int $amount
+	 */
+	private $amount;
+
+	/**
+	 * @var Currency $currency
+	 */
+	private $currency;
+
+	/**
+	 * @var Calculator $calculator
+	 */
+	protected $calculator;
+
+	/**
+	 * @var MoneyFormatter[] $formatters
+	 */
+	protected $formatters;
+
+
+
+	/**
+	 * Money constructor.
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param Currency         $currency
+	 * @param Calculator       $calculator
+	 * @param MoneyFormatter[] $formatters
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct($amount, Currency $currency, Calculator $calculator, array $formatters)
+	{
+		$this->currency   = $currency;
+		$this->amount     = (string) $this->parseAmount($amount);
+		$this->calculator = $calculator;
+		$this->formatters = $formatters;
+	}
+
+
+
+	/**
+	 * @return Calculator
+	 */
+	protected function calculator()
+	{
+		return $this->calculator;
+	}
+
+
+
+	/**
+	 * @return MoneyFormatter[]
+	 */
+	protected function formatters()
+	{
+		return $this->formatters;
+	}
+
+
+
+	/**
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @return float|int|number|string
+	 * @throws InvalidDataTypeException
+	 */
+	private function parseAmount($amount)
+	{
+		$type = gettype($amount);
+		switch ($type) {
+			case 'integer' :
+			case 'double' :
+			case 'string' :
+				break;
+			default  :
+				throw new InvalidDataTypeException(
+					'$amount',
+					$amount,
+					'integer (or float or string)'
+				);
+		}
+		if ($this->currency->decimalMark() !== '.') {
+			// remove thousands separator and replace decimal place with standard decimal.
+			$amount = str_replace(
+				array(
+					$this->currency->thousands(),
+					$this->currency->decimalMark(),
+				),
+				array(
+					'',
+					'.',
+				),
+				$amount
+			);
+		}
+		// remove any non numeric values but leave the decimal
+		$amount = (float) preg_replace('/([^0-9\\.])/', '', $amount);
+		// shift the decimal position by the number of decimal places used internally
+		// ex: 12.5 for a currency using 2 decimal places, would become 1250
+		// then if our extra internal precision was 3, it would become 1250000
+		$amount *= pow(10, $this->precision());
+		// then round up the remaining value if there is still a fractional amount left
+		$amount = round($amount);
+		return $amount;
+	}
+
+
+
+	/**
+	 * adds or subtracts additional decimal places based on the value of the Money::EXTRA_PRECISION constant
+	 *
+	 * @param bool $positive
+	 * @return int
+	 */
+	private function precision($positive = true)
+	{
+		$sign = $positive ? 1 : -1;
+		return ((int) $this->currency->decimalPlaces() + Money::EXTRA_PRECISION) * $sign;
+	}
+
+
+
+	/**
+	 * Returns the money amount as an unformatted string
+	 * IF YOU REQUIRE A FORMATTED STRING, THEN USE Money::format()
+	 *
+	 * @return string
+	 */
+	public function amount()
+	{
+		// shift the decimal position BACK by the number of decimal places used internally
+		// ex: 1250 for a currency using 2 decimal places, would become 12.50
+		$amount = (string) $this->amount * pow(10, $this->precision(false));
+		// then shave off our extra internal precision using the number of decimal places for the currency
+		$amount = round($amount, $this->currency->decimalPlaces());
+		return $amount;
+	}
+
+
+
+	/**
+	 * Returns the money SUBUNITS amount as an INTEGER
+	 *
+	 * @return integer
+	 */
+	public function amountInSubunits()
+	{
+		// shift the decimal position BACK
+		// by the number of decimal places used internally by the extra internal precision
+		// ex: if our extra internal precision was 3,
+		// then 1250000 would become 1250
+		$amount = (string) $this->amount * pow(10, Money::EXTRA_PRECISION * -1);
+		// then shave off anything after the decimal
+		$amount = round($amount);
+		return $amount;
+	}
+
+
+
+	/**
+	 * applies formatting based on the specified formatting level
+	 * corresponding to one of the constants on \EventEspresso\core\services\currency\MoneyFormatter
+	 *
+	 * @param int $formatting_level
+	 * @return string
+	 */
+	public function format($formatting_level = MoneyFormatter::ADD_THOUSANDS)
+	{
+		$formatted_amount = $this->amount();
+		$formatters       = $this->formatters();
+		// if we are applying thousands formatting...
+		if ($formatting_level >= MoneyFormatter::ADD_THOUSANDS) {
+			// then let's remove decimal formatting since it's included in thousands formatting
+			unset($formatters[ MoneyFormatter::DECIMAL_ONLY ]);
+		}
+		for ($x = 1; $x <= $formatting_level; $x++) {
+			if (isset($formatters[ $x ]) && $formatters[ $x ] instanceof MoneyFormatter) {
+				$formatted_amount = $formatters[ $x ]->format($formatted_amount, $this->currency);
+			}
+		}
+		return $formatted_amount;
+	}
+
+
+
+	/**
+	 * Returns the Currency object for this money
+	 *
+	 * @return Currency
+	 */
+	public function currency()
+	{
+		return $this->currency;
+	}
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function add(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->add(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency(),
+			$this->calculator(),
+			$this->formatters()
+		);
+	}
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param Money $other
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 */
+	public function subtract(Money $other)
+	{
+		$this->verifySameCurrency($other->currency());
+		return new Money(
+			$this->calculator()->subtract(
+				$this->amount(),
+				$other->amount()
+			),
+			$this->currency(),
+			$this->calculator(),
+			$this->formatters()
+		);
+	}
+
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $multiplier
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function multiply($multiplier, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->multiply(
+				$this->amount(),
+				$multiplier,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency(),
+			$this->calculator(),
+			$this->formatters()
+		);
+	}
+
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $divisor
+	 * @param int              $rounding_mode
+	 * @return Money
+	 * @throws InvalidDataTypeException
+	 */
+	public function divide($divisor, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return new Money(
+			$this->calculator()->divide(
+				$this->amount(),
+				$divisor,
+				$this->precision(),
+				$rounding_mode
+			),
+			$this->currency(),
+			$this->calculator(),
+			$this->formatters()
+		);
+	}
+
+
+
+	/**
+	 * @param Currency $other_currency
+	 * @throws InvalidArgumentException
+	 */
+	public function verifySameCurrency(Currency $other_currency)
+	{
+		if ($this->currency()->equals($other_currency) !== true) {
+			throw new InvalidArgumentException(
+				esc_html__(
+					'Currencies must be the same in order to add or subtract their values.',
+					'event_espresso'
+				)
+			);
+		}
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->format(MoneyFormatter::DECIMAL_ONLY);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object for the currency specified as if it were a class method
+	 * example: Money::USD(12.5);
+	 * money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 * example: $12.5 USD would equate to a value amount of 12.50
+	 *
+	 * @param string $currency_code
+	 * @param array  $arguments
+	 * @return Money
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws EE_Error
+	 * @throws InvalidInterfaceException
+	 */
+	public static function __callStatic($currency_code, $arguments)
+	{
+		return new Money(
+			$arguments[0],
+			CreateCurrency::fromCode($currency_code),
+			CreateMoney::calculator(),
+			CreateMoney::formatters()
+		);
+	}
 
 
 }

core/services/currency/DefaultCalculator.php

Indentation +76 added lines, -76 removed lines

@@ -21,82 +21,82 @@
 
 
 
-    /**
-     * returns true if a calculator is supported as determined by loaded server extensions
-     *
-     * @return bool
-     */
-    public function isSupported()
-    {
-        return true;
-    }
-
-
-
-    /**
-     * adds the supplied Money amount to this Money amount
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $amount_to_add
-     * @return string
-     */
-    public function add($amount, $amount_to_add)
-    {
-        return (string) ($amount + $amount_to_add);
-    }
-
-
-
-    /**
-     * subtracts the supplied Money amount from this Money amount
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $amount_to_subtract
-     * @return string
-     */
-    public function subtract($amount, $amount_to_subtract)
-    {
-        return (string) ($amount - $amount_to_subtract);
-    }
-
-
-
-    /**
-     * multiplies this Money amount by the supplied $multiplier
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $multiplier
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public function multiply($amount, $multiplier, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        return $this->round($amount * $multiplier, $precision, $rounding_mode);
-    }
-
-
-
-    /**
-     * divides this Money amount by the supplied $divisor
-     * and returns a new Money object
-     *
-     * @param float|int|string $amount
-     * @param float|int|string $divisor
-     * @param int              $precision
-     * @param int              $rounding_mode
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    public function divide($amount, $divisor, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
-    {
-        $this->validateDivisor($divisor);
-        return $this->round($amount / $divisor, $precision, $rounding_mode);
-    }
+	/**
+	 * returns true if a calculator is supported as determined by loaded server extensions
+	 *
+	 * @return bool
+	 */
+	public function isSupported()
+	{
+		return true;
+	}
+
+
+
+	/**
+	 * adds the supplied Money amount to this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $amount_to_add
+	 * @return string
+	 */
+	public function add($amount, $amount_to_add)
+	{
+		return (string) ($amount + $amount_to_add);
+	}
+
+
+
+	/**
+	 * subtracts the supplied Money amount from this Money amount
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $amount_to_subtract
+	 * @return string
+	 */
+	public function subtract($amount, $amount_to_subtract)
+	{
+		return (string) ($amount - $amount_to_subtract);
+	}
+
+
+
+	/**
+	 * multiplies this Money amount by the supplied $multiplier
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $multiplier
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	public function multiply($amount, $multiplier, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		return $this->round($amount * $multiplier, $precision, $rounding_mode);
+	}
+
+
+
+	/**
+	 * divides this Money amount by the supplied $divisor
+	 * and returns a new Money object
+	 *
+	 * @param float|int|string $amount
+	 * @param float|int|string $divisor
+	 * @param int              $precision
+	 * @param int              $rounding_mode
+	 * @return string
+	 * @throws InvalidArgumentException
+	 */
+	public function divide($amount, $divisor, $precision = 3, $rounding_mode = Calculator::ROUND_HALF_UP)
+	{
+		$this->validateDivisor($divisor);
+		return $this->round($amount / $divisor, $precision, $rounding_mode);
+	}
 
 
 

core/services/currency/CreateCurrency.php

Indentation +142 added lines, -142 removed lines

@@ -28,148 +28,148 @@
 class CreateCurrency
 {
 
-    /**
-     * @var EE_Country[] $countries
-     */
-    protected static $countries_by_iso_code;
-
-    /**
-     * @var EE_Country[] $countries
-     */
-    protected static $countries_by_currency;
-
-    /**
-     * @var string $site_country_iso
-     */
-    protected static $site_country_iso;
-
-
-    /**
-     * @return EEM_Country
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    private static function countryModel()
-    {
-        return LoaderFactory::getLoader()->getShared('EEM_Country');
-    }
-
-
-    /**
-     * returns a Currency object for the supplied country code
-     *
-     * @param string $CNT_ISO
-     * @return Currency
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     */
-    public static function fromCountryCode($CNT_ISO = null)
-    {
-        $CNT_ISO = $CNT_ISO !== null ? $CNT_ISO : CreateCurrency::getSiteCountryIso();
-        if(isset(CreateCurrency::$countries_by_iso_code[$CNT_ISO])) {
-            $country = CreateCurrency::$countries_by_iso_code[ $CNT_ISO ];
-        } else {
-            /** @var EE_Country $country */
-            $country = CreateCurrency::countryModel()->get_one_by_ID($CNT_ISO);
-            if (! $country instanceof EE_Country) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        esc_html__(
-                            'A valid country could not be found for the "%1$s" country code;',
-                            'event_espresso'
-                        ),
-                        $CNT_ISO
-                    )
-                );
-            }
-            CreateCurrency::$countries_by_iso_code[ $CNT_ISO ] = $country;
-            CreateCurrency::$countries_by_currency[ $country->currency_code() ] = $country;
-        }
-        return new Currency(
-            $country->currency_code(),
-            new Label(
-                $country->currency_name_single(),
-                $country->currency_name_plural()
-            ),
-            $country->currency_sign(),
-            $country->currency_sign_before(),
-            $country->currency_decimal_places(),
-            $country->currency_decimal_mark(),
-            $country->currency_thousands_separator()
-        );
-    }
-
-
-
-    /**
-     * returns a Currency object for the supplied currency code
-     * PLZ NOTE: variations may exist between how different countries display the same currency,
-     * so it may be necessary to use CreateCurrency::fromCountryCode() to achieve the desired results
-     *
-     * @param string $code
-     * @return Currency
-     * @throws InvalidInterfaceException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     * @throws EE_Error
-     */
-    public static function fromCode($code)
-    {
-        if (isset(CreateCurrency::$countries_by_currency[ $code ])) {
-            $country = CreateCurrency::$countries_by_currency[ $code ];
-        } else {
-            /** @var EE_Country $country */
-            $country = CreateCurrency::countryModel()->get_one(array(array('CNT_cur_code' => $code)));
-            if (! $country instanceof EE_Country) {
-                throw new InvalidArgumentException(
-                    sprintf(
-                        esc_html__(
-                            'A valid currency could not be found for the "%1$s" currency code;',
-                            'event_espresso'
-                        ),
-                        $code
-                    )
-                );
-            }
-            CreateCurrency::$countries_by_iso_code[ $country->ID() ] = $country;
-            CreateCurrency::$countries_by_currency[$code ] = $country;
-        }
-        return new Currency(
-            $country->currency_code(),
-            new Label(
-                $country->currency_name_single(),
-                $country->currency_name_plural()
-            ),
-            $country->currency_sign(),
-            $country->currency_sign_before(),
-            $country->currency_decimal_places(),
-            $country->currency_decimal_mark(),
-            $country->currency_thousands_separator()
-        );
-    }
-
-
-
-    /**
-     * @return string
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function getSiteCountryIso()
-    {
-        if (empty(CreateCurrency::$site_country_iso)) {
-            $config = LoaderFactory::getLoader()->getShared('EE_Config');
-            CreateCurrency::$site_country_iso = $config->organization !== null
-                                             && $config->organization instanceof EE_Organization_Config
-                ? $config->organization->CNT_ISO
-                : 'US';
-        }
-        return CreateCurrency::$site_country_iso;
-    }
+	/**
+	 * @var EE_Country[] $countries
+	 */
+	protected static $countries_by_iso_code;
+
+	/**
+	 * @var EE_Country[] $countries
+	 */
+	protected static $countries_by_currency;
+
+	/**
+	 * @var string $site_country_iso
+	 */
+	protected static $site_country_iso;
+
+
+	/**
+	 * @return EEM_Country
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	private static function countryModel()
+	{
+		return LoaderFactory::getLoader()->getShared('EEM_Country');
+	}
+
+
+	/**
+	 * returns a Currency object for the supplied country code
+	 *
+	 * @param string $CNT_ISO
+	 * @return Currency
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 */
+	public static function fromCountryCode($CNT_ISO = null)
+	{
+		$CNT_ISO = $CNT_ISO !== null ? $CNT_ISO : CreateCurrency::getSiteCountryIso();
+		if(isset(CreateCurrency::$countries_by_iso_code[$CNT_ISO])) {
+			$country = CreateCurrency::$countries_by_iso_code[ $CNT_ISO ];
+		} else {
+			/** @var EE_Country $country */
+			$country = CreateCurrency::countryModel()->get_one_by_ID($CNT_ISO);
+			if (! $country instanceof EE_Country) {
+				throw new InvalidArgumentException(
+					sprintf(
+						esc_html__(
+							'A valid country could not be found for the "%1$s" country code;',
+							'event_espresso'
+						),
+						$CNT_ISO
+					)
+				);
+			}
+			CreateCurrency::$countries_by_iso_code[ $CNT_ISO ] = $country;
+			CreateCurrency::$countries_by_currency[ $country->currency_code() ] = $country;
+		}
+		return new Currency(
+			$country->currency_code(),
+			new Label(
+				$country->currency_name_single(),
+				$country->currency_name_plural()
+			),
+			$country->currency_sign(),
+			$country->currency_sign_before(),
+			$country->currency_decimal_places(),
+			$country->currency_decimal_mark(),
+			$country->currency_thousands_separator()
+		);
+	}
+
+
+
+	/**
+	 * returns a Currency object for the supplied currency code
+	 * PLZ NOTE: variations may exist between how different countries display the same currency,
+	 * so it may be necessary to use CreateCurrency::fromCountryCode() to achieve the desired results
+	 *
+	 * @param string $code
+	 * @return Currency
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 * @throws EE_Error
+	 */
+	public static function fromCode($code)
+	{
+		if (isset(CreateCurrency::$countries_by_currency[ $code ])) {
+			$country = CreateCurrency::$countries_by_currency[ $code ];
+		} else {
+			/** @var EE_Country $country */
+			$country = CreateCurrency::countryModel()->get_one(array(array('CNT_cur_code' => $code)));
+			if (! $country instanceof EE_Country) {
+				throw new InvalidArgumentException(
+					sprintf(
+						esc_html__(
+							'A valid currency could not be found for the "%1$s" currency code;',
+							'event_espresso'
+						),
+						$code
+					)
+				);
+			}
+			CreateCurrency::$countries_by_iso_code[ $country->ID() ] = $country;
+			CreateCurrency::$countries_by_currency[$code ] = $country;
+		}
+		return new Currency(
+			$country->currency_code(),
+			new Label(
+				$country->currency_name_single(),
+				$country->currency_name_plural()
+			),
+			$country->currency_sign(),
+			$country->currency_sign_before(),
+			$country->currency_decimal_places(),
+			$country->currency_decimal_mark(),
+			$country->currency_thousands_separator()
+		);
+	}
+
+
+
+	/**
+	 * @return string
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function getSiteCountryIso()
+	{
+		if (empty(CreateCurrency::$site_country_iso)) {
+			$config = LoaderFactory::getLoader()->getShared('EE_Config');
+			CreateCurrency::$site_country_iso = $config->organization !== null
+											 && $config->organization instanceof EE_Organization_Config
+				? $config->organization->CNT_ISO
+				: 'US';
+		}
+		return CreateCurrency::$site_country_iso;
+	}
 
 
 

Spacing +10 added lines, -10 removed lines

@@ -69,12 +69,12 @@ 
     public static function fromCountryCode($CNT_ISO = null)
     {
         $CNT_ISO = $CNT_ISO !== null ? $CNT_ISO : CreateCurrency::getSiteCountryIso();
-        if(isset(CreateCurrency::$countries_by_iso_code[$CNT_ISO])) {
-            $country = CreateCurrency::$countries_by_iso_code[ $CNT_ISO ];
+        if (isset(CreateCurrency::$countries_by_iso_code[$CNT_ISO])) {
+            $country = CreateCurrency::$countries_by_iso_code[$CNT_ISO];
         } else {
             /** @var EE_Country $country */
             $country = CreateCurrency::countryModel()->get_one_by_ID($CNT_ISO);
-            if (! $country instanceof EE_Country) {
+            if ( ! $country instanceof EE_Country) {
                 throw new InvalidArgumentException(
                     sprintf(
                         esc_html__(
@@ -85,8 +85,8 @@ 
                     )
                 );
             }
-            CreateCurrency::$countries_by_iso_code[ $CNT_ISO ] = $country;
-            CreateCurrency::$countries_by_currency[ $country->currency_code() ] = $country;
+            CreateCurrency::$countries_by_iso_code[$CNT_ISO] = $country;
+            CreateCurrency::$countries_by_currency[$country->currency_code()] = $country;
         }
         return new Currency(
             $country->currency_code(),
@@ -118,12 +118,12 @@ 
      */
     public static function fromCode($code)
     {
-        if (isset(CreateCurrency::$countries_by_currency[ $code ])) {
-            $country = CreateCurrency::$countries_by_currency[ $code ];
+        if (isset(CreateCurrency::$countries_by_currency[$code])) {
+            $country = CreateCurrency::$countries_by_currency[$code];
         } else {
             /** @var EE_Country $country */
             $country = CreateCurrency::countryModel()->get_one(array(array('CNT_cur_code' => $code)));
-            if (! $country instanceof EE_Country) {
+            if ( ! $country instanceof EE_Country) {
                 throw new InvalidArgumentException(
                     sprintf(
                         esc_html__(
@@ -134,8 +134,8 @@ 
                     )
                 );
             }
-            CreateCurrency::$countries_by_iso_code[ $country->ID() ] = $country;
-            CreateCurrency::$countries_by_currency[$code ] = $country;
+            CreateCurrency::$countries_by_iso_code[$country->ID()] = $country;
+            CreateCurrency::$countries_by_currency[$code] = $country;
         }
         return new Currency(
             $country->currency_code(),

core/services/currency/CurrencyCodeMoneyFormatter.php

Indentation +9 added lines, -9 removed lines

@@ -19,14 +19,14 @@
 class CurrencyCodeMoneyFormatter implements MoneyFormatter
 {
 
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency)
-    {
-        return $money_amount . ' ' . $currency->code();
-    }
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency)
+	{
+		return $money_amount . ' ' . $currency->code();
+	}
 
 }

core/services/currency/CreateMoney.php

Indentation +184 added lines, -184 removed lines

@@ -23,190 +23,190 @@
 class CreateMoney
 {
 
-    /**
-     * @var Calculator $calculator
-     */
-    protected static $calculator;
-
-    /**
-     * @var MoneyFormatter[] $formatters
-     */
-    protected static $formatters;
-
-
-
-    /**
-     * factory method that returns a Money object using amount specified in the currency's subunits
-     * example: for $12.50 USD use CreateMoney::fromSubUnits(1250, 'USD')
-     *
-     * @param int    $subunits_amount money amount IN THE SUBUNITS FOR THE CURRENCY ie: cents
-     *                                example: $12.50 USD would equate to a subunits amount of 1250
-     * @param string $currency_code
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function fromSubUnits($subunits_amount, $currency_code = '')
-    {
-        $currency = CreateCurrency::fromCode($currency_code);
-        return new Money(
-            // shift decimal BACK by number of places for currency
-            $subunits_amount * pow(10, $currency->decimalPlaces() * -1),
-            $currency,
-            CreateMoney::calculator(),
-            CreateMoney::formatters()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency corresponding to the site's country
-     * example: CreateMoney::forSite(12.5)
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a standard amount of 12.50
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function forSite($amount)
-    {
-        return new Money(
-            $amount,
-            CreateCurrency::fromCountryCode(),
-            CreateMoney::calculator(),
-            CreateMoney::formatters()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied ISO country code
-     * example: CreateMoney::forCountry(12.5,'US')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $CNT_ISO
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function forCountry($amount, $CNT_ISO)
-    {
-        return new Money(
-            $amount,
-            CreateCurrency::fromCountryCode($CNT_ISO),
-            CreateMoney::calculator(),
-            CreateMoney::formatters()
-        );
-    }
-
-
-
-    /**
-     * factory method that returns a Money object using the currency as specified by the supplied currency code
-     * example: CreateMoney::forCurrency(12.5, 'USD')
-     *
-     * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
-     *                                 example: $12.5 USD would equate to a value amount of 12.50
-     * @param string           $currency_code
-     * @return Money
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function forCurrency($amount, $currency_code)
-    {
-        return new Money(
-            $amount,
-            CreateCurrency::fromCode($currency_code),
-            CreateMoney::calculator(),
-            CreateMoney::formatters()
-        );
-    }
-
-
-
-
-    /**
-     * @return Calculator
-     */
-    public static function calculator()
-    {
-        CreateMoney::initializeCalculators();
-        return CreateMoney::$calculator;
-    }
-
-
-
-    /**
-     * loops through a filterable array of Calculator services
-     * and selects the first one that is supported by the current server
-     */
-    protected static function initializeCalculators()
-    {
-        if (CreateMoney::$calculator instanceof Calculator) {
-            return;
-        }
-        $calculators = apply_filters(
-            'FHEE__EventEspresso\core\services\currency\MoneyFactory__initializeCalculators__Calculator_array',
-            array(
-                '\EventEspresso\core\services\currency\DefaultCalculator',
-            )
-        );
-        foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
-                continue;
-            }
-            $calculator = new $calculator();
-            if ($calculator instanceof Calculator && $calculator->isSupported()) {
-                CreateMoney::$calculator = $calculator;
-                break;
-            }
-        }
-    }
-
-
-
-    /**
-     * @return MoneyFormatter[]
-     */
-    public static function formatters()
-    {
-        CreateMoney::initializeFormatters();
-        return CreateMoney::$formatters;
-    }
-
-
-
-    /**
-     * initializes a filterable array of MoneyFormatter services
-     */
-    protected static function initializeFormatters()
-    {
-        if (! empty(CreateMoney::$formatters)) {
-            return;
-        }
-        CreateMoney::$formatters = apply_filters(
-            'FHEE__EventEspresso\core\services\currency\MoneyFactory__initializeFormatters__MoneyFormatters_array',
-            array(
-                1 => new DecimalMoneyFormatter(),
-                2 => new ThousandsMoneyFormatter(),
-                3 => new CurrencySignMoneyFormatter(),
-                4 => new CurrencyCodeMoneyFormatter(),
-                5 => new InternationalMoneyFormatter(),
-            )
-        );
-    }
+	/**
+	 * @var Calculator $calculator
+	 */
+	protected static $calculator;
+
+	/**
+	 * @var MoneyFormatter[] $formatters
+	 */
+	protected static $formatters;
+
+
+
+	/**
+	 * factory method that returns a Money object using amount specified in the currency's subunits
+	 * example: for $12.50 USD use CreateMoney::fromSubUnits(1250, 'USD')
+	 *
+	 * @param int    $subunits_amount money amount IN THE SUBUNITS FOR THE CURRENCY ie: cents
+	 *                                example: $12.50 USD would equate to a subunits amount of 1250
+	 * @param string $currency_code
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function fromSubUnits($subunits_amount, $currency_code = '')
+	{
+		$currency = CreateCurrency::fromCode($currency_code);
+		return new Money(
+			// shift decimal BACK by number of places for currency
+			$subunits_amount * pow(10, $currency->decimalPlaces() * -1),
+			$currency,
+			CreateMoney::calculator(),
+			CreateMoney::formatters()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency corresponding to the site's country
+	 * example: CreateMoney::forSite(12.5)
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a standard amount of 12.50
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function forSite($amount)
+	{
+		return new Money(
+			$amount,
+			CreateCurrency::fromCountryCode(),
+			CreateMoney::calculator(),
+			CreateMoney::formatters()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied ISO country code
+	 * example: CreateMoney::forCountry(12.5,'US')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $CNT_ISO
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function forCountry($amount, $CNT_ISO)
+	{
+		return new Money(
+			$amount,
+			CreateCurrency::fromCountryCode($CNT_ISO),
+			CreateMoney::calculator(),
+			CreateMoney::formatters()
+		);
+	}
+
+
+
+	/**
+	 * factory method that returns a Money object using the currency as specified by the supplied currency code
+	 * example: CreateMoney::forCurrency(12.5, 'USD')
+	 *
+	 * @param float|int|string $amount money amount IN THE STANDARD UNIT FOR THE CURRENCY ie: dollars, Euros, etc
+	 *                                 example: $12.5 USD would equate to a value amount of 12.50
+	 * @param string           $currency_code
+	 * @return Money
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function forCurrency($amount, $currency_code)
+	{
+		return new Money(
+			$amount,
+			CreateCurrency::fromCode($currency_code),
+			CreateMoney::calculator(),
+			CreateMoney::formatters()
+		);
+	}
+
+
+
+
+	/**
+	 * @return Calculator
+	 */
+	public static function calculator()
+	{
+		CreateMoney::initializeCalculators();
+		return CreateMoney::$calculator;
+	}
+
+
+
+	/**
+	 * loops through a filterable array of Calculator services
+	 * and selects the first one that is supported by the current server
+	 */
+	protected static function initializeCalculators()
+	{
+		if (CreateMoney::$calculator instanceof Calculator) {
+			return;
+		}
+		$calculators = apply_filters(
+			'FHEE__EventEspresso\core\services\currency\MoneyFactory__initializeCalculators__Calculator_array',
+			array(
+				'\EventEspresso\core\services\currency\DefaultCalculator',
+			)
+		);
+		foreach ($calculators as $calculator) {
+			if (! class_exists($calculator)) {
+				continue;
+			}
+			$calculator = new $calculator();
+			if ($calculator instanceof Calculator && $calculator->isSupported()) {
+				CreateMoney::$calculator = $calculator;
+				break;
+			}
+		}
+	}
+
+
+
+	/**
+	 * @return MoneyFormatter[]
+	 */
+	public static function formatters()
+	{
+		CreateMoney::initializeFormatters();
+		return CreateMoney::$formatters;
+	}
+
+
+
+	/**
+	 * initializes a filterable array of MoneyFormatter services
+	 */
+	protected static function initializeFormatters()
+	{
+		if (! empty(CreateMoney::$formatters)) {
+			return;
+		}
+		CreateMoney::$formatters = apply_filters(
+			'FHEE__EventEspresso\core\services\currency\MoneyFactory__initializeFormatters__MoneyFormatters_array',
+			array(
+				1 => new DecimalMoneyFormatter(),
+				2 => new ThousandsMoneyFormatter(),
+				3 => new CurrencySignMoneyFormatter(),
+				4 => new CurrencyCodeMoneyFormatter(),
+				5 => new InternationalMoneyFormatter(),
+			)
+		);
+	}
 
 
 }

Spacing +2 added lines, -2 removed lines

@@ -164,7 +164,7 @@ 
             )
         );
         foreach ($calculators as $calculator) {
-            if (! class_exists($calculator)) {
+            if ( ! class_exists($calculator)) {
                 continue;
             }
             $calculator = new $calculator();
@@ -193,7 +193,7 @@ 
      */
     protected static function initializeFormatters()
     {
-        if (! empty(CreateMoney::$formatters)) {
+        if ( ! empty(CreateMoney::$formatters)) {
             return;
         }
         CreateMoney::$formatters = apply_filters(

core/services/currency/CurrencySignMoneyFormatter.php

Indentation +16 added lines, -16 removed lines

@@ -21,20 +21,20 @@
 
 
 
-    /**
-     * @param string   $money_amount
-     * @param Currency $currency
-     * @return string
-     */
-    public function format($money_amount, Currency $currency)
-    {
-        // add currency sign
-        if ($currency->signB4()) {
-            if ($money_amount >= 0) {
-                return $currency->sign() . $money_amount;
-            }
-            return '-' . $currency->sign() . str_replace('-', '', $money_amount);
-        }
-        return $money_amount . $currency->sign();
-    }
+	/**
+	 * @param string   $money_amount
+	 * @param Currency $currency
+	 * @return string
+	 */
+	public function format($money_amount, Currency $currency)
+	{
+		// add currency sign
+		if ($currency->signB4()) {
+			if ($money_amount >= 0) {
+				return $currency->sign() . $money_amount;
+			}
+			return '-' . $currency->sign() . str_replace('-', '', $money_amount);
+		}
+		return $money_amount . $currency->sign();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -31,10 +31,10 @@
         // add currency sign
         if ($currency->signB4()) {
             if ($money_amount >= 0) {
-                return $currency->sign() . $money_amount;
+                return $currency->sign().$money_amount;
             }
-            return '-' . $currency->sign() . str_replace('-', '', $money_amount);
+            return '-'.$currency->sign().str_replace('-', '', $money_amount);
         }
-        return $money_amount . $currency->sign();
+        return $money_amount.$currency->sign();
     }
 }

core/domain/values/currency/Currency.php

Indentation +165 added lines, -165 removed lines

@@ -19,182 +19,182 @@
 class Currency
 {
 
-    /**
-     * eg 'US'
-     *
-     * @var string $code
-     */
-    private $code;
-
-    /**
-     * @var Label $label
-     */
-    private $label;
-
-    /**
-     * currency sign
-     *
-     * @var string $sign
-     * eg '$'
-     */
-    private $sign;
-
-    /**
-     * Whether the currency sign should come before the number or not
-     *
-     * @var boolean $sign_b4
-     */
-    private $sign_b4;
-
-    /**
-     * How many digits should come after the decimal place
-     *
-     * @var int $decimal_places
-     */
-    private $decimal_places;
-
-    /**
-     * Symbol to use for decimal mark
-     *
-     * @var string $decimal_mark
-     * eg '.'
-     */
-    private $decimal_mark;
-
-    /**
-     * Symbol to use for thousands
-     *
-     * @var string $thousands
-     * eg ','
-     */
-    private $thousands;
-
-
-
-    /**
-     * Currency constructor.
-     *
-     * @param string $code
-     * @param Label  $label
-     * @param string $sign
-     * @param bool   $sign_b4
-     * @param int    $decimal_places
-     * @param string $decimal_mark
-     * @param string $thousands
-     */
-    public function __construct($code, Label $label, $sign, $sign_b4, $decimal_places, $decimal_mark, $thousands)
-    {
-        $this->code           = $code;
-        $this->label          = $label;
-        $this->sign           = $sign;
-        $this->sign_b4        = $sign_b4;
-        $this->decimal_places = $decimal_places;
-        $this->decimal_mark   = $decimal_mark;
-        $this->thousands      = $thousands;
-    }
-
-
-
-    /**
-     * returns true if this currency is the same as the supplied currency
-     *
-     * @param Currency $other
-     * @return bool
-     */
-    public function equals(Currency $other)
-    {
-        return $this->code() === $other->code();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function code()
-    {
-        return $this->code;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        return $this->label->singular();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function plural()
-    {
-        return $this->label->plural();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function sign()
-    {
-        return $this->sign;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function signB4()
-    {
-        return $this->sign_b4;
-    }
-
+	/**
+	 * eg 'US'
+	 *
+	 * @var string $code
+	 */
+	private $code;
+
+	/**
+	 * @var Label $label
+	 */
+	private $label;
+
+	/**
+	 * currency sign
+	 *
+	 * @var string $sign
+	 * eg '$'
+	 */
+	private $sign;
+
+	/**
+	 * Whether the currency sign should come before the number or not
+	 *
+	 * @var boolean $sign_b4
+	 */
+	private $sign_b4;
+
+	/**
+	 * How many digits should come after the decimal place
+	 *
+	 * @var int $decimal_places
+	 */
+	private $decimal_places;
+
+	/**
+	 * Symbol to use for decimal mark
+	 *
+	 * @var string $decimal_mark
+	 * eg '.'
+	 */
+	private $decimal_mark;
+
+	/**
+	 * Symbol to use for thousands
+	 *
+	 * @var string $thousands
+	 * eg ','
+	 */
+	private $thousands;
+
+
+
+	/**
+	 * Currency constructor.
+	 *
+	 * @param string $code
+	 * @param Label  $label
+	 * @param string $sign
+	 * @param bool   $sign_b4
+	 * @param int    $decimal_places
+	 * @param string $decimal_mark
+	 * @param string $thousands
+	 */
+	public function __construct($code, Label $label, $sign, $sign_b4, $decimal_places, $decimal_mark, $thousands)
+	{
+		$this->code           = $code;
+		$this->label          = $label;
+		$this->sign           = $sign;
+		$this->sign_b4        = $sign_b4;
+		$this->decimal_places = $decimal_places;
+		$this->decimal_mark   = $decimal_mark;
+		$this->thousands      = $thousands;
+	}
+
+
+
+	/**
+	 * returns true if this currency is the same as the supplied currency
+	 *
+	 * @param Currency $other
+	 * @return bool
+	 */
+	public function equals(Currency $other)
+	{
+		return $this->code() === $other->code();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function code()
+	{
+		return $this->code;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->label->singular();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function plural()
+	{
+		return $this->label->plural();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function sign()
+	{
+		return $this->sign;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function signB4()
+	{
+		return $this->sign_b4;
+	}
+
 
 
-    /**
-     * @return int
-     */
-    public function decimalPlaces()
-    {
-        return $this->decimal_places;
-    }
+	/**
+	 * @return int
+	 */
+	public function decimalPlaces()
+	{
+		return $this->decimal_places;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function decimalMark()
-    {
-        return $this->decimal_mark;
-    }
+	/**
+	 * @return string
+	 */
+	public function decimalMark()
+	{
+		return $this->decimal_mark;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function thousands()
-    {
-        return $this->thousands;
-    }
+	/**
+	 * @return string
+	 */
+	public function thousands()
+	{
+		return $this->thousands;
+	}
 
 
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->code();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->code();
+	}