Coverage Tweaks

See if we can satisfy Scrutinizer.

Author: oleibman

tests/PhpSpreadsheetTests/Reader/Ods/DefinedNamesTest.php

@@ -4,7 +4,6 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Reader\Ods;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Reader\Ods;
 use PHPUnit\Framework\TestCase;
 
@@ -15,10 +14,7 @@ public function testDefinedNamesValue(): void
         $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 @@ public function testDefinedNamesApostropheValue(): void
         $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 @@ public function testDefinedNamesArray(): void
         $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();

tests/PhpSpreadsheetTests/Shared/DateTest.php

@@ -39,10 +39,15 @@ public function testSetExcelCalendar(): void
             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