Conditional Formatting in extLst

Fix #4629. Excel Xml can specify Conditional Formatting in 2 ways - either using a `conditionalFormatting` tag as a child of `worksheet`, or in a slightly different manner as a child of `worksheet->extLst`. Although these are both handled by PhpSpreadsheet, the former is lost if there exists a latter whose cell range (`sqref`) matches it. This PR merges the former with the latter in that circumstance, preserving both.

The issue also notes that `font` and `stopIfTrue` are not handled correctly. Support for those was missing in the `extlst` handling, and is now added with this PR.

Author: oleibman

src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php

@@ -71,6 +71,11 @@ private function setConditionalsFromExt(array $conditionals): void
             ksort($cfRules);
             // Priority is used as the key for sorting; but may not start at 0,
             // so we use array_values to reset the index after sorting.
+            $existing = $this->worksheet->getConditionalStylesCollection();
+            if (array_key_exists($conditionalRange, $existing)) {
+                $conditionalStyle = $existing[$conditionalRange];
+                $cfRules = array_merge($conditionalStyle, $cfRules);
+            }
             $this->worksheet->getStyle($conditionalRange)
                 ->setConditionalStyles(array_values($cfRules));
         }
@@ -133,6 +138,7 @@ private function readConditionalRuleFromExt(SimpleXMLElement $cfRuleXml, SimpleX
         $conditionType = (string) $attributes->type;
         $operatorType = (string) $attributes->operator;
         $priority = (int) (string) $attributes->priority;
+        $stopIfTrue = (int) (string) $attributes->stopIfTrue;
 
         $operands = [];
         foreach ($cfRuleXml->children($this->ns['xm']) as $cfRuleOperandsXml) {
@@ -143,6 +149,7 @@ private function readConditionalRuleFromExt(SimpleXMLElement $cfRuleXml, SimpleX
         $conditional->setConditionType($conditionType);
         $conditional->setOperatorType($operatorType);
         $conditional->setPriority($priority);
+        $conditional->setStopIfTrue($stopIfTrue === 1);
         if (
             $conditionType === Conditional::CONDITION_CONTAINSTEXT
             || $conditionType === Conditional::CONDITION_NOTCONTAINSTEXT
@@ -169,6 +176,9 @@ private function readStyleFromExt(SimpleXMLElement $extCfRuleXml): Style
             if ($styleXML->fill) {
                 $this->styleReader->readFillStyle($cfStyle->getFill(), $styleXML->fill);
             }
+            if ($styleXML->font) {
+                $this->styleReader->readFontStyle($cfStyle->getFont(), $styleXML->font);
+            }
         }
 
         return $cfStyle;

tests/PhpSpreadsheetTests/Reader/Xlsx/Issue4629Test.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PHPUnit\Framework\TestCase;
+
+class Issue4629Test extends TestCase
+{
+    public function testExternalAndInternalCondionalStyles(): void
+    {
+        $infile = 'tests/data/Reader/XLSX/issue.4629.xlsx';
+        $reader = new XlsxReader();
+        $spreadsheet = $reader->load($infile);
+        $sheet = $spreadsheet->getSheetByNameOrThrow('top');
+        $conditionals = $sheet->getStyle('A1:A20')->getConditionalStyles();
+        self::assertCount(3, $conditionals);
+
+        $conditional = $conditionals[0];
+        self::assertSame('expression', $conditional->getConditionType());
+        self::assertFalse($conditional->getStopIfTrue());
+        self::assertSame(['$A1<>$B1'], $conditional->getConditions());
+        self::assertSame(2, $conditional->getPriority());
+
+        $conditional = $conditionals[1];
+        self::assertSame('expression', $conditional->getConditionType());
+        self::assertFalse($conditional->getStopIfTrue());
+        self::assertSame(['AND($A1="cheese", $C1="yogurt")'], $conditional->getConditions());
+        self::assertSame(3, $conditional->getPriority());
+
+        $conditional = $conditionals[2]; // defined within <ext>
+        self::assertSame('expression', $conditional->getConditionType());
+        self::assertTrue($conditional->getStopIfTrue());
+        self::assertSame(['A1<>bottom!A1'], $conditional->getConditions());
+        self::assertSame(1, $conditional->getPriority());
+        self::assertSame('FF9C5700', $conditional->getStyle()->getFont()->getColor()->getArgb());
+
+        $spreadsheet->disconnectWorksheets();
+    }
+}