Upgrade Dompdf

Author: oleibman

.gitattributes

@@ -3,14 +3,19 @@
 /.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
+/phpunit9.xml.dist export-ignore
 /samples export-ignore
 /tests export-ignore

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### 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 Dompdf (Php8.4 compatibility).
+- Remove unnecessary files from Composer package.
 
 ## 2024-11-22 - 2.3.3
 

composer.lock

@@ -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;
@@ -126,11 +125,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/Helper/Sample.php

@@ -1215,7 +1215,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);
                     }
                 }

src/PhpSpreadsheet/ReferenceHelper.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests;
+
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PHPUnit\Framework\TestCase;
+
+class ReferenceHelper5Test extends TestCase
+{
+    public function testIssue4246(): void
+    {
+        // code below would have thrown exception because
+        // row and column were swapped in code
+        $spreadsheet = new Spreadsheet();
+        $sheet = $spreadsheet->getActiveSheet();
+        $row = 987654;
+        $rowMinus1 = $row - 1;
+        $rowPlus1 = $row + 1;
+        $sheet->getCell("A$rowMinus1")->setValue(1);
+        $sheet->getCell("B$rowMinus1")->setValue(2);
+        $sheet->getCell("C$rowMinus1")->setValue(3);
+        $sheet->getStyle("A$rowMinus1")->getFont()->setBold(true);
+        $sheet->getCell("A$row")->setValue(1);
+        $sheet->getCell("B$row")->setValue(2);
+        $sheet->getCell("C$row")->setValue(3);
+        $sheet->getStyle("B$row")->getFont()->setBold(true);
+
+        $sheet->insertNewRowBefore($row);
+        self::assertTrue(
+            $sheet->getStyle("A$row")->getFont()->getBold()
+        );
+        self::assertFalse(
+            $sheet->getStyle("B$row")->getFont()->getBold()
+        );
+        self::assertFalse(
+            $sheet->getStyle("A$rowPlus1")->getFont()->getBold()
+        );
+        self::assertTrue(
+            $sheet->getStyle("B$rowPlus1")->getFont()->getBold()
+        );
+        $spreadsheet->disconnectWorksheets();
+    }
+}

tests/PhpSpreadsheetTests/ReferenceHelper5Test.php

@@ -10,12 +10,6 @@
 use PhpOffice\PhpSpreadsheet\Writer\Pdf\Dompdf;
 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 PaperSizeArrayTest extends TestCase
 {
     private string $outfile = '';
@@ -42,11 +36,7 @@ public function testPaperSizeArray(): void
         $sheet->setCellValue('A7', 'Lorem Ipsum');
         $writer = new Dompdf($spreadsheet);
         $this->outfile = File::temporaryFilename();
-        if (PHP_VERSION_ID >= 80400) { // hopefully temporary
-            @$writer->save($this->outfile);
-        } else {
-            $writer->save($this->outfile);
-        }
+        $writer->save($this->outfile);
         $spreadsheet->disconnectWorksheets();
         unset($spreadsheet);
         $contents = file_get_contents($this->outfile);
@@ -66,11 +56,7 @@ public function testPaperSizeNotArray(): void
         $sheet->setCellValue('A7', 'Lorem Ipsum');
         $writer = new Dompdf($spreadsheet);
         $this->outfile = File::temporaryFilename();
-        if (PHP_VERSION_ID >= 80400) { // hopefully temporary
-            @$writer->save($this->outfile);
-        } else {
-            $writer->save($this->outfile);
-        }
+        $writer->save($this->outfile);
         $spreadsheet->disconnectWorksheets();
         unset($spreadsheet);
         $contents = file_get_contents($this->outfile);