Handle dates as numbers, just like Excel wants (#17)

Author: Slamdunk

.github/workflows/integrate.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout"
@@ -62,7 +62,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
           - "8.0"
 
     steps:
@@ -107,7 +106,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout"
@@ -153,7 +152,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout"
@@ -190,7 +189,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout"

composer.json

@@ -10,17 +10,17 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": ">=8.0",
         "ext-iconv": "*",
         "ext-mbstring": "*"
     },
     "require-dev": {
         "malukenho/mcbumpface": "^1.1.5",
-        "mikey179/vfsstream": "^1.6.8",
-        "phpoffice/phpspreadsheet": "^1.17.1",
-        "phpstan/phpstan": "^0.12.86",
-        "phpstan/phpstan-phpunit": "^0.12.18",
-        "phpunit/phpunit": "^9.5.4",
+        "mikey179/vfsstream": "^1.6.9",
+        "phpoffice/phpspreadsheet": "^1.18.0",
+        "phpstan/phpstan": "^0.12.94",
+        "phpstan/phpstan-phpunit": "^0.12.21",
+        "phpunit/phpunit": "^9.5.8",
         "slam/php-cs-fixer-extensions": "^3.0.1",
         "slam/php-debug-r": "^1.7.0",
         "slam/phpstan-extensions": "^5.1.0"

lib/Helper/CellStyle/Date.php

@@ -9,17 +9,43 @@
 
 final class Date implements CellStyleInterface
 {
-    public function decorateValue($value)
+    public function decorateValue($value): ?int
     {
-        if (empty($value)) {
-            return $value;
+        if (! \is_string($value) || 1 !== \preg_match('/^(?<year>\d\d\d\d)-(?<month>\d\d)-(?<day>\d\d)$/', $value, $matches)) {
+            return null;
         }
 
-        return \implode('/', \array_reverse(\explode('-', $value)));
+        $year  = (int) $matches['year'];
+        $month = (int) $matches['month'];
+        $day   = (int) $matches['day'];
+
+        //    Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
+        //    This affects every date following 28th February 1900
+        $excel1900isLeapYear = true;
+        if ((1900 === $year) && ($month <= 2)) {
+            $excel1900isLeapYear = false;
+        }
+        $myexcelBaseDate = 2415020;
+
+        //    Julian base date Adjustment
+        if ($month > 2) {
+            $month -= 3;
+        } else {
+            $month += 9;
+            --$year;
+        }
+
+        //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
+        $century   = (int) \substr((string) $year, 0, 2);
+        $decade    = (int) \substr((string) $year, 2, 2);
+        $excelDate = \floor((146097 * $century) / 4) + \floor((1461 * $decade) / 4) + \floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
+
+        return (int) $excelDate;
     }
 
     public function styleCell(Format $format): void
     {
         $format->setAlign('center');
+        $format->setNumFormat('DD/MM/YYYY');
     }
 }

lib/Helper/TableWorkbook.php

@@ -185,7 +185,9 @@ private function writeRow(Table $table, array $row, ?string $type = null): void
                 $write = 'writeString';
             }
 
-            $content = $cellStyle->decorateValue($content);
+            if ('title' !== $type) {
+                $content = $cellStyle->decorateValue($content);
+            }
             $content = $this->sanitize($content);
 
             $sheet->{$write}($table->getRowCurrent(), $table->getColumnCurrent(), $content, $format);

phpstan-baseline.neon

@@ -0,0 +1,7 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertArrayHasKey\\(\\) with 'foo' and Slam\\\\Excel\\\\Helper\\\\ColumnCollection will always evaluate to false\\.$#"
+			count: 1
+			path: tests/Helper/ColumnCollectionTest.php
+

phpstan.neon

@@ -1,16 +1,13 @@
 includes:
-    - phar://phpstan.phar/conf/config.levelmax.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/slam/phpstan-extensions/conf/slam-rules.neon
+    - phpstan-baseline.neon
 
 parameters:
+    level: max
     checkMissingIterableValueType: false
     paths:
         - lib/
         - tests/
     excludes_analyse:
         - %currentWorkingDirectory%/lib/Pear/*
-    ignoreErrors:
-        -
-            message: '#Cannot call method \w+\(\) on PhpOffice\\PhpSpreadsheet\\Cell\\Cell\|null#'
-            path: %currentWorkingDirectory%/tests/Helper/TableWorkbookTest.php

tests/Helper/CellStyle/DateTest.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Slam\Excel\Tests\Helper\CellStyle;
+
+use PHPUnit\Framework\TestCase;
+use Slam\Excel\Helper\CellStyle\Date;
+
+final class DateTest extends TestCase
+{
+    /**
+     * @dataProvider provide1900Dates
+     *
+     * @see https://github.com/PHPOffice/PhpSpreadsheet/blob/188d026615f2c79b6a196c97ed8ca82407f47e57/tests/PhpSpreadsheetTests/Shared/DateTest.php#L119-L130
+     */
+    public function testDateTimeFormattedPHPToExcel1900(?int $expected, ?string $from): void
+    {
+        self::assertSame($expected, (new Date())->decorateValue($from));
+    }
+
+    public function provide1900Dates(): array
+    {
+        return [
+            'null' => [
+                null,
+                null,
+            ],
+            'empty-string' => [
+                null,
+                '',
+            ],
+            'non-date-string' => [
+                null,
+                'foobar',
+            ],
+            'PHP 32-bit Earliest Date 14-Dec-1901' => [
+                714,
+                '1901-12-14',
+            ],
+            '31-Dec-1903' => [
+                1461,
+                '1903-12-31',
+            ],
+            'Excel 1904 Calendar Base Date   01-Jan-1904' => [
+                1462,
+                '1904-01-01',
+            ],
+            '02-Jan-1904' => [
+                1463,
+                '1904-01-02',
+            ],
+            '19-Dec-1960' => [
+                22269,
+                '1960-12-19',
+            ],
+            'PHP Base Date 01-Jan-1970' => [
+                25569,
+                '1970-01-01',
+            ],
+            '07-Dec-1982' => [
+                30292,
+                '1982-12-07',
+            ],
+            '12-Jun-2008' => [
+                39611,
+                '2008-06-12',
+            ],
+            'PHP 32-bit Latest Date 19-Jan-2038' => [
+                50424,
+                '2038-01-19',
+            ],
+        ];
+    }
+}

tests/Helper/TableWorkbookTest.php

@@ -20,6 +20,7 @@ protected function setUp(): void
     {
         $this->vfs      = vfs\vfsStream::setup('root', 0770);
         $this->filename = vfs\vfsStream::url('root/test-encoding.xls');
+        // $this->filename = __DIR__ . '/test.xls';
     }
 
     public function testPostGenerationDetails(): void
@@ -138,7 +139,7 @@ public function testCellStyles(): void
             'A4' => 'text',
             'B4' => 3.45,
             'C4' => 1234567.8,
-            'D4' => '02/03/2017',
+            'D4' => 42796,
             'E4' => 1234567.89,
             'F4' => 'AABB',
         ];