fixed, added format code for currencies

Author: StvL97

src/ColumnFormatter/BaseFormatter.php

@@ -21,4 +21,9 @@ public function getNumberFormat(): ?array
     {
         return null;
     }
+
+    public function getFormatCode(): ?string
+    {
+        return null;
+    }
 }

src/ColumnFormatter/ColumnFormatter.php

@@ -15,4 +15,7 @@ public function getAlignment(): array;
 
     /** @return string[]|null */
     public function getNumberFormat(): ?array;
+
+    /** @return string|null */
+    public function getFormatCode(): ?string;
 }

src/ColumnFormatter/CurrencyFormatter.php

@@ -3,15 +3,28 @@
 namespace Fastbolt\ExcelWriter\ColumnFormatter;
 
 use Fastbolt\ExcelWriter\ColumnSetting;
+use OutOfRangeException;
 use PhpOffice\PhpSpreadsheet\Style\Alignment;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 
 class CurrencyFormatter extends BaseFormatter
 {
+    public const CURRENCY_EUR = "EUR";
+
+    public const CURRENCY_USD = "USD";
+
     private int $decimalLength;
 
-    public function __construct(ColumnSetting $column)
+    private string $currency;
+
+    /**
+     * @param ColumnSetting       $column
+     * @param string{'EUR'|'USD'} $currency
+     */
+    public function __construct(ColumnSetting $column, string $currency)
     {
         $this->decimalLength = $column->getDecimalLength();
+        $this->currency = $currency;
     }
 
     public function getAlignment(): array
@@ -25,4 +38,13 @@ public function getNumberFormat(): array
 
         return ['formatCode' => $formatCode];
     }
+
+    public function getFormatCode(): string
+    {
+        return match ($this->currency) {
+            self::CURRENCY_EUR => NumberFormat::FORMAT_CURRENCY_EUR,
+            self::CURRENCY_USD => NumberFormat::FORMAT_CURRENCY_USD,
+            default => throw new OutOfRangeException("Currency  " . $this->currency . " is not supported"),
+        };
+    }
 }

src/ColumnSetting.php

@@ -24,7 +24,8 @@ class ColumnSetting
     public const FORMAT_STRING     = 'string';
     public const FORMAT_DATE       = 'datetime';
     public const FOMRAT_PERCENTAGE = 'percentage';
-    public const FORMAT_CURRENCY   = 'currency';
+    public const FORMAT_CURRENCY_EUR   = 'currency_eur';
+    public const FORMAT_CURRENCY_USD   = 'currency_usd';
 
     private string $format;
     private string $name = '';    //excel-name for the column
@@ -88,22 +89,16 @@ public function setName(string $name): ColumnSetting
      */
     public function getFormatter(): ColumnFormatter
     {
-        switch ($this->format) {
-            case self::FORMAT_STRING:
-                return new StringFormatter();
-            case self::FORMAT_DATE:
-                return new DateFormatter();
-            case self::FORMAT_INTEGER:
-                return new IntegerFormatter();
-            case self::FORMAT_FLOAT:
-                return new FloatFormatter($this);
-            case self::FOMRAT_PERCENTAGE:
-                return new PercentageFormatter($this);
-            case self::FORMAT_CURRENCY:
-                return new CurrencyFormatter($this);
-        }
-
-        return new StringFormatter();
+        return match ($this->format) {
+            self::FORMAT_STRING => new StringFormatter(),
+            self::FORMAT_DATE => new DateFormatter(),
+            self::FORMAT_INTEGER => new IntegerFormatter(),
+            self::FORMAT_FLOAT => new FloatFormatter($this),
+            self::FOMRAT_PERCENTAGE => new PercentageFormatter($this),
+            self::FORMAT_CURRENCY_EUR => new CurrencyFormatter($this, CurrencyFormatter::CURRENCY_EUR),
+            self::FORMAT_CURRENCY_USD => new CurrencyFormatter($this, CurrencyFormatter::CURRENCY_USD),
+            default => new StringFormatter(),
+        };
     }
 
     /**

src/ExcelGenerator.php

@@ -321,6 +321,11 @@ public function applyColumnFormat(): void
                 $format['numberFormat'] = $numberFormat;
             }
 
+            //needed for currencies
+            if (null !== ($formatCode = $formatter->getFormatCode())) {
+                $format['formatCode'] = $formatCode;
+            }
+
             $sheet->getStyle($column->getName() . ':' . $column->getName())
                 ->applyFromArray($format);
         }