eventespresso / event-espresso-core

core/services/notices/NoticesContainer.php

Indentation +214 added lines, -214 removed lines

@@ -15,218 +15,218 @@
 {
 
 
-    /**
-     * @var NoticeInterface[] $information
-     */
-    private $information = array();
-
-
-    /**
-     * @var NoticeInterface[] $attention
-     */
-    private $attention = array();
-
-
-    /**
-     * @var NoticeInterface[] $error
-     */
-    private $error = array();
-
-
-    /**
-     * @var NoticeInterface[] $success
-     */
-    private $success = array();
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->information[] = new Notice(
-            Notice::INFORMATION,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->attention[] = new Notice(
-            Notice::ATTENTION,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-    // phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addError($notice, $dismissible = true, $file, $func, $line)
-    {
-        $this->error[] = new Notice(
-            Notice::ERROR,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @param string $notice
-     * @param bool   $dismissible
-     * @param string $file
-     * @param string $func
-     * @param string $line
-     * @throws InvalidDataTypeException
-     */
-    public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
-    {
-        $this->success[] = new Notice(
-            Notice::SUCCESS,
-            $notice,
-            $dismissible,
-            $file,
-            $func,
-            $line
-        );
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasInformation()
-    {
-        return ! empty($this->information);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasAttention()
-    {
-        return ! empty($this->attention);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasError()
-    {
-        return ! empty($this->error);
-    }
-
-
-    /**
-     * @return boolean
-     */
-    public function hasSuccess()
-    {
-        return ! empty($this->success);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countInformation()
-    {
-        return count($this->information);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countAttention()
-    {
-        return count($this->attention);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countError()
-    {
-        return count($this->error);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function countSuccess()
-    {
-        return count($this->success);
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getInformation()
-    {
-        return $this->information;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getAttention()
-    {
-        return $this->attention;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-
-    /**
-     * @return NoticeInterface[]
-     */
-    public function getSuccess()
-    {
-        return $this->success;
-    }
+	/**
+	 * @var NoticeInterface[] $information
+	 */
+	private $information = array();
+
+
+	/**
+	 * @var NoticeInterface[] $attention
+	 */
+	private $attention = array();
+
+
+	/**
+	 * @var NoticeInterface[] $error
+	 */
+	private $error = array();
+
+
+	/**
+	 * @var NoticeInterface[] $success
+	 */
+	private $success = array();
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->information[] = new Notice(
+			Notice::INFORMATION,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->attention[] = new Notice(
+			Notice::ATTENTION,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+	// phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addError($notice, $dismissible = true, $file, $func, $line)
+	{
+		$this->error[] = new Notice(
+			Notice::ERROR,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @param string $notice
+	 * @param bool   $dismissible
+	 * @param string $file
+	 * @param string $func
+	 * @param string $line
+	 * @throws InvalidDataTypeException
+	 */
+	public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
+	{
+		$this->success[] = new Notice(
+			Notice::SUCCESS,
+			$notice,
+			$dismissible,
+			$file,
+			$func,
+			$line
+		);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasInformation()
+	{
+		return ! empty($this->information);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasAttention()
+	{
+		return ! empty($this->attention);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasError()
+	{
+		return ! empty($this->error);
+	}
+
+
+	/**
+	 * @return boolean
+	 */
+	public function hasSuccess()
+	{
+		return ! empty($this->success);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countInformation()
+	{
+		return count($this->information);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countAttention()
+	{
+		return count($this->attention);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countError()
+	{
+		return count($this->error);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function countSuccess()
+	{
+		return count($this->success);
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getInformation()
+	{
+		return $this->information;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getAttention()
+	{
+		return $this->attention;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getError()
+	{
+		return $this->error;
+	}
+
+
+	/**
+	 * @return NoticeInterface[]
+	 */
+	public function getSuccess()
+	{
+		return $this->success;
+	}
 }

core/services/container/CoffeeMill.php

Indentation +47 added lines, -47 removed lines

@@ -15,59 +15,59 @@
 class CoffeeMill
 {
 
-    /**
-     * @var CoffeeShop $coffee_shop
-     */
-    private static $coffee_shop;
+	/**
+	 * @var CoffeeShop $coffee_shop
+	 */
+	private static $coffee_shop;
 
 
-    /**
-     * @return mixed
-     */
-    public static function getCoffeeShop()
-    {
-        return self::$coffee_shop;
-    }
+	/**
+	 * @return mixed
+	 */
+	public static function getCoffeeShop()
+	{
+		return self::$coffee_shop;
+	}
 
 
-    /**
-     * @param CoffeeShop $coffee_shop
-     */
-    public static function setCoffeeShop(CoffeeShop $coffee_shop)
-    {
-        self::$coffee_shop = $coffee_shop;
-    }
+	/**
+	 * @param CoffeeShop $coffee_shop
+	 */
+	public static function setCoffeeShop(CoffeeShop $coffee_shop)
+	{
+		self::$coffee_shop = $coffee_shop;
+	}
 
 
-    /**
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
+	/**
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
 
 
-    /**
-     * IMPORTANT!!!
-     * Usage of this method is discouraged as it promotes service location.
-     * It's current use is only as a stop gap measure until the CoffeeShop
-     * Dependency Injection Container can be implemented properly for all classes.
-     * If it is at all possible, inject your dependencies via your class constructor.
-     * This method WILL BE DEPRECATED at some point in the near future.
-     *
-     * @param string $identifier
-     * @param array  $arguments
-     * @param string $type
-     * @return mixed
-     * @throws ServiceNotFoundException
-     */
-    public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
-    {
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
-    }
+	/**
+	 * IMPORTANT!!!
+	 * Usage of this method is discouraged as it promotes service location.
+	 * It's current use is only as a stop gap measure until the CoffeeShop
+	 * Dependency Injection Container can be implemented properly for all classes.
+	 * If it is at all possible, inject your dependencies via your class constructor.
+	 * This method WILL BE DEPRECATED at some point in the near future.
+	 *
+	 * @param string $identifier
+	 * @param array  $arguments
+	 * @param string $type
+	 * @return mixed
+	 * @throws ServiceNotFoundException
+	 */
+	public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
+	{
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
+	}
 }

core/services/container/NewCoffeeMaker.php

Indentation +45 added lines, -45 removed lines

@@ -20,51 +20,51 @@
 {
 
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_NEW;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_NEW;
+	}
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        $this->resolveClassAndFilepath($recipe);
-        $reflector = $this->injector()->getReflectionClass($recipe->fqcn());
-        $method = $this->resolveInstantiationMethod($reflector);
-        switch ($method) {
-            case 'instance':
-            case 'new_instance':
-            case 'new_instance_from_db':
-                $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
-                    return call_user_func_array(
-                        array($reflector->getName(), $method),
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
-                    );
-                };
-                break;
-            case 'newInstance':
-                $closure = function () use ($reflector) {
-                    return $reflector->newInstance();
-                };
-                break;
-            case 'newInstanceArgs':
-            default:
-                $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
-                    return $reflector->newInstanceArgs(
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
-                    );
-                };
-        }
-        return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
-    }
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		$this->resolveClassAndFilepath($recipe);
+		$reflector = $this->injector()->getReflectionClass($recipe->fqcn());
+		$method = $this->resolveInstantiationMethod($reflector);
+		switch ($method) {
+			case 'instance':
+			case 'new_instance':
+			case 'new_instance_from_db':
+				$injector = $this->injector();
+				$closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
+					return call_user_func_array(
+						array($reflector->getName(), $method),
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
+					);
+				};
+				break;
+			case 'newInstance':
+				$closure = function () use ($reflector) {
+					return $reflector->newInstance();
+				};
+				break;
+			case 'newInstanceArgs':
+			default:
+				$injector = $this->injector();
+				$closure = function ($arguments) use ($recipe, $reflector, $injector) {
+					return $reflector->newInstanceArgs(
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
+					);
+				};
+		}
+		return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
             case 'new_instance':
             case 'new_instance_from_db':
                 $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
+                $closure = function($arguments) use ($recipe, $reflector, $method, $injector) {
                     return call_user_func_array(
                         array($reflector->getName(), $method),
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
@@ -52,14 +52,14 @@ 
                 };
                 break;
             case 'newInstance':
-                $closure = function () use ($reflector) {
+                $closure = function() use ($reflector) {
                     return $reflector->newInstance();
                 };
                 break;
             case 'newInstanceArgs':
             default:
                 $injector = $this->injector();
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
+                $closure = function($arguments) use ($recipe, $reflector, $injector) {
                     return $reflector->newInstanceArgs(
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
                     );

core/services/container/SharedCoffeeMaker.php

Indentation +37 added lines, -37 removed lines

@@ -18,43 +18,43 @@
 {
 
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_SHARED;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_SHARED;
+	}
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        $this->resolveClassAndFilepath($recipe);
-        $reflector = $this->injector()->getReflectionClass($recipe->fqcn());
-        $method = $this->resolveInstantiationMethod($reflector);
-        switch ($method) {
-            case 'instance':
-            case 'new_instance':
-            case 'new_instance_from_db':
-                $service = call_user_func_array(
-                    array($reflector->getName(), $method),
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
-                );
-                break;
-            case 'newInstance':
-                $service = $reflector->newInstance();
-                break;
-            case 'newInstanceArgs':
-            default:
-                $service = $reflector->newInstanceArgs(
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
-                );
-        }
-        return $this->coffeePot()->addService($recipe->identifier(), $service);
-    }
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		$this->resolveClassAndFilepath($recipe);
+		$reflector = $this->injector()->getReflectionClass($recipe->fqcn());
+		$method = $this->resolveInstantiationMethod($reflector);
+		switch ($method) {
+			case 'instance':
+			case 'new_instance':
+			case 'new_instance_from_db':
+				$service = call_user_func_array(
+					array($reflector->getName(), $method),
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
+				);
+				break;
+			case 'newInstance':
+				$service = $reflector->newInstance();
+				break;
+			case 'newInstanceArgs':
+			default:
+				$service = $reflector->newInstanceArgs(
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
+				);
+		}
+		return $this->coffeePot()->addService($recipe->identifier(), $service);
+	}
 }

core/services/container/LoadOnlyCoffeeMaker.php

Indentation +17 added lines, -17 removed lines

@@ -21,23 +21,23 @@
 class LoadOnlyCoffeeMaker extends CoffeeMaker
 {
 
-    /**
-     * @return string
-     */
-    public function type()
-    {
-        return CoffeeMaker::BREW_LOAD_ONLY;
-    }
+	/**
+	 * @return string
+	 */
+	public function type()
+	{
+		return CoffeeMaker::BREW_LOAD_ONLY;
+	}
 
 
-    /**
-     * @param RecipeInterface $recipe
-     * @param array           $arguments
-     * @return mixed
-     * @throws InvalidClassException
-     */
-    public function brew(RecipeInterface $recipe, $arguments = array())
-    {
-        return $this->resolveClassAndFilepath($recipe);
-    }
+	/**
+	 * @param RecipeInterface $recipe
+	 * @param array           $arguments
+	 * @return mixed
+	 * @throws InvalidClassException
+	 */
+	public function brew(RecipeInterface $recipe, $arguments = array())
+	{
+		return $this->resolveClassAndFilepath($recipe);
+	}
 }

core/services/progress_steps/ProgressStepCollection.php

Indentation +9 added lines, -9 removed lines

@@ -17,13 +17,13 @@
 class ProgressStepCollection extends Collection
 {
 
-    /**
-     * ProgressStepCollection constructor.
-     *
-     * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
-     */
-    public function __construct()
-    {
-        parent::__construct('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
-    }
+	/**
+	 * ProgressStepCollection constructor.
+	 *
+	 * @throws \EventEspresso\core\exceptions\InvalidInterfaceException
+	 */
+	public function __construct()
+	{
+		parent::__construct('\EventEspresso\core\services\progress_steps\ProgressStepInterface');
+	}
 }

core/services/loaders/LoaderDecorator.php

Indentation +13 added lines, -13 removed lines

@@ -14,19 +14,19 @@
 {
 
 
-    /**
-     * @var LoaderDecoratorInterface $loader
-     */
-    protected $loader;
+	/**
+	 * @var LoaderDecoratorInterface $loader
+	 */
+	protected $loader;
 
 
-    /**
-     * LoaderDecorator constructor.
-     *
-     * @param LoaderDecoratorInterface $loader
-     */
-    public function __construct(LoaderDecoratorInterface $loader)
-    {
-        $this->loader = $loader;
-    }
+	/**
+	 * LoaderDecorator constructor.
+	 *
+	 * @param LoaderDecoratorInterface $loader
+	 */
+	public function __construct(LoaderDecoratorInterface $loader)
+	{
+		$this->loader = $loader;
+	}
 }

core/services/locators/Locator.php

Indentation +39 added lines, -39 removed lines

@@ -17,43 +17,43 @@
 abstract class Locator implements LocatorInterface, Countable
 {
 
-    /**
-     * @var array $flags
-     */
-    protected $flags = array();
-
-
-    /**
-     * FileLocator constructor.
-     *
-     * @access public
-     * @param array $flags controls how files are found and/or file data is returned
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function __construct($flags = array())
-    {
-        if (empty($flags)) {
-            $flags = array(
-                FilesystemIterator::SKIP_DOTS,
-                FilesystemIterator::UNIX_PATHS,
-                FilesystemIterator::CURRENT_AS_PATHNAME,
-            );
-        }
-        $this->setFlags($flags);
-    }
-
-
-    /**
-     * @see    http://php.net/manual/en/class.filesystemiterator.php#filesystemiterator.constants
-     * @access public
-     * @param array $flags
-     * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
-     */
-    public function setFlags($flags)
-    {
-        if (! is_array($flags)) {
-            throw new InvalidDataTypeException('$flags', $flags, 'array');
-        }
-        $this->flags = $flags;
-    }
+	/**
+	 * @var array $flags
+	 */
+	protected $flags = array();
+
+
+	/**
+	 * FileLocator constructor.
+	 *
+	 * @access public
+	 * @param array $flags controls how files are found and/or file data is returned
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function __construct($flags = array())
+	{
+		if (empty($flags)) {
+			$flags = array(
+				FilesystemIterator::SKIP_DOTS,
+				FilesystemIterator::UNIX_PATHS,
+				FilesystemIterator::CURRENT_AS_PATHNAME,
+			);
+		}
+		$this->setFlags($flags);
+	}
+
+
+	/**
+	 * @see    http://php.net/manual/en/class.filesystemiterator.php#filesystemiterator.constants
+	 * @access public
+	 * @param array $flags
+	 * @throws \EventEspresso\core\exceptions\InvalidDataTypeException
+	 */
+	public function setFlags($flags)
+	{
+		if (! is_array($flags)) {
+			throw new InvalidDataTypeException('$flags', $flags, 'array');
+		}
+		$this->flags = $flags;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      */
     public function setFlags($flags)
     {
-        if (! is_array($flags)) {
+        if ( ! is_array($flags)) {
             throw new InvalidDataTypeException('$flags', $flags, 'array');
         }
         $this->flags = $flags;

core/services/address/formatters/AddressFormatter.php

Indentation +34 added lines, -34 removed lines

@@ -12,38 +12,38 @@
  */
 class AddressFormatter
 {
-    // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
-    /**
-     * @param string $address
-     * @param string $address2
-     * @param string $city
-     * @param string $state
-     * @param string $zip
-     * @param string $country
-     * @param string $formatted_address
-     * @param string $sub
-     * @return mixed
-     */
-    protected function parse_formatted_address(
-        $address,
-        $address2,
-        $city,
-        $state,
-        $zip,
-        $country,
-        $formatted_address,
-        $sub
-    ) {
-        // swap address part placeholders for the real text
-        $formatted_address = str_replace(
-            // find
-            array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
-            // replace
-            array($address, $address2, $city, $state, $zip, $country),
-            // string
-            $formatted_address
-        );
-        // remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
-        return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
-    }
+	// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
+	/**
+	 * @param string $address
+	 * @param string $address2
+	 * @param string $city
+	 * @param string $state
+	 * @param string $zip
+	 * @param string $country
+	 * @param string $formatted_address
+	 * @param string $sub
+	 * @return mixed
+	 */
+	protected function parse_formatted_address(
+		$address,
+		$address2,
+		$city,
+		$state,
+		$zip,
+		$country,
+		$formatted_address,
+		$sub
+	) {
+		// swap address part placeholders for the real text
+		$formatted_address = str_replace(
+			// find
+			array('{address}', '{address2}', '{city}', '{state}', '{zip}', '{country}'),
+			// replace
+			array($address, $address2, $city, $state, $zip, $country),
+			// string
+			$formatted_address
+		);
+		// remove placeholder from start and end, reduce repeating placeholders to singles, then replace with HTML line breaks
+		return preg_replace('/%+/', $sub, trim($formatted_address, '%'));
+	}
 }