From d7ac7021c61818b7182a7325e4a7f6e89e79c2a7 Mon Sep 17 00:00:00 2001
From: oleibman <eclipsechasers2@yahoo.com>
Date: Sun, 8 Aug 2021 08:24:03 -0700
Subject: [PATCH] Apache OpenOffice Creates Xls Using Wrong Case for Number
 Format General (#2242)

See issue #2239. Problem is dealt with at the source, by making sure that Reader Xls checks for use of 'GENERAL' rather than 'General'. There doesn't seem to be a reason to test in other places, or to test for other casing variants.
---
 src/PhpSpreadsheet/Reader/Xls.php             |   6 +++-
 .../Reader/Xls/NumberFormatGeneralTest.php    |  34 ++++++++++++++++++
 tests/data/Reader/XLS/issue2239.xls           | Bin 0 -> 10752 bytes
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
 create mode 100644 tests/data/Reader/XLS/issue2239.xls

diff --git a/src/PhpSpreadsheet/Reader/Xls.php b/src/PhpSpreadsheet/Reader/Xls.php
index 42f5fceedc..3825471808 100644
--- a/src/PhpSpreadsheet/Reader/Xls.php
+++ b/src/PhpSpreadsheet/Reader/Xls.php
@@ -2125,6 +2125,10 @@ private function readFormat(): void
             }
 
             $formatString = $string['value'];
+            // Apache Open Office sets wrong case writing to xls - issue 2239
+            if ($formatString === 'GENERAL') {
+                $formatString = NumberFormat::FORMAT_GENERAL;
+            }
             $this->formats[$indexCode] = $formatString;
         }
     }
@@ -2174,7 +2178,7 @@ private function readXf(): void
                 $numberFormat = ['formatCode' => $code];
             } else {
                 // we set the general format code
-                $numberFormat = ['formatCode' => 'General'];
+                $numberFormat = ['formatCode' => NumberFormat::FORMAT_GENERAL];
             }
             $objStyle->getNumberFormat()->setFormatCode($numberFormat['formatCode']);
 
diff --git a/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php b/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
new file mode 100644
index 0000000000..a67fbb341f
--- /dev/null
+++ b/tests/PhpSpreadsheetTests/Reader/Xls/NumberFormatGeneralTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xls;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xls;
+use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
+
+class NumberFormatGeneralTest extends AbstractFunctional
+{
+    public function testGeneral(): void
+    {
+        $filename = 'tests/data/Reader/XLS/issue2239.xls';
+        $contents = file_get_contents($filename) ?: '';
+        self::assertStringContainsString('GENERAL', $contents);
+
+        $reader = new Xls();
+        $spreadsheet = $reader->load($filename);
+        $sheet = $spreadsheet->getSheetByName('Blad1');
+        if ($sheet === null) {
+            self::fail('Expected to find sheet Blad1');
+        } else {
+            $array = $sheet->toArray();
+            self::assertSame('€ 2.95', $array[1][3]);
+            self::assertSame(2.95, $sheet->getCell('D2')->getValue());
+            self::assertSame(2.95, $sheet->getCell('D2')->getCalculatedValue());
+            self::assertSame('€ 2.95', $sheet->getCell('D2')->getFormattedValue());
+            self::assertSame(21, $array[1][4]);
+            self::assertSame(21, $sheet->getCell('E2')->getValue());
+            self::assertSame(21, $sheet->getCell('E2')->getCalculatedValue());
+            self::assertSame('21', $sheet->getCell('E2')->getFormattedValue());
+        }
+        $spreadsheet->disconnectWorksheets();
+    }
+}
diff --git a/tests/data/Reader/XLS/issue2239.xls b/tests/data/Reader/XLS/issue2239.xls
new file mode 100644
index 0000000000000000000000000000000000000000..bb94575bbe7f12fb349d80c3bfd64977447505c5
GIT binary patch
literal 10752
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

literal 0
HcmV?d00001