From 292dd9073f5367f7985d19c487a5e556a25fef05 Mon Sep 17 00:00:00 2001 From: MarkBaker Date: Fri, 17 Feb 2023 21:39:07 +0100 Subject: [PATCH] Adjust CURRENCY_USD and CURRENCY_EUR constants to rationalise and eliminate quoted currency symbols in favour of bracketed symbols --- CHANGELOG.md | 2 +- .../Autofilter/10_Autofilter_selection_1.php | 2 +- .../Autofilter/10_Autofilter_selection_2.php | 2 +- .../10_Autofilter_selection_display.php | 2 +- samples/Basic/08_Conditional_formatting.php | 6 +- samples/templates/sampleSpreadsheet.php | 2 +- samples/templates/sampleSpreadsheet2.php | 2 +- .../Cell/AdvancedValueBinder.php | 2 +- src/PhpSpreadsheet/Reader/Ods.php | 2 +- src/PhpSpreadsheet/Style/NumberFormat.php | 12 +- tests/data/Style/NumberFormat.php | 144 +++++++++--------- 11 files changed, 91 insertions(+), 87 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d0eda592..2a0fa31f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). ### Deprecated -- Nothing +- Rationalisation of Pre-defined Currency Format Masks ### Removed diff --git a/samples/Autofilter/10_Autofilter_selection_1.php b/samples/Autofilter/10_Autofilter_selection_1.php index 764bb2216..fe4709722 100644 --- a/samples/Autofilter/10_Autofilter_selection_1.php +++ b/samples/Autofilter/10_Autofilter_selection_1.php @@ -96,7 +96,7 @@ $spreadsheet->getActiveSheet()->getStyle('A1:F1')->getAlignment()->setWrapText(t $spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5); $spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5); $spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD); -$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); +$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER); $spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14); $spreadsheet->getActiveSheet()->freezePane('A2'); diff --git a/samples/Autofilter/10_Autofilter_selection_2.php b/samples/Autofilter/10_Autofilter_selection_2.php index 3d0b02491..bd08b1d12 100644 --- a/samples/Autofilter/10_Autofilter_selection_2.php +++ b/samples/Autofilter/10_Autofilter_selection_2.php @@ -96,7 +96,7 @@ $spreadsheet->getActiveSheet()->getStyle('A1:F1')->getAlignment()->setWrapText(t $spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5); $spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5); $spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD); -$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); +$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER); $spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14); $spreadsheet->getActiveSheet()->freezePane('A2'); diff --git a/samples/Autofilter/10_Autofilter_selection_display.php b/samples/Autofilter/10_Autofilter_selection_display.php index 9905b5391..c3995b3a9 100644 --- a/samples/Autofilter/10_Autofilter_selection_display.php +++ b/samples/Autofilter/10_Autofilter_selection_display.php @@ -96,7 +96,7 @@ $spreadsheet->getActiveSheet()->getStyle('A1:F1')->getAlignment()->setWrapText(t $spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5); $spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5); $spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD); -$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE); +$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER); $spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14); $spreadsheet->getActiveSheet()->freezePane('A2'); diff --git a/samples/Basic/08_Conditional_formatting.php b/samples/Basic/08_Conditional_formatting.php index 2f5486321..31c298b89 100644 --- a/samples/Basic/08_Conditional_formatting.php +++ b/samples/Basic/08_Conditional_formatting.php @@ -60,7 +60,7 @@ $conditional1->setConditionType(Conditional::CONDITION_CELLIS) ->addCondition('400'); $conditional1->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_YELLOW); $conditional1->getStyle()->getFont()->setBold(true); -$conditional1->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE); +$conditional1->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER); $conditional2 = new Conditional(); $conditional2->setConditionType(Conditional::CONDITION_CELLIS) @@ -68,7 +68,7 @@ $conditional2->setConditionType(Conditional::CONDITION_CELLIS) ->addCondition('0'); $conditional2->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_RED); $conditional2->getStyle()->getFont()->setItalic(true); -$conditional2->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE); +$conditional2->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER); $conditional3 = new Conditional(); $conditional3->setConditionType(Conditional::CONDITION_CELLIS) @@ -76,7 +76,7 @@ $conditional3->setConditionType(Conditional::CONDITION_CELLIS) ->addCondition('0'); $conditional3->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_GREEN); $conditional3->getStyle()->getFont()->setItalic(true); -$conditional3->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE); +$conditional3->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER); $conditionalStyles = $spreadsheet->getActiveSheet()->getStyle('B2')->getConditionalStyles(); $conditionalStyles[] = $conditional1; diff --git a/samples/templates/sampleSpreadsheet.php b/samples/templates/sampleSpreadsheet.php index b698ba897..92e88262d 100644 --- a/samples/templates/sampleSpreadsheet.php +++ b/samples/templates/sampleSpreadsheet.php @@ -120,7 +120,7 @@ $spreadsheet->getActiveSheet()->protectCells('A3:E13', 'PhpSpreadsheet'); // Set cell number formats $helper->log('Set cell number formats'); -$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE); +$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER); // Set column widths $helper->log('Set column widths'); diff --git a/samples/templates/sampleSpreadsheet2.php b/samples/templates/sampleSpreadsheet2.php index b44880ad4..5a7beda70 100644 --- a/samples/templates/sampleSpreadsheet2.php +++ b/samples/templates/sampleSpreadsheet2.php @@ -120,7 +120,7 @@ $spreadsheet->getActiveSheet()->protectCells('A3:E13', 'PhpSpreadsheet'); // Set cell number formats $helper->log('Set cell number formats'); -$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE); +$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER); // Set column widths $helper->log('Set column widths'); diff --git a/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php b/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php index 01ef0494a..1bf73ba82 100644 --- a/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php +++ b/src/PhpSpreadsheet/Cell/AdvancedValueBinder.php @@ -169,7 +169,7 @@ class AdvancedValueBinder extends DefaultValueBinder implements IValueBinder // Set style $cell->getWorksheet()->getStyle($cell->getCoordinate()) ->getNumberFormat()->setFormatCode( - str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD_SIMPLE) + str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD) ); return true; diff --git a/src/PhpSpreadsheet/Reader/Ods.php b/src/PhpSpreadsheet/Reader/Ods.php index 60a5cdfc2..250815400 100644 --- a/src/PhpSpreadsheet/Reader/Ods.php +++ b/src/PhpSpreadsheet/Reader/Ods.php @@ -485,7 +485,7 @@ class Ods extends BaseReader if (floor($dataValue) == $dataValue) { $dataValue = (int) $dataValue; } - $formatting = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE; + $formatting = NumberFormat::FORMAT_CURRENCY_USD_INTEGER; break; case 'float': diff --git a/src/PhpSpreadsheet/Style/NumberFormat.php b/src/PhpSpreadsheet/Style/NumberFormat.php index 57dc9f641..4cda2a32c 100644 --- a/src/PhpSpreadsheet/Style/NumberFormat.php +++ b/src/PhpSpreadsheet/Style/NumberFormat.php @@ -79,10 +79,14 @@ class NumberFormat extends Supervisor self::FORMAT_DATE_TIME8, ]; - const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0.00_-'; - const FORMAT_CURRENCY_USD = '$#,##0_-'; - const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0.00_-"€"'; - const FORMAT_CURRENCY_EUR = '#,##0_-"€"'; + /** @deprecated 1.28 use FORMAT_CURRENCY_USD_INTEGER instead */ + const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0_-'; + const FORMAT_CURRENCY_USD_INTEGER = '$#,##0_-'; + const FORMAT_CURRENCY_USD = '$#,##0.00_-'; + /** @deprecated 1.28 use FORMAT_CURRENCY_EUR_INTEGER instead */ + const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0_-"€"'; + const FORMAT_CURRENCY_EUR_INTEGER = '#,##0_-[$€]'; + const FORMAT_CURRENCY_EUR = '#,##0.00_-[$€]'; const FORMAT_ACCOUNTING_USD = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)'; const FORMAT_ACCOUNTING_EUR = '_("€"* #,##0.00_);_("€"* \(#,##0.00\);_("€"* "-"??_);_(@_)'; diff --git a/tests/data/Style/NumberFormat.php b/tests/data/Style/NumberFormat.php index 9b43db345..1d7b917d7 100644 --- a/tests/data/Style/NumberFormat.php +++ b/tests/data/Style/NumberFormat.php @@ -968,362 +968,362 @@ return [ [ '$0.00 ', '0', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,000.00 ', '1000', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.11 ', '1111.111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.11 ', '1111.114', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.12 ', '1111.115', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.12 ', '1111.119', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$0.00 ', '-0', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.00 ', '-1111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.11 ', '-1111.111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.11 ', '-1111.114', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.12 ', '-1111.115', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.12 ', '-1111.119', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$0 ', '0', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,000 ', '1000', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,111 ', '1111.1', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,111 ', '1111.4', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,112 ', '1111.5', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,112 ', '1111.9', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$0 ', '-0', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111.1', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111.4', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,112 ', '-1111.5', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,112 ', '-1111.9', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$0.00 ', '0', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,000.00 ', '1000', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.11 ', '1111.111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.11 ', '1111.114', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.12 ', '1111.115', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$1,111.12 ', '1111.119', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$0.00 ', '-0', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.00 ', '-1111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.11 ', '-1111.111', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.11 ', '-1111.114', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.12 ', '-1111.115', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$-1,111.12 ', '-1111.119', - NumberFormat::FORMAT_CURRENCY_USD_SIMPLE, + NumberFormat::FORMAT_CURRENCY_USD, ], [ '$0 ', '0', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,000 ', '1000', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,111 ', '1111.1', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,111 ', '1111.4', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,112 ', '1111.5', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$1,112 ', '1111.9', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$0 ', '-0', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111.1', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,111 ', '-1111.4', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,112 ', '-1111.5', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '$-1,112 ', '-1111.9', - NumberFormat::FORMAT_CURRENCY_USD, + NumberFormat::FORMAT_CURRENCY_USD_INTEGER, ], [ '0.00 €', '0', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '1,000.00 €', '1000', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '1,111.11 €', '1111.111', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '1,111.11 €', '1111.114', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '1,111.12 €', '1111.115', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '1,111.12 €', '1111.119', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '0.00 €', '-0', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '-1,111.00 €', '-1111', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '-1,111.11 €', '-1111.111', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '-1,111.11 €', '-1111.114', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '-1,111.12 €', '-1111.115', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '-1,111.12 €', '-1111.119', - NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE, + NumberFormat::FORMAT_CURRENCY_EUR, ], [ '0 €', '0', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '1,000 €', '1000', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '1,111 €', '1111.1', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '1,111 €', '1111.4', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '1,112 €', '1111.5', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '1,112 €', '1111.9', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '0 €', '-0', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '-1,111 €', '-1111', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '-1,111 €', '-1111.1', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '-1,111 €', '-1111.4', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '-1,112 €', '-1111.5', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ '-1,112 €', '-1111.9', - NumberFormat::FORMAT_CURRENCY_EUR, + NumberFormat::FORMAT_CURRENCY_EUR_INTEGER, ], [ ' $ - ',