Merge pull request #578 from ComputerTinker/develop

#574 Incorrect Constant Names in \Style\Font.php
PHPOffice · Nov 7, 2017 · 64a6505 · 64a6505
2 parents 610d91e + e929610
commit 64a6505
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
@@ -1698,7 +1698,7 @@ private function readPrl($data, $pos, $cbNum)
  $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASH;
  break;
  case 0x09:
- $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASH;
+ $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASH;
  break;
  case 0x0A:
  $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASH;
@@ -1713,7 +1713,7 @@ private function readPrl($data, $pos, $cbNum)
  $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DASHHEAVY;
  break;
  case 0x19:
- $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTHASHHEAVY;
+ $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDASHHEAVY;
  break;
  case 0x1A:
  $oStylePrl->styleFont['underline'] = Style\Font::UNDERLINE_DOTDOTDASHHEAVY;

diff --git a/src/PhpWord/Style/Font.php b/src/PhpWord/Style/Font.php
@@ -33,8 +33,10 @@ class Font extends AbstractStyle
  const UNDERLINE_DASHLONG = 'dashLong';
  const UNDERLINE_DASHLONGHEAVY = 'dashLongHeavy';
  const UNDERLINE_DOUBLE = 'dbl';
- const UNDERLINE_DOTHASH = 'dotDash';
- const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy';
+ const UNDERLINE_DOTHASH = 'dotDash'; // Incorrect spelling, for backwards compatibility
+ const UNDERLINE_DOTHASHHEAVY = 'dotDashHeavy'; // Incorrect spelling, for backwards compatibility
+ const UNDERLINE_DOTDASH = 'dotDash'; // Correct spelling
+ const UNDERLINE_DOTDASHHEAVY = 'dotDashHeavy'; // Correct spelling
  const UNDERLINE_DOTDOTDASH = 'dotDotDash';
  const UNDERLINE_DOTDOTDASHHEAVY = 'dotDotDashHeavy';
  const UNDERLINE_DOTTED = 'dotted';