Trim format (#22)

* test currency format + trim * add decimals * fix test for decimals
packaged · Mar 5, 2020 · 6578dab · 6578dab
1 parent 47b60be
commit 6578dab
Show file tree

Hide file tree

Showing 181 changed files with 918 additions and 12 deletions.
diff --git a/src/Currency/AbstractCurrency.php b/src/Currency/AbstractCurrency.php
@@ -33,18 +33,20 @@ public function getUSDAverageValue($value)
 
   public function format($amount, $showSymbol = true, $showCode = false)
   {
-    return str_replace(
-      [
-        '{symbol}',
-        '{number}',
-        '{code}',
-      ],
-      [
-        $showSymbol ? $this->getSymbol() : '',
-        $this->numberFormat($amount),
-        $showCode ? $this->getCode() : '',
-      ],
-      $this->_getRenderFormat($amount)
+    return trim(
+      str_replace(
+        [
+          '{symbol}',
+          '{number}',
+          '{code}',
+        ],
+        [
+          $showSymbol ? $this->getSymbol() : '',
+          $this->numberFormat($amount),
+          $showCode ? $this->getCode() : '',
+        ],
+        $this->_getRenderFormat($amount)
+      )
     );
   }
 

diff --git a/src/Currency/Currencies/AEDCurrency.php b/src/Currency/Currencies/AEDCurrency.php
@@ -5,6 +5,11 @@
 
 class AEDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'AED';

diff --git a/src/Currency/Currencies/AFNCurrency.php b/src/Currency/Currencies/AFNCurrency.php
@@ -5,6 +5,11 @@
 
 class AFNCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '؋';

diff --git a/src/Currency/Currencies/ALLCurrency.php b/src/Currency/Currencies/ALLCurrency.php
@@ -5,6 +5,11 @@
 
 class ALLCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'Lek';

diff --git a/src/Currency/Currencies/AMDCurrency.php b/src/Currency/Currencies/AMDCurrency.php
@@ -5,6 +5,11 @@
 
 class AMDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'AMD';

diff --git a/src/Currency/Currencies/ANGCurrency.php b/src/Currency/Currencies/ANGCurrency.php
@@ -5,6 +5,11 @@
 
 class ANGCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'ƒ';

diff --git a/src/Currency/Currencies/AOACurrency.php b/src/Currency/Currencies/AOACurrency.php
@@ -5,6 +5,11 @@
 
 class AOACurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'AOA';

diff --git a/src/Currency/Currencies/ARSCurrency.php b/src/Currency/Currencies/ARSCurrency.php
@@ -5,6 +5,11 @@
 
 class ARSCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/ATSCurrency.php b/src/Currency/Currencies/ATSCurrency.php
@@ -5,6 +5,11 @@
 
 class ATSCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'ATS';

diff --git a/src/Currency/Currencies/AUDCurrency.php b/src/Currency/Currencies/AUDCurrency.php
@@ -5,6 +5,11 @@
 
 class AUDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/AWGCurrency.php b/src/Currency/Currencies/AWGCurrency.php
@@ -5,6 +5,11 @@
 
 class AWGCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'ƒ';

diff --git a/src/Currency/Currencies/AZNCurrency.php b/src/Currency/Currencies/AZNCurrency.php
@@ -5,6 +5,11 @@
 
 class AZNCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'ман';

diff --git a/src/Currency/Currencies/BAMCurrency.php b/src/Currency/Currencies/BAMCurrency.php
@@ -5,6 +5,11 @@
 
 class BAMCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'KM';

diff --git a/src/Currency/Currencies/BBDCurrency.php b/src/Currency/Currencies/BBDCurrency.php
@@ -5,6 +5,11 @@
 
 class BBDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/BDTCurrency.php b/src/Currency/Currencies/BDTCurrency.php
@@ -5,6 +5,11 @@
 
 class BDTCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'BDT';

diff --git a/src/Currency/Currencies/BEFCurrency.php b/src/Currency/Currencies/BEFCurrency.php
@@ -5,6 +5,11 @@
 
 class BEFCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'BEF';

diff --git a/src/Currency/Currencies/BGNCurrency.php b/src/Currency/Currencies/BGNCurrency.php
@@ -5,6 +5,11 @@
 
 class BGNCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'лв';

diff --git a/src/Currency/Currencies/BHDCurrency.php b/src/Currency/Currencies/BHDCurrency.php
@@ -5,6 +5,11 @@
 
 class BHDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 3;
+  }
+
   public function getSymbol()
   {
     return 'BHD';

diff --git a/src/Currency/Currencies/BIFCurrency.php b/src/Currency/Currencies/BIFCurrency.php
@@ -5,6 +5,11 @@
 
 class BIFCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 0;
+  }
+
   public function getSymbol()
   {
     return 'BIF';

diff --git a/src/Currency/Currencies/BMDCurrency.php b/src/Currency/Currencies/BMDCurrency.php
@@ -5,6 +5,11 @@
 
 class BMDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/BNDCurrency.php b/src/Currency/Currencies/BNDCurrency.php
@@ -5,6 +5,11 @@
 
 class BNDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/BOBCurrency.php b/src/Currency/Currencies/BOBCurrency.php
@@ -5,6 +5,11 @@
 
 class BOBCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$b';

diff --git a/src/Currency/Currencies/BRLCurrency.php b/src/Currency/Currencies/BRLCurrency.php
@@ -5,6 +5,11 @@
 
 class BRLCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'R$';

diff --git a/src/Currency/Currencies/BSDCurrency.php b/src/Currency/Currencies/BSDCurrency.php
@@ -5,6 +5,11 @@
 
 class BSDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/BTNCurrency.php b/src/Currency/Currencies/BTNCurrency.php
@@ -5,6 +5,11 @@
 
 class BTNCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'BTN';

diff --git a/src/Currency/Currencies/BWPCurrency.php b/src/Currency/Currencies/BWPCurrency.php
@@ -5,6 +5,11 @@
 
 class BWPCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'P';

diff --git a/src/Currency/Currencies/BYRCurrency.php b/src/Currency/Currencies/BYRCurrency.php
@@ -5,6 +5,11 @@
 
 class BYRCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 0;
+  }
+
   public function getSymbol()
   {
     return 'p.';

diff --git a/src/Currency/Currencies/BZDCurrency.php b/src/Currency/Currencies/BZDCurrency.php
@@ -5,6 +5,11 @@
 
 class BZDCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'BZ$';

diff --git a/src/Currency/Currencies/CADCurrency.php b/src/Currency/Currencies/CADCurrency.php
@@ -5,6 +5,11 @@
 
 class CADCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return '$';

diff --git a/src/Currency/Currencies/CDFCurrency.php b/src/Currency/Currencies/CDFCurrency.php
@@ -5,6 +5,11 @@
 
 class CDFCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'CDF';

diff --git a/src/Currency/Currencies/CHFCurrency.php b/src/Currency/Currencies/CHFCurrency.php
@@ -5,6 +5,11 @@
 
 class CHFCurrency extends AbstractCurrency
 {
+  public function getDecimalCount()
+  {
+    return 2;
+  }
+
   public function getSymbol()
   {
     return 'CHF';