Skip to content

Commit 1590595

Browse files
committed
Minor Tweaks
1 parent ace1755 commit 1590595

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

docs/topics/Excel Anomalies.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ If you have a spreadsheet that has been altered in this way, it can be fixed wit
1515
```php
1616
foreach ($spreadsheet->getCellXfCollection() as $style) {
1717
$numberFormat = $style->getNumberFormat();
18+
// okay to use NumberFormat::SHORT_DATE_INDEX below
1819
if ($numberFormat->getBuiltInFormatCode() === 14) {
1920
$numberFormat->setFormatCode('yyyy-mm-dd');
2021
}
@@ -23,7 +24,7 @@ If you have a spreadsheet that has been altered in this way, it can be fixed wit
2324
Starting with PhpSpreadsheet 4.5.0, this can be simplified to:
2425
```php
2526
$spreadsheet->replaceBuiltinNumberFormat(
26-
14,
27+
\PhpOffice\PhpSpreadsheet\Style\NumberFormat::SHORT_DATE_INDEX,
2728
'yyyy-mm-dd'
2829
);
2930
```

tests/PhpSpreadsheetTests/Reader/Xlsx/ReplaceBuiltinNumberFormatTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
66

77
use PhpOffice\PhpSpreadsheet\Spreadsheet;
8+
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
89
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
910

1011
class ReplaceBuiltinNumberFormatTest extends AbstractFunctional
@@ -25,17 +26,17 @@ protected function tearDown(): void
2526
}
2627
}
2728

28-
public function testJustifyLastLine(): void
29+
public function testReplaceBuiltinNumberFormat(): void
2930
{
3031
$spreadsheet = $this->spreadsheet = new Spreadsheet();
3132
$sheet = $this->spreadsheet->getActiveSheet();
3233
$sheet->fromArray([45486, 1023, 45487, 45488, 45489]);
3334
$sheet->getStyle('A1')->getNumberFormat()
34-
->setBuiltInFormatCode(14);
35+
->setBuiltInFormatCode(NumberFormat::SHORT_DATE_INDEX);
3536
$sheet->getStyle('B1')->getNumberFormat()
3637
->setFormatCode('#,##0.00');
3738
$sheet->getStyle('C1')->getNumberFormat()
38-
->setBuiltInFormatCode(14);
39+
->setBuiltInFormatCode(NumberFormat::SHORT_DATE_INDEX);
3940
$sheet->getStyle('D1')->getNumberFormat()
4041
->setFormatCode('dd-MMM-yyyy');
4142
$sheet->getStyle('E1')->getNumberFormat()
@@ -51,7 +52,7 @@ public function testJustifyLastLine(): void
5152
self::assertSame($expected, $values);
5253
$this->reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx');
5354
$this->reloadedSpreadsheet->replaceBuiltinNumberFormat(
54-
14,
55+
NumberFormat::SHORT_DATE_INDEX,
5556
'yyyy-mm-dd'
5657
);
5758
$rsheet = $this->reloadedSpreadsheet->getActiveSheet();

0 commit comments

Comments
 (0)