Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reading Xlsx With Supplied Palette (#2595) 

Fix #2499, which see for details of an obscure problem affecting both PhpSpreadsheet and Excel. Add support for palette contained in workbook styles. This seems to be a very rare occurrence, so allow it only when the palette contains exactly 64 entries. If there are other possibilities, we'll presumably have a new workbook to guide us how to handle them. Also add some tests for specification of indexed color without palette, another rarity (no in-range examples amongst our current files). Also change one private static array, initialized once at run-time and never changed, to a constant.
This commit is contained in:
oleibman 2022-02-23 22:09:22 -08:00 committed by GitHub
parent 0cb60a5098
commit 9cf526a920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 174 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PhpSpreadsheet/Reader/Xlsx.php
View File

@ -541,6 +541,8 @@ class Xlsx extends BaseReader
$xmlStyles = $this->loadZip("$dir/$xpath[Target]", $mainNS); $xmlStyles = $this->loadZip("$dir/$xpath[Target]", $mainNS);
} }
$palette = self::extractPalette($xmlStyles);
$this->styleReader->setWorkbookPalette($palette);
$fills = self::extractStyles($xmlStyles, 'fills', 'fill'); $fills = self::extractStyles($xmlStyles, 'fills', 'fill');
$fonts = self::extractStyles($xmlStyles, 'fonts', 'font'); $fonts = self::extractStyles($xmlStyles, 'fonts', 'font');
$borders = self::extractStyles($xmlStyles, 'borders', 'border'); $borders = self::extractStyles($xmlStyles, 'borders', 'border');
@ -2103,4 +2105,21 @@ class Xlsx extends BaseReader
return $array; return $array;
} }
private static function extractPalette(?SimpleXMLElement $sxml): array
{
$array = [];
if ($sxml && $sxml->colors->indexedColors) {
foreach ($sxml->colors->indexedColors->rgbColor as $node) {
if ($node !== null) {
$attr = $node->attributes();
if (isset($attr['rgb'])) {
$array[] = (string) $attr['rgb'];
}
}
}
}
return (count($array) === 64) ? $array : [];
}
} }

14
src/PhpSpreadsheet/Reader/Xlsx/Styles.php
View File

@ -24,6 +24,9 @@ class Styles extends BaseParserClass
*/ */
private $theme; private $theme;
/** @var array */
private $workbookPalette = [];
/** @var array */ /** @var array */
private $styles = []; private $styles = [];
@ -41,6 +44,11 @@ class Styles extends BaseParserClass
$this->namespace = $namespace; $this->namespace = $namespace;
} }
public function setWorkbookPalette(array $palette): void
{
$this->workbookPalette = $palette;
}
/** /**
* Cast SimpleXMLElement to bool to overcome Scrutinizer problem. * Cast SimpleXMLElement to bool to overcome Scrutinizer problem.
* *
@ -355,7 +363,11 @@ class Styles extends BaseParserClass
return (string) $attr['rgb']; return (string) $attr['rgb'];
} }
if (isset($attr['indexed'])) { if (isset($attr['indexed'])) {
return Color::indexedColor((int) ($attr['indexed'] - 7), $background)->getARGB() ?? ''; if (empty($this->workbookPalette)) {
return Color::indexedColor((int) ($attr['indexed'] - 7), $background)->getARGB() ?? '';
}
return Color::indexedColor((int) ($attr['indexed']), $background, $this->workbookPalette)->getARGB() ?? '';
} }
if (isset($attr['theme'])) { if (isset($attr['theme'])) {
if ($this->theme !== null) { if ($this->theme !== null) {

138
src/PhpSpreadsheet/Style/Color.php
View File

@ -45,12 +45,64 @@ class Color extends Supervisor
const VALIDATE_COLOR_6 = '/^[A-F0-9]{6}$/i'; const VALIDATE_COLOR_6 = '/^[A-F0-9]{6}$/i';
const VALIDATE_COLOR_8 = '/^[A-F0-9]{8}$/i'; const VALIDATE_COLOR_8 = '/^[A-F0-9]{8}$/i';
/** private const INDEXED_COLORS = [
* Indexed colors array. 1 => 'FF000000', // System Colour #1 - Black
* 2 => 'FFFFFFFF', // System Colour #2 - White
* @var array 3 => 'FFFF0000', // System Colour #3 - Red
*/ 4 => 'FF00FF00', // System Colour #4 - Green
protected static $indexedColors; 5 => 'FF0000FF', // System Colour #5 - Blue
6 => 'FFFFFF00', // System Colour #6 - Yellow
7 => 'FFFF00FF', // System Colour #7- Magenta
8 => 'FF00FFFF', // System Colour #8- Cyan
9 => 'FF800000', // Standard Colour #9
10 => 'FF008000', // Standard Colour #10
11 => 'FF000080', // Standard Colour #11
12 => 'FF808000', // Standard Colour #12
13 => 'FF800080', // Standard Colour #13
14 => 'FF008080', // Standard Colour #14
15 => 'FFC0C0C0', // Standard Colour #15
16 => 'FF808080', // Standard Colour #16
17 => 'FF9999FF', // Chart Fill Colour #17
18 => 'FF993366', // Chart Fill Colour #18
19 => 'FFFFFFCC', // Chart Fill Colour #19
20 => 'FFCCFFFF', // Chart Fill Colour #20
21 => 'FF660066', // Chart Fill Colour #21
22 => 'FFFF8080', // Chart Fill Colour #22
23 => 'FF0066CC', // Chart Fill Colour #23
24 => 'FFCCCCFF', // Chart Fill Colour #24
25 => 'FF000080', // Chart Line Colour #25
26 => 'FFFF00FF', // Chart Line Colour #26
27 => 'FFFFFF00', // Chart Line Colour #27
28 => 'FF00FFFF', // Chart Line Colour #28
29 => 'FF800080', // Chart Line Colour #29
30 => 'FF800000', // Chart Line Colour #30
31 => 'FF008080', // Chart Line Colour #31
32 => 'FF0000FF', // Chart Line Colour #32
33 => 'FF00CCFF', // Standard Colour #33
34 => 'FFCCFFFF', // Standard Colour #34
35 => 'FFCCFFCC', // Standard Colour #35
36 => 'FFFFFF99', // Standard Colour #36
37 => 'FF99CCFF', // Standard Colour #37
38 => 'FFFF99CC', // Standard Colour #38
39 => 'FFCC99FF', // Standard Colour #39
40 => 'FFFFCC99', // Standard Colour #40
41 => 'FF3366FF', // Standard Colour #41
42 => 'FF33CCCC', // Standard Colour #42
43 => 'FF99CC00', // Standard Colour #43
44 => 'FFFFCC00', // Standard Colour #44
45 => 'FFFF9900', // Standard Colour #45
46 => 'FFFF6600', // Standard Colour #46
47 => 'FF666699', // Standard Colour #47
48 => 'FF969696', // Standard Colour #48
49 => 'FF003366', // Standard Colour #49
50 => 'FF339966', // Standard Colour #50
51 => 'FF003300', // Standard Colour #51
52 => 'FF333300', // Standard Colour #52
53 => 'FF993300', // Standard Colour #53
54 => 'FF993366', // Standard Colour #54
55 => 'FF333399', // Standard Colour #55
56 => 'FF333333', // Standard Colour #56
];
/** /**
* ARGB - Alpha RGB. * ARGB - Alpha RGB.
@ -335,75 +387,19 @@ class Color extends Supervisor
* *
* @return Color * @return Color
*/ */
public static function indexedColor($colorIndex, $background = false): self public static function indexedColor($colorIndex, $background = false, ?array $palette = null): self
{ {
// Clean parameter // Clean parameter
$colorIndex = (int) $colorIndex; $colorIndex = (int) $colorIndex;
// Indexed colors if (empty($palette)) {
if (self::$indexedColors === null) { if (isset(self::INDEXED_COLORS[$colorIndex])) {
self::$indexedColors = [ return new self(self::INDEXED_COLORS[$colorIndex]);
1 => 'FF000000', // System Colour #1 - Black }
2 => 'FFFFFFFF', // System Colour #2 - White } else {
3 => 'FFFF0000', // System Colour #3 - Red if (isset($palette[$colorIndex])) {
4 => 'FF00FF00', // System Colour #4 - Green return new self($palette[$colorIndex]);
5 => 'FF0000FF', // System Colour #5 - Blue }
6 => 'FFFFFF00', // System Colour #6 - Yellow
7 => 'FFFF00FF', // System Colour #7- Magenta
8 => 'FF00FFFF', // System Colour #8- Cyan
9 => 'FF800000', // Standard Colour #9
10 => 'FF008000', // Standard Colour #10
11 => 'FF000080', // Standard Colour #11
12 => 'FF808000', // Standard Colour #12
13 => 'FF800080', // Standard Colour #13
14 => 'FF008080', // Standard Colour #14
15 => 'FFC0C0C0', // Standard Colour #15
16 => 'FF808080', // Standard Colour #16
17 => 'FF9999FF', // Chart Fill Colour #17
18 => 'FF993366', // Chart Fill Colour #18
19 => 'FFFFFFCC', // Chart Fill Colour #19
20 => 'FFCCFFFF', // Chart Fill Colour #20
21 => 'FF660066', // Chart Fill Colour #21
22 => 'FFFF8080', // Chart Fill Colour #22
23 => 'FF0066CC', // Chart Fill Colour #23
24 => 'FFCCCCFF', // Chart Fill Colour #24
25 => 'FF000080', // Chart Line Colour #25
26 => 'FFFF00FF', // Chart Line Colour #26
27 => 'FFFFFF00', // Chart Line Colour #27
28 => 'FF00FFFF', // Chart Line Colour #28
29 => 'FF800080', // Chart Line Colour #29
30 => 'FF800000', // Chart Line Colour #30
31 => 'FF008080', // Chart Line Colour #31
32 => 'FF0000FF', // Chart Line Colour #32
33 => 'FF00CCFF', // Standard Colour #33
34 => 'FFCCFFFF', // Standard Colour #34
35 => 'FFCCFFCC', // Standard Colour #35
36 => 'FFFFFF99', // Standard Colour #36
37 => 'FF99CCFF', // Standard Colour #37
38 => 'FFFF99CC', // Standard Colour #38
39 => 'FFCC99FF', // Standard Colour #39
40 => 'FFFFCC99', // Standard Colour #40
41 => 'FF3366FF', // Standard Colour #41
42 => 'FF33CCCC', // Standard Colour #42
43 => 'FF99CC00', // Standard Colour #43
44 => 'FFFFCC00', // Standard Colour #44
45 => 'FFFF9900', // Standard Colour #45
46 => 'FFFF6600', // Standard Colour #46
47 => 'FF666699', // Standard Colour #47
48 => 'FF969696', // Standard Colour #48
49 => 'FF003366', // Standard Colour #49
50 => 'FF339966', // Standard Colour #50
51 => 'FF003300', // Standard Colour #51
52 => 'FF333300', // Standard Colour #52
53 => 'FF993300', // Standard Colour #53
54 => 'FF993366', // Standard Colour #54
55 => 'FF333399', // Standard Colour #55
56 => 'FF333333', // Standard Colour #56
];
}
if (isset(self::$indexedColors[$colorIndex])) {
return new self(self::$indexedColors[$colorIndex]);
} }
return ($background) ? new self(self::COLOR_WHITE) : new self(self::COLOR_BLACK); return ($background) ? new self(self::COLOR_WHITE) : new self(self::COLOR_BLACK);

41
tests/PhpSpreadsheetTests/Reader/Xlsx/Issue2490Test.php Normal file
View File

@ -0,0 +1,41 @@
<?php
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\IOFactory;
use PHPUnit\Framework\TestCase;
class Issue2490Test extends TestCase
{
/**
* @var string
*/
private static $testbook = 'tests/data/Reader/XLSX/issue.2490.xlsx';
public function testPreliminaries(): void
{
$file = 'zip://';
$file .= self::$testbook;
$file .= '#xl/styles.xml';
$data = file_get_contents($file);
// confirm that file contains expected color index tag
if ($data === false) {
self::fail('Unable to read file');
} else {
self::assertStringContainsString('<colors><indexedColors><rgbColor rgb="00000000"/>', $data);
}
}
public function testIssue2490(): void
{
// Spreadsheet with its own color palette.
$filename = self::$testbook;
$reader = IOFactory::createReader('Xlsx');
$spreadsheet = $reader->load($filename);
$sheet = $spreadsheet->getActiveSheet();
self::assertSame('00FFFFFF', $sheet->getCell('A3')->getStyle()->getFill()->getStartColor()->getArgb());
self::assertSame('00F0FBFF', $sheet->getCell('A1')->getStyle()->getFill()->getStartColor()->getArgb());
self::assertSame('00F0F0F0', $sheet->getCell('B1')->getStyle()->getFill()->getStartColor()->getArgb());
$spreadsheet->disconnectWorksheets();
}
}

34
tests/PhpSpreadsheetTests/Style/ColorIndexTest.php Normal file
View File

@ -0,0 +1,34 @@
<?php
namespace PhpOffice\PhpSpreadsheetTests\Style;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx\Styles;
use PHPUnit\Framework\TestCase;
class ColorIndexTest extends TestCase
{
/**
* @dataProvider providerColorIndexes
*/
public function testColorIndex(string $expectedResult, string $xml, bool $background = false): void
{
$sxml = simplexml_load_string($xml);
if ($sxml === false) {
self::fail('Unable to parse xml');
} else {
$styles = new Styles();
$result = $styles->readColor($sxml, $background);
self::assertSame($expectedResult, $result);
}
}
public function providerColorIndexes(): array
{
return [
'subtract 7 to return system color 4' => ['FF00FF00', '<fgColor indexed="11"/>'],
'default foreground color when out of range' => ['FF000000', '<color indexed="81"/>'],
'default background color when out of range' => ['FFFFFFFF', '<bgColor indexed="81"/>', true],
'rgb specified' => ['FF123456', '<bgColor rgb="FF123456"/>', true],
];
}
}

BIN
tests/data/Reader/XLSX/issue.2490.xlsx Normal file
View File

Binary file not shown.