@@ -312,6 +313,17 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
$this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tr/w:tc'));
$this->assertTrue($doc->elementExists('/w:document/w:body/w:tbl/w:tblPr/w:jc'));
$this->assertEquals(Jc::START, $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tblPr/w:jc', 'w:val'));
+
+ //check border colors
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:top', 'w:color'));
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:right', 'w:color'));
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom', 'w:color'));
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:left', 'w:color'));
+
+ $this->assertEquals('00AA00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:top', 'w:color'));
+ $this->assertEquals('00BB00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:right', 'w:color'));
+ $this->assertEquals('00CC00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:bottom', 'w:color'));
+ $this->assertEquals('00DD00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:left', 'w:color'));
}
/**
@@ -487,7 +499,7 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
*/
public function testParseRemoteImage()
{
- $src = 'https://phpword.readthedocs.io/en/latest/_images/phpword.png';
+ $src = self::getRemoteImageUrl();
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
@@ -589,4 +601,35 @@ class HtmlTest extends \PHPUnit\Framework\TestCase
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
$this->assertFalse($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:jc'));
}
+
+ /**
+ * Tests parsing hidden text
+ */
+ public function testParseHiddenText()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'This is some hidden text.
';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:vanish'));
+ }
+
+ /**
+ * Tests parsing letter spacing
+ */
+ public function testParseLetterSpacing()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'This is some text with letter spacing.
';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:spacing'));
+ $this->assertEquals(150 * 15, $doc->getElement('/w:document/w:body/w:p/w:r/w:rPr/w:spacing')->getAttribute('w:val'));
+ }
}
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index db789fdc..3c31a457 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -17,6 +17,8 @@
namespace PhpOffice\PhpWord\Style;
+use PhpOffice\PhpWord\SimpleType\VerticalJc;
+
/**
* Test class for PhpOffice\PhpWord\Style\Cell
*
@@ -33,7 +35,7 @@ class CellTest extends \PHPUnit\Framework\TestCase
$object = new Cell();
$attributes = array(
- 'valign' => Cell::VALIGN_TOP,
+ 'valign' => VerticalJc::TOP,
'textDirection' => Cell::TEXT_DIR_BTLR,
'bgColor' => 'FFFF00',
'borderTopSize' => 120,
diff --git a/tests/PhpWord/Style/SectionTest.php b/tests/PhpWord/Style/SectionTest.php
index b26d1d94..59d18167 100644
--- a/tests/PhpWord/Style/SectionTest.php
+++ b/tests/PhpWord/Style/SectionTest.php
@@ -17,6 +17,8 @@
namespace PhpOffice\PhpWord\Style;
+use PhpOffice\PhpWord\SimpleType\VerticalJc;
+
/**
* Test class for PhpOffice\PhpWord\Style\Section
*
@@ -328,4 +330,18 @@ class SectionTest extends \PHPUnit\Framework\TestCase
$oSettings->setBreakType();
$this->assertNull($oSettings->getBreakType());
}
+
+ /**
+ * Vertical page alignment
+ */
+ public function testVerticalAlign()
+ {
+ // Section Settings
+ $oSettings = new Section();
+
+ $this->assertNull($oSettings->getVAlign());
+
+ $oSettings->setVAlign(VerticalJc::BOTH);
+ $this->assertEquals('both', $oSettings->getVAlign());
+ }
}
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 370fcdf1..4caca77a 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -17,6 +17,9 @@
namespace PhpOffice\PhpWord;
+use PhpOffice\PhpWord\Element\Text;
+use PhpOffice\PhpWord\Element\TextRun;
+
/**
* @covers \PhpOffice\PhpWord\TemplateProcessor
* @coversDefaultClass \PhpOffice\PhpWord\TemplateProcessor
@@ -196,6 +199,67 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
$this->assertTrue($docFound);
}
+ /**
+ * @covers ::setValue
+ * @covers ::cloneRow
+ * @covers ::saveAs
+ * @test
+ */
+ public function testCloneRowAndSetValues()
+ {
+ $mainPart = '
+
+
+
+
+
+
+
+ ${userId}
+
+
+
+
+
+
+ ${userName}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${userLocation}
+
+
+
+
+ ';
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+
+ $this->assertEquals(
+ array('userId', 'userName', 'userLocation'),
+ $templateProcessor->getVariables()
+ );
+
+ $values = array(
+ array('userId' => 1, 'userName' => 'Batman', 'userLocation' => 'Gotham City'),
+ array('userId' => 2, 'userName' => 'Superman', 'userLocation' => 'Metropolis'),
+ );
+ $templateProcessor->setValue('tableHeader', 'My clonable table');
+ $templateProcessor->cloneRowAndSetValues('userId', $values);
+ $this->assertContains('Superman', $templateProcessor->getMainPart());
+ $this->assertContains('Metropolis', $templateProcessor->getMainPart());
+ }
+
/**
* @expectedException \Exception
* @test
@@ -246,6 +310,78 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
);
}
+ public function testSetComplexValue()
+ {
+ $title = new TextRun();
+ $title->addText('This is my title');
+
+ $firstname = new Text('Donald');
+ $lastname = new Text('Duck');
+
+ $mainPart = '
+
+
+ Hello ${document-title}
+
+
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $result = '
+
+
+
+
+ This is my title
+
+
+
+
+ Hello
+
+
+
+ Donald
+
+
+
+
+
+
+ Duck
+
+ ';
+
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+ $templateProcessor->setComplexBlock('document-title', $title);
+ $templateProcessor->setComplexValue('firstname', $firstname);
+ $templateProcessor->setComplexValue('lastname', $lastname);
+
+ $this->assertEquals(preg_replace('/>\s+<', $result), preg_replace('/>\s+<', $templateProcessor->getMainPart()));
+ }
+
+ /**
+ * @covers ::setValues
+ * @test
+ */
+ public function testSetValues()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+ $templateProcessor->setValues(array('firstname' => 'John', 'lastname' => 'Doe'));
+
+ $this->assertContains('Hello John Doe', $templateProcessor->getMainPart());
+ }
+
/**
* @covers ::setImageValue
* @test
@@ -595,4 +731,117 @@ final class TemplateProcessorTest extends \PHPUnit\Framework\TestCase
$variables = $templateProcessor->getVariablesForPart('$15,000.00. ${variable_name}');
$this->assertEquals(array('variable_name'), $variables);
}
+
+ /**
+ * @covers ::textNeedsSplitting
+ */
+ public function testTextNeedsSplitting()
+ {
+ $templateProcessor = new TestableTemplateProcesor();
+
+ $this->assertFalse($templateProcessor->textNeedsSplitting('${nothing-to-replace}'));
+
+ $text = 'Hello ${firstname} ${lastname}';
+ $this->assertTrue($templateProcessor->textNeedsSplitting($text));
+ $splitText = $templateProcessor->splitTextIntoTexts($text);
+ $this->assertFalse($templateProcessor->textNeedsSplitting($splitText));
+ }
+
+ /**
+ * @covers ::splitTextIntoTexts
+ */
+ public function testSplitTextIntoTexts()
+ {
+ $templateProcessor = new TestableTemplateProcesor();
+
+ $splitText = $templateProcessor->splitTextIntoTexts('${nothing-to-replace}');
+ $this->assertEquals('${nothing-to-replace}', $splitText);
+
+ $splitText = $templateProcessor->splitTextIntoTexts('Hello ${firstname} ${lastname}');
+ $this->assertEquals('Hello ${firstname} ${lastname}', $splitText);
+ }
+
+ public function testFindXmlBlockStart()
+ {
+ $toFind = '
+
+
+
+
+ This whole paragraph will be replaced with my ${title}
+ ';
+ $mainPart = '
+
+
+
+
+
+
+ ${value1} ${value2}
+
+
+
+
+
+
+ .
+
+
+
+
+
+
+
+
+
+ ' . $toFind . '
+
+ ';
+
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+ $position = $templateProcessor->findContainingXmlBlockForMacro('${title}', 'w:r');
+
+ $this->assertEquals($toFind, $templateProcessor->getSlice($position['start'], $position['end']));
+ }
+
+ public function testShouldReturnFalseIfXmlBlockNotFound()
+ {
+ $mainPart = '
+
+
+
+
+
+ this is my text containing a ${macro}
+
+
+ ';
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+
+ //non-existing macro
+ $result = $templateProcessor->findContainingXmlBlockForMacro('${fake-macro}', 'w:p');
+ $this->assertFalse($result);
+
+ //existing macro but not inside node looked for
+ $result = $templateProcessor->findContainingXmlBlockForMacro('${macro}', 'w:fake-node');
+ $this->assertFalse($result);
+
+ //existing macro but end tag not found after macro
+ $result = $templateProcessor->findContainingXmlBlockForMacro('${macro}', 'w:rPr');
+ $this->assertFalse($result);
+ }
+
+ public function testShouldMakeFieldsUpdateOnOpen()
+ {
+ $settingsPart = '
+
+ ';
+ $templateProcessor = new TestableTemplateProcesor(null, $settingsPart);
+
+ $templateProcessor->setUpdateFields(true);
+ $this->assertContains('', $templateProcessor->getSettingsPart());
+
+ $templateProcessor->setUpdateFields(false);
+ $this->assertContains('', $templateProcessor->getSettingsPart());
+ }
}
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 5b7176c7..101e226f 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -86,10 +86,10 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$section = $phpWord->addSection();
$table = $section->addTable();
$row1 = $table->addRow();
- $cell11 = $row1->addCell(1000, array('gridSpan' => 2));
+ $cell11 = $row1->addCell(1000, array('gridSpan' => 2, 'bgColor' => '6086B8'));
$cell11->addText('cell spanning 2 bellow');
$row2 = $table->addRow();
- $cell21 = $row2->addCell(500);
+ $cell21 = $row2->addCell(500, array('bgColor' => 'ffffff'));
$cell21->addText('first cell');
$cell22 = $row2->addCell(500);
$cell22->addText('second cell');
@@ -100,6 +100,11 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$this->assertEquals(1, $xpath->query('/html/body/table/tr[1]/td')->length);
$this->assertEquals('2', $xpath->query('/html/body/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
$this->assertEquals(2, $xpath->query('/html/body/table/tr[2]/td')->length);
+
+ $this->assertEquals('#6086B8', $xpath->query('/html/body/table/tr[1]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
+ $this->assertEquals('#ffffff', $xpath->query('/html/body/table/tr[1]/td')->item(0)->attributes->getNamedItem('color')->textContent);
+ $this->assertEquals('#ffffff', $xpath->query('/html/body/table/tr[2]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
+ $this->assertNull($xpath->query('/html/body/table/tr[2]/td')->item(0)->attributes->getNamedItem('color'));
}
/**
diff --git a/tests/PhpWord/Writer/HTMLTest.php b/tests/PhpWord/Writer/HTMLTest.php
index 8868db5a..24a8bca3 100644
--- a/tests/PhpWord/Writer/HTMLTest.php
+++ b/tests/PhpWord/Writer/HTMLTest.php
@@ -17,6 +17,7 @@
namespace PhpOffice\PhpWord\Writer;
+use PhpOffice\PhpWord\AbstractWebServerEmbeddedTest;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\SimpleType\Jc;
@@ -26,7 +27,7 @@ use PhpOffice\PhpWord\SimpleType\Jc;
*
* @runTestsInSeparateProcesses
*/
-class HTMLTest extends \PHPUnit\Framework\TestCase
+class HTMLTest extends AbstractWebServerEmbeddedTest
{
/**
* Construct
@@ -57,7 +58,7 @@ class HTMLTest extends \PHPUnit\Framework\TestCase
{
$localImage = __DIR__ . '/../_files/images/PhpWord.png';
$archiveImage = 'zip://' . __DIR__ . '/../_files/documents/reader.docx#word/media/image1.jpeg';
- $gdImage = 'http://php.net/images/logos/php-med-trans-light.gif';
+ $gdImage = self::getRemoteGifImageUrl();
$objectSrc = __DIR__ . '/../_files/documents/sheet.xls';
$file = __DIR__ . '/../_files/temp.html';
diff --git a/tests/PhpWord/Writer/RTF/ElementTest.php b/tests/PhpWord/Writer/RTF/ElementTest.php
index 47630335..4b01bacf 100644
--- a/tests/PhpWord/Writer/RTF/ElementTest.php
+++ b/tests/PhpWord/Writer/RTF/ElementTest.php
@@ -29,7 +29,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
*/
public function testUnmatchedElements()
{
- $elements = array('Container', 'Text', 'Title', 'Link', 'Image', 'Table');
+ $elements = array('Container', 'Text', 'Title', 'Link', 'Image', 'Table', 'Field');
foreach ($elements as $element) {
$objectClass = 'PhpOffice\\PhpWord\\Writer\\RTF\\Element\\' . $element;
$parentWriter = new RTF();
@@ -39,4 +39,40 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$this->assertEquals('', $object->write());
}
}
+
+ public function testPageField()
+ {
+ $parentWriter = new RTF();
+ $element = new \PhpOffice\PhpWord\Element\Field('PAGE');
+ $field = new \PhpOffice\PhpWord\Writer\RTF\Element\Field($parentWriter, $element);
+
+ $this->assertEquals("{\\field{\\*\\fldinst PAGE}{\\fldrslt}}\\par\n", $field->write());
+ }
+
+ public function testNumpageField()
+ {
+ $parentWriter = new RTF();
+ $element = new \PhpOffice\PhpWord\Element\Field('NUMPAGES');
+ $field = new \PhpOffice\PhpWord\Writer\RTF\Element\Field($parentWriter, $element);
+
+ $this->assertEquals("{\\field{\\*\\fldinst NUMPAGES}{\\fldrslt}}\\par\n", $field->write());
+ }
+
+ public function testDateField()
+ {
+ $parentWriter = new RTF();
+ $element = new \PhpOffice\PhpWord\Element\Field('DATE', array('dateformat' => 'd MM yyyy H:mm:ss'));
+ $field = new \PhpOffice\PhpWord\Writer\RTF\Element\Field($parentWriter, $element);
+
+ $this->assertEquals("{\\field{\\*\\fldinst DATE \\\\@ \"d MM yyyy H:mm:ss\"}{\\fldrslt}}\\par\n", $field->write());
+ }
+
+ public function testIndexField()
+ {
+ $parentWriter = new RTF();
+ $element = new \PhpOffice\PhpWord\Element\Field('INDEX');
+ $field = new \PhpOffice\PhpWord\Writer\RTF\Element\Field($parentWriter, $element);
+
+ $this->assertEquals("{}\\par\n", $field->write());
+ }
}
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 703f4590..6a295965 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -510,4 +510,25 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:t'));
$this->assertEquals('this text contains an & (ampersant)', $doc->getElement('/w:document/w:body/w:p/w:r/w:t')->nodeValue);
}
+
+ /**
+ * Test ListItemRun paragraph style writing
+ */
+ public function testListItemRunStyleWriting()
+ {
+ $phpWord = new PhpWord();
+ $phpWord->addParagraphStyle('MyParagraphStyle', array('spaceBefore' => 400));
+
+ $section = $phpWord->addSection();
+ $listItemRun = $section->addListItemRun(0, null, 'MyParagraphStyle');
+ $listItemRun->addText('List item');
+ $listItemRun->addText(' in bold', array('bold' => true));
+
+ $doc = TestHelperDOCX::getDocument($phpWord);
+ $this->assertFalse($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:pPr'));
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:pPr/w:pStyle'));
+ $this->assertEquals('List item', $doc->getElement('/w:document/w:body/w:p/w:r[1]/w:t')->nodeValue);
+ $this->assertEquals(' in bold', $doc->getElement('/w:document/w:body/w:p/w:r[2]/w:t')->nodeValue);
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r[2]/w:rPr/w:b'));
+ }
}
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index ec3b2483..8e5cb634 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -141,4 +141,21 @@ class TableTest extends \PHPUnit\Framework\TestCase
$this->assertSame($value, (int) $doc->getElementAttribute($path, 'w:w'));
$this->assertSame($type, $doc->getElementAttribute($path, 'w:type'));
}
+
+ public function testRigthToLeft()
+ {
+ $tableStyle = new Table();
+ $tableStyle->setBidiVisual(true);
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $table = $section->addTable($tableStyle);
+ $table->addRow();
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $path = '/w:document/w:body/w:tbl/w:tblPr/w:bidiVisual';
+ $this->assertTrue($doc->elementExists($path));
+ $this->assertEquals('1', $doc->getElementAttribute($path, 'w:val'));
+ }
}
diff --git a/tests/PhpWord/Writer/Word2007Test.php b/tests/PhpWord/Writer/Word2007Test.php
index 0db36fc1..563475b4 100644
--- a/tests/PhpWord/Writer/Word2007Test.php
+++ b/tests/PhpWord/Writer/Word2007Test.php
@@ -17,6 +17,7 @@
namespace PhpOffice\PhpWord\Writer;
+use PhpOffice\PhpWord\AbstractWebServerEmbeddedTest;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\SimpleType\Jc;
use PhpOffice\PhpWord\TestHelperDOCX;
@@ -26,7 +27,7 @@ use PhpOffice\PhpWord\TestHelperDOCX;
*
* @runTestsInSeparateProcesses
*/
-class Word2007Test extends \PHPUnit\Framework\TestCase
+class Word2007Test extends AbstractWebServerEmbeddedTest
{
/**
* Tear down after each test
@@ -75,7 +76,7 @@ class Word2007Test extends \PHPUnit\Framework\TestCase
public function testSave()
{
$localImage = __DIR__ . '/../_files/images/earth.jpg';
- $remoteImage = 'http://php.net/images/logos/new-php-logo.png';
+ $remoteImage = self::getRemoteGifImageUrl();
$phpWord = new PhpWord();
$phpWord->addFontStyle('Font', array('size' => 11));
$phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));
diff --git a/tests/PhpWord/_files/images/new-php-logo.png b/tests/PhpWord/_files/images/new-php-logo.png
new file mode 100644
index 00000000..66490799
Binary files /dev/null and b/tests/PhpWord/_files/images/new-php-logo.png differ
diff --git a/tests/PhpWord/_includes/AbstractWebServerEmbeddedTest.php b/tests/PhpWord/_includes/AbstractWebServerEmbeddedTest.php
new file mode 100644
index 00000000..9316a9fe
--- /dev/null
+++ b/tests/PhpWord/_includes/AbstractWebServerEmbeddedTest.php
@@ -0,0 +1,80 @@
+start();
+ while (!self::$httpServer->isRunning()) {
+ usleep(1000);
+ }
+ }
+ }
+
+ public static function tearDownAfterClass()
+ {
+ if (self::isBuiltinServerSupported()) {
+ self::$httpServer->stop();
+ }
+ }
+
+ protected static function getBaseUrl()
+ {
+ return 'http://localhost:8080';
+ }
+
+ protected static function getRemoteImageUrl()
+ {
+ if (self::$httpServer) {
+ return self::getBaseUrl() . '/images/new-php-logo.png';
+ }
+
+ return 'http://php.net/images/logos/new-php-logo.png';
+ }
+
+ protected static function getRemoteGifImageUrl()
+ {
+ if (self::$httpServer) {
+ return self::getBaseUrl() . '/images/mario.gif';
+ }
+
+ return 'http://php.net/images/logos/php-med-trans-light.gif';
+ }
+
+ protected static function getRemoteBmpImageUrl()
+ {
+ if (self::$httpServer) {
+ return self::getBaseUrl() . '/images/duke_nukem.bmp';
+ }
+
+ return 'https://samples.libav.org/image-samples/RACECAR.BMP';
+ }
+
+ private static function isBuiltinServerSupported()
+ {
+ return version_compare(PHP_VERSION, '5.4.0', '>=');
+ }
+}
diff --git a/tests/PhpWord/_includes/TestableTemplateProcesor.php b/tests/PhpWord/_includes/TestableTemplateProcesor.php
index 3b6f5b56..80cc748f 100644
--- a/tests/PhpWord/_includes/TestableTemplateProcesor.php
+++ b/tests/PhpWord/_includes/TestableTemplateProcesor.php
@@ -25,9 +25,10 @@ namespace PhpOffice\PhpWord;
*/
class TestableTemplateProcesor extends TemplateProcessor
{
- public function __construct($mainPart = null)
+ public function __construct($mainPart = null, $settingsPart = null)
{
$this->tempDocumentMainPart = $mainPart;
+ $this->tempDocumentSettingsPart = $settingsPart;
}
public function fixBrokenMacros($documentPart)
@@ -35,6 +36,16 @@ class TestableTemplateProcesor extends TemplateProcessor
return parent::fixBrokenMacros($documentPart);
}
+ public function splitTextIntoTexts($text)
+ {
+ return parent::splitTextIntoTexts($text);
+ }
+
+ public function textNeedsSplitting($text)
+ {
+ return parent::textNeedsSplitting($text);
+ }
+
public function getVariablesForPart($documentPartXML)
{
$documentPartXML = parent::fixBrokenMacros($documentPartXML);
@@ -42,8 +53,34 @@ class TestableTemplateProcesor extends TemplateProcessor
return parent::getVariablesForPart($documentPartXML);
}
+ public function findXmlBlockStart($offset, $blockType)
+ {
+ return parent::findXmlBlockStart($offset, $blockType);
+ }
+
+ public function findContainingXmlBlockForMacro($macro, $blockType = 'w:p')
+ {
+ return parent::findContainingXmlBlockForMacro($macro, $blockType);
+ }
+
+ public function getSlice($startPosition, $endPosition = 0)
+ {
+ return parent::getSlice($startPosition, $endPosition);
+ }
+
+ /**
+ * @return string
+ */
public function getMainPart()
{
return $this->tempDocumentMainPart;
}
+
+ /**
+ * @return string
+ */
+ public function getSettingsPart()
+ {
+ return $this->tempDocumentSettingsPart;
+ }
}
diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
index f51eaad8..3a7869bc 100644
--- a/tests/PhpWord/_includes/XmlDocument.php
+++ b/tests/PhpWord/_includes/XmlDocument.php
@@ -76,10 +76,10 @@ class XmlDocument
$this->file = $file;
$file = $this->path . '/' . $file;
- libxml_disable_entity_loader(false);
+ $orignalLibEntityLoader = libxml_disable_entity_loader(false);
$this->dom = new \DOMDocument();
$this->dom->load($file);
- libxml_disable_entity_loader(true);
+ libxml_disable_entity_loader($orignalLibEntityLoader);
return $this->dom;
}