only append code if we specifically want to add it (removes spacing f… (

#27)

* only append code if we specifically want to add it (removes spacing form the right)

* phpunit fix

* Lower phpunit version

* remove silly

* default to true, pass through

* Revert change as standard

* && has code

.github/workflows/ci.yml

@@ -13,3 +13,4 @@ jobs:
         with:
           configuration: ./phpunit.xml
           php_version: 7.4
+          version: 8.5

composer.json

@@ -13,7 +13,7 @@
     "php": ">=7.4"
   },
   "require-dev": {
-    "phpunit/phpunit": "~8.0"
+    "phpunit/phpunit": "^8.0"
   },
   "autoload": {
     "psr-4": {

src/Currency/AbstractCurrency.php

@@ -45,15 +45,21 @@ public function format($amount, $showSymbol = true, $showCode = false)
           $this->numberFormat(abs($amount)),
           $showCode ? $this->getCode() : '',
         ],
-        $this->_getRenderFormat($amount)
+        $this->_getRenderFormat($amount, $showCode && $this->getCode())
       )
     );
   }
 
-  protected function _getRenderFormat($amount)
+  protected function _getRenderFormat($amount, $showCode = true)
   {
     $return = $amount < 0 ? '-' : '';
-    $return .= '{symbol}{number} {code}';
+    $return .= '{symbol}{number}';
+
+    if($showCode)
+    {
+      $return .= ' {code}';
+    }
+
     return $return;
   }
 

src/Currency/Currencies/EURCurrency.php

@@ -10,7 +10,7 @@ public function getDecimalCount()
   {
     return 2;
   }
-  
+
   public function getSymbol()
   {
     return '€';
@@ -54,7 +54,7 @@ public function setCountry($code)
     return $this;
   }
 
-  protected function _getRenderFormat($amount)
+  protected function _getRenderFormat($amount, $showCode = true)
   {
     switch($this->_countryCode)
     {
@@ -65,7 +65,11 @@ protected function _getRenderFormat($amount)
       case CountryCode::CODE_PT;
       case CountryCode::CODE_ES;
         $return = $amount < 0 ? '-' : '';
-        $return .= '{number} {symbol} {code}';
+        $return .= '{number} {symbol}';
+        if($showCode)
+        {
+          $return .= ' {code}';
+        }
         return $return;
     }
     return parent::_getRenderFormat($amount);