From 584c8662d77332aa6c0b16f2e66be44b38ecfe35 Mon Sep 17 00:00:00 2001 From: oleibman <10341515+oleibman@users.noreply.github.com> Date: Wed, 26 Mar 2025 23:47:03 -0700 Subject: [PATCH] Final Touch-up --- ... html_01_Basic_Conditional_Formatting.php} | 0 ...> html_02_More_Conditional_Formatting.php} | 0 ...olor_Scale.php => html_03_Color_Scale.php} | 0 ...l_04_Table_Format_without_Conditional.php} | 0 ...html_05_Table_Format_with_Conditional.php} | 0 .../Writer/Html/HtmlColourScaleTest.php | 84 ++++++++----------- .../Html/HtmlConditionalFormattingTest.php | 12 +-- ...tmlDifferentConditionalFormattingsTest.php | 34 ++++---- 8 files changed, 60 insertions(+), 70 deletions(-) rename samples/Html/{01_Basic_Conditional_Formatting.php => html_01_Basic_Conditional_Formatting.php} (100%) rename samples/Html/{02_More_Conditional_Formatting.php => html_02_More_Conditional_Formatting.php} (100%) rename samples/Html/{03_Color_Scale.php => html_03_Color_Scale.php} (100%) rename samples/Html/{04_Table_Format_without_Conditional.php => html_04_Table_Format_without_Conditional.php} (100%) rename samples/Html/{05_Table_Format_with_Conditional.php => html_05_Table_Format_with_Conditional.php} (100%) diff --git a/samples/Html/01_Basic_Conditional_Formatting.php b/samples/Html/html_01_Basic_Conditional_Formatting.php similarity index 100% rename from samples/Html/01_Basic_Conditional_Formatting.php rename to samples/Html/html_01_Basic_Conditional_Formatting.php diff --git a/samples/Html/02_More_Conditional_Formatting.php b/samples/Html/html_02_More_Conditional_Formatting.php similarity index 100% rename from samples/Html/02_More_Conditional_Formatting.php rename to samples/Html/html_02_More_Conditional_Formatting.php diff --git a/samples/Html/03_Color_Scale.php b/samples/Html/html_03_Color_Scale.php similarity index 100% rename from samples/Html/03_Color_Scale.php rename to samples/Html/html_03_Color_Scale.php diff --git a/samples/Html/04_Table_Format_without_Conditional.php b/samples/Html/html_04_Table_Format_without_Conditional.php similarity index 100% rename from samples/Html/04_Table_Format_without_Conditional.php rename to samples/Html/html_04_Table_Format_without_Conditional.php diff --git a/samples/Html/05_Table_Format_with_Conditional.php b/samples/Html/html_05_Table_Format_with_Conditional.php similarity index 100% rename from samples/Html/05_Table_Format_with_Conditional.php rename to samples/Html/html_05_Table_Format_with_Conditional.php diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php index 979e75bb0..87a9fb698 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlColourScaleTest.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace PhpOffice\PhpSpreadsheetTests\Writer\Html; +use PhpOffice\PhpSpreadsheet\Cell\Coordinate; use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader; use PhpOffice\PhpSpreadsheet\Writer\Html as HtmlWriter; use PHPUnit\Framework\TestCase; @@ -23,57 +24,46 @@ class HtmlColourScaleTest extends TestCase $spreadsheet->disconnectWorksheets(); } - #[\PHPUnit\Framework\Attributes\DataProvider('colourScaleProvider')] - public function testColourScaleHtmlOutput(int $rowNumber, array $expectedMatches): void + private function extractCell(string $coordinate): string { - self::assertSame(1, preg_match('~~ms', $this->data, $matches)); - foreach ($expectedMatches as $i => $expected) { - self::assertStringContainsString($expected, $matches[0]); + [$column, $row] = Coordinate::indexesFromString($coordinate); + --$column; + --$row; + // extract row into $matches + $match = preg_match('~~s', $this->data, $matches); + if ($match !== 1) { + return 'unable to match row'; } + $rowData = $matches[0]; + // extract cell into $matches + $match = preg_match('~1', - '2', - '3', - '4', - '5', - '6', - '7', - '8', - '9', - '10']], - 'row 1: low/high 40%/80% with 50% midpoint' => [1, ['1', - '2', - '3', - '4', - '5', - '6', - '7', - '8', - '9', - '10']], - 'row 2: low/high/midpoint values 3/8/4 ' => [2, ['1', - '2', - '3', - '4', - '5', - '6', - '7', - '8', - '9', - '10']], - 'row 3: low/high with 30/80 percentile and 50% midpoint, one cell no value' => [3, ['1', - '2', - '3', - '4', - '2', - '9', - '9', - '9', - '', - '10']]]; + $expectedMatches = [ + ['E1', 'background-color:#B4CA76;">5<', 'cell E1'], + ['F1', 'background-color:#CBCD71;">6<', 'cell F1'], + ['G1', 'background-color:#E3D16C;">7<', 'cell G1'], + ['D2', 'background-color:#57BB8A;">4<', 'cell D2'], + ['E2', 'background-color:#A1C77A;">5<', 'cell E2'], + ['F2', 'background-color:#F1A36D;">6<', 'cell F2'], + ['D3', 'background-color:#FFD666;">4<', 'cell D3'], + ['G3', 'background-color:#EC926F;">7<', 'cell G3'], + ['H3', 'background-color:#E67C73;">8<', 'cell H3'], + ['A4', 'background-color:#57BB8A;">1<', 'cell A4'], + ['I4', 'null"><', 'empty cell I4'], + ['J4', 'background-color:#E67C73;">10<', 'cell J4'], + ]; + foreach ($expectedMatches as $expected) { + [$coordinate, $expectedString, $message] = $expected; + $string = $this->extractCell($coordinate); + self::assertStringContainsString($expectedString, $string, $message); + } } } diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlConditionalFormattingTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlConditionalFormattingTest.php index 0339248ca..c5a31e415 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlConditionalFormattingTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlConditionalFormattingTest.php @@ -48,12 +48,12 @@ class HtmlConditionalFormattingTest extends TestCase { $expectedMatches = [ ['B1', 'class="column1 style1 s">Jan<', 'no conditional styling for B1'], - ['F2', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#006100;font-family:\'Arial\';font-size:11pt;background-color:#C6EFCE;">120<', 'conditional style for F2'], - ['H2', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#9C5700;font-family:\'Arial\';font-size:11pt;background-color:#FFEB9C;">90<', 'conditional style for H2'], - ['F3', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#006100;font-family:\'Arial\';font-size:11pt;background-color:#C6EFCE;">70<', 'conditional style for cell F3'], - ['H3', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#9C5700;font-family:\'Arial\';font-size:11pt;background-color:#FFEB9C;">60<', 'conditional style for cell H3'], - ['F4', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#006100;font-family:\'Arial\';font-size:11pt;background-color:#C6EFCE;">1<', 'conditional style for cell F4'], - ['L4', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#9C0006;font-family:\'Arial\';font-size:11pt;background-color:#FFC7CE;">5<', 'conditional style for cell L4'], + ['F2', 'background-color:#C6EFCE;">120<', 'conditional style for F2'], + ['H2', 'background-color:#FFEB9C;">90<', 'conditional style for H2'], + ['F3', 'background-color:#C6EFCE;">70<', 'conditional style for cell F3'], + ['H3', 'background-color:#FFEB9C;">60<', 'conditional style for cell H3'], + ['F4', 'background-color:#C6EFCE;">1<', 'conditional style for cell F4'], + ['L4', 'background-color:#FFC7CE;">5<', 'conditional style for cell L4'], ['F5', 'class="column5 style1 n">0<', 'no conditional styling for F5'], ]; foreach ($expectedMatches as $expected) { diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlDifferentConditionalFormattingsTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlDifferentConditionalFormattingsTest.php index 38b7e976d..4bdb88621 100644 --- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlDifferentConditionalFormattingsTest.php +++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlDifferentConditionalFormattingsTest.php @@ -47,40 +47,40 @@ class HtmlDifferentConditionalFormattingsTest extends TestCase public function testConditionalFormattingRulesHtml(): void { $expectedMatches = [ - ['A1', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">1<', 'A1 equals hit'], + ['A1', 'background-color:#B7E1CD;">1<', 'A1 equals hit'], ['B1', 'class="column1 style1 n">2<', 'B1 equals miss'], - ['E1', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">1<', 'E1 equals horizontal reference hit'], + ['E1', 'background-color:#B7E1CD;">1<', 'E1 equals horizontal reference hit'], ['F1', 'class="column5 style1 n">2<', 'F1 equals horizontal reference miss'], ['G1', 'class="column6 style1 n">3<', 'G1 equals horizontal reference miss'], - ['A2', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A2 text contains hit'], + ['A2', 'background-color:#B7E1CD;">terve<', 'A2 text contains hit'], ['B2', 'class="column1 style1 s">moi<', 'B2 text contains miss'], - ['A3', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A3 text does not contain hit'], + ['A3', 'background-color:#B7E1CD;">terve<', 'A3 text does not contain hit'], ['B3', 'class="column1 style1 s">moi<', 'B2 text does not contain miss'], - ['A4', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A4 text starts with hit'], + ['A4', 'background-color:#B7E1CD;">terve<', 'A4 text starts with hit'], ['B4', 'class="column1 style1 s">moi<', 'B2 text starts with miss'], - ['A5', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A5 text ends with hit'], + ['A5', 'background-color:#B7E1CD;">terve<', 'A5 text ends with hit'], ['B5', 'class="column1 style1 s">moi<', 'B5 text ends with miss'], - ['A6', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">2025/01/01<', 'A6 date after hit'], + ['A6', 'background-color:#B7E1CD;">2025/01/01<', 'A6 date after hit'], ['B6', 'class="column1 style2 n">2020/01/01<', 'B6 date after miss'], - ['A7', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve vaan<', 'A7 text contains hit'], + ['A7', 'background-color:#B7E1CD;">terve vaan<', 'A7 text contains hit'], ['B7', 'class="column1 style1 s">moi<', 'B7 text contains miss'], - ['A8', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A8 text does not contain hit'], + ['A8', 'background-color:#B7E1CD;">terve<', 'A8 text does not contain hit'], ['B8', 'class="column1 style1 s">terve vaan<', 'B2 does not contain miss'], - ['A9', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">#DIV/0!<', 'A10 own formula is error hit'], + ['A9', 'background-color:#B7E1CD;">#DIV/0!<', 'A10 own formula is error hit'], ['B9', 'class="column1 style1 s">moi<', 'B9 own formula is error miss'], - ['A10', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">moi<', 'A10 own formula is not error hit'], + ['A10', 'background-color:#B7E1CD;">moi<', 'A10 own formula is not error hit'], ['B10', 'class="column1 style3 s">#DIV/0!<', 'B10 own formula is not error miss'], - ['A11', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'A11 own formula count instances of cell on line and hit when more than one hit'], - ['B11', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">terve<', 'B11 own formula count instances of cell on line and hit when more than one hit'], + ['A11', 'background-color:#B7E1CD;">terve<', 'A11 own formula count instances of cell on line and hit when more than one hit'], + ['B11', 'background-color:#B7E1CD;">terve<', 'B11 own formula count instances of cell on line and hit when more than one hit'], ['C11', 'class="column2 style1 s">moi<', 'C11 own formula count instances of cell on line and hit when more than one miss'], - ['A12', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">moi<', 'A12 own formula count instances of cell on line and hit when at most 1 hit'], + ['A12', 'background-color:#B7E1CD;">moi<', 'A12 own formula count instances of cell on line and hit when at most 1 hit'], ['B12', 'class="column1 style1 s">terve<', 'B12 own formula count instances of cell on line and hit when at most 1 miss'], ['C12', 'class="column2 style1 s">terve<', 'C11 own formula count instances of cell on line and hit when at most 1 miss'], - ['A13', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">12<', 'A13 own formula self reference hit'], + ['A13', 'background-color:#B7E1CD;">12<', 'A13 own formula self reference hit'], ['B13', 'class="column1 style1 n">10<', 'B13 own formula self reference miss'], - ['A14', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">10<', 'A14 multiple conditional hits'], + ['A14', 'background-color:#B7E1CD;">10<', 'A14 multiple conditional hits'], ['B14', 'class="column1 style1 n">1<', 'B14 multiple conditionals miss'], - ['F7', '"vertical-align:bottom;border-bottom:1px solid #000000 !important;border-top:1px solid #000000 !important;border-left:1px solid #000000 !important;border-right:1px solid #000000 !important;color:#000000;font-family:\'Arial\';font-size:11pt;background-color:#B7E1CD;">1<', 'F7 equals vertical reference hit'], + ['F7', 'background-color:#B7E1CD;">1<', 'F7 equals vertical reference hit'], ['F8', 'class="column5 style1 n">2<', 'F8 equals vertical reference miss'], ['F9', 'class="column5 style1 n">3<', 'F9 equals vertical reference miss'], ['F10', 'class="column5 style1 n">4<', 'F10 equals vertical reference miss'],