Ignore Theme When Tint is Also Specified

Theme colors subject to tints occur in the wild, and should not be targeted by this PR. Our use case is an unmodified Theme color. There is probably a decent case to be made for adding a Tint property to Color, but that can come later if desired.

`Color::setHyperlinkTheme` will now try to fill in `rgb` as well as `theme` if it can locate an appropriate value in the Spreadsheet Theme. This will permit non-Xlsx formats to at least duplicate the color that Xlsx uses for hyperlinks.

Setting `Color::rgb\argb` will reset `theme` to none. If you want to use both, do rgb first, then theme. This will, I hope, avoid surpises for end-users.

Author: oleibman

docs/topics/recipes.md

@@ -20,7 +20,7 @@ finding a specific document in a file repository or a document
 management system. For example Microsoft Sharepoint uses document
 metadata to search for a specific document in its document lists.
 
-<details>
+<details markdown>
   <summary>Click here for details of Spreadsheet Document Properties</summary>
 
 These are accessed in MS Excel from the "Info" option on the "File" menu:
@@ -67,7 +67,7 @@ $spreadsheet->getProperties()
 
 You can choose which properties to set or ignore.
 
-<details>
+<details markdown>
   <summary>Click here for details of Property Getters/Setters</summary>
 
 PhpSpreadsheet provides specific getters/setters for a number of pre-defined properties.
@@ -90,7 +90,7 @@ PhpSpreadsheet provides specific getters/setters for a number of pre-defined pro
 
 </details>
 
-<details>
+<details markdown>
   <summary>Click here for details of Custom Properties</summary>
 
 Additionally, PhpSpreadsheet supports the creation and reading of custom properties for those file formats that accept custom properties.
@@ -143,7 +143,7 @@ $spreadsheet->getProperties()
 
 A Spreadsheet consists of (very rarely) none, one or more Worksheets. If you have 1 or more Worksheets, then one (and only one) of those Worksheets can be "Active" (viewed or updated) at a time, but there will always be an "Active" Worksheet (unless you explicitly delete all of the Worksheets in the Spreadsheet).
 
-<details>
+<details markdown>
   <summary>Click here for details about Worksheets</summary>
 
 When you create a new Spreadsheet in MS Excel, it creates the Spreadsheet with a single Worksheet ("Sheet1")
@@ -278,7 +278,7 @@ define your own values as long as they are a valid MS Excel format.
 PhpSpreadsheet also provides a number of Wizards to help you create
 Date, Time and DateTime format masks.
 
-<details>
+<details markdown>
   <summary>Click here for an example of the Date/Time Wizards</summary>
 
 ```php
@@ -657,7 +657,8 @@ $spreadsheet->getActiveSheet()
     ->getFont()
     ->setHyperlinkTheme();
 ```
-This will set underline (all formats) and text color (Xlsx only).
+This will set underline (all formats) and text color (always
+for Xlsx, and usually for other formats).
 
 ## Setting Printer Options for Excel files
 
@@ -840,7 +841,9 @@ $drawing = new \PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooterDrawing();
 $drawing->setName('PhpSpreadsheet logo');
 $drawing->setPath('./images/PhpSpreadsheet_logo.png');
 $drawing->setHeight(36);
-$spreadsheet->getActiveSheet()->getHeaderFooter()->addImage($drawing, \PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooter::IMAGE_HEADER_LEFT);
+$spreadsheet->getActiveSheet()
+    ->getHeaderFooter()
+    ->addImage($drawing, \PhpOffice\PhpSpreadsheet\Worksheet\HeaderFooter::IMAGE_HEADER_LEFT);
 ```
 
 ### Setting printing breaks on a row or column
@@ -2034,7 +2037,11 @@ $richText->createText('This invoice is ');
 $payable = $richText->createTextRun('payable within thirty days after the end of the month');
 $payable->getFont()->setBold(true);
 $payable->getFont()->setItalic(true);
-$payable->getFont()->setColor( new \PhpOffice\PhpSpreadsheet\Style\Color( \PhpOffice\PhpSpreadsheet\Style\Color::COLOR_DARKGREEN ) );
+$payable->getFont()->setColor(
+    new \PhpOffice\PhpSpreadsheet\Style\Color( 
+        \PhpOffice\PhpSpreadsheet\Style\Color::COLOR_DARKGREEN
+    )
+);
 $richText->createText(', unless specified otherwise on the invoice.');
 $spreadsheet->getActiveSheet()->getCell('A18')->setValue($richText);
 ```

docs/topics/settings.md

@@ -42,7 +42,7 @@ then the `setLocale()` method will return an error, and American English
 More details of the features available once a locale has been set,
 including a list of the languages and locales currently supported, can
 be found in [Locale Settings for
-Formulae](./recipes.md#locale-settings-for-formulae).
+Formulas](./recipes.md#locale-settings-for-formulas).
 
 ## HTTP client
 

mkdocs.yml

@@ -7,3 +7,5 @@ extra_css:
     - extra/extra.css
 extra_javascript:
     - extra/extrajs.js
+markdown_extensions:
+    - md_in_html

src/PhpSpreadsheet/Reader/Xlsx/Styles.php

@@ -104,14 +104,14 @@ public function readFontStyle(Font $fontStyle, SimpleXMLElement $fontStyleXml):
             $attr = $this->getStyleAttributes($fontStyleXml->strike);
             $fontStyle->setStrikethrough(!isset($attr['val']) || self::boolean((string) $attr['val']));
         }
-        $theme = $this->readColorTheme($fontStyleXml->color);
-        if ($theme >= 0) {
-            $fontStyle->getColor()->setTheme($theme);
-        }
         $fontStyle->getColor()
             ->setARGB(
                 $this->readColor($fontStyleXml->color)
             );
+        $theme = $this->readColorTheme($fontStyleXml->color);
+        if ($theme >= 0) {
+            $fontStyle->getColor()->setTheme($theme);
+        }
 
         if (isset($fontStyleXml->u)) {
             $attr = $this->getStyleAttributes($fontStyleXml->u);
@@ -408,8 +408,12 @@ public function readProtectionHidden(Style $docStyle, SimpleXMLElement $style):
     public function readColorTheme(SimpleXMLElement $color): int
     {
         $attr = $this->getStyleAttributes($color);
+        $retVal = -1;
+        if (isset($attr['theme']) && is_numeric((string) $attr['theme']) && !isset($attr['tint'])) {
+            $retVal = (int) $attr['theme'];
+        }
 
-        return isset($attr['theme']) ? (int) $attr['theme'] : -1;
+        return $retVal;
     }
 
     public function readColor(SimpleXMLElement $color, bool $background = false): string

src/PhpSpreadsheet/Style/Color.php

@@ -248,6 +248,7 @@ public function getARGB(): ?string
     public function setARGB(?string $colorValue = self::COLOR_BLACK, bool $nullStringOkay = false): static
     {
         $this->hasChanged = true;
+        $this->setTheme(-1);
         if (!$nullStringOkay || $colorValue !== '') {
             $colorValue = $this->validateColor($colorValue);
             if ($colorValue === '') {
@@ -464,6 +465,14 @@ public function setTheme(int $theme): self
 
     public function setHyperlinkTheme(): self
     {
+        $rgb = $this->getActiveSheet()
+            ->getParent()
+            ?->getTheme()
+            ->getThemeColors();
+        if (is_array($rgb) && array_key_exists('hlink', $rgb)) {
+            $this->setRGB($rgb['hlink']);
+        }
+
         return $this->setTheme(Theme::HYPERLINK_THEME);
     }
 }

tests/PhpSpreadsheetTests/Reader/Xlsx/HyperlinkTest.php

@@ -55,6 +55,13 @@ public function testReadAndWriteHyperlinks(): void
         $rsheet2 = $reloadedSpreadsheet->getSheet(1);
         self::assertSame('link to other sheet', $rsheet2->getCell('A2')->getValue());
         self::assertSame("sheet://'Sheet One'!A1", $rsheet2->getCell('A2')->getHyperlink()->getUrl());
+         self::assertSame(
+             'FF0000FF',
+             $rsheet2
+                 ->getStyle('A2')
+                 ->getFont()->getColor()->getARGB(),
+             'argb is set in addition to theme'
+         );
 
         self::assertSame('external link', $rsheet2->getCell('A3')->getValue());
         self::assertSame('https://www.example.com', $rsheet2->getCell('A3')->getHyperlink()->getUrl());