Allow rgb() When Converting Html

Fix PHPOffice#2508. Program currently expects `#xxxxxx` to specify a color when used by the `bgcolor` html attribute or the `color` or `background-color` css attributes. This PR allows support for `rgb(red, green, blue)` as well.
oleibman · Nov 29, 2023 · d59c053 · d59c053
1 parent 11a7aaa
commit d59c053
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 3 deletions.
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -37,6 +37,8 @@
  */
 class Html
 {
+ private const RGB_REGEXP = '/^\s*rgb\s*[(]\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*[)]\s*$/';
+
  protected static $listIndex = 0;
 
  protected static $xpath;
@@ -142,7 +144,7 @@ protected static function parseInlineStyle($node, $styles = [])
  break;
  case 'bgcolor':
  // tables, rows, cells e.g. <tr bgColor="#FF0000">
- $styles['bgColor'] = trim($val, '# ');
+ $styles['bgColor'] = self::convertRgb($val);
 
  break;
  case 'valign':
@@ -720,11 +722,11 @@ protected static function parseStyleDeclarations(array $selectors, array $styles
 
  break;
  case 'color':
- $styles['color'] = trim($value, '#');
+ $styles['color'] = self::convertRgb($value);
 
  break;
  case 'background-color':
- $styles['bgColor'] = trim($value, '#');
+ $styles['bgColor'] = self::convertRgb($value);
 
  break;
  case 'line-height':
@@ -1170,4 +1172,13 @@ protected static function parseHorizRule($node, $element): void
  // - line - that is a shape, has different behaviour
  // - repeated text, e.g. underline "_", because of unpredictable line wrapping
  }
+
+ private static function convertRgb(string $rgb): string
+ {
+ if (preg_match(self::RGB_REGEXP, $rgb, $matches) === 1) {
+ return sprintf('%02X%02X%02X', $matches[1], $matches[2], $matches[3]);
+ }
+
+ return trim($rgb, '# ');
+ }
 }
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php b/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php
@@ -17,6 +17,8 @@
 
 namespace PhpOffice\PhpWordTests\Writer\Word2007\Style;
 
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Shared\Html;
 use PhpOffice\PhpWordTests\TestHelperDOCX;
 
 /**
@@ -155,4 +157,44 @@ public function testPosition(): void
  self::assertTrue($doc->elementExists($path));
  self::assertEquals(-20, $doc->getElementAttribute($path, 'w:val'));
  }
+
+ public static function testRgb(): void
+ {
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection(['pageNumberingStart' => 1]);
+ $html = implode(
+ "\n",
+ [
+ '<table>',
+ '<tbody>',
+ '<tr>',
+ '<td style="color: #A7D9C1;">This one is in color.</td>',
+ '<td style="color: rgb(167, 217, 193);">This one too.</td>',
+ '</tr>',
+ '</tbody>',
+ '</table>',
+ ]
+ );
+
+ Html::addHtml($section, $html, false, false);
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $element = '/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r';
+ $txtelem = $element . '/w:t';
+ $styelem = $element . '/w:rPr';
+ self::assertTrue($doc->elementExists($txtelem));
+ self::assertSame('This one is in color.', $doc->getElement($txtelem)->textContent);
+ self::assertTrue($doc->elementExists($styelem));
+ self::assertTrue($doc->elementExists($styelem . '/w:color'));
+ self::assertSame('A7D9C1', $doc->getElementAttribute($styelem . '/w:color', 'w:val'));
+
+ $element = '/w:document/w:body/w:tbl/w:tr/w:tc[2]/w:p/w:r';
+ $txtelem = $element . '/w:t';
+ $styelem = $element . '/w:rPr';
+ self::assertTrue($doc->elementExists($txtelem));
+ self::assertSame('This one too.', $doc->getElement($txtelem)->textContent);
+ self::assertTrue($doc->elementExists($styelem));
+ self::assertTrue($doc->elementExists($styelem . '/w:color'));
+ self::assertSame('A7D9C1', $doc->getElementAttribute($styelem . '/w:color', 'w:val'));
+ }
 }