Merge branch 'master' into issue4049

Author: oleibman

CHANGELOG.md

@@ -9,15 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 
 ### Added
 
-- Nothing
+- Xlsx Reader Optionally Ignore Rows With No Cells. [Issue #3982](https://github.com/PHPOffice/PhpSpreadsheet/issues/3982) [PR #4035](https://github.com/PHPOffice/PhpSpreadsheet/pull/4035)
 
 ### Changed
 
 - Nothing
 
 ### Deprecated
 
-- Nothing
+- Writer\Xls\Style\ColorMap is no longer needed.
 
 ### Moved
 
@@ -28,8 +28,10 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Incorrect Reader CSV with BOM. [Issue #4028](https://github.com/PHPOffice/PhpSpreadsheet/issues/4028) [PR #4029](https://github.com/PHPOffice/PhpSpreadsheet/pull/4029)
 - POWER Null/Bool Args. [PR #4031](https://github.com/PHPOffice/PhpSpreadsheet/pull/4031)
 - Do Not Output Alignment and Protection for Conditional Format. [Issue #4025](https://github.com/PHPOffice/PhpSpreadsheet/issues/4025) [PR #4027](https://github.com/PHPOffice/PhpSpreadsheet/pull/4027)
-- Xls Conditional Format Improvements. [PR #4030](https://github.com/PHPOffice/PhpSpreadsheet/pull/4030)
 - Conditional Color Scale Improvements. [Issue #4049](https://github.com/PHPOffice/PhpSpreadsheet/issues/4049) [PR #4050](https://github.com/PHPOffice/PhpSpreadsheet/pull/4050)
+- Mpdf and Tcpdf Borders on Merged Cells. [Issue #3557](https://github.com/PHPOffice/PhpSpreadsheet/issues/3557) [PR #4047](https://github.com/PHPOffice/PhpSpreadsheet/pull/4047)
+- Xls Conditional Format Improvements. [PR #4030](https://github.com/PHPOffice/PhpSpreadsheet/pull/4030) [PR #4033](https://github.com/PHPOffice/PhpSpreadsheet/pull/4033)
+- Csv Reader allow use of html mimetype. [Issue #4036](https://github.com/PHPOffice/PhpSpreadsheet/issues/4036) [PR #4049](https://github.com/PHPOffice/PhpSpreadsheet/pull/4040)
 
 ## 2024-05-11 - 2.1.0
 

samples/Financial2/DISC.php

@@ -5,7 +5,7 @@
 
 require __DIR__ . '/../Header.php';
 
-$helper->log('Returns the the Discount Rate for a security.');
+$helper->log('Returns the Discount Rate for a security.');
 
 // Create new PhpSpreadsheet object
 $spreadsheet = new Spreadsheet();

src/PhpSpreadsheet/Collection/Cells.php

@@ -288,7 +288,7 @@ public function cloneCellCollection(Worksheet $worksheet): static
             $newCollection->index[$key] = $value;
             $stored = $newCollection->cache->set(
                 $newCollection->cachePrefix . $key,
-                clone $this->cache->get($this->cachePrefix . $key)
+                clone $this->getCache($key)
             );
             if ($stored === false) {
                 $this->destructIfNeeded($newCollection, 'Failed to copy cells in cache');
@@ -410,11 +410,7 @@ public function get(string $cellCoordinate): ?Cell
             return null;
         }
 
-        // Check if the entry that has been requested actually exists in the cache
-        $cell = $this->cache->get($this->cachePrefix . $cellCoordinate);
-        if ($cell === null) {
-            throw new PhpSpreadsheetException("Cell entry {$cellCoordinate} no longer exists in cache. This probably means that the cache was cleared by someone else.");
-        }
+        $cell = $this->getcache($cellCoordinate);
 
         // Set current entry to the requested entry
         $this->currentCoordinate = $cellCoordinate;
@@ -466,4 +462,14 @@ private function getAllCacheKeys(): iterable
             yield $this->cachePrefix . $coordinate;
         }
     }
+
+    private function getCache(string $cellCoordinate): Cell
+    {
+        $cell = $this->cache->get($this->cachePrefix . $cellCoordinate);
+        if (!($cell instanceof Cell)) {
+            throw new PhpSpreadsheetException("Cell entry {$cellCoordinate} no longer exists in cache. This probably means that the cache was cleared by someone else.");
+        }
+
+        return $cell;
+    }
 }

src/PhpSpreadsheet/Helper/Html.php

@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Helper;
 
+use DOMAttr;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
@@ -708,6 +709,7 @@ protected function startFontTag(DOMElement $tag): void
     {
         $attrs = $tag->attributes;
         if ($attrs !== null) {
+            /** @var DOMAttr $attribute */
             foreach ($attrs as $attribute) {
                 $attributeName = strtolower($attribute->name);
                 $attributeName = preg_replace('/^html:/', '', $attributeName) ?? $attributeName; // in case from Xml spreadsheet

src/PhpSpreadsheet/Helper/Sample.php

@@ -81,13 +81,9 @@ public function getSamples(): array
         $regex = new RegexIterator($iterator, '/^.+\.php$/', RecursiveRegexIterator::GET_MATCH);
 
         $files = [];
+        /** @var string[] $file */
         foreach ($regex as $file) {
             $file = str_replace(str_replace('\\', '/', $baseDir) . '/', '', str_replace('\\', '/', $file[0]));
-            if (is_array($file)) {
-                // @codeCoverageIgnoreStart
-                throw new RuntimeException('str_replace returned array');
-                // @codeCoverageIgnoreEnd
-            }
             $info = pathinfo($file);
             $category = str_replace('_', ' ', $info['dirname'] ?? '');
             $name = str_replace('_', ' ', (string) preg_replace('/(|\.php)/', '', $info['filename']));
@@ -254,10 +250,10 @@ public function logCalculationResult(
         ?string $descriptionCell = null
     ): void {
         if ($descriptionCell !== null) {
-            $this->log($worksheet->getCell($descriptionCell)->getValue());
+            $this->log($worksheet->getCell($descriptionCell)->getValueString());
         }
-        $this->log($worksheet->getCell($formulaCell)->getValue());
-        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValue());
+        $this->log($worksheet->getCell($formulaCell)->getValueString());
+        $this->log(sprintf('%s() Result is ', $functionName) . $worksheet->getCell($formulaCell)->getCalculatedValueString());
     }
 
     /**

src/PhpSpreadsheet/Reader/BaseReader.php

@@ -39,6 +39,13 @@ abstract class BaseReader implements IReader
      */
     protected ?array $loadSheetsOnly = null;
 
+    /**
+     * Ignore rows with no cells?
+     * Identifies whether the Reader should ignore rows with no cells.
+     *        Currently implemented only for Xlsx.
+     */
+    protected bool $ignoreRowsWithNoCells = false;
+
     /**
      * IReadFilter instance.
      */
@@ -78,6 +85,18 @@ public function setReadEmptyCells(bool $readEmptyCells): self
         return $this;
     }
 
+    public function getIgnoreRowsWithNoCells(): bool
+    {
+        return $this->ignoreRowsWithNoCells;
+    }
+
+    public function setIgnoreRowsWithNoCells(bool $ignoreRowsWithNoCells): self
+    {
+        $this->ignoreRowsWithNoCells = $ignoreRowsWithNoCells;
+
+        return $this;
+    }
+
     public function getIncludeCharts(): bool
     {
         return $this->includeCharts;
@@ -150,6 +169,9 @@ protected function processFlags(int $flags): void
         if (((bool) ($flags & self::SKIP_EMPTY_CELLS) || (bool) ($flags & self::IGNORE_EMPTY_CELLS)) === true) {
             $this->setReadEmptyCells(false);
         }
+        if (((bool) ($flags & self::IGNORE_ROWS_WITH_NO_CELLS)) === true) {
+            $this->setIgnoreRowsWithNoCells(true);
+        }
     }
 
     protected function loadSpreadsheetFromFile(string $filename): Spreadsheet

src/PhpSpreadsheet/Reader/Csv.php

@@ -566,6 +566,7 @@ public function canRead(string $filename): bool
             'text/csv',
             'text/plain',
             'inode/x-empty',
+            'text/html',
         ];
 
         return in_array($type, $supportedTypes, true);

src/PhpSpreadsheet/Reader/Html.php

@@ -2,6 +2,7 @@
 
 namespace PhpOffice\PhpSpreadsheet\Reader;
 
+use DOMAttr;
 use DOMDocument;
 use DOMElement;
 use DOMNode;
@@ -289,6 +290,7 @@ protected function flushCell(Worksheet $sheet, string $column, int|string $row,
     private function processDomElementBody(Worksheet $sheet, int &$row, string &$column, string &$cellContent, DOMElement $child): void
     {
         $attributeArray = [];
+        /** @var DOMAttr $attribute */
         foreach ($child->attributes as $attribute) {
             $attributeArray[$attribute->name] = $attribute->value;
         }

src/PhpSpreadsheet/Reader/IReader.php

@@ -13,6 +13,8 @@ interface IReader
     public const SKIP_EMPTY_CELLS = 4;
     public const IGNORE_EMPTY_CELLS = 4;
 
+    public const IGNORE_ROWS_WITH_NO_CELLS = 8;
+
     public function __construct();
 
     /**

src/PhpSpreadsheet/Reader/Slk.php

@@ -268,6 +268,7 @@ private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, strin
         if ($sharedFormula === true && $sharedRow >= 0 && $sharedColumn >= 0) {
             $thisCoordinate = Coordinate::stringFromColumnIndex((int) $column) . $row;
             $sharedCoordinate = Coordinate::stringFromColumnIndex($sharedColumn) . $sharedRow;
+            /** @var string */
             $formula = $spreadsheet->getActiveSheet()->getCell($sharedCoordinate)->getValue();
             $spreadsheet->getActiveSheet()->getCell($thisCoordinate)->setValue($formula);
             $referenceHelper = ReferenceHelper::getInstance();
@@ -281,6 +282,7 @@ private function processCRecord(array $rowData, Spreadsheet &$spreadsheet, strin
             return;
         }
         $columnLetter = Coordinate::stringFromColumnIndex((int) $column);
+        /** @var string */
         $cellData = Calculation::unwrapResult($cellData);
 
         // Set cell value