Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1436 from begnini/fixing_title 

HTML Title Writer loses text when Title contains a TextRun instead a string.
This commit is contained in:
troosan 2018-07-19 02:00:36 +02:00 committed by GitHub
parent f376f207b8 8c62cea580
commit 18c26f9218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpWord/Writer/HTML/Element/Title.php
View File

@ -45,7 +45,7 @@ class Title extends AbstractElement
$text = $this->escaper->escapeHtml($text);
}
} elseif ($text instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
$writer = new Container($this->parentWriter, $this->element);
$writer = new Container($this->parentWriter, $text);
$text = $writer->write();
}

19
tests/PhpWord/Writer/HTML/ElementTest.php
View File

@ -18,6 +18,7 @@
namespace PhpOffice\PhpWord\Writer\HTML;
use PhpOffice\PhpWord\Element\Text as TextElement;
use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\Element\TrackChange;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Writer\HTML;
@ -138,4 +139,22 @@ class ElementTest extends \PHPUnit\Framework\TestCase
return $dom;
}
public function testWriteTitleTextRun()
{
$expected = 'Title with TextRun';
$phpWord = new PhpWord();
$section = $phpWord->addSection();
$textRun = new TextRun();
$textRun->addText($expected);
$section->addTitle($textRun);
$htmlWriter = new HTML($phpWord);
$content = $htmlWriter->getContent();
$this->assertTrue(strpos($content, $expected) !== false);
}
}