mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-08-21 21:03:41 +00:00
oleibman
5cfe66e18f
I check from time to time. There are a number of problems now, mostly due to the elimination of Php 7.4 and replacement of doc-block typing with explicit Php typing. - Bitwise functions were particularly affected by PR #3718 and PR #3793. - Chart/Axis and Writer/Xlsx were amusingly affected by PR #3836, which added a scaling option which included an array indexed by the known allowable factors, one of which is 1 trillion, which cannot be represented as an integer on a 32-bit system. Issue3833Test, introduced by the same PR (and not suffering any errors) was expanded to test this value. - Some minor changes to Reader/Xls and Shared/OLE/PPS to accommodate hex values which are negative in 32-bit but which Php-32 may wind up casting to large floating point numbers; it is not clear to me why these hadn't shown up as problems previously. Possibly this is the result of changes in the most recent Php versions. - BitAndTest, BitOrTest, BitXorTest and Shared/DateTest were adversely affected by PR #3859 when arguments and/or expected results too large for a 32-bit integer were supplied. - ImExpTest required a slightly reduced precision for 32-bit. No idea why this hadn't shown up earlier.
149 lines
5.7 KiB
PHP
149 lines
5.7 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace PhpOffice\PhpSpreadsheetTests\Chart;
|
|
|
|
use PhpOffice\PhpSpreadsheet\Chart\Axis;
|
|
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
|
|
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as XlsxWriter;
|
|
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
|
|
|
|
class Issue3833Test extends AbstractFunctional
|
|
{
|
|
// based on 33_Char_create_scatter2
|
|
public function readCharts(XlsxReader $reader): void
|
|
{
|
|
$reader->setIncludeCharts(true);
|
|
}
|
|
|
|
public function writeCharts(XlsxWriter $writer): void
|
|
{
|
|
$writer->setIncludeCharts(true);
|
|
}
|
|
|
|
public function testDisplayUnits1(): void
|
|
{
|
|
$reader = new XlsxReader();
|
|
$reader->setIncludeCharts(true);
|
|
$spreadsheet = $reader->load('tests/data/Reader/XLSX/issue.3833.units.xlsx');
|
|
|
|
/** @var callable */
|
|
$callableReader = [$this, 'readCharts'];
|
|
/** @var callable */
|
|
$callableWriter = [$this, 'writeCharts'];
|
|
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
|
|
$spreadsheet->disconnectWorksheets();
|
|
|
|
$sheet = $reloadedSpreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts2 = $sheet->getChartCollection();
|
|
self::assertCount(1, $charts2);
|
|
$chart2 = $charts2[0];
|
|
self::assertNotNull($chart2);
|
|
$yAxis = $chart2->getChartAxisY();
|
|
$dispUnits = $yAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
|
|
self::assertSame('tenThousands', $dispUnits);
|
|
$logBase = $yAxis->getAxisOptionsProperty('logBase');
|
|
self::assertNull($logBase);
|
|
|
|
$reloadedSpreadsheet->disconnectWorksheets();
|
|
}
|
|
|
|
public function testDisplayUnits2(): void
|
|
{
|
|
$reader = new XlsxReader();
|
|
$reader->setIncludeCharts(true);
|
|
$spreadsheet = $reader->load('tests/data/Reader/XLSX/issue.3833.units.xlsx');
|
|
$sheet1 = $spreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts1 = $sheet1->getChartCollection();
|
|
self::assertCount(1, $charts1);
|
|
$chart1 = $charts1[0];
|
|
self::assertNotNull($chart1);
|
|
$yAxis1 = $chart1->getChartAxisY();
|
|
$yAxis1->setAxisOption('dispUnitsBuiltIn', 1000);
|
|
|
|
/** @var callable */
|
|
$callableReader = [$this, 'readCharts'];
|
|
/** @var callable */
|
|
$callableWriter = [$this, 'writeCharts'];
|
|
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
|
|
$spreadsheet->disconnectWorksheets();
|
|
|
|
$sheet = $reloadedSpreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts2 = $sheet->getChartCollection();
|
|
self::assertCount(1, $charts2);
|
|
$chart2 = $charts2[0];
|
|
self::assertNotNull($chart2);
|
|
$yAxis = $chart2->getChartAxisY();
|
|
$dispUnits = $yAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
|
|
self::assertSame('thousands', $dispUnits);
|
|
$logBase = $yAxis->getAxisOptionsProperty('logBase');
|
|
self::assertNull($logBase);
|
|
|
|
$reloadedSpreadsheet->disconnectWorksheets();
|
|
}
|
|
|
|
public function testDisplayUnits3(): void
|
|
{
|
|
$reader = new XlsxReader();
|
|
$reader->setIncludeCharts(true);
|
|
$spreadsheet = $reader->load('tests/data/Reader/XLSX/issue.3833.units.xlsx');
|
|
$sheet1 = $spreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts1 = $sheet1->getChartCollection();
|
|
self::assertCount(1, $charts1);
|
|
$chart1 = $charts1[0];
|
|
self::assertNotNull($chart1);
|
|
$yAxis1 = $chart1->getChartAxisY();
|
|
$yAxis1->setDispUnitsTitle(null);
|
|
|
|
/** @var callable */
|
|
$callableReader = [$this, 'readCharts'];
|
|
/** @var callable */
|
|
$callableWriter = [$this, 'writeCharts'];
|
|
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
|
|
$spreadsheet->disconnectWorksheets();
|
|
|
|
$sheet = $reloadedSpreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts2 = $sheet->getChartCollection();
|
|
self::assertCount(1, $charts2);
|
|
$chart2 = $charts2[0];
|
|
self::assertNotNull($chart2);
|
|
$yAxis = $chart2->getChartAxisY();
|
|
self::assertNull($yAxis->getDispUnitsTitle());
|
|
|
|
$reloadedSpreadsheet->disconnectWorksheets();
|
|
}
|
|
|
|
public function testLogBase(): void
|
|
{
|
|
$reader = new XlsxReader();
|
|
$reader->setIncludeCharts(true);
|
|
$spreadsheet = $reader->load('tests/data/Reader/XLSX/issue.3833.logarithm.xlsx');
|
|
|
|
/** @var callable */
|
|
$callableReader = [$this, 'readCharts'];
|
|
/** @var callable */
|
|
$callableWriter = [$this, 'writeCharts'];
|
|
$reloadedSpreadsheet = $this->writeAndReload($spreadsheet, 'Xlsx', $callableReader, $callableWriter);
|
|
$spreadsheet->disconnectWorksheets();
|
|
|
|
$sheet = $reloadedSpreadsheet->getSheetByNameOrThrow('charts');
|
|
$charts2 = $sheet->getChartCollection();
|
|
self::assertCount(1, $charts2);
|
|
$chart2 = $charts2[0];
|
|
self::assertNotNull($chart2);
|
|
$yAxis = $chart2->getChartAxisY();
|
|
$logBase = $yAxis->getAxisOptionsProperty('logBase');
|
|
self::assertSame('10', $logBase);
|
|
$dispUnits = $yAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
|
|
self::assertNull($dispUnits);
|
|
$yAxis->setAxisOption('dispUnitsBuiltIn', 1000000000000);
|
|
$dispUnits = $yAxis->getAxisOptionsProperty('dispUnitsBuiltIn');
|
|
// same logic as in Writer/Xlsx/Chart for 32-bit safety
|
|
$dispUnits = ($dispUnits == Axis::TRILLION_INDEX) ? Axis::DISP_UNITS_TRILLIONS : (is_numeric($dispUnits) ? (Axis::DISP_UNITS_BUILTIN_INT[(int) $dispUnits] ?? '') : $dispUnits);
|
|
self::assertSame('trillions', $dispUnits);
|
|
|
|
$reloadedSpreadsheet->disconnectWorksheets();
|
|
}
|
|
}
|