Scrutinizer

PHPOffice · Nov 30, 2024 · eeef6dc · eeef6dc
1 parent dd69858
commit eeef6dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/PhpSpreadsheet/Writer/Xls/Worksheet.php b/src/PhpSpreadsheet/Writer/Xls/Worksheet.php
@@ -2875,9 +2875,9 @@ private function writeCFRule(
             $bFormatBorder = 0;
         }
         // Pattern
-        $bFillStyle = ($conditional->getStyle()->getFill()->getFillType() == null ? 0 : 1);
-        $bFillColor = ($conditional->getStyle()->getFill()->getStartColor()->getARGB() == null ? 0 : 1);
-        $bFillColorBg = ($conditional->getStyle()->getFill()->getEndColor()->getARGB() == null ? 0 : 1);
+        $bFillStyle = $conditional->getStyle()->getFill()->getFillType() ? 1 : 0;
+        $bFillColor = $conditional->getStyle()->getFill()->getStartColor()->getARGB() ? 1 : 0;
+        $bFillColorBg = $conditional->getStyle()->getFill()->getEndColor()->getARGB() ? 1 : 0;
         if ($bFillStyle == 1 || $bFillColor == 1 || $bFillColorBg == 1) {
             $bFormatFill = 1;
         } else {

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4248Test.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4248Test.php
@@ -27,7 +27,6 @@ public function testStyles(): void
         $file = 'tests/data/Reader/XLSX/issue.4248.xlsx';
         $reader = new XlsxReader();
         $spreadsheet = $reader->load($file);
-        $sheet = $spreadsheet->getActiveSheet();
         $writer = new XlsxWriter($spreadsheet);
         $this->outfile = File::temporaryFilename();
         $writer->save($this->outfile);
@@ -85,7 +84,6 @@ public function testHtml(): void
         $file = 'tests/data/Reader/XLSX/issue.4248.xlsx';
         $reader = new XlsxReader();
         $spreadsheet = $reader->load($file);
-        $sheet = $spreadsheet->getActiveSheet();
         $writer = new HtmlWriter($spreadsheet);
 
         $file = 'zip://';