Test for calendar when reading Excel Files.

Set Excel calendar to be used for calculations and formatting for the calendar stored against the spreadsheet.

Author: MarkBaker

phpstan-baseline.neon

@@ -990,11 +990,6 @@ parameters:
 			count: 6
 			path: src/PhpSpreadsheet/Cell/Cell.php
 
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Cell/Cell.php
-
 		-
 			message: "#^Call to an undefined method object\\:\\:getHashCode\\(\\)\\.$#"
 			count: 1
@@ -2580,11 +2575,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Shared/OLERead.php
 
-		-
-			message: "#^Call to an undefined method PhpOffice\\\\PhpSpreadsheet\\\\Calculation\\\\Calculation\\:\\:_calculateFormulaValue\\(\\)\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Shared/StringHelper.php
-
 		-
 			message: "#^Static method PhpOffice\\\\PhpSpreadsheet\\\\Shared\\\\TimeZone\\:\\:validateTimeZone\\(\\) is unused\\.$#"
 			count: 1

src/PhpSpreadsheet/Cell/Cell.php

@@ -181,6 +181,8 @@ public function getValue()
      */
     public function getFormattedValue()
     {
+        SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
+
         return (string) NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
             $this->getStyle()
@@ -342,8 +344,6 @@ public function setValueExplicit($value, $dataType, bool $isArrayFormula = false
                 break;
             default:
                 throw new Exception('Invalid datatype: ' . $dataType);
-
-                break;
         }
 
         // set the datatype
@@ -403,6 +403,8 @@ public function getCalculatedValue(bool $asArray = false, bool $resetLog = true)
     {
         if ($this->dataType === DataType::TYPE_FORMULA) {
             try {
+//                SharedDate::setExcelCalendar($this->getWorksheet()->getParent()->getExcelCalendar());
+//
                 $coordinate = $this->getCoordinate();
                 $worksheet = $this->getWorksheet();
                 $value = $this->value;

src/PhpSpreadsheet/Shared/Date.php

@@ -67,7 +67,7 @@ class Date
     protected static $defaultTimeZone;
 
     /**
-     * Set the Excel Default Calendar (Windows 1900 or Mac 1904).
+     * Set the Excel Date Calendar (Windows 1900 or Mac 1904) used for calculations and formatting.
      *
      * @param int $baseYear Excel base date (1900 or 1904)
      *
@@ -85,7 +85,8 @@ public static function setExcelCalendar($baseYear)
     }
 
     /**
-     * Return the Excel Default Calendar (Windows 1900 or Mac 1904).
+     * Return the Excel Date Calendar (Windows 1900 or Mac 1904)
+     *     to be used for current calculations and formatting.
      *
      * @return int Excel base date (1900 or 1904)
      */

tests/PhpSpreadsheetTests/Reader/Xls/DateReaderTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PHPUnit\Framework\TestCase;
+
+class DateReaderTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+    }
+
+    public function testReadExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1900_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_WINDOWS_1900, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(44562, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+
+    public function testReadExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLS/1904_Calendar.xls';
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_MAC_1904, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(43100, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+}

tests/PhpSpreadsheetTests/Reader/Xlsx/DateReaderTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
+use PhpOffice\PhpSpreadsheet\Shared\Date;
+use PHPUnit\Framework\TestCase;
+
+class DateReaderTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Date::setExcelCalendar(Date::CALENDAR_WINDOWS_1900);
+    }
+
+    public function testReadExcel1900Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1900_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_WINDOWS_1900, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(44562, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(44926, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+
+    public function testReadExcel1904Spreadsheet(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/1904_Calendar.xlsx';
+        $reader = new Xlsx();
+        $spreadsheet = $reader->load($filename);
+
+        self::assertSame(Date::CALENDAR_MAC_1904, $spreadsheet->getExcelCalendar());
+
+        $worksheet = $spreadsheet->getActiveSheet();
+        self::assertSame(43100, $worksheet->getCell('A1')->getValue());
+        self::assertSame('2022-01-01', $worksheet->getCell('A1')->getFormattedValue());
+        self::assertSame(43464, $worksheet->getCell('A2')->getValue());
+        self::assertSame('2022-12-31', $worksheet->getCell('A2')->getFormattedValue());
+    }
+}