Skip to content

Commit 3beef1f

Browse files
MarkBakerMarkBaker
authored
Merge pull request #3377 from PHPOffice/AdvancedValueBinder_Additional-Minor-Tweaks
Adjust CURRENCY_USD and CURRENCY_EUR constants
2 parents a241792 + 292dd90 commit 3beef1f

File tree

11 files changed

+91
-87
lines changed

11 files changed

+91
-87
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
2323

2424
### Deprecated
2525

26-
- Nothing
26+
- Rationalisation of Pre-defined Currency Format Masks
2727

2828
### Removed
2929

‎samples/Autofilter/10_Autofilter_selection_1.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
$spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5);
9797
$spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5);
9898
$spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD);
99-
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
99+
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER);
100100
$spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14);
101101
$spreadsheet->getActiveSheet()->freezePane('A2');
102102

‎samples/Autofilter/10_Autofilter_selection_2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
$spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5);
9797
$spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5);
9898
$spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD);
99-
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
99+
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER);
100100
$spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14);
101101
$spreadsheet->getActiveSheet()->freezePane('A2');
102102

‎samples/Autofilter/10_Autofilter_selection_display.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
$spreadsheet->getActiveSheet()->getColumnDimension('C')->setWidth(12.5);
9797
$spreadsheet->getActiveSheet()->getColumnDimension('D')->setWidth(10.5);
9898
$spreadsheet->getActiveSheet()->getStyle('D2:D' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_DATE_YYYYMMDD);
99-
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
99+
$spreadsheet->getActiveSheet()->getStyle('E2:F' . $row)->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_USD_INTEGER);
100100
$spreadsheet->getActiveSheet()->getColumnDimension('F')->setWidth(14);
101101
$spreadsheet->getActiveSheet()->freezePane('A2');
102102

‎samples/Basic/08_Conditional_formatting.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,23 @@
6060
->addCondition('400');
6161
$conditional1->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_YELLOW);
6262
$conditional1->getStyle()->getFont()->setBold(true);
63-
$conditional1->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE);
63+
$conditional1->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER);
6464

6565
$conditional2 = new Conditional();
6666
$conditional2->setConditionType(Conditional::CONDITION_CELLIS)
6767
->setOperatorType(Conditional::OPERATOR_LESSTHAN)
6868
->addCondition('0');
6969
$conditional2->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_RED);
7070
$conditional2->getStyle()->getFont()->setItalic(true);
71-
$conditional2->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE);
71+
$conditional2->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER);
7272

7373
$conditional3 = new Conditional();
7474
$conditional3->setConditionType(Conditional::CONDITION_CELLIS)
7575
->setOperatorType(Conditional::OPERATOR_GREATERTHANOREQUAL)
7676
->addCondition('0');
7777
$conditional3->getStyle()->getFont()->getColor()->setARGB(Color::COLOR_GREEN);
7878
$conditional3->getStyle()->getFont()->setItalic(true);
79-
$conditional3->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE);
79+
$conditional3->getStyle()->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER);
8080

8181
$conditionalStyles = $spreadsheet->getActiveSheet()->getStyle('B2')->getConditionalStyles();
8282
$conditionalStyles[] = $conditional1;

‎samples/templates/sampleSpreadsheet.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
// Set cell number formats
122122
$helper->log('Set cell number formats');
123-
$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE);
123+
$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER);
124124

125125
// Set column widths
126126
$helper->log('Set column widths');

‎samples/templates/sampleSpreadsheet2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
// Set cell number formats
122122
$helper->log('Set cell number formats');
123-
$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_SIMPLE);
123+
$spreadsheet->getActiveSheet()->getStyle('E4:E13')->getNumberFormat()->setFormatCode(NumberFormat::FORMAT_CURRENCY_EUR_INTEGER);
124124

125125
// Set column widths
126126
$helper->log('Set column widths');

‎src/PhpSpreadsheet/Cell/AdvancedValueBinder.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ protected function setCurrency(float $value, Cell $cell, string $currencyCode):
169169
// Set style
170170
$cell->getWorksheet()->getStyle($cell->getCoordinate())
171171
->getNumberFormat()->setFormatCode(
172-
str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD_SIMPLE)
172+
str_replace('$', '[$' . $currencyCode . ']', NumberFormat::FORMAT_CURRENCY_USD)
173173
);
174174

175175
return true;

‎src/PhpSpreadsheet/Reader/Ods.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ public function loadIntoExisting($filename, Spreadsheet $spreadsheet)
485485
if (floor($dataValue) == $dataValue) {
486486
$dataValue = (int) $dataValue;
487487
}
488-
$formatting = NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
488+
$formatting = NumberFormat::FORMAT_CURRENCY_USD_INTEGER;
489489

490490
break;
491491
case 'float':

‎src/PhpSpreadsheet/Style/NumberFormat.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,14 @@ class NumberFormat extends Supervisor
7979
self::FORMAT_DATE_TIME8,
8080
];
8181

82-
const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0.00_-';
83-
const FORMAT_CURRENCY_USD = '$#,##0_-';
84-
const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0.00_-"€"';
85-
const FORMAT_CURRENCY_EUR = '#,##0_-"€"';
82+
/** @deprecated 1.28 use FORMAT_CURRENCY_USD_INTEGER instead */
83+
const FORMAT_CURRENCY_USD_SIMPLE = '"$"#,##0_-';
84+
const FORMAT_CURRENCY_USD_INTEGER = '$#,##0_-';
85+
const FORMAT_CURRENCY_USD = '$#,##0.00_-';
86+
/** @deprecated 1.28 use FORMAT_CURRENCY_EUR_INTEGER instead */
87+
const FORMAT_CURRENCY_EUR_SIMPLE = '#,##0_-"€"';
88+
const FORMAT_CURRENCY_EUR_INTEGER = '#,##0_-[$€]';
89+
const FORMAT_CURRENCY_EUR = '#,##0.00_-[$€]';
8690
const FORMAT_ACCOUNTING_USD = '_("$"* #,##0.00_);_("$"* \(#,##0.00\);_("$"* "-"??_);_(@_)';
8791
const FORMAT_ACCOUNTING_EUR = '_("€"* #,##0.00_);_("€"* \(#,##0.00\);_("€"* "-"??_);_(@_)';
8892

0 commit comments

Comments
 (0)