+
+
+
+Testing Head Section
+
+
+
+
+
+
+This is bold text.
+
+
+EOF;
+ Html::addHtml($section, $htmlContent, true, true);
+ self::assertSame('Testing Head Section', $phpWord->getDocInfo()->getTitle());
+ self::assertSame('PhpWord Test', $phpWord->getDocInfo()->getCreator());
+ self::assertSame('testing html read including meta tags', $phpWord->getDocInfo()->getDescription());
+ $elements = $section->getElements();
+ self::assertCount(1, $elements);
+ $element = $elements[0];
+ self::assertInstanceOf(TextRun::class, $element);
+ $textElements = $element->getElements();
+ self::assertCount(3, $textElements);
+
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ $style = $textElement->getFontStyle();
+ self::assertInstanceOf(Font::class, $style);
+ self::assertNotTrue($style->isBold());
+ self::assertSame('This is ', $textElement->getText());
+
+ $textElement = $textElements[1];
+ self::assertInstanceOf(Text::class, $textElement);
+ $style = $textElement->getFontStyle();
+ self::assertInstanceOf(Font::class, $style);
+ self::assertTrue($style->isBold());
+ self::assertSame('bold', $textElement->getText());
+
+ $textElement = $textElements[2];
+ self::assertInstanceOf(Text::class, $textElement);
+ $style = $textElement->getFontStyle();
+ self::assertInstanceOf(Font::class, $style);
+ self::assertNotTrue($style->isBold());
+ self::assertSame(' text.', $textElement->getText());
+ }
+}
diff --git a/tests/PhpWordTests/Shared/HtmlHeadingsTest.php b/tests/PhpWordTests/Shared/HtmlHeadingsTest.php
new file mode 100644
index 0000000000..4704e8b3e1
--- /dev/null
+++ b/tests/PhpWordTests/Shared/HtmlHeadingsTest.php
@@ -0,0 +1,66 @@
+addTitleStyle(1, ['size' => 20]);
+ $section = $originalDoc->addSection();
+ $expectedStrings = [];
+ $section->addTitle('Title 1', 1);
+ $expectedStrings[] = 'Title 1
';
+ for ($i = 2; $i <= 6; ++$i) {
+ $textRun = new TextRun();
+ $textRun->addText('Title ');
+ $textRun->addText("$i", ['italic' => true]);
+ $section->addTitle($textRun, $i);
+ $expectedStrings[] = "Title $i";
+ }
+ $writer = new HtmlWriter($originalDoc);
+ $content = $writer->getContent();
+ foreach ($expectedStrings as $expectedString) {
+ self::assertStringContainsString($expectedString, $content);
+ }
+
+ $newDoc = new PhpWord();
+ $newSection = $newDoc->addSection();
+ SharedHtml::addHtml($newSection, $content, true);
+ $newWriter = new HtmlWriter($newDoc);
+ $newContent = $newWriter->getContent();
+ // Reader transforms Text to TextRun,
+ // but result is functionally the same.
+ $firstStringAsTextRun = 'Title 1
';
+ self::assertSame($content, str_replace($firstStringAsTextRun, $expectedStrings[0], $newContent));
+ }
+}
diff --git a/tests/PhpWordTests/Shared/HtmlRtlTest.php b/tests/PhpWordTests/Shared/HtmlRtlTest.php
new file mode 100644
index 0000000000..219437fd9c
--- /dev/null
+++ b/tests/PhpWordTests/Shared/HtmlRtlTest.php
@@ -0,0 +1,180 @@
+addSection();
+ $html = 'test1.
';
+ $html .= 'test2.
';
+ $html .= 'test3.
';
+ Html::addHtml($section, $html);
+ $elements = $section->getElements();
+ self::assertCount(3, $elements);
+
+ $index = 0;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertTrue($paragraphStyle->isBidi());
+ self::assertSame('tbRl', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertTrue($textElement->getFontStyle()->isRtl());
+
+ $index = 1;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertFalse($paragraphStyle->isBidi());
+ self::assertSame('lrTb', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertFalse($textElement->getFontStyle()->isRtl());
+
+ $index = 2;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertNull($paragraphStyle->isBidi());
+ self::assertSame('', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertNull($textElement->getFontStyle()->isRtl());
+ }
+
+ public function testParseHtmlDir(): void
+ {
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'test1.
';
+ $html .= 'test2.
';
+ $html .= 'test3.
';
+ Html::addHtml($section, $html);
+ $elements = $section->getElements();
+ self::assertCount(3, $elements);
+
+ $index = 0;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertTrue($paragraphStyle->isBidi());
+ self::assertSame('tbRl', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertTrue($textElement->getFontStyle()->isRtl());
+
+ $index = 1;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertFalse($paragraphStyle->isBidi());
+ self::assertSame('lrTb', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertFalse($textElement->getFontStyle()->isRtl());
+
+ $index = 2;
+ $element = $elements[$index];
+ self::assertInstanceOf(TextRun::class, $element);
+ $paragraphStyle = $element->getParagraphStyle();
+ self::assertInstanceOf(Paragraph::class, $paragraphStyle);
+ self::assertNull($paragraphStyle->isBidi());
+ self::assertSame('', $paragraphStyle->getTextDirection());
+ $textElements = $element->getElements();
+ self::assertCount(1, $textElements);
+ $textElement = $textElements[0];
+ self::assertInstanceOf(Text::class, $textElement);
+ self::assertInstanceOf(Font::class, $textElement->getFontStyle());
+ self::assertNull($textElement->getFontStyle()->isRtl());
+ }
+
+ public function testCssClassNameOnPElement(): void
+ {
+ $phpWord = new PhpWord();
+ $phpWord->addFontStyle('customClass', ['bold' => true], ['borderBottomSize' => 3, 'borderBottomColor' => '#00ff00', 'textDirection' => 'tbRl']);
+ $section = $phpWord->addSection();
+ $html = 'test1.
';
+ Html::addHtml($section, $html);
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ $path = '/w:document/w:body/w:p';
+ $paragraphPath = $path . '/w:pPr';
+ $element = $doc->getElement($paragraphPath . '/w:pStyle');
+ self::assertSame('customClass', $element->getAttribute('w:val'));
+ $textPath = $path . '/w:r/w:t';
+ self::assertSame('test1.', $doc->getElement($textPath)->nodeValue);
+ self::assertSame('customClass', $doc->getElement($path . '/w:r/w:rPr/w:rStyle')->getAttribute('w:val'));
+
+ // Styles
+ $file = 'word/styles.xml';
+ $path = '/w:styles/w:style[@w:styleId="customClass"]';
+ $paragraphPath = $path . '/w:pPr';
+ $element = $doc->getElement($paragraphPath . '/w:pBdr/w:bottom', $file);
+ self::assertSame('#00ff00', $element->getAttribute('w:color'));
+ $element = $doc->getElement($paragraphPath . '/w:textDirection', $file);
+ self::assertSame('tbRl', $element->getAttribute('w:val'));
+ $fontPath = $path . '/w:rPr';
+ $element = $doc->getElement($fontPath . '/w:b', $file);
+ self::assertSame('1', $element->getAttribute('w:val'));
+ }
+}
diff --git a/tests/PhpWordTests/Shared/HtmlTest.php b/tests/PhpWordTests/Shared/HtmlTest.php
index c8640509de..765d79f906 100644
--- a/tests/PhpWordTests/Shared/HtmlTest.php
+++ b/tests/PhpWordTests/Shared/HtmlTest.php
@@ -20,10 +20,14 @@
use Exception;
use PhpOffice\PhpWord\Element\Section;
use PhpOffice\PhpWord\Element\Table;
+use PhpOffice\PhpWord\Element\Text;
+use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Shared\Html;
use PhpOffice\PhpWord\SimpleType\Jc;
use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
+use PhpOffice\PhpWord\Style;
+use PhpOffice\PhpWord\Style\Font;
use PhpOffice\PhpWord\Style\Paragraph;
use PhpOffice\PhpWordTests\AbstractWebServerEmbeddedTest;
use PhpOffice\PhpWordTests\TestHelperDOCX;
@@ -154,6 +158,37 @@ public function testParseStyleTableClassName(): void
self::assertEquals('pStyle', $section->getElement(0)->getStyle()->getStyleName());
}
+ public function testSpanClassName(): void
+ {
+ $phpWord = new PhpWord();
+ $phpWord->addFontStyle('boldtext', ['bold' => true]);
+ $html = 'This is bold text.
';
+ $section = $phpWord->addSection();
+ Html::addHtml($section, $html);
+ self::assertTrue(true);
+ $element = $section->getElements()[0];
+ self::assertInstanceOf(TextRun::class, $element);
+ $textElements = $element->getElements();
+ self::assertCount(3, $textElements);
+
+ $text = $textElements[0];
+ self::assertInstanceOf(Text::class, $text);
+ self::assertInstanceOf(Font::class, $text->getFontStyle());
+ self::assertNotTrue($text->getFontStyle()->isBold());
+
+ $text = $textElements[1];
+ self::assertInstanceOf(Text::class, $text);
+ self::assertSame('boldtext', $text->getFontStyle());
+ $style = Style::getStyle('boldtext');
+ self::assertInstanceOf(Font::class, $style);
+ self::assertTrue($style->isBold());
+
+ $text = $textElements[2];
+ self::assertInstanceOf(Text::class, $text);
+ self::assertInstanceOf(Font::class, $text->getFontStyle());
+ self::assertNotTrue($text->getFontStyle()->isBold());
+ }
+
/**
* Test underline.
*/
@@ -635,7 +670,7 @@ public function testParseTableStyleAttributeInlineStyle(): void
$xpath = '/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:shd';
self::assertTrue($doc->elementExists($xpath));
- self::assertEquals('red', $doc->getElement($xpath)->getAttribute('w:fill'));
+ self::assertEquals('ff0000', $doc->getElement($xpath)->getAttribute('w:fill'));
}
/**
@@ -1016,7 +1051,7 @@ public function testParseHorizontalRule(): void
self::assertTrue($doc->elementExists($xpath));
self::assertEquals('single', $doc->getElement($xpath)->getAttribute('w:val'));
self::assertEquals((int) (5 * 15 / 2), $doc->getElement($xpath)->getAttribute('w:sz'));
- self::assertEquals('lightblue', $doc->getElement($xpath)->getAttribute('w:color'));
+ self::assertEquals('add8e6', $doc->getElement($xpath)->getAttribute('w:color'));
$xpath = '/w:document/w:body/w:p[4]/w:pPr/w:spacing';
self::assertTrue($doc->elementExists($xpath));
diff --git a/tests/PhpWordTests/TemplateProcessorSectionTest.php b/tests/PhpWordTests/TemplateProcessorSectionTest.php
new file mode 100644
index 0000000000..0402d4fc66
--- /dev/null
+++ b/tests/PhpWordTests/TemplateProcessorSectionTest.php
@@ -0,0 +1,92 @@
+templateProcessor = new TemplateProcessor($filename);
+
+ return $this->templateProcessor;
+ }
+
+ protected function tearDown(): void
+ {
+ if ($this->templateProcessor !== null) {
+ $filename = $this->templateProcessor->getTempDocumentFilename();
+ $this->templateProcessor = null;
+ if (file_exists($filename)) {
+ @unlink($filename);
+ }
+ }
+ }
+
+ public function testSetComplexSection(): void
+ {
+ $templateProcessor = $this->getTemplateProcessor(__DIR__ . '/_files/templates/document22-xml.docx');
+ $html = '
+ Bug Report:
+ BugTracker X is ${facing1} an issue.
+ BugTracker X is ${facing2} an issue.
+ BugTracker X is ${facing1} an issue.
+ ';
+ $section = new Section(0);
+ Html::addHtml($section, $html, false, false);
+ $templateProcessor->setComplexBlock('test', $section);
+ $facing1 = new TextRun();
+ $facing1->addText('facing', ['bold' => true]);
+ $facing2 = new TextRun();
+ $facing2->addText('facing', ['italic' => true]);
+
+ $templateProcessor->setComplexBlock('test', $section);
+ $templateProcessor->setComplexValue('facing1', $facing1, true);
+ $templateProcessor->setComplexValue('facing2', $facing2);
+
+ $docName = $templateProcessor->save();
+ $docFound = file_exists($docName);
+ self::assertTrue($docFound);
+ $contents = file_get_contents("zip://$docName#word/document2.xml");
+ unlink($docName);
+ self::assertNotFalse($contents);
+ $contents = preg_replace('/>\s+<', $contents) ?? '';
+ self::assertStringContainsString('Test', $contents);
+ $count = substr_count($contents, 'facing');
+ self::assertSame(2, $count, 'should be 2 bold strings');
+ $count = substr_count($contents, 'facing');
+ self::assertSame(1, $count, 'should be 1 italic string');
+ self::assertStringNotContainsString('$', $contents, 'no leftover macros');
+ self::assertStringNotContainsString('facing1', $contents, 'no leftover replaced string1');
+ self::assertStringNotContainsString('facing2', $contents, 'no leftover replaced string2');
+ }
+}
diff --git a/tests/PhpWordTests/TemplateProcessorTest.php b/tests/PhpWordTests/TemplateProcessorTest.php
index 49e88d1b5b..b8ad970ced 100644
--- a/tests/PhpWordTests/TemplateProcessorTest.php
+++ b/tests/PhpWordTests/TemplateProcessorTest.php
@@ -25,6 +25,7 @@
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\TemplateProcessor;
+use Throwable;
use TypeError;
use ZipArchive;
@@ -63,12 +64,21 @@ protected function tearDown(): void
*
* @covers ::__construct
* @covers ::__destruct
+ * @covers \PhpOffice\PhpWord\Shared\ZipArchive::close
*/
public function testTheConstruct(): void
{
$object = $this->getTemplateProcessor(__DIR__ . '/_files/templates/blank.docx');
self::assertInstanceOf('PhpOffice\\PhpWord\\TemplateProcessor', $object);
self::assertEquals([], $object->getVariables());
+ $object->save();
+
+ try {
+ $object->zip()->close();
+ self::fail('Expected exception for double close');
+ } catch (Throwable $e) {
+ // nothing to do here
+ }
}
/**
diff --git a/tests/PhpWordTests/Writer/HTML/FontTest.php b/tests/PhpWordTests/Writer/HTML/FontTest.php
index 442c2639c9..08a8fca6a4 100644
--- a/tests/PhpWordTests/Writer/HTML/FontTest.php
+++ b/tests/PhpWordTests/Writer/HTML/FontTest.php
@@ -84,23 +84,23 @@ public function testFontNames1(): void
self::assertEquals('style5', Helper::getTextContent($xpath, '/html/body/div/p[6]/span', 'class'));
$style = Helper::getTextContent($xpath, '/html/head/style');
- $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
- self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
+ $prg = preg_match('/^body[^\\r\\n]*/m', $style, $matches);
+ self::assertSame(1, $prg);
+ self::assertEquals('body {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
$prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style1 {font-family: \'Tahoma\'; font-size: 10pt; color: #1B2232; font-weight: bold;}', $matches[0]);
$prg = preg_match('/^[.]style2[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style2 {font-family: \'Arial\'; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style3[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style3 {font-family: \'hack attempt'}; display:none\'; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style4[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style4 {font-family: \'padmaa 1.1\'; font-size: 10pt; font-weight: bold;}', $matches[0]);
$prg = preg_match('/^[.]style5[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style5 {font-family: \'MingLiU-ExtB\'; font-size: 10pt; font-weight: bold;}', $matches[0]);
}
@@ -134,20 +134,20 @@ public function testFontNames2(): void
self::assertEquals('style4', Helper::getTextContent($xpath, '/html/body/div/p[5]/span', 'class'));
$style = Helper::getTextContent($xpath, '/html/head/style');
- $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
- self::assertEquals('* {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
+ $prg = preg_match('/^body[^\\r\\n]*/m', $style, $matches);
+ self::assertSame(1, $prg);
+ self::assertEquals('body {font-family: \'Courier New\'; font-size: 12pt;}', $matches[0]);
$prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style1 {font-family: \'Tahoma\'; font-size: 10pt; color: #1B2232; font-weight: bold;}', $matches[0]);
$prg = preg_match('/^[.]style2[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style2 {font-family: \'Arial\', sans-serif; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style3[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style3 {font-family: \'DejaVu Sans Monospace\', monospace; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style4[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style4 {font-family: \'Arial\'; font-size: 10pt;}', $matches[0]);
}
@@ -181,20 +181,20 @@ public function testFontNames3(): void
self::assertEquals('style4', Helper::getTextContent($xpath, '/html/body/div/p[5]/span', 'class'));
$style = Helper::getTextContent($xpath, '/html/head/style');
- $prg = preg_match('/^[*][^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
- self::assertEquals('* {font-family: \'Courier New\', monospace; font-size: 12pt;}', $matches[0]);
+ $prg = preg_match('/^body[^\\r\\n]*/m', $style, $matches);
+ self::assertSame(1, $prg);
+ self::assertEquals('body {font-family: \'Courier New\', monospace; font-size: 12pt;}', $matches[0]);
$prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style1 {font-family: \'Tahoma\'; font-size: 10pt; color: #1B2232; font-weight: bold;}', $matches[0]);
$prg = preg_match('/^[.]style2[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style2 {font-family: \'Arial\', sans-serif; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style3[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style3 {font-family: \'DejaVu Sans Monospace\', monospace; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style4[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style4 {font-family: \'Arial\'; font-size: 10pt;}', $matches[0]);
}
@@ -221,19 +221,19 @@ public function testWhiteSpace(): void
$xpath = new DOMXPath($dom);
$style = Helper::getTextContent($xpath, '/html/head/style');
- self::assertNotFalse(preg_match('/^[*][^\\r\\n]*/m', $style, $matches));
- self::assertEquals('* {font-family: \'Arial\'; font-size: 12pt; white-space: pre-wrap;}', $matches[0]);
+ self::assertNotFalse(preg_match('/^body[^\\r\\n]*/m', $style, $matches));
+ self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; white-space: pre-wrap;}', $matches[0]);
$prg = preg_match('/^[.]style1[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style1 {font-family: \'Courier New\'; font-size: 10pt; white-space: pre-wrap;}', $matches[0]);
$prg = preg_match('/^[.]style2[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style2 {font-family: \'Courier New\'; font-size: 10pt;}', $matches[0]);
$prg = preg_match('/^[.]style3[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style3 {font-family: \'Courier New\'; font-size: 10pt; white-space: normal;}', $matches[0]);
$prg = preg_match('/^[.]style4[^\\r\\n]*/m', $style, $matches);
- self::assertNotFalse($prg);
+ self::assertSame(1, $prg);
self::assertEquals('.style4 {font-family: \'Courier New\'; font-size: 10pt;}', $matches[0]);
}
diff --git a/tests/PhpWordTests/Writer/HTML/Helper.php b/tests/PhpWordTests/Writer/HTML/Helper.php
index b777d4be14..555145d0d6 100644
--- a/tests/PhpWordTests/Writer/HTML/Helper.php
+++ b/tests/PhpWordTests/Writer/HTML/Helper.php
@@ -64,7 +64,7 @@ public static function getNamedItem(DOMXPath $xpath, string $query, string $name
if ($item2 === null) {
self::fail('Unexpected null return requesting item');
} else {
- $returnValue = $item2->attributes->getNamedItem($namedItem);
+ $returnVal = $item2->attributes->getNamedItem($namedItem);
}
}
@@ -94,4 +94,13 @@ public static function getAsHTML(PhpWord $phpWord, string $defaultWhiteSpace = '
return $dom;
}
+
+ public static function getHtmlString(PhpWord $phpWord, string $defaultWhiteSpace = '', string $defaultGenericFont = ''): string
+ {
+ $htmlWriter = new HTML($phpWord);
+ $htmlWriter->setDefaultWhiteSpace($defaultWhiteSpace);
+ $htmlWriter->setDefaultGenericFont($defaultGenericFont);
+
+ return $htmlWriter->getContent();
+ }
}
diff --git a/tests/PhpWordTests/Writer/HTML/PartTest.php b/tests/PhpWordTests/Writer/HTML/PartTest.php
index 9515932ac8..e919b80b5b 100644
--- a/tests/PhpWordTests/Writer/HTML/PartTest.php
+++ b/tests/PhpWordTests/Writer/HTML/PartTest.php
@@ -178,11 +178,17 @@ public function testTitleStyles(): void
$xpath = new DOMXPath($dom);
$style = Helper::getTextContent($xpath, '/html/head/style');
- self::assertNotFalse(strpos($style, 'h1 {font-family: \'Calibri\'; font-weight: bold;}'));
+ //self::assertNotFalse(strpos($style, 'h1 {font-family: \'Calibri\'; font-weight: bold;}'));
self::assertNotFalse(strpos($style, 'h1 {margin-top: 0.5pt; margin-bottom: 0.5pt;}'));
- self::assertNotFalse(strpos($style, 'h2 {font-family: \'Times New Roman\'; font-style: italic;}'));
+ //self::assertNotFalse(strpos($style, 'h2 {font-family: \'Times New Roman\'; font-style: italic;}'));
self::assertNotFalse(strpos($style, 'h2 {margin-top: 0.25pt; margin-bottom: 0.25pt;}'));
self::assertEquals(1, Helper::getLength($xpath, '/html/body/div/h1'));
self::assertEquals(2, Helper::getLength($xpath, '/html/body/div/h2'));
+ // code for getNamedItem had been erroneous
+ self::assertSame("font-family: 'Calibri'; font-weight: bold;", Helper::getNamedItem($xpath, '/html/body/div/h1', 'style')->textContent);
+ $html = Helper::getHtmlString($phpWord);
+ self::assertStringContainsString('Header 1 #1
', $html);
+ self::assertStringContainsString('Header 2 #1
', $html);
+ self::assertStringContainsString('Header 2 #2
', $html);
}
}
diff --git a/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php b/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
index f86507ce06..834b4d4fbb 100644
--- a/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
@@ -18,6 +18,7 @@
namespace PhpOffice\PhpWordTests\Writer\ODText\Part;
use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\SimpleType\Jc;
use PhpOffice\PhpWordTests\TestHelperDOCX;
@@ -28,11 +29,20 @@
*/
class ContentTest extends \PHPUnit\Framework\TestCase
{
+ /** @var string */
+ private $defaultFontName;
+
/**
* Executed before each method of the class.
*/
+ protected function setUp(): void
+ {
+ $this->defaultFontName = Settings::getDefaultFontName();
+ }
+
protected function tearDown(): void
{
+ Settings::setDefaultFontName($this->defaultFontName);
TestHelperDOCX::clear();
}
diff --git a/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php b/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
index b638b380b6..8481d01f88 100644
--- a/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
+++ b/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
@@ -49,14 +49,17 @@ public function testTextAlign(): void
$element .= '/style:paragraph-properties';
self::assertTrue($doc->elementExists($element));
self::assertEquals('right', $doc->getElementAttribute($element, 'fo:text-align'));
+ self::assertEquals('rl-tb', $doc->getElementAttribute($element, 'style:writing-mode'));
$element = "$s2a/style:style[6]/style:paragraph-properties";
self::assertTrue($doc->elementExists($element));
self::assertEquals('right', $doc->getElementAttribute($element, 'fo:text-align'));
+ self::assertEquals('rl-tb', $doc->getElementAttribute($element, 'style:writing-mode'));
$element = "$s2a/style:style[8]/style:paragraph-properties";
self::assertTrue($doc->elementExists($element));
self::assertEquals('left', $doc->getElementAttribute($element, 'fo:text-align'));
+ self::assertEquals('rl-tb', $doc->getElementAttribute($element, 'style:writing-mode'));
$doc->setDefaultFile('styles.xml');
$element = '/office:document-styles/office:styles/style:style';
@@ -64,7 +67,8 @@ public function testTextAlign(): void
self::assertEquals('Normal', $doc->getElementAttribute($element, 'style:name'));
$element .= '/style:paragraph-properties';
self::assertTrue($doc->elementExists($element));
- self::assertEquals('left', $doc->getElementAttribute($element, 'fo:text-align'));
+ self::assertEquals('right', $doc->getElementAttribute($element, 'fo:text-align'));
+ self::assertEquals('rl-tb', $doc->getElementAttribute($element, 'style:writing-mode'));
}
/**
diff --git a/tests/PhpWordTests/Writer/RTF/RichTextTitleTest.php b/tests/PhpWordTests/Writer/RTF/RichTextTitleTest.php
new file mode 100644
index 0000000000..0578c17cad
--- /dev/null
+++ b/tests/PhpWordTests/Writer/RTF/RichTextTitleTest.php
@@ -0,0 +1,50 @@
+addSection();
+ $htmlContent = 'This is heading 1
This is heading 2
';
+ Html::addHtml($section, $htmlContent, false, false);
+ $elements = $section->getElements();
+ self::assertInstanceOf(Title::class, $elements[0]);
+ self::assertInstanceOf(TextRun::class, $elements[0]->getText());
+
+ $writer = new RTF($phpWord);
+ $contents = $writer->getContent();
+ self::assertStringContainsString('{This is heading 1}\par', $contents);
+ self::assertStringContainsString('{This is heading 2}\par', $contents);
+ }
+}
diff --git a/tests/PhpWordTests/Writer/Word2007/Element/TableTest.php b/tests/PhpWordTests/Writer/Word2007/Element/TableTest.php
new file mode 100644
index 0000000000..57010893ae
--- /dev/null
+++ b/tests/PhpWordTests/Writer/Word2007/Element/TableTest.php
@@ -0,0 +1,147 @@
+addSection();
+ $section->addText('Before table (normal).');
+ $table = $section->addTable(['width' => 5000, 'unit' => TblWidth::PERCENT]);
+ $row = $table->addRow();
+ $tc = $table->addCell();
+ $tc->addText('R1C1');
+ $tc = $table->addCell();
+ $tc->addText('R1C2');
+ $row = $table->addRow();
+ $tc = $table->addCell();
+ $tc->addText('R2C1');
+ $tc = $table->addCell();
+ $tc->addText('R2C2');
+ $row = $table->addRow();
+ $tc = $table->addCell();
+ $tc->addText('R3C1');
+ $tc = $table->addCell();
+ $tc->addText('R3C2');
+ $section->addText('After table.');
+
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl[2]'), 'should be only 1 table');
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]'));
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]/w:tc'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]/w:tc[2]'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]/w:tc[3]'));
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc[2]'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc[3]'));
+ }
+
+ public static function testSomeRowWithNoCells(): void
+ {
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('Before table (row 2 has no cells).');
+ $table = $section->addTable(['width' => 5000, 'unit' => TblWidth::PERCENT]);
+ $row = $table->addRow();
+ $tc = $table->addCell();
+ $tc->addText('R1C1');
+ $tc = $table->addCell();
+ $tc->addText('R1C2');
+ $row = $table->addRow();
+ $row = $table->addRow();
+ $tc = $table->addCell();
+ $tc->addText('R3C1');
+ $tc = $table->addCell();
+ $tc->addText('R3C2');
+ $section->addText('After table.');
+
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl[2]'), 'should be only 1 table');
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]'));
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]/w:tc'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]/w:tc[2]'));
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc[2]'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[3]/w:tc[3]'));
+ }
+
+ public static function testOnly1RowWithNoCells(): void
+ {
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('Before table (only 1 row and it has no cells).');
+ $table = $section->addTable(['width' => 5000, 'unit' => TblWidth::PERCENT]);
+ $row = $table->addRow();
+ $section->addText('After table.');
+
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl[2]'), 'only 1 table should be written');
+
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]'));
+ self::assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc'));
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]'));
+
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl/w:tr[2]'));
+ }
+
+ public static function testNoRows(): void
+ {
+ $phpWord = new PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('Before table (no rows therefore omitted).');
+ $table = $section->addTable(['width' => 5000, 'unit' => TblWidth::PERCENT]);
+ $section->addText('After table.');
+
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ self::assertFalse($doc->elementExists('/w:document/w:body/w:tbl[1]'), 'no table should be written');
+ }
+}
diff --git a/tests/PhpWordTests/_files/documents/word.2474.docx b/tests/PhpWordTests/_files/documents/word.2474.docx
new file mode 100644
index 0000000000000000000000000000000000000000..8ecbaef2b3bb00517c31c2087cefd094963f2963
GIT binary patch
literal 27593
zcmeFYRct0vlD7Go?J_enmzkNFxy;PW%*@Qp%*=_59}|
zrIe0R%1}hS@hBqXr9ePY0N?;f002M;P|A|`ECd1o7`|VT0g%9&Lbf(e#x_p6%IZ@spuiM)0O0TY|L6QKw!l!bjNBkSOvttPd+1NqCKEe;$m;#R5yUtQq!nuW
z)-W&1Th^y*`;}_Jx@zRYJw?jqj~=-!R=f=_wZthxvP3iOZK8f0v`YnO}l(;`rHxEYi8sOrXDxJ!8lm=}_++&n#@ecTX3PlfdKZ=aAZU_!K(*V6E
z&vfk%aQ*u5RIsc#8v>Lj;Eiwa9@>e*^x?*>&IX4n^oRj-iUh-dH_B~kyPJh%lPj~B
zmk6^JfcG_VD@JVsoi~x2$t=KD8^c~GsEu!fV)@MG`x
z>i|ALi
z&Cc)mqS!5b<$VSJwY@1-5Z@Ol0O0Ej1R($4VjC|WtM&TZVP(HV7y3K4bsdbY9O-EP
z@%%qA{l7Sn|I4peCG=Z-$29+S;78zGx58RKMxiX7;p{rbDg>magf#N{AB&aG5AHvI
zfVEHc#U|z#5@$UevqYVDlC*EIQdD3gx}lc;>I`bWb-4kOgS(0u+?MV3U^0)MOg_em
zB`C)OBh^tOX0X8HU&7L+`j8KQ3O^l|LYos&&MX>|G#2LAtE@by`7q_BGb}Azh--R6
zRPc!Ogy42eWBU9s;j2$&qKS(g*lN%oQa(#;V~n<-e5A&*qNgLxiZ`hGfpyb0cji&p
zTRI#bObwL}6;Ai&Wuk?o@p&9^gvrNxO{m_ayK9S`r7dv(t#JPuAH~MXm^Y#TOC3St9E9O=Wf%p5m@G80orG%iJd?sIfu
zooW!;q3s44KZx?p3Vu1fo#xJT5*QdI&P$v5jYjCDCSrTj2;*Uh3M?}Z4?ANaPyc8^
zSqUlz*Q7NRjK1aLIcZU8(c+0_Xs9_vuO(3$Ay&2GmK+73b=}eS;XGM
zGBjKSR|nzO%MV_o=wusbD*8ne#{>zg(JX#NKaU@E9}-{1I)*RWuwFDruSk_W?-J0M
zWm4B>#61jb^LJdF!FTmQ6);^NhHj4(2|_PZ`+JAo6EhD{oF!;6#sk@l*cegfqO7D2
z+k3DvFQM1sp!iIHQWrKFRHg$LdL$aQ16_j9LVau4wfLpWf_mH%ycFss-guaEI`b+H
zuDE}%Bg9JAv5!^e%)1lEnYy{Rxy2nbgt#v9Rpny7Xz|^dh>=TJi3ls4_GebEx@CeO
zI6geyK?d@1LCjPsxEhV0nAu3E$P|VOOdw9Bro�v5Mn(nYgT%6ZP325V~XzAmL0M
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
literal 0
HcmV?d00001
From 0ac841e338884e7cac15ea11ff9d623fb4013b1b Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:13:40 -0800
Subject: [PATCH 2/9] Update Html.php
---
src/PhpWord/Shared/Html.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 21d8404ddc..6f168164c6 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -109,7 +109,7 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
$dom->loadXML($html);
static::$xpath = new DOMXPath($dom);
$node = $dom->getElementsByTagName('html');
- if (count($node) === 0) {
+ if (count($node) === 0 || $node->item(0) === null) {
$node = $dom->getElementsByTagName('body');
}
From 39fbabc5e81512078d9f15251d957701da56dca0 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 9 May 2024 00:37:05 -0700
Subject: [PATCH 3/9] Load Html as Html Not Xml
Better from a technical standpoint.
Pre-processing much simplified.
Some post-processing added because loadHTML preserveWhiteSpace=false does not work well.
Not-UTF8 html can now be loaded.
No need to surround snippets with body tag.
---
src/PhpWord/Shared/Html.php | 69 +++++++++++++++---
.../PhpWordTests/Reader/Html/CharsetTest.php | 63 ++++++++++++++++
.../Reader/{ => Html}/HTMLTest.php | 4 +-
tests/PhpWordTests/Shared/HtmlTest.php | 40 +++++++---
.../_files/html/charset.ISO-8859-1.html | 17 +++++
.../_files/html/charset.ISO-8859-1.html4.html | 17 +++++
.../_files/html/charset.ISO-8859-2.html | 17 +++++
.../_files/html/charset.UTF-16.bebom.html | Bin 0 -> 604 bytes
.../_files/html/charset.UTF-16.lebom.html | Bin 0 -> 604 bytes
.../_files/html/charset.UTF-8.bom.html | 16 ++++
.../_files/html/charset.UTF-8.html | 17 +++++
.../_files/html/charset.gb18030.html | 9 +++
.../_files/html/charset.nocharset.html | 8 ++
.../_files/html/charset.unknown.html | 17 +++++
14 files changed, 270 insertions(+), 24 deletions(-)
create mode 100644 tests/PhpWordTests/Reader/Html/CharsetTest.php
rename tests/PhpWordTests/Reader/{ => Html}/HTMLTest.php (92%)
create mode 100644 tests/PhpWordTests/_files/html/charset.ISO-8859-1.html
create mode 100644 tests/PhpWordTests/_files/html/charset.ISO-8859-1.html4.html
create mode 100644 tests/PhpWordTests/_files/html/charset.ISO-8859-2.html
create mode 100644 tests/PhpWordTests/_files/html/charset.UTF-16.bebom.html
create mode 100644 tests/PhpWordTests/_files/html/charset.UTF-16.lebom.html
create mode 100644 tests/PhpWordTests/_files/html/charset.UTF-8.bom.html
create mode 100644 tests/PhpWordTests/_files/html/charset.UTF-8.html
create mode 100644 tests/PhpWordTests/_files/html/charset.gb18030.html
create mode 100644 tests/PhpWordTests/_files/html/charset.nocharset.html
create mode 100644 tests/PhpWordTests/_files/html/charset.unknown.html
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 6f168164c6..9210aec19c 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -46,6 +46,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*$/';
+ private const DECLARES_CHARSET = '/ charset=/i';
+
protected static $listIndex = 0;
protected static $xpath;
@@ -55,6 +57,9 @@ class Html
/** @var ?DocInfo */
protected static $docInfo;
+ /** @var bool */
+ private static $addbody = false;
+
/**
* @var Css
*/
@@ -88,16 +93,14 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
}
}
- // Preprocess: remove all line ends, decode HTML entity,
- // fix ampersand and angle brackets and add body tag for HTML fragments
- $html = str_replace(["\n", "\r"], '', $html);
- $html = str_replace(['<', '>', '&', '"'], ['_lt_', '_gt_', '_amp_', '_quot_'], $html);
- $html = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
- $html = str_replace('&', '&', $html);
- $html = str_replace(['_lt_', '_gt_', '_amp_', '_quot_'], ['<', '>', '&', '"'], $html);
-
- if (false === $fullHTML) {
- $html = '' . $html . '';
+ if (substr($html, 0, 2) === "\xfe\xff" || substr($html, 0, 2) === "\xff\xfe") {
+ $html = mb_convert_encoding($html, 'UTF-8', 'UTF-16');
+ }
+ if (substr($html, 0, 3) === "\xEF\xBB\xBF") {
+ $html = substr($html, 3);
+ }
+ if (self::$addbody && false === $fullHTML) {
+ $html = '' . $html . ''; // @codeCoverageIgnore
}
// Load DOM
@@ -105,8 +108,20 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
$orignalLibEntityLoader = libxml_disable_entity_loader(true); // @codeCoverageIgnore
}
$dom = new DOMDocument();
+ $html = self::replaceNonAsciiIfNeeded($html);
$dom->preserveWhiteSpace = $preserveWhiteSpace;
- $dom->loadXML($html);
+
+ try {
+ $result = $dom->loadHTML($html);
+ $exceptionMessage = 'DOM loadHTML failed';
+ } catch (Exception $e) {
+ $result = false;
+ $exceptionMessage = $e->getMessage();
+ }
+ if ($result === false) {
+ throw new Exception($exceptionMessage);
+ }
+ self::removeAnnoyingWhitespaceTextNodes($dom);
static::$xpath = new DOMXPath($dom);
$node = $dom->getElementsByTagName('html');
if (count($node) === 0 || $node->item(0) === null) {
@@ -119,6 +134,38 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
}
}
+ // https://www.php.net/manual/en/domdocument.loadhtml.php
+ private static function removeAnnoyingWhitespaceTextNodes(DOMNode $node): void
+ {
+ if ($node->hasChildNodes()) {
+ for ($i = $node->childNodes->length - 1; $i >= 0; --$i) {
+ self::removeAnnoyingWhitespaceTextNodes($node->childNodes->item($i));
+ }
+ }
+ if ($node->nodeType === XML_TEXT_NODE && !$node->hasChildNodes() && !$node->hasAttributes() && empty(trim($node->textContent))) {
+ $node->parentNode->removeChild($node);
+ }
+ }
+
+ private static function replaceNonAscii(array $matches): string
+ {
+ return '&#' . mb_ord($matches[0], 'UTF-8') . ';';
+ }
+
+ private static function replaceNonAsciiIfNeeded(string $convert): ?string
+ {
+ if (preg_match(self::DECLARES_CHARSET, $convert) !== 1) {
+ $lowend = "\u{80}";
+ $highend = "\u{10ffff}";
+ $regexp = "/[$lowend-$highend]/u";
+ /** @var callable $callback */
+ $callback = [self::class, 'replaceNonAscii'];
+ $convert = preg_replace_callback($regexp, $callback, $convert);
+ }
+
+ return $convert;
+ }
+
/**
* parse Inline style of a node.
*
diff --git a/tests/PhpWordTests/Reader/Html/CharsetTest.php b/tests/PhpWordTests/Reader/Html/CharsetTest.php
new file mode 100644
index 0000000000..60e80964a2
--- /dev/null
+++ b/tests/PhpWordTests/Reader/Html/CharsetTest.php
@@ -0,0 +1,63 @@
+expectException(Throwable::class);
+ $this->expectExceptionMessage('unknown encoding');
+ }
+ $directory = 'tests/PhpWordTests/_files/html';
+ $reader = new HTML();
+ $doc = $reader->load("$directory/$filename");
+ $sections = $doc->getSections();
+ self::assertCount(1, $sections);
+ $section = $sections[0];
+ $elements = $section->getElements();
+ $element = $elements[0];
+ self::assertInstanceOf(TextRun::class, $element);
+ self::assertSame($expectedResult, $element->getText());
+ }
+
+ public static function providerCharset(): array
+ {
+ return [
+ ['charset.ISO-8859-1.html', 'À1'],
+ ['charset.ISO-8859-1.html4.html', 'À1'],
+ ['charset.ISO-8859-2.html', 'Ŕ1'],
+ ['charset.nocharset.html', 'À1'],
+ ['charset.UTF-8.html', 'À1'],
+ ['charset.UTF-8.bom.html', 'À1'],
+ ['charset.UTF-16.bebom.html', 'À1'],
+ ['charset.UTF-16.lebom.html', 'À1'],
+ ['charset.gb18030.html', '电视机'],
+ ['charset.unknown.html', 'exception'],
+ ];
+ }
+}
diff --git a/tests/PhpWordTests/Reader/HTMLTest.php b/tests/PhpWordTests/Reader/Html/HTMLTest.php
similarity index 92%
rename from tests/PhpWordTests/Reader/HTMLTest.php
rename to tests/PhpWordTests/Reader/Html/HTMLTest.php
index f091e5a275..c0e150e495 100644
--- a/tests/PhpWordTests/Reader/HTMLTest.php
+++ b/tests/PhpWordTests/Reader/Html/HTMLTest.php
@@ -15,7 +15,7 @@
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/
-namespace PhpOffice\PhpWordTests\Reader;
+namespace PhpOffice\PhpWordTests\Reader\Html;
use Exception;
use PhpOffice\PhpWord\IOFactory;
@@ -34,7 +34,7 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
*/
public function testLoad(): void
{
- $filename = __DIR__ . '/../_files/documents/reader.html';
+ $filename = 'tests/PhpWordTests/_files/documents/reader.html';
$phpWord = IOFactory::load($filename, 'HTML');
self::assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord);
}
diff --git a/tests/PhpWordTests/Shared/HtmlTest.php b/tests/PhpWordTests/Shared/HtmlTest.php
index 765d79f906..76e8273ec4 100644
--- a/tests/PhpWordTests/Shared/HtmlTest.php
+++ b/tests/PhpWordTests/Shared/HtmlTest.php
@@ -23,6 +23,7 @@
use PhpOffice\PhpWord\Element\Text;
use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Shared\Html;
use PhpOffice\PhpWord\SimpleType\Jc;
use PhpOffice\PhpWord\SimpleType\LineSpacingRule;
@@ -52,6 +53,7 @@ protected function tearDown(): void
*/
public function testAddHtml(): void
{
+ Settings::setOutputEscapingEnabled(true);
$content = '';
// Default
@@ -80,16 +82,31 @@ public function testAddHtml(): void
// Other parts
$section = $phpWord->addSection();
$content = '';
+ $expectd = '';
$content .= '';
$content .= '';
$content .= '- Bullet
';
$content .= "'Single Quoted Text'";
+ $expectd .= "'Single Quoted Text'";
$content .= '"Double Quoted Text"';
- $content .= '& Ampersand';
+ $expectd .= '"Double Quoted Text"';
+ $content .= '& Ampersand';
+ $expectd .= '& Ampersand';
$content .= '<>“‘’«»‹›';
+ $expectd .= '<>“‘’«»‹›';
$content .= '&•°…™©®—';
+ $expectd .= '&•°…™©®—';
$content .= '– ²³¼½¾';
+ $expectd .= "–\u{a0} ²³¼½¾";
Html::addHtml($section, $content);
+ $elements = $section->getElements();
+ foreach ($elements as $element) {
+ if ($element instanceof Text) {
+ self::assertSame($expectd, $element->getText());
+
+ break;
+ }
+ }
}
/**
@@ -110,7 +127,7 @@ public function testParseFullHtml(): void
*/
public function testParseHtmlEntities(): void
{
- \PhpOffice\PhpWord\Settings::setOutputEscapingEnabled(true);
+ Settings::setOutputEscapingEnabled(true);
$phpWord = new PhpWord();
$section = $phpWord->addSection();
Html::addHtml($section, 'text with entities <my text>');
@@ -138,13 +155,14 @@ public function testParseStyle(): void
Html::addHtml($section, $html);
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
- self::assertTrue($doc->elementExists('/w:document/w:body/w:p[2]'));
- self::assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:r'));
- self::assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:r/w:t'));
- self::assertEquals('Calculator', $doc->getElement('/w:document/w:body/w:p[2]/w:r/w:t')->nodeValue);
- self::assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:r/w:rPr'));
- self::assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:r/w:rPr/w:sz'));
- self::assertEquals('22.5', $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:r/w:rPr/w:sz', 'w:val'));
+ $element = '/w:document/w:body/w:p';
+ self::assertTrue($doc->elementExists($element));
+ self::assertTrue($doc->elementExists("$element/w:r"));
+ self::assertTrue($doc->elementExists("$element/w:r/w:t"));
+ self::assertEquals('Calculator', $doc->getElement("$element/w:r/w:t")->nodeValue);
+ self::assertTrue($doc->elementExists("$element/w:r/w:rPr"));
+ self::assertTrue($doc->elementExists("$element/w:r/w:rPr/w:sz"));
+ self::assertEquals('22.5', $doc->getElementAttribute("$element/w:r/w:rPr/w:sz", 'w:val'));
}
public function testParseStyleTableClassName(): void
@@ -778,7 +796,7 @@ public function testParseListWithFormat(): void
{
$phpWord = new PhpWord();
$section = $phpWord->addSection();
- $html = preg_replace('/\s+/', ' ', '
+ $html = '
- Some text before
list item1 bold with text after bold
@@ -790,7 +808,7 @@ public function testParseListWithFormat(): void
list item2
-
');
+
';
Html::addHtml($section, $html, false, false);
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
diff --git a/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html b/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html
new file mode 100644
index 0000000000..fd27c975f3
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html
@@ -0,0 +1,17 @@
+
+
+
+
+ ISO-8859-1
+
+
+ 1
+
B1
+ 1
+ D1
+ 2
+ B2
+ C2
+ 2
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html4.html b/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html4.html
new file mode 100644
index 0000000000..8a14894517
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.ISO-8859-1.html4.html
@@ -0,0 +1,17 @@
+
+
+
+
+ ISO-8859-1 Html4 Doctype and Meta
+
+
+ 1
+ B1
+ 1
+ D1
+ 2
+ B2
+ C2
+ 2
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.ISO-8859-2.html b/tests/PhpWordTests/_files/html/charset.ISO-8859-2.html
new file mode 100644
index 0000000000..c2b494ff99
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.ISO-8859-2.html
@@ -0,0 +1,17 @@
+
+
+
+
+ ISO-8859-2
+
+
+ 1
+ B1
+ 1
+ D1
+ 2
+ B2
+ C2
+ 2
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.UTF-16.bebom.html b/tests/PhpWordTests/_files/html/charset.UTF-16.bebom.html
new file mode 100644
index 0000000000000000000000000000000000000000..6b29e7d2b011f7d8099fd407244dad7ef0d3121a
GIT binary patch
literal 604
zcmezOpFsf%Z5R|8Tp0WroEbtGA{hc0T!G>l3?&S?3^@#T3|vU+V4?~@nM8&>hI9s7
z26cv1AWI!XWhzib3YusMLnhGN9H0(6hESkwZVb8%h74v5HVpbeafBSQo%%qxU^6R;
zAs=XdC5jC&AHirFh614c0iYcq8$fJ?$uKoA8lu*T1hvmeQ0qd1+QSS+B)FG&waz4%
UdjYFjP$*&xcaS(NZ2-d<0BnUsYybcN
literal 0
HcmV?d00001
diff --git a/tests/PhpWordTests/_files/html/charset.UTF-16.lebom.html b/tests/PhpWordTests/_files/html/charset.UTF-16.lebom.html
new file mode 100644
index 0000000000000000000000000000000000000000..4ba47a81395d2f8076299b471e0357e1287ce1e3
GIT binary patch
literal 604
zcmezWPk{jfZ5R|8Tp0WroEbtGA{hc0T!G>l3?&S?3^@#T3|vrE3Jf-IQ3aq(B10ZS
zI)g2PIzuXurH-L86{sQwO|*m|6KHM@P=_5uD9|=H23-b21~Z_^`ap4n9I~DIKwGhy
zmBf$_G`|wX2AGdvv<*W6Q2qeW4v-BXHo|0>8W;^x>qLUu=On0gAwlh71|t&OOT1cV
U63o4TRV^qKv4uNG967}R0Iu{zYybcN
literal 0
HcmV?d00001
diff --git a/tests/PhpWordTests/_files/html/charset.UTF-8.bom.html b/tests/PhpWordTests/_files/html/charset.UTF-8.bom.html
new file mode 100644
index 0000000000..5a49399018
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.UTF-8.bom.html
@@ -0,0 +1,16 @@
+
+
+
+ UTF-8
+
+
+ À1
+ B1
+ ç1
+ D1
+ Ã2
+ B2
+ C2
+ Ð2
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.UTF-8.html b/tests/PhpWordTests/_files/html/charset.UTF-8.html
new file mode 100644
index 0000000000..9ae5a8e343
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.UTF-8.html
@@ -0,0 +1,17 @@
+
+
+
+
+ UTF-8
+
+
+ À1
+ B1
+ ç1
+ D1
+ Ã2
+ B2
+ C2
+ Ð2
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.gb18030.html b/tests/PhpWordTests/_files/html/charset.gb18030.html
new file mode 100644
index 0000000000..271a55fc54
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.gb18030.html
@@ -0,0 +1,9 @@
+
+
+
+gb18030
+
+
+ ӻ
+
+
diff --git a/tests/PhpWordTests/_files/html/charset.nocharset.html b/tests/PhpWordTests/_files/html/charset.nocharset.html
new file mode 100644
index 0000000000..d6829b2edc
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.nocharset.html
@@ -0,0 +1,8 @@
+ À1
+ B1
+ ç1
+ D1
+ Ã2
+ B2
+ C2
+ Ð2
diff --git a/tests/PhpWordTests/_files/html/charset.unknown.html b/tests/PhpWordTests/_files/html/charset.unknown.html
new file mode 100644
index 0000000000..189638a80f
--- /dev/null
+++ b/tests/PhpWordTests/_files/html/charset.unknown.html
@@ -0,0 +1,17 @@
+
+
+
+
+ UTF-8
+
+
+ À1
+ B1
+ ç1
+ D1
+ Ã2
+ B2
+ C2
+ Ð2
+
+
From cf1fd2a112419e72878b40a7589212f2dfd29c3c Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 9 May 2024 17:35:13 -0700
Subject: [PATCH 4/9] Permit Some Backwards Compatibility
It's debatable, but allow unescaped ampersand and unknown charset.
---
phpunit.xml.dist | 4 ++--
src/PhpWord/Shared/Html.php | 4 ++--
tests/PhpWordTests/Reader/Html/CharsetTest.php | 2 +-
tests/PhpWordTests/Shared/HtmlTest.php | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6f1f5445ab..ff0c676fad 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,10 +7,10 @@
./src/PhpWord/Shared/PCLZip
-
+
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 9210aec19c..2d68806f33 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -112,14 +112,14 @@ public static function addHtml($element, $html, $fullHTML = false, $preserveWhit
$dom->preserveWhiteSpace = $preserveWhiteSpace;
try {
- $result = $dom->loadHTML($html);
+ $result = $dom->loadHTML($html, LIBXML_NOWARNING | LIBXML_NOERROR);
$exceptionMessage = 'DOM loadHTML failed';
} catch (Exception $e) {
$result = false;
$exceptionMessage = $e->getMessage();
}
if ($result === false) {
- throw new Exception($exceptionMessage);
+ throw new Exception($exceptionMessage); // @codeCoverageIgnore
}
self::removeAnnoyingWhitespaceTextNodes($dom);
static::$xpath = new DOMXPath($dom);
diff --git a/tests/PhpWordTests/Reader/Html/CharsetTest.php b/tests/PhpWordTests/Reader/Html/CharsetTest.php
index 60e80964a2..4c73d70bb0 100644
--- a/tests/PhpWordTests/Reader/Html/CharsetTest.php
+++ b/tests/PhpWordTests/Reader/Html/CharsetTest.php
@@ -57,7 +57,7 @@ public static function providerCharset(): array
['charset.UTF-16.bebom.html', 'À1'],
['charset.UTF-16.lebom.html', 'À1'],
['charset.gb18030.html', '电视机'],
- ['charset.unknown.html', 'exception'],
+ 'loadhtml gives its best shot' => ['charset.unknown.html', "Ã\u{80}1"],
];
}
}
diff --git a/tests/PhpWordTests/Shared/HtmlTest.php b/tests/PhpWordTests/Shared/HtmlTest.php
index 76e8273ec4..3fa4b5c1d0 100644
--- a/tests/PhpWordTests/Shared/HtmlTest.php
+++ b/tests/PhpWordTests/Shared/HtmlTest.php
@@ -90,14 +90,14 @@ public function testAddHtml(): void
$expectd .= "'Single Quoted Text'";
$content .= '"Double Quoted Text"';
$expectd .= '"Double Quoted Text"';
- $content .= '& Ampersand';
+ $content .= '& Ampersand';
$expectd .= '& Ampersand';
- $content .= '<>“‘’«»‹›';
- $expectd .= '<>“‘’«»‹›';
+ $content .= '<>“”‘’«»‹›';
+ $expectd .= '<>“”‘’«»‹›';
$content .= '&•°…™©®—';
$expectd .= '&•°…™©®—';
$content .= '– ²³¼½¾';
- $expectd .= "–\u{a0} ²³¼½¾";
+ $expectd .= "–\u{a0}\u{2003}\u{2002}²³¼½¾";
Html::addHtml($section, $content);
$elements = $section->getElements();
foreach ($elements as $element) {
From 2f799c2ba9be781106ac84545a58b58b2fc00f98 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 16 Aug 2024 08:10:24 -0700
Subject: [PATCH 5/9] Phpstan False Positives
---
src/PhpWord/Shared/Html.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index d78338526a..2d96c375f7 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -180,7 +180,7 @@ protected static function parseInlineStyle($node, &$styles)
$attributes = $node->attributes; // get all the attributes(eg: id, class)
$bidi = false;
- $direction = isset($attributes['dir']) ? $attributes['dir']->value : '';
+ $direction = isset($attributes['dir']) ? $attributes['dir']->value : ''; // @phpstan-ignore-line
if ($direction === 'rtl') {
$bidi = $styles['bidi'] = $styles['rtl'] = true;
$styles['textDirection'] = TextDirection::RLTB;
@@ -550,7 +550,7 @@ protected static function parseTable($node, $element, &$styles)
$attributes = $node->attributes;
if ($attributes->getNamedItem('border') !== null && is_object($newElement->getStyle())) {
- $border = (int) $attributes->getNamedItem('border')->value;
+ $border = (int) $attributes->getNamedItem('border')->value; // @phpstan-ignore-line
$newElement->getStyle()->setBorderSize((int) Converter::pixelToTwip($border));
$newElement->getStyle()->setBorderStyle(($border === 0) ? 'none' : 'single');
}
From d9120c7f3782496d606ec087baa524ced709a51e Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 16 Aug 2024 08:39:59 -0700
Subject: [PATCH 6/9] Improve Resolution of Phpstan Problem
---
src/PhpWord/Shared/Html.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
index 2d96c375f7..7fa9c6f36f 100644
--- a/src/PhpWord/Shared/Html.php
+++ b/src/PhpWord/Shared/Html.php
@@ -180,7 +180,8 @@ protected static function parseInlineStyle($node, &$styles)
$attributes = $node->attributes; // get all the attributes(eg: id, class)
$bidi = false;
- $direction = isset($attributes['dir']) ? $attributes['dir']->value : ''; // @phpstan-ignore-line
+ $attrDir = $attributes->getNamedItem('dir');
+ $direction = isset($attrDir) ? $attrDir->nodeValue : '';
if ($direction === 'rtl') {
$bidi = $styles['bidi'] = $styles['rtl'] = true;
$styles['textDirection'] = TextDirection::RLTB;
@@ -550,7 +551,7 @@ protected static function parseTable($node, $element, &$styles)
$attributes = $node->attributes;
if ($attributes->getNamedItem('border') !== null && is_object($newElement->getStyle())) {
- $border = (int) $attributes->getNamedItem('border')->value; // @phpstan-ignore-line
+ $border = (int) $attributes->getNamedItem('border')->nodeValue;
$newElement->getStyle()->setBorderSize((int) Converter::pixelToTwip($border));
$newElement->getStyle()->setBorderStyle(($border === 0) ? 'none' : 'single');
}
From 1093a3b3ad5295a71cd3d7dbb5ed56d4f5de69c6 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:34:34 -0700
Subject: [PATCH 7/9] Update Sample_45_RTLTitles.php
---
samples/Sample_45_RTLTitles.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/Sample_45_RTLTitles.php b/samples/Sample_45_RTLTitles.php
index 83dd9b9872..e39510c97f 100644
--- a/samples/Sample_45_RTLTitles.php
+++ b/samples/Sample_45_RTLTitles.php
@@ -6,7 +6,7 @@
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Shared\Html as SharedHtml;
-// Suggested by issue 2427.
+// Suggested by issue #2427.
echo date('H:i:s'), ' Create new PhpWord object', EOL;
$phpWord = new PhpWord();
Settings::setDefaultRtl(true);
From 74918d0909c8224b1a46a4dfbf1494f11e8dd5ed Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 3 Sep 2024 23:38:32 -0700
Subject: [PATCH 8/9] Update Sample_45_RTLTitles.php
---
samples/Sample_45_RTLTitles.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/Sample_45_RTLTitles.php b/samples/Sample_45_RTLTitles.php
index e39510c97f..83dd9b9872 100644
--- a/samples/Sample_45_RTLTitles.php
+++ b/samples/Sample_45_RTLTitles.php
@@ -6,7 +6,7 @@
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Shared\Html as SharedHtml;
-// Suggested by issue #2427.
+// Suggested by issue 2427.
echo date('H:i:s'), ' Create new PhpWord object', EOL;
$phpWord = new PhpWord();
Settings::setDefaultRtl(true);
From 28b1b08ee77462e87b0b69d364f1688d0e0eacd7 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 4 Sep 2024 00:20:17 -0700
Subject: [PATCH 9/9] Update Sample_45_RTLTitles.php
---
samples/Sample_45_RTLTitles.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/samples/Sample_45_RTLTitles.php b/samples/Sample_45_RTLTitles.php
index 83dd9b9872..e39510c97f 100644
--- a/samples/Sample_45_RTLTitles.php
+++ b/samples/Sample_45_RTLTitles.php
@@ -6,7 +6,7 @@
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Shared\Html as SharedHtml;
-// Suggested by issue 2427.
+// Suggested by issue #2427.
echo date('H:i:s'), ' Create new PhpWord object', EOL;
$phpWord = new PhpWord();
Settings::setDefaultRtl(true);