Merge pull request #4377 from oleibman/issue4375

Ignore ignoredErrors when Not Applicable

Author: oleibman

CHANGELOG.md

@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Fixed
 
 - Refactor Helper/Html. [PR #4359](https://github.com/PHPOffice/PhpSpreadsheet/pull/4359)
+- Ignore ignoredErrors when not applicable. [Issue #4375](https://github.com/PHPOffice/PhpSpreadsheet/issues/4375) [PR #4377](https://github.com/PHPOffice/PhpSpreadsheet/pull/4377)
 - Better handling of defined names on sheets whose titles include apostrophes. [Issue #4356](https://github.com/PHPOffice/PhpSpreadsheet/issues/4356) [Issue #4362](https://github.com/PHPOffice/PhpSpreadsheet/issues/4362) [Issue #4376](https://github.com/PHPOffice/PhpSpreadsheet/issues/4376) [PR #4360](https://github.com/PHPOffice/PhpSpreadsheet/pull/4360)
 
 ## 2025-02-08 - 4.0.0

src/PhpSpreadsheet/Collection/Cells.php

@@ -81,6 +81,11 @@ public function has(string $cellCoordinate): bool
         return ($cellCoordinate === $this->currentCoordinate) || isset($this->index[$cellCoordinate]);
     }
 
+    public function has2(string $cellCoordinate): bool
+    {
+        return isset($this->index[$cellCoordinate]);
+    }
+
     /**
      * Add or update a cell in the collection.
      *

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -982,9 +982,8 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                 }
                             }
                             $docSheet->setSelectedCells($holdSelectedCells);
-                            if ($xmlSheetNS && $xmlSheetNS->ignoredErrors) {
-                                foreach ($xmlSheetNS->ignoredErrors->ignoredError as $ignoredErrorx) {
-                                    $ignoredError = self::testSimpleXml($ignoredErrorx);
+                            if (!$this->readDataOnly && $xmlSheetNS && $xmlSheetNS->ignoredErrors) {
+                                foreach ($xmlSheetNS->ignoredErrors->ignoredError as $ignoredError) {
                                     $this->processIgnoredErrors($ignoredError, $docSheet);
                                 }
                             }
@@ -2376,6 +2375,7 @@ private static function extractPalette(?SimpleXMLElement $sxml): array
 
     private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet): void
     {
+        $cellCollection = $sheet->getCellCollection();
         $attributes = self::getAttributes($xml);
         $sqref = (string) ($attributes['sqref'] ?? '');
         $numberStoredAsText = (string) ($attributes['numberStoredAsText'] ?? '');
@@ -2400,6 +2400,9 @@ private function processIgnoredErrors(SimpleXMLElement $xml, Worksheet $sheet):
                     ++$lastCol;
                     for ($row = $firstRow; $row <= $lastRow; ++$row) {
                         for ($col = $firstCol; $col !== $lastCol; ++$col) {
+                            if (!$cellCollection->has2("$col$row")) {
+                                continue;
+                            }
                             if ($numberStoredAsText === '1') {
                                 $sheet->getCell("$col$row")->getIgnoredErrors()->setNumberStoredAsText(true);
                             }

tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4375Test.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PHPUnit\Framework\TestCase;
+
+class Issue4375Test extends TestCase
+{
+    private static string $file = 'tests/data/Reader/XLSX/issue.4375.small.xlsx';
+
+    public function testPreliminaries(): void
+    {
+        $file = 'zip://';
+        $file .= self::$file;
+        $file .= '#xl/worksheets/sheet1.xml';
+        $data = file_get_contents($file) ?: '';
+        $expected = '<ignoredErrors><ignoredError sqref="A2:B5 B1:F1" numberStoredAsText="1"/></ignoredErrors>';
+        self::assertStringContainsString($expected, $data);
+    }
+
+    public function testDataOnly(): void
+    {
+        $file = self::$file;
+        $reader = new XlsxReader();
+        $reader->setReadDataOnly(true);
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame('0', $sheet->getCell('A2')->getValue());
+        self::assertFalse(
+            $sheet->getCell('A2')
+                ->getIgnoredErrors()
+                ->getNumberStoredAsText()
+        );
+        self::assertFalse($sheet->cellExists('A3'));
+        $spreadsheet->disconnectWorksheets();
+    }
+
+    public function testNormalRead(): void
+    {
+        $file = self::$file;
+        $reader = new XlsxReader();
+        $spreadsheet = $reader->load($file);
+        $sheet = $spreadsheet->getActiveSheet();
+        self::assertSame('0', $sheet->getCell('A2')->getValue());
+        self::assertTrue(
+            $sheet->getCell('A2')
+                ->getIgnoredErrors()
+                ->getNumberStoredAsText()
+        );
+        self::assertFalse($sheet->cellExists('A3'));
+        $spreadsheet->disconnectWorksheets();
+    }
+}