mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-10 10:06:30 +00:00
oleibman
1cdc6cd2fb
* Breaking Change to toFormattedString and 3 toArray Methods DocBlock says `toFormattedString` returns string, but code can return int, float, bool, null, or RichText. I think the DocBlock is correct (function name clearly indicates "to string"), and the code needs to change to match it. This is not that big a deal on its own. However, some methods in `Worksheet` call this function by default - `rangeToArray`, `toArray`, and `namedRangeToArray`. All 3 can be called with a parameter so that they don't call `toFormattedString`, but, by default, they do call, and so are affected by this change. Some unit test results are changed as a result of this code change. In all those cases, an additional test is added which would match the previous result. * Update Change Log I often skip this till later, but, since it's a breaking change ... * Scrutinizer, Plus Strange Cast to -0 Avoid Scrutinizer complaint by casting string to float, but ... Php decides resulted should sometimes be `-0`? That caused test failures. Very odd.
31 lines
1.2 KiB
PHP
31 lines
1.2 KiB
PHP
<?php
|
|
|
|
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
|
|
|
|
use PhpOffice\PhpSpreadsheet\Reader\Xls;
|
|
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
|
|
|
|
class NumberFormatGeneralTest extends AbstractFunctional
|
|
{
|
|
public function testGeneral(): void
|
|
{
|
|
$filename = 'tests/data/Reader/XLS/issue2239.xls';
|
|
$contents = file_get_contents($filename) ?: '';
|
|
self::assertStringContainsString('GENERAL', $contents);
|
|
|
|
$reader = new Xls();
|
|
$spreadsheet = $reader->load($filename);
|
|
$sheet = $spreadsheet->getSheetByNameOrThrow('Blad1');
|
|
$array = $sheet->toArray();
|
|
self::assertSame('€ 2.95', $array[1][3]);
|
|
self::assertSame(2.95, $sheet->getCell('D2')->getValue());
|
|
self::assertSame(2.95, $sheet->getCell('D2')->getCalculatedValue());
|
|
self::assertSame('€ 2.95', $sheet->getCell('D2')->getFormattedValue());
|
|
self::assertSame('21', $array[1][4]);
|
|
self::assertSame(21, $sheet->getCell('E2')->getValue());
|
|
self::assertSame(21, $sheet->getCell('E2')->getCalculatedValue());
|
|
self::assertSame('21', $sheet->getCell('E2')->getFormattedValue());
|
|
$spreadsheet->disconnectWorksheets();
|
|
}
|
|
}
|