Coverage Tweaks

See if we can satisfy Scrutinizer.
This commit is contained in:
oleibman
2025-07-30 20:55:02 -07:00
parent f1ce95eaa4
commit c16eaeb6e4
2 changed files with 8 additions and 13 deletions
@@ -4,7 +4,6 @@ declare(strict_types=1);
namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
use PhpOffice\PhpSpreadsheet\Reader\Ods;
use PHPUnit\Framework\TestCase;
@@ -15,10 +14,7 @@ class DefinedNamesTest extends TestCase
$filename = 'tests/data/Reader/Ods/DefinedNames.ods';
$reader = new Ods();
$spreadsheet = $reader->load($filename);
$calculation = Calculation::getInstance($spreadsheet);
$calculation->setInstanceArrayReturnType(
Calculation::RETURN_ARRAY_AS_VALUE
);
$spreadsheet->returnArrayAsValue();
$worksheet = $spreadsheet->getActiveSheet();
$firstDefinedNameValue = $worksheet->getCell('First')->getValue();
@@ -36,10 +32,7 @@ class DefinedNamesTest extends TestCase
$filename = 'tests/data/Reader/Ods/DefinedNames.apostrophe.ods';
$reader = new Ods();
$spreadsheet = $reader->load($filename);
$calculation = Calculation::getInstance($spreadsheet);
$calculation->setInstanceArrayReturnType(
Calculation::RETURN_ARRAY_AS_VALUE
);
$spreadsheet->returnArrayAsValue();
$worksheet = $spreadsheet->getActiveSheet();
self::assertSame("apo'strophe", $worksheet->getTitle());
@@ -58,10 +51,7 @@ class DefinedNamesTest extends TestCase
$filename = 'tests/data/Reader/Ods/DefinedNames.ods';
$reader = new Ods();
$spreadsheet = $reader->load($filename);
$calculation = Calculation::getInstance($spreadsheet);
$calculation->setInstanceArrayReturnType(
Calculation::RETURN_ARRAY_AS_ARRAY
);
$spreadsheet->returnArrayAsArray();
$worksheet = $spreadsheet->getActiveSheet();
$firstDefinedNameValue = $worksheet->getCell('First')->getValue();
@@ -39,10 +39,15 @@ class DateTest extends TestCase
Date::CALENDAR_WINDOWS_1900,
];
$spreadsheet = new Spreadsheet();
foreach ($calendarValues as $calendarValue) {
$result = Date::setExcelCalendar($calendarValue);
self::assertTrue($result);
$result = $spreadsheet->setExcelCalendar($calendarValue);
self::assertTrue($result);
}
self::assertFalse($spreadsheet->setExcelCalendar(0));
$spreadsheet->disconnectWorksheets();
}
public function testSetExcelCalendarWithInvalidValue(): void