File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed
src/PhpSpreadsheet/Writer/Xls
tests/PhpSpreadsheetTests/Reader/Xlsx Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -2875,9 +2875,9 @@ private function writeCFRule(
28752875 $ bFormatBorder = 0 ;
28762876 }
28772877 // Pattern
2878- $ bFillStyle = ( $ conditional ->getStyle ()->getFill ()->getFillType () == null ? 0 : 1 ) ;
2879- $ bFillColor = ( $ conditional ->getStyle ()->getFill ()->getStartColor ()->getARGB () == null ? 0 : 1 ) ;
2880- $ bFillColorBg = ( $ conditional ->getStyle ()->getFill ()->getEndColor ()->getARGB () == null ? 0 : 1 ) ;
2878+ $ bFillStyle = $ conditional ->getStyle ()->getFill ()->getFillType () ? 1 : 0 ;
2879+ $ bFillColor = $ conditional ->getStyle ()->getFill ()->getStartColor ()->getARGB () ? 1 : 0 ;
2880+ $ bFillColorBg = $ conditional ->getStyle ()->getFill ()->getEndColor ()->getARGB () ? 1 : 0 ;
28812881 if ($ bFillStyle == 1 || $ bFillColor == 1 || $ bFillColorBg == 1 ) {
28822882 $ bFormatFill = 1 ;
28832883 } else {
Original file line number Diff line number Diff line change @@ -27,7 +27,6 @@ public function testStyles(): void
2727 $ file = 'tests/data/Reader/XLSX/issue.4248.xlsx ' ;
2828 $ reader = new XlsxReader ();
2929 $ spreadsheet = $ reader ->load ($ file );
30- $ sheet = $ spreadsheet ->getActiveSheet ();
3130 $ writer = new XlsxWriter ($ spreadsheet );
3231 $ this ->outfile = File::temporaryFilename ();
3332 $ writer ->save ($ this ->outfile );
@@ -85,7 +84,6 @@ public function testHtml(): void
8584 $ file = 'tests/data/Reader/XLSX/issue.4248.xlsx ' ;
8685 $ reader = new XlsxReader ();
8786 $ spreadsheet = $ reader ->load ($ file );
88- $ sheet = $ spreadsheet ->getActiveSheet ();
8987 $ writer = new HtmlWriter ($ spreadsheet );
9088
9189 $ file = 'zip:// ' ;
You can’t perform that action at this time.
0 commit comments