Upgrade Dompdf, Tcpdf, .gitattributes

.gitattributes

@@ -3,14 +3,18 @@
 /.gitattributes export-ignore
 /.github export-ignore
 /.gitignore export-ignore
-/.php_cs.dist export-ignore
+/.phpcs.xml.dist export-ignore
+/.php-cs-fixer.dist.php export-ignore
+/.readthedocs.yaml export-ignore
 /.scrutinizer.yml export-ignore
 /CHANGELOG.PHPExcel.md export-ignore
 /bin export-ignore
 /composer.lock export-ignore
 /docs export-ignore
 /infra export-ignore
 /mkdocs.yml export-ignore
+/phpstan.neon.dist export-ignore
+/phpstan-baseline.neon export-ignore
 /phpunit.xml.dist export-ignore
 /samples export-ignore
 /tests export-ignore

CHANGELOG.md

@@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com)
 and this project adheres to [Semantic Versioning](https://semver.org).
 
-## TBD - 2.1.5
+## 2024-12-08 - 2.1.5
 
 ### Fixed
 
 - Fix Minor Break Handling Drawings. Backport of [PR #4244](https://github.com/PHPOffice/PhpSpreadsheet/pull/4244)
+- Swapped Row and Column Indexes in Reference Helper. Backport of [PR #4247](https://github.com/PHPOffice/PhpSpreadsheet/pull/4247)
+- Upgrade locked version of Tcpdf (security advisory).
+- Upgrade locked version of Dompdf (Php8.4 compatibility).
+- Remove unnecessary files from Composer package.
 
 ## 2024-11-22 - 2.1.4
 

composer.json

@@ -88,7 +88,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
-        "dompdf/dompdf": "^2.0",
+        "dompdf/dompdf": "^2.0 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.2",
         "mitoteam/jpgraph": "^10.3",
         "mpdf/mpdf": "^8.1.1",

src/PhpSpreadsheet/Helper/Sample.php

@@ -9,7 +9,6 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Writer\IWriter;
-use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use RecursiveRegexIterator;
@@ -130,11 +129,7 @@ public function write(Spreadsheet $spreadsheet, string $filename, array $writers
                 $writerCallback($writer);
             }
             $callStartTime = microtime(true);
-            if (PHP_VERSION_ID >= 80400 && $writer instanceof Dompdf) {
-                @$writer->save($path);
-            } else {
-                $writer->save($path);
-            }
+            $writer->save($path);
             $this->logWrite($writer, $path, $callStartTime);
             if ($this->isCli() === false) {
                 // @codeCoverageIgnoreStart

src/PhpSpreadsheet/ReferenceHelper.php

@@ -1217,7 +1217,7 @@ private function duplicateStylesByRow(Worksheet $worksheet, int $beforeColumn, i
             if ($worksheet->cellExists($coordinate)) {
                 $xfIndex = $worksheet->getCell($coordinate)->getXfIndex();
                 for ($j = $beforeRow; $j <= $beforeRow - 1 + $numberOfRows; ++$j) {
-                    if (!empty($xfIndex) || $worksheet->cellExists([$j, $i])) {
+                    if (!empty($xfIndex) || $worksheet->cellExists([$i, $j])) {
                         $worksheet->getCell(Coordinate::stringFromColumnIndex($i) . $j)->setXfIndex($xfIndex);
                     }
                 }

tests/PhpSpreadsheetTests/Functional/StreamTest.php

@@ -8,12 +8,6 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Not clear that Dompdf will be Php8.4 compatible in time.
- * Run in separate process and add version test till it is ready.
- *
- * @runTestsInSeparateProcesses
- */
 class StreamTest extends TestCase
 {
     public static function providerFormats(): array
@@ -48,11 +42,7 @@ public function testAllWritersCanWriteToStream(string $format): void
         } else {
             self::assertSame(0, $stat['size']);
 
-            if ($format === 'Dompdf' && PHP_VERSION_ID >= 80400) {
-                @$writer->save($stream);
-            } else {
-                $writer->save($stream);
-            }
+            $writer->save($stream);
 
             self::assertIsResource($stream, 'should not close the stream for further usage out of PhpSpreadsheet');
             $stat = fstat($stream);