', $content);
}
+
+ /** @runInSeparateProcess */
+ public function testExcpetionRatherThanDie(): void
+ {
+ $this->expectException(Exception::class);
+ $this->expectExceptionMessage('Could not include font definition file');
+ $file = __DIR__ . '/../../_files/tcpdf.pdf';
+ $phpWord = new PhpWord();
+ $section1 = $phpWord->addSection();
+ $section1->addText('This is section 1.');
+ $section2 = $phpWord->addSection();
+ $section2->addText('This is section 2.');
+ $writer = new PDF\TcpdfNoDie($phpWord);
+ $writer->setFont('xyz');
+ $writer->save($file);
+ self::assertFileExists($file);
+ unlink($file);
+ }
}
diff --git a/tests/PhpWordTests/Writer/PDFTest.php b/tests/PhpWordTests/Writer/PDFTest.php
index c7e5376fab..c5c8f3b7aa 100644
--- a/tests/PhpWordTests/Writer/PDFTest.php
+++ b/tests/PhpWordTests/Writer/PDFTest.php
@@ -32,16 +32,51 @@ class PDFTest extends \PHPUnit\Framework\TestCase
/**
* Test normal construct.
*/
- public function testConstruct(): void
+ public function testConstructDompdf(): void
{
define('DOMPDF_ENABLE_AUTOLOAD', false);
$file = __DIR__ . '/../_files/temp.pdf';
$rendererName = Settings::PDF_RENDERER_DOMPDF;
$rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/dompdf/dompdf');
+ self::assertNotFalse($rendererLibraryPath);
Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
$writer = new PDF(new PhpWord());
- $writer->setFont('xyz'); //* @phpstan-ignore-line
+ $writer->setFont('xyz');
+ $writer->save($file);
+
+ self::assertFileExists($file);
+
+ unlink($file);
+ }
+
+ public function testConstructMpdf(): void
+ {
+ $file = __DIR__ . '/../_files/temp.pdf';
+
+ $rendererName = Settings::PDF_RENDERER_MPDF;
+ $rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/mpdf/mpdf');
+ self::assertNotFalse($rendererLibraryPath);
+ Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
+ $writer = new PDF(new PhpWord());
+ $writer->setFont('xyz');
+ $writer->save($file);
+
+ self::assertFileExists($file);
+
+ unlink($file);
+ }
+
+ public function testConstructTcpdf(): void
+ {
+ $file = __DIR__ . '/../_files/temp.pdf';
+
+ $rendererName = Settings::PDF_RENDERER_TCPDF;
+ $rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/tecnickcom/tcpdf');
+ self::assertNotFalse($rendererLibraryPath);
+ Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
+ $writer = new PDF(new PhpWord());
+ $writer->setFont('Helvetica');
$writer->save($file);
self::assertFileExists($file);
diff --git a/tests/PhpWordTests/_files/tcpdf.pdf b/tests/PhpWordTests/_files/tcpdf.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
From 9408c1d24ad3ff1f598357ddb4ab66afb134d9fe Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 29 Sep 2025 14:41:22 -0700
Subject: [PATCH 105/153] Still More Coverage
---
src/PhpWord/Reader/Word2007/Footnotes.php | 7 ++--
src/PhpWord/Shared/Css.php | 22 ++++++-------
src/PhpWord/Shared/Text.php | 31 +++++++++++-------
src/PhpWord/Writer/EPub3.php | 12 +++----
tests/PhpWordTests/Shared/Text2.php | 32 +++++++++++++++++++
tests/PhpWordTests/Shared/TextTest.php | 8 +++++
.../{SampleTest.php => ZampleTest.php} | 2 +-
7 files changed, 80 insertions(+), 34 deletions(-)
create mode 100644 tests/PhpWordTests/Shared/Text2.php
rename tests/PhpWordTests/{SampleTest.php => ZampleTest.php} (98%)
diff --git a/src/PhpWord/Reader/Word2007/Footnotes.php b/src/PhpWord/Reader/Word2007/Footnotes.php
index 0b259e926a..ee2e182e10 100644
--- a/src/PhpWord/Reader/Word2007/Footnotes.php
+++ b/src/PhpWord/Reader/Word2007/Footnotes.php
@@ -81,16 +81,19 @@ public function read(PhpWord $phpWord): void
*/
private function getElement(PhpWord $phpWord, $relationId)
{
+ $returnVal = null;
$getMethod = "get{$this->collection}";
$collection = $phpWord->$getMethod()->getItems();
//not found by key, looping to search by relationId
foreach ($collection as $collectionElement) {
if ($collectionElement->getRelationId() == $relationId) {
- return $collectionElement;
+ $returnVal = $collectionElement;
+
+ break;
}
}
- return null;
+ return $returnVal;
}
}
diff --git a/src/PhpWord/Shared/Css.php b/src/PhpWord/Shared/Css.php
index 93f69000b4..c26940b1a6 100644
--- a/src/PhpWord/Shared/Css.php
+++ b/src/PhpWord/Shared/Css.php
@@ -41,19 +41,17 @@ public function process(): void
$cssContent = str_replace(["\r", "\n"], '', $this->cssContent);
preg_match_all('/(.+?)\s?\{\s?(.+?)\s?\}/', $cssContent, $cssExtracted);
// Check if there are x selectors and x rules
- if (count($cssExtracted[1]) != count($cssExtracted[2])) {
- return;
- }
-
- foreach ($cssExtracted[1] as $key => $selector) {
- $rules = trim($cssExtracted[2][$key]);
- $rules = explode(';', $rules);
- foreach ($rules as $rule) {
- if (empty($rule)) {
- continue;
+ if (count($cssExtracted[1]) === count($cssExtracted[2])) {
+ foreach ($cssExtracted[1] as $key => $selector) {
+ $rules = trim($cssExtracted[2][$key]);
+ $rules = explode(';', $rules);
+ foreach ($rules as $rule) {
+ if (empty($rule)) {
+ continue;
+ }
+ [$key, $value] = explode(':', trim($rule));
+ $this->styles[$this->sanitize($selector)][$this->sanitize($key)] = $this->sanitize($value);
}
- [$key, $value] = explode(':', trim($rule));
- $this->styles[$this->sanitize($selector)][$this->sanitize($key)] = $this->sanitize($value);
}
}
}
diff --git a/src/PhpWord/Shared/Text.php b/src/PhpWord/Shared/Text.php
index 251764b3dd..de5e5fb2f8 100644
--- a/src/PhpWord/Shared/Text.php
+++ b/src/PhpWord/Shared/Text.php
@@ -18,11 +18,8 @@
namespace PhpOffice\PhpWord\Shared;
-use PhpOffice\PhpWord\Exception\Exception;
+use PhpOffice\PhpWord\Exception\Exception as WordException;
-/**
- * Text.
- */
class Text
{
/**
@@ -37,6 +34,9 @@ class Text
*/
private static function buildControlCharacters(): void
{
+ if (!empty(self::$controlCharacters)) {
+ return;
+ }
for ($i = 0; $i <= 19; ++$i) {
if ($i != 9 && $i != 10 && $i != 13) {
$find = '_x' . sprintf('%04s', strtoupper(dechex($i))) . '_';
@@ -63,9 +63,7 @@ private static function buildControlCharacters(): void
*/
public static function controlCharacterPHP2OOXML($value = '')
{
- if (empty(self::$controlCharacters)) {
- self::buildControlCharacters();
- }
+ self::buildControlCharacters();
return str_replace(array_values(self::$controlCharacters), array_keys(self::$controlCharacters), $value);
}
@@ -119,9 +117,7 @@ public static function chr($dec)
*/
public static function controlCharacterOOXML2PHP($value = '')
{
- if (empty(self::$controlCharacters)) {
- self::buildControlCharacters();
- }
+ self::buildControlCharacters();
return str_replace(array_keys(self::$controlCharacters), array_values(self::$controlCharacters), $value);
}
@@ -149,15 +145,26 @@ public static function toUTF8($value = '')
{
if (null !== $value && !self::isUTF8($value)) {
// PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
- $value = (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+ $value = static::mbConvertEncoding($value);
if ($value === false) {
- throw new Exception('Unable to convert text to UTF-8');
+ throw new WordException('Unable to convert text to UTF-8');
}
}
return $value;
}
+ /**
+ * @param string $value
+ *
+ * @return false|string
+ */
+ protected static function mbConvertEncoding($value)
+ {
+ // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
+ return (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+ }
+
/**
* Returns unicode from UTF8 text.
*
diff --git a/src/PhpWord/Writer/EPub3.php b/src/PhpWord/Writer/EPub3.php
index b2ed9700d1..71227a1745 100644
--- a/src/PhpWord/Writer/EPub3.php
+++ b/src/PhpWord/Writer/EPub3.php
@@ -72,14 +72,12 @@ public function save(string $filename): void
// Add other files
foreach ($this->parts as $partName => $fileName) {
- if ($fileName === '') {
- continue;
+ if ($fileName !== '') {
+ $part = $this->getWriterPart($partName);
+ if ($part instanceof AbstractPart) {
+ $zip->addFromString($fileName, $part->write());
+ }
}
- $part = $this->getWriterPart($partName);
- if (!$part instanceof AbstractPart) {
- continue;
- }
- $zip->addFromString($fileName, $part->write());
}
// Close zip archive
diff --git a/tests/PhpWordTests/Shared/Text2.php b/tests/PhpWordTests/Shared/Text2.php
new file mode 100644
index 0000000000..2d59a2a2ab
--- /dev/null
+++ b/tests/PhpWordTests/Shared/Text2.php
@@ -0,0 +1,32 @@
+expectException(WordException::class);
+ $this->expectExceptionMessage('Unable to convert text to UTF-8');
+ Text2::toUTF8("\x80");
+ }
}
diff --git a/tests/PhpWordTests/SampleTest.php b/tests/PhpWordTests/ZampleTest.php
similarity index 98%
rename from tests/PhpWordTests/SampleTest.php
rename to tests/PhpWordTests/ZampleTest.php
index 358c4a773b..b5312b0636 100644
--- a/tests/PhpWordTests/SampleTest.php
+++ b/tests/PhpWordTests/ZampleTest.php
@@ -23,7 +23,7 @@
use RegexIterator;
use RuntimeException;
-class SampleTest extends TestCase
+class ZampleTest extends TestCase
{
/** @var bool */
protected static $alwaysTrue = true;
From a96f0a3841fddcdb9ed61a71879ab5b0ee2e04ac Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Mon, 29 Sep 2025 19:56:08 -0700
Subject: [PATCH 106/153] Tweak Text
Should be my last change here for a while.
---
src/PhpWord/Shared/Text.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/PhpWord/Shared/Text.php b/src/PhpWord/Shared/Text.php
index de5e5fb2f8..eeaaa5ad9f 100644
--- a/src/PhpWord/Shared/Text.php
+++ b/src/PhpWord/Shared/Text.php
@@ -144,7 +144,6 @@ public static function isUTF8($value = '')
public static function toUTF8($value = '')
{
if (null !== $value && !self::isUTF8($value)) {
- // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
$value = static::mbConvertEncoding($value);
if ($value === false) {
throw new WordException('Unable to convert text to UTF-8');
@@ -161,8 +160,7 @@ public static function toUTF8($value = '')
*/
protected static function mbConvertEncoding($value)
{
- // PHP8.2 : utf8_encode is deprecated, but mb_convert_encoding always usable
- return (function_exists('mb_convert_encoding')) ? mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1') : utf8_encode($value);
+ return mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
}
/**
From 6536f5c180784a3f0e180da3c7164554e012d5be Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 00:17:52 -0700
Subject: [PATCH 107/153] Minor Tweaks
---
src/PhpWord/Writer/PDF/TCPDF.php | 1 -
src/PhpWord/Writer/PDF/TcpdfNoDie.php | 7 -------
tests/PhpWordTests/Writer/PDF/TCPDFTest.php | 9 ++-------
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/src/PhpWord/Writer/PDF/TCPDF.php b/src/PhpWord/Writer/PDF/TCPDF.php
index 2e42945281..2add7e3c89 100644
--- a/src/PhpWord/Writer/PDF/TCPDF.php
+++ b/src/PhpWord/Writer/PDF/TCPDF.php
@@ -27,7 +27,6 @@
/**
* TCPDF writer.
*
- * @deprecated 0.13.0 Use `DomPDF` or `MPDF` instead.
* @see http://www.tcpdf.org/
* @since 0.11.0
*/
diff --git a/src/PhpWord/Writer/PDF/TcpdfNoDie.php b/src/PhpWord/Writer/PDF/TcpdfNoDie.php
index 1e1e1e97e0..2e85d702f6 100644
--- a/src/PhpWord/Writer/PDF/TcpdfNoDie.php
+++ b/src/PhpWord/Writer/PDF/TcpdfNoDie.php
@@ -18,13 +18,6 @@
namespace PhpOffice\PhpWord\Writer\PDF;
-/**
- * TCPDF writer.
- *
- * @deprecated 0.13.0 Use `DomPDF` or `MPDF` instead.
- * @see http://www.tcpdf.org/
- * @since 0.11.0
- */
class TcpdfNoDie extends TCPDF
{
/**
diff --git a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
index 886eb17230..f6ce12f035 100644
--- a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
@@ -25,8 +25,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF\TCPDF.
- *
- * @runTestsInSeparateProcesses
*/
class TCPDFTest extends \PHPUnit\Framework\TestCase
{
@@ -85,11 +83,10 @@ public function testSectionPageBreak(): void
}
/** @runInSeparateProcess */
- public function testExcpetionRatherThanDie(): void
+ public function testExceptionRatherThanDie(): void
{
$this->expectException(Exception::class);
$this->expectExceptionMessage('Could not include font definition file');
- $file = __DIR__ . '/../../_files/tcpdf.pdf';
$phpWord = new PhpWord();
$section1 = $phpWord->addSection();
$section1->addText('This is section 1.');
@@ -97,8 +94,6 @@ public function testExcpetionRatherThanDie(): void
$section2->addText('This is section 2.');
$writer = new PDF\TcpdfNoDie($phpWord);
$writer->setFont('xyz');
- $writer->save($file);
- self::assertFileExists($file);
- unlink($file);
+ $writer->save('php://memory');
}
}
From 1921cbd7198632d6d6fc431dc273f8f44d34a186 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 00:48:38 -0700
Subject: [PATCH 108/153] Mysterious Failure with PhpUnit 7/8/9
Corresponding to Php7.* and Php8.0. Did not seem to recognize runInSeparateProcess for test method.
---
tests/PhpWordTests/Writer/PDF/TCPDFTest.php | 3 ++-
tests/PhpWordTests/_files/tcpdf.pdf | Bin
2 files changed, 2 insertions(+), 1 deletion(-)
delete mode 100644 tests/PhpWordTests/_files/tcpdf.pdf
diff --git a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
index f6ce12f035..2bc2cd552c 100644
--- a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
@@ -25,6 +25,8 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF\TCPDF.
+ *
+ * @runTestsInSeparateProcesses
*/
class TCPDFTest extends \PHPUnit\Framework\TestCase
{
@@ -82,7 +84,6 @@ public function testSectionPageBreak(): void
self::assertStringContainsString('
', $content);
}
- /** @runInSeparateProcess */
public function testExceptionRatherThanDie(): void
{
$this->expectException(Exception::class);
diff --git a/tests/PhpWordTests/_files/tcpdf.pdf b/tests/PhpWordTests/_files/tcpdf.pdf
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
From 9ee33497b09d3630fe60f83acb511d2312e44dd0 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 01:30:17 -0700
Subject: [PATCH 109/153] Try preserveGlobalState
Not sure why this should be needed for Phpunit 9 but not 10. No harm specifying it in 10.
---
tests/PhpWordTests/Writer/PDF/TCPDFTest.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
index 2bc2cd552c..de8ac147af 100644
--- a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
@@ -25,8 +25,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF\TCPDF.
- *
- * @runTestsInSeparateProcesses
*/
class TCPDFTest extends \PHPUnit\Framework\TestCase
{
@@ -84,6 +82,11 @@ public function testSectionPageBreak(): void
self::assertStringContainsString('
', $content);
}
+ /**
+ * @runInSeparateProcess
+ *
+ * @preserveGlobalState disabled
+ */
public function testExceptionRatherThanDie(): void
{
$this->expectException(Exception::class);
From c7f6a8073e7a59dc549d2c371c02e888aec4efbd Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 14:50:47 -0700
Subject: [PATCH 110/153] Start to Eliminate Most Tests in Separate Processes
Writer/Html/FontTest was already bad, testing for the wrong default font values because a prior test had overlaid those; a full unit test would succeed, but just testing the Writer/Html directory would not. Better test planning eliminates that possibility, without the need to resort to resource-intensive separate processes.
---
phpstan-baseline.neon | 55 -----------------
phpstan-baseline.php7.neon | 55 -----------------
phpstan-baseline.php73.neon | 55 -----------------
src/PhpWord/Settings.php | 17 ++++++
tests/PhpWordTests/PhpWordTest.php | 11 +++-
tests/PhpWordTests/SettingsTest.php | 61 +------------------
.../WriteReadback/Word2007Test.php | 11 +++-
tests/PhpWordTests/Writer/HTML/FontTest.php | 28 ++-------
.../Writer/ODText/Part/ContentTest.php | 13 +---
.../Writer/ODText/Style/FontTest.php | 2 +
tests/PhpWordTests/Writer/PDF/DomPDFTest.php | 9 +--
tests/PhpWordTests/Writer/PDF/MPDFTest.php | 29 ++++-----
tests/PhpWordTests/Writer/PDF/TCPDFTest.php | 16 ++---
tests/PhpWordTests/Writer/PDFTest.php | 39 ++++++------
.../Writer/Word2007/Part/StylesTest.php | 4 +-
15 files changed, 93 insertions(+), 312 deletions(-)
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index dc469bc4b3..bd9206dd06 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1275,61 +1275,6 @@ parameters:
count: 2
path: tests/PhpWordTests/Reader/Word2007/StyleTest.php
- -
- message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$compatibility has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontSize has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultPaper has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$measurementUnit has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$outputEscapingEnabled has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererPath has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$tempDir has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$zipClass has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
-
message: "#^Cannot call method getStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
count: 1
diff --git a/phpstan-baseline.php7.neon b/phpstan-baseline.php7.neon
index f8939671a5..93a737665a 100644
--- a/phpstan-baseline.php7.neon
+++ b/phpstan-baseline.php7.neon
@@ -1250,61 +1250,6 @@ parameters:
count: 2
path: tests/PhpWordTests/Reader/Word2007/StyleTest.php
- -
- message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$compatibility has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontSize has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultPaper has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$measurementUnit has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$outputEscapingEnabled has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererPath has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$tempDir has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$zipClass has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
-
message: "#^Cannot call method getStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
count: 1
diff --git a/phpstan-baseline.php73.neon b/phpstan-baseline.php73.neon
index 1f5d7e7766..5ebf3d7727 100644
--- a/phpstan-baseline.php73.neon
+++ b/phpstan-baseline.php73.neon
@@ -1250,61 +1250,6 @@ parameters:
count: 2
path: tests/PhpWordTests/Reader/Word2007/StyleTest.php
- -
- message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$compatibility has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultFontSize has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$defaultPaper has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$measurementUnit has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$outputEscapingEnabled has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererName has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$pdfRendererPath has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$tempDir has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
- -
- message: "#^Property PhpOffice\\\\PhpWordTests\\\\SettingsTest\\:\\:\\$zipClass has no type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/SettingsTest.php
-
-
message: "#^Cannot call method getStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
count: 1
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index c4b7c38dfc..d8956d8428 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -529,4 +529,21 @@ public static function setDefaultPaper(string $value): bool
return false;
}
+
+ public static function restoreDefaults(): void
+ {
+ self::$defaultAsianFontName = self::DEFAULT_FONT_NAME;
+ self::$defaultFontColor = self::DEFAULT_FONT_COLOR;
+ self::$defaultFontName = self::DEFAULT_FONT_NAME;
+ self::$defaultFontSize = self::DEFAULT_FONT_SIZE;
+ self::$defaultPaper = self::DEFAULT_PAPER;
+ self::$measurementUnit = self::UNIT_TWIP;
+ self::$outputEscapingEnabled = false;
+ self::$pdfRendererName = null;
+ self::$pdfRendererOptions = [];
+ self::$pdfRendererPath = null;
+ self::$tempDir = '';
+ self::$xmlWriterCompatibility = true;
+ self::$zipClass = self::ZIPARCHIVE;
+ }
}
diff --git a/tests/PhpWordTests/PhpWordTest.php b/tests/PhpWordTests/PhpWordTest.php
index 76919bbdf3..0e99909aa9 100644
--- a/tests/PhpWordTests/PhpWordTest.php
+++ b/tests/PhpWordTests/PhpWordTest.php
@@ -27,16 +27,23 @@
/**
* Test class for PhpOffice\PhpWord\PhpWord.
- *
- * @runTestsInSeparateProcesses
*/
class PhpWordTest extends \PHPUnit\Framework\TestCase
{
+ /**
+ * Executed after each method of the class.
+ */
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test object creation.
*/
public function testConstruct(): void
{
+ Settings::restoreDefaults();
do {
$dtStart = new DateTimeImmutable();
$startSecond = $dtStart->format('s');
diff --git a/tests/PhpWordTests/SettingsTest.php b/tests/PhpWordTests/SettingsTest.php
index cc18383f8d..fb51bc0b11 100644
--- a/tests/PhpWordTests/SettingsTest.php
+++ b/tests/PhpWordTests/SettingsTest.php
@@ -24,69 +24,12 @@
* Test class for PhpOffice\PhpWord\Settings.
*
* @coversDefaultClass \PhpOffice\PhpWord\Settings
- *
- * @runTestsInSeparateProcesses
*/
class SettingsTest extends TestCase
{
- private $compatibility;
-
- /** @var string */
- private $defaultFontColor;
-
- private $defaultFontSize;
-
- private $defaultFontName;
-
- private $defaultPaper;
-
- private $measurementUnit;
-
- private $outputEscapingEnabled;
-
- private $pdfRendererName;
-
- /**
- * @var array
- */
- private $pdfRendererOptions;
-
- private $pdfRendererPath;
-
- private $tempDir;
-
- private $zipClass;
-
- protected function setUp(): void
- {
- $this->compatibility = Settings::hasCompatibility();
- $this->defaultFontColor = Settings::getDefaultFontColor();
- $this->defaultFontSize = Settings::getDefaultFontSize();
- $this->defaultFontName = Settings::getDefaultFontName();
- $this->defaultPaper = Settings::getDefaultPaper();
- $this->measurementUnit = Settings::getMeasurementUnit();
- $this->outputEscapingEnabled = Settings::isOutputEscapingEnabled();
- $this->pdfRendererName = Settings::getPdfRendererName();
- $this->pdfRendererOptions = Settings::getPdfRendererOptions();
- $this->pdfRendererPath = Settings::getPdfRendererPath();
- $this->tempDir = Settings::getTempDir();
- $this->zipClass = Settings::getZipClass();
- }
-
protected function tearDown(): void
{
- Settings::setCompatibility($this->compatibility);
- Settings::setDefaultFontColor($this->defaultFontColor);
- Settings::setDefaultFontSize($this->defaultFontSize);
- Settings::setDefaultFontName($this->defaultFontName);
- Settings::setDefaultPaper($this->defaultPaper);
- Settings::setMeasurementUnit($this->measurementUnit);
- Settings::setOutputEscapingEnabled($this->outputEscapingEnabled);
- Settings::setPdfRendererName($this->pdfRendererName);
- Settings::setPdfRendererOptions($this->pdfRendererOptions);
- Settings::setPdfRendererPath($this->pdfRendererPath);
- Settings::setTempDir($this->tempDir);
- Settings::setZipClass($this->zipClass);
+ Settings::restoreDefaults();
}
/**
@@ -94,6 +37,7 @@ protected function tearDown(): void
*/
public function testSetGetCompatibility(): void
{
+ Settings::restoreDefaults();
self::assertTrue(Settings::hasCompatibility());
self::assertTrue(Settings::setCompatibility(false));
self::assertFalse(Settings::hasCompatibility());
@@ -129,6 +73,7 @@ public function testSetGetZipClass(): void
public function testSetGetPdfRenderer(): void
{
$domPdfPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/dompdf/dompdf');
+ self::assertNotFalse($domPdfPath);
self::assertFalse(Settings::setPdfRenderer('FOO', 'dummy/path'));
self::assertTrue(Settings::setPdfRenderer(Settings::PDF_RENDERER_DOMPDF, $domPdfPath));
diff --git a/tests/PhpWordTests/WriteReadback/Word2007Test.php b/tests/PhpWordTests/WriteReadback/Word2007Test.php
index 858faa77fe..1b21a77ada 100644
--- a/tests/PhpWordTests/WriteReadback/Word2007Test.php
+++ b/tests/PhpWordTests/WriteReadback/Word2007Test.php
@@ -21,6 +21,7 @@
use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\IOFactory;
use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Style\Font;
use PhpOffice\PhpWord\Writer\Word2007;
@@ -28,11 +29,17 @@
* Test class for PhpOffice\PhpWord\Reader\Word2007 and PhpOffice\PhpWord\Writer\Word2007.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\Word2007
- *
- * @runTestsInSeparateProcesses
*/
class Word2007Test extends \PHPUnit\Framework\TestCase
{
+ /**
+ * Executed after each method of the class.
+ */
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test default font name.
*/
diff --git a/tests/PhpWordTests/Writer/HTML/FontTest.php b/tests/PhpWordTests/Writer/HTML/FontTest.php
index 6b6e920b89..6b4f44854e 100644
--- a/tests/PhpWordTests/Writer/HTML/FontTest.php
+++ b/tests/PhpWordTests/Writer/HTML/FontTest.php
@@ -28,37 +28,17 @@
*/
class FontTest extends \PHPUnit\Framework\TestCase
{
- /** @var string */
- private $defaultFontName;
-
- /** @var float|int */
- private $defaultFontSize;
-
- /** @var string */
- private $defaultFontColor;
-
- /**
- * Executed before each method of the class.
- */
- protected function setUp(): void
- {
- $this->defaultFontName = Settings::getDefaultFontName();
- $this->defaultFontSize = Settings::getDefaultFontSize();
- $this->defaultFontColor = Settings::getDefaultFontColor();
- }
-
/**
* Executed after each method of the class.
*/
protected function tearDown(): void
{
- Settings::setDefaultFontName($this->defaultFontName);
- Settings::setDefaultFontSize($this->defaultFontSize);
- Settings::setDefaultFontColor($this->defaultFontColor);
+ Settings::restoreDefaults();
}
public function testDefaultDefaults(): void
{
+ Settings::restoreDefaults();
$phpWord = new PhpWord();
$dom = Helper::getAsHTML($phpWord);
@@ -68,7 +48,7 @@ public function testDefaultDefaults(): void
$prg = preg_match('/body {(.*?)}/', $style, $matches);
self::assertNotEmpty($matches);
self::assertNotFalse($prg);
- self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #000000;}', $matches[0]);
+ self::assertEquals('body {font-family: \'Arial\'; font-size: 10pt; color: #000000;}', $matches[0]);
}
public function testSettingDefaultFontColor(): void
@@ -85,7 +65,7 @@ public function testSettingDefaultFontColor(): void
$prg = preg_match('/body {(.*?)}/', $style, $matches);
self::assertNotEmpty($matches);
self::assertNotFalse($prg);
- self::assertEquals('body {font-family: \'Arial\'; font-size: 12pt; color: #00FF00;}', $matches[0]);
+ self::assertEquals('body {font-family: \'Arial\'; font-size: 10pt; color: #00FF00;}', $matches[0]);
}
/**
diff --git a/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php b/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
index e6cad15ea0..412197f2c6 100644
--- a/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
+++ b/tests/PhpWordTests/Writer/ODText/Part/ContentTest.php
@@ -30,20 +30,9 @@
*/
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);
+ Settings::restoreDefaults();
TestHelperDOCX::clear();
}
diff --git a/tests/PhpWordTests/Writer/ODText/Style/FontTest.php b/tests/PhpWordTests/Writer/ODText/Style/FontTest.php
index b377ff4fcd..f238777cf4 100644
--- a/tests/PhpWordTests/Writer/ODText/Style/FontTest.php
+++ b/tests/PhpWordTests/Writer/ODText/Style/FontTest.php
@@ -18,6 +18,7 @@
namespace PhpOffice\PhpWordTests\Writer\ODText\Style;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Style\Font;
use PhpOffice\PhpWordTests\TestHelperDOCX;
@@ -31,6 +32,7 @@ class FontTest extends \PHPUnit\Framework\TestCase
*/
protected function tearDown(): void
{
+ Settings::restoreDefaults();
TestHelperDOCX::clear();
}
diff --git a/tests/PhpWordTests/Writer/PDF/DomPDFTest.php b/tests/PhpWordTests/Writer/PDF/DomPDFTest.php
index 4c5c6ba0d9..870e417d3b 100644
--- a/tests/PhpWordTests/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/DomPDFTest.php
@@ -24,11 +24,14 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF\DomPDF.
- *
- * @runTestsInSeparateProcesses
*/
class DomPDFTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test construct.
*/
@@ -73,8 +76,6 @@ public function testSetGetAbstractRendererProperties(): void
*/
public function testSetGetAbstractRendererOptions(): void
{
- define('DOMPDF_ENABLE_AUTOLOAD', false);
-
$rendererName = Settings::PDF_RENDERER_DOMPDF;
$rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/dompdf/dompdf');
self::assertNotFalse($rendererLibraryPath);
diff --git a/tests/PhpWordTests/Writer/PDF/MPDFTest.php b/tests/PhpWordTests/Writer/PDF/MPDFTest.php
index 90048c4163..e48b961785 100644
--- a/tests/PhpWordTests/Writer/PDF/MPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/MPDFTest.php
@@ -25,18 +25,19 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF\MPDF.
- *
- * @runTestsInSeparateProcesses
*/
class MPDFTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test construct.
*/
public function testConstruct(): void
{
- $file = __DIR__ . '/../../_files/mpdf.pdf';
-
$phpWord = new PhpWord();
$section = $phpWord->addSection();
$section->addText('Test 1');
@@ -49,17 +50,14 @@ public function testConstruct(): void
$writer = new MPDF($phpWord);
$writer->setFont('xyz');
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
public function testEditCallback(): void
{
- $file = __DIR__ . '/../../_files/mpdf.pdf';
-
$phpWord = new PhpWord();
$section = $phpWord->addSection();
$section->addText('Test 1');
@@ -74,11 +72,10 @@ public function testEditCallback(): void
/** @var callable */
$callback = [self::class, 'cbEditContent'];
$writer->setEditCallback($callback);
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
// add a footer
diff --git a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
index de8ac147af..2a623ec6ce 100644
--- a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
@@ -28,13 +28,16 @@
*/
class TCPDFTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test construct.
*/
public function testConstruct(): void
{
- $file = __DIR__ . '/../../_files/tcpdf.pdf';
-
$phpWord = new PhpWord();
$phpWord->setDefaultParagraphStyle(['spaceBefore' => 0, 'spaceAfter' => 0]);
$section = $phpWord->addSection();
@@ -42,11 +45,10 @@ public function testConstruct(): void
$writer = new PDF\TCPDF($phpWord);
$writer->setFont('Helvetica');
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
/**
diff --git a/tests/PhpWordTests/Writer/PDFTest.php b/tests/PhpWordTests/Writer/PDFTest.php
index c5c8f3b7aa..6e1fbc1c74 100644
--- a/tests/PhpWordTests/Writer/PDFTest.php
+++ b/tests/PhpWordTests/Writer/PDFTest.php
@@ -24,30 +24,30 @@
/**
* Test class for PhpOffice\PhpWord\Writer\PDF.
- *
- * @runTestsInSeparateProcesses
*/
class PDFTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test normal construct.
*/
public function testConstructDompdf(): void
{
- define('DOMPDF_ENABLE_AUTOLOAD', false);
- $file = __DIR__ . '/../_files/temp.pdf';
-
+ Settings::restoreDefaults();
$rendererName = Settings::PDF_RENDERER_DOMPDF;
$rendererLibraryPath = realpath(PHPWORD_TESTS_BASE_DIR . '/../vendor/dompdf/dompdf');
self::assertNotFalse($rendererLibraryPath);
Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
$writer = new PDF(new PhpWord());
$writer->setFont('xyz');
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
public function testConstructMpdf(): void
@@ -60,11 +60,10 @@ public function testConstructMpdf(): void
Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
$writer = new PDF(new PhpWord());
$writer->setFont('xyz');
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
public function testConstructTcpdf(): void
@@ -77,11 +76,10 @@ public function testConstructTcpdf(): void
Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
$writer = new PDF(new PhpWord());
$writer->setFont('Helvetica');
- $writer->save($file);
-
- self::assertFileExists($file);
-
- unlink($file);
+ ob_start();
+ $writer->save('php://output');
+ $contents = (string) ob_get_clean();
+ self::assertSame('%PDF', substr($contents, 0, 4));
}
/**
@@ -89,6 +87,7 @@ public function testConstructTcpdf(): void
*/
public function testConstructException(): void
{
+ Settings::restoreDefaults();
$this->expectException(\PhpOffice\PhpWord\Exception\Exception::class);
$this->expectExceptionMessage('PDF rendering library or library path has not been defined.');
$writer = new PDF(new PhpWord());
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php b/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
index 09936d6d33..88274b3622 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
@@ -19,6 +19,7 @@
namespace PhpOffice\PhpWordTests\Writer\Word2007\Part;
use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\SimpleType\Jc;
use PhpOffice\PhpWord\Style\Font;
use PhpOffice\PhpWord\Style\Paragraph;
@@ -28,8 +29,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Styles.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Styles
- *
- * @runTestsInSeparateProcesses
*/
class StylesTest extends \PHPUnit\Framework\TestCase
{
@@ -38,6 +37,7 @@ class StylesTest extends \PHPUnit\Framework\TestCase
*/
protected function tearDown(): void
{
+ Settings::restoreDefaults();
TestHelperDOCX::clear();
}
From ec23a9c4de51c609afc2ecc28ee3e821aef391a5 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 15:29:35 -0700
Subject: [PATCH 111/153] Weirdness in One Test for Phpunit 9 (Php7.* and
Php8.0)
PhpWordTest tries to save as if it were a browser even though that is not the case. This causes a problem for Phpunit 9 (Php 7.* or 8.0) if not run in separate process. So let it run separate. No harm for Php8.1+, except for a slight performance penalty.
---
tests/PhpWordTests/PhpWordTest.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/PhpWordTests/PhpWordTest.php b/tests/PhpWordTests/PhpWordTest.php
index 0e99909aa9..5150862c4e 100644
--- a/tests/PhpWordTests/PhpWordTest.php
+++ b/tests/PhpWordTests/PhpWordTest.php
@@ -157,7 +157,14 @@ public function testAddTitleStyle(): void
}
/**
- * Test save.
+ * Weird test - tries to save as if it were a browser even though that
+ * is not the case. This causes a problem for Phpunit 9 (Php 7.* or 8.0)
+ * if not run in separate process. So let it run separate. No harm
+ * for Php8.1+, except for a slight performance penalty.
+ *
+ * @runInSeparateProcess
+ *
+ * @preserveGlobalState disabled
*/
public function testSave(): void
{
From 763e34c14d0ce4bb03e1f55a0d32399da8375bd1 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 21:36:52 -0700
Subject: [PATCH 112/153] Convert More Separate Process Tests
---
.../ComplexType/FootnotePropertiesTest.php | 2 -
.../ComplexType/RubyPropertiesTest.php | 2 -
.../PhpWordTests/Exception/ExceptionTest.php | 2 -
.../Exception/InvalidImageExceptionTest.php | 2 -
.../Exception/InvalidStyleExceptionTest.php | 2 -
.../UnsupportedImageTypeExceptionTest.php | 2 -
tests/PhpWordTests/IOFactoryTest.php | 7 +-
tests/PhpWordTests/MediaTest.php | 2 -
tests/PhpWordTests/Metadata/DocInfoTest.php | 2 -
tests/PhpWordTests/Metadata/SettingsTest.php | 2 -
tests/PhpWordTests/SettingsRtlTest.php | 2 -
tests/PhpWordTests/Shared/ZipArchiveTest.php | 75 ++++++++++---------
tests/PhpWordTests/StyleTest.php | 2 -
.../TemplateProcessorSectionTest.php | 2 -
.../PhpWordTests/WriteReadback/ODTextTest.php | 2 -
15 files changed, 46 insertions(+), 62 deletions(-)
diff --git a/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php b/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php
index 6472968d3b..22b8edab27 100644
--- a/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php
+++ b/tests/PhpWordTests/ComplexType/FootnotePropertiesTest.php
@@ -26,8 +26,6 @@
* Test class for PhpOffice\PhpWord\ComplexType\FootnoteProperties.
*
* @coversDefaultClass \PhpOffice\PhpWord\ComplexType\FootnoteProperties
- *
- * @runTestsInSeparateProcesses
*/
class FootnotePropertiesTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php b/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php
index 62bc0b0739..d494b2ab0d 100644
--- a/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php
+++ b/tests/PhpWordTests/ComplexType/RubyPropertiesTest.php
@@ -23,8 +23,6 @@
/**
* Test class for PhpOffice\PhpWord\ComplexType\RubyProperties.
- *
- * @runTestsInSeparateProcesses
*/
class RubyPropertiesTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Exception/ExceptionTest.php b/tests/PhpWordTests/Exception/ExceptionTest.php
index 09ee933c86..8bbd03190a 100644
--- a/tests/PhpWordTests/Exception/ExceptionTest.php
+++ b/tests/PhpWordTests/Exception/ExceptionTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Exception\Exception.
*
* @coversDefaultClass \Exception
- *
- * @runTestsInSeparateProcesses
*/
class ExceptionTest extends TestCase
{
diff --git a/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php b/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php
index dea167bb25..045d7124a0 100644
--- a/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php
+++ b/tests/PhpWordTests/Exception/InvalidImageExceptionTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Exception\InvalidImageException.
*
* @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidImageException
- *
- * @runTestsInSeparateProcesses
*/
class InvalidImageExceptionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php b/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php
index 7f2a1650e4..f38fc3cf44 100644
--- a/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php
+++ b/tests/PhpWordTests/Exception/InvalidStyleExceptionTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Exception\InvalidStyleException.
*
* @coversDefaultClass \PhpOffice\PhpWord\Exception\InvalidStyleException
- *
- * @runTestsInSeparateProcesses
*/
class InvalidStyleExceptionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php b/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php
index 2252b874ef..d40dc8ae9a 100644
--- a/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php
+++ b/tests/PhpWordTests/Exception/UnsupportedImageTypeExceptionTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Exception\UnsupportedImageTypeExceptionTest.
- *
- * @runTestsInSeparateProcesses
*/
class UnsupportedImageTypeExceptionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/IOFactoryTest.php b/tests/PhpWordTests/IOFactoryTest.php
index 6a8d746bd0..bf69703336 100644
--- a/tests/PhpWordTests/IOFactoryTest.php
+++ b/tests/PhpWordTests/IOFactoryTest.php
@@ -31,8 +31,6 @@
/**
* Test class for PhpOffice\PhpWord\IOFactory.
- *
- * @runTestsInSeparateProcesses
*/
class IOFactoryTest extends TestCase
{
@@ -43,6 +41,11 @@ protected function setUp(): void
Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
}
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Create all possible writers.
*
diff --git a/tests/PhpWordTests/MediaTest.php b/tests/PhpWordTests/MediaTest.php
index 2eb60a858b..2774e46e2a 100644
--- a/tests/PhpWordTests/MediaTest.php
+++ b/tests/PhpWordTests/MediaTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Media.
- *
- * @runTestsInSeparateProcesses
*/
class MediaTest extends AbstractWebServerEmbedded
{
diff --git a/tests/PhpWordTests/Metadata/DocInfoTest.php b/tests/PhpWordTests/Metadata/DocInfoTest.php
index d5c9eb5124..f6a9911fb4 100644
--- a/tests/PhpWordTests/Metadata/DocInfoTest.php
+++ b/tests/PhpWordTests/Metadata/DocInfoTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Metadata\DocInfo.
- *
- * @runTestsInSeparateProcesses
*/
class DocInfoTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Metadata/SettingsTest.php b/tests/PhpWordTests/Metadata/SettingsTest.php
index 0c5a6f1593..9da794c685 100644
--- a/tests/PhpWordTests/Metadata/SettingsTest.php
+++ b/tests/PhpWordTests/Metadata/SettingsTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Metadata\Settings.
- *
- * @runTestsInSeparateProcesses
*/
class SettingsTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/SettingsRtlTest.php b/tests/PhpWordTests/SettingsRtlTest.php
index 67747c7c0a..b424c123d1 100644
--- a/tests/PhpWordTests/SettingsRtlTest.php
+++ b/tests/PhpWordTests/SettingsRtlTest.php
@@ -28,8 +28,6 @@
* Test class for PhpOffice\PhpWord\Settings.
*
* @coversDefaultClass \PhpOffice\PhpWord\Settings
- *
- * @runTestsInSeparateProcesses
*/
class SettingsRtlTest extends TestCase
{
diff --git a/tests/PhpWordTests/Shared/ZipArchiveTest.php b/tests/PhpWordTests/Shared/ZipArchiveTest.php
index 3f998c26ef..5cc6249780 100644
--- a/tests/PhpWordTests/Shared/ZipArchiveTest.php
+++ b/tests/PhpWordTests/Shared/ZipArchiveTest.php
@@ -25,39 +25,47 @@
* Test class for PhpOffice\PhpWord\Shared\ZipArchive.
*
* @coversDefaultClass \PhpOffice\PhpWord\Shared\ZipArchive
- *
- * @runTestsInSeparateProcesses
*/
class ZipArchiveTest extends \PHPUnit\Framework\TestCase
{
-// /**
-// * Test close method exception: Working in local, not working in Travis
-// *
-// * expectedException \PhpOffice\PhpWord\Exception\Exception
-// * expectedExceptionMessage Could not close zip file
-// * covers ::close
-// */
-// public function testCloseException()
-// {
-// $zipFile = __DIR__ . "/../_files/documents/ziptest.zip";
-
-// $object = new ZipArchive();
-// $object->open($zipFile, ZipArchive::CREATE);
-// $object->addFromString('content/string.txt', 'Test');
-
-// // Lock the file
-// $resource = fopen($zipFile, "w");
-// flock($resource, LOCK_EX);
-
-// // Closing the file should throws an exception
-// $object->close();
-
-// // Unlock the file
-// flock($resource, LOCK_UN);
-// fclose($resource);
-
-// @unlink($zipFile);
-// }
+ /** @var string */
+ private $zipFile;
+
+ protected function tearDown(): void
+ {
+ if (file_exists($this->zipFile)) {
+ unlink($this->zipFile);
+ }
+ Settings::restoreDefaults();
+ }
+
+ /**
+ * Test close method exception.
+ *
+ * covers ::close
+ */
+ public function testCloseException(): void
+ {
+ $this->zipFile = __DIR__ . '/../_files/documents/ziptest1.zip';
+ $this->expectException(\PhpOffice\PhpWord\Exception\Exception::class);
+ $this->expectExceptionMessage('Could not close zip file');
+
+ $object = new ZipArchive();
+ $object->open($this->zipFile, ZipArchive::CREATE);
+ $object->addFromString('content/string.txt', 'Test');
+
+ // Lock the file
+ $resource = fopen($this->zipFile, 'wb');
+ self::assertNotFalse($resource);
+ flock($resource, LOCK_EX);
+
+ // Closing the file should throws an exception
+ $object->close();
+
+ // Unlock the file
+ flock($resource, LOCK_UN);
+ fclose($resource);
+ }
/**
* Test all methods.
@@ -68,7 +76,7 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
{
// Preparation
$existingFile = __DIR__ . '/../_files/documents/sheet.xls';
- $zipFile = __DIR__ . '/../_files/documents/ziptest.zip';
+ $this->zipFile = __DIR__ . '/../_files/documents/ziptest2.zip';
$destination1 = __DIR__ . '/../_files/documents/extract1';
$destination2 = __DIR__ . '/../_files/documents/extract2';
@mkdir($destination1);
@@ -77,11 +85,11 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
Settings::setZipClass($zipClass);
$object = new ZipArchive();
- $object->open($zipFile, ZipArchive::CREATE);
+ $object->open($this->zipFile, ZipArchive::CREATE);
$object->addFile($existingFile, 'xls/new.xls');
$object->addFromString('content/string.txt', 'Test');
$object->close();
- $object->open($zipFile);
+ $object->open($this->zipFile);
// Run tests
self::assertEquals(0, $object->locateName('xls/new.xls'));
@@ -101,7 +109,6 @@ public function testZipArchive($zipClass = 'ZipArchive'): void
// Cleanup
$this->deleteDir($destination1);
$this->deleteDir($destination2);
- @unlink($zipFile);
}
/**
diff --git a/tests/PhpWordTests/StyleTest.php b/tests/PhpWordTests/StyleTest.php
index 6115e04426..32d61e09f6 100644
--- a/tests/PhpWordTests/StyleTest.php
+++ b/tests/PhpWordTests/StyleTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Style.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style
- *
- * @runTestsInSeparateProcesses
*/
class StyleTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/TemplateProcessorSectionTest.php b/tests/PhpWordTests/TemplateProcessorSectionTest.php
index a6e9d61163..211566f4c3 100644
--- a/tests/PhpWordTests/TemplateProcessorSectionTest.php
+++ b/tests/PhpWordTests/TemplateProcessorSectionTest.php
@@ -27,8 +27,6 @@
* @covers \PhpOffice\PhpWord\TemplateProcessor
*
* @coversDefaultClass \PhpOffice\PhpWord\TemplateProcessor
- *
- * @runTestsInSeparateProcesses
*/
final class TemplateProcessorSectionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/WriteReadback/ODTextTest.php b/tests/PhpWordTests/WriteReadback/ODTextTest.php
index cee0f38301..613eb8e508 100644
--- a/tests/PhpWordTests/WriteReadback/ODTextTest.php
+++ b/tests/PhpWordTests/WriteReadback/ODTextTest.php
@@ -27,8 +27,6 @@
* Test class for PhpOffice\PhpWord\Reader\ODText and PhpOffice\PhpWord\Writer\ODText.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\ODText
- *
- * @runTestsInSeparateProcesses
*/
class ODTextTest extends \PHPUnit\Framework\TestCase
{
From 9309e04c15e8cbb338b3bcb2628d92b1f631c81f Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Tue, 30 Sep 2025 22:27:27 -0700
Subject: [PATCH 113/153] Try Another Means to Generate Zip Close Failure
---
tests/PhpWordTests/Shared/ZipArchiveTest.php | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/tests/PhpWordTests/Shared/ZipArchiveTest.php b/tests/PhpWordTests/Shared/ZipArchiveTest.php
index 5cc6249780..9e285f0e4c 100644
--- a/tests/PhpWordTests/Shared/ZipArchiveTest.php
+++ b/tests/PhpWordTests/Shared/ZipArchiveTest.php
@@ -53,18 +53,10 @@ public function testCloseException(): void
$object = new ZipArchive();
$object->open($this->zipFile, ZipArchive::CREATE);
$object->addFromString('content/string.txt', 'Test');
-
- // Lock the file
- $resource = fopen($this->zipFile, 'wb');
- self::assertNotFalse($resource);
- flock($resource, LOCK_EX);
-
- // Closing the file should throws an exception
+ // Should not be able to add a directory like this
+ $object->addFile('.', '.');
+ // But error doesn't express itself till close is attempted
$object->close();
-
- // Unlock the file
- flock($resource, LOCK_UN);
- fclose($resource);
}
/**
From 30a56b059f6fa7ec39ac10622a00df511c0d63f8 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 1 Oct 2025 08:39:16 -0700
Subject: [PATCH 114/153] Eliminate More Test Separate Processes
Removed from Element and Reader tests. Style and Writer remain for now.
---
tests/PhpWordTests/Element/BookmarkTest.php | 2 --
tests/PhpWordTests/Element/CellTest.php | 2 --
tests/PhpWordTests/Element/CheckBoxTest.php | 2 --
tests/PhpWordTests/Element/CommentTest.php | 2 --
tests/PhpWordTests/Element/FieldTest.php | 2 --
tests/PhpWordTests/Element/FooterTest.php | 2 --
tests/PhpWordTests/Element/FootnoteTest.php | 2 --
tests/PhpWordTests/Element/FormulaTest.php | 2 --
tests/PhpWordTests/Element/HeaderTest.php | 2 --
tests/PhpWordTests/Element/LineTest.php | 2 --
tests/PhpWordTests/Element/LinkTest.php | 2 --
tests/PhpWordTests/Element/ListItemRunTest.php | 2 --
tests/PhpWordTests/Element/ListItemTest.php | 2 --
tests/PhpWordTests/Element/ObjectTest.php | 2 --
tests/PhpWordTests/Element/PreserveTextTest.php | 2 --
tests/PhpWordTests/Element/RowTest.php | 2 --
tests/PhpWordTests/Element/RubyTest.php | 2 --
tests/PhpWordTests/Element/SectionTest.php | 2 --
tests/PhpWordTests/Element/TOCTest.php | 2 --
tests/PhpWordTests/Element/TableTest.php | 2 --
tests/PhpWordTests/Element/TextBoxTest.php | 2 --
tests/PhpWordTests/Element/TextBreakTest.php | 2 --
tests/PhpWordTests/Element/TextRunTest.php | 2 --
tests/PhpWordTests/Element/TextTest.php | 2 --
tests/PhpWordTests/Element/TitleTest.php | 2 --
tests/PhpWordTests/Element/TrackChangeTest.php | 2 --
tests/PhpWordTests/Reader/HTMLTest.php | 2 --
tests/PhpWordTests/Reader/MsDocTest.php | 2 --
tests/PhpWordTests/Reader/ODTextTest.php | 2 --
tests/PhpWordTests/Reader/RTFTest.php | 2 --
tests/PhpWordTests/Reader/Word2007/StyleTableTest.php | 2 --
tests/PhpWordTests/Reader/Word2007Test.php | 2 --
32 files changed, 64 deletions(-)
diff --git a/tests/PhpWordTests/Element/BookmarkTest.php b/tests/PhpWordTests/Element/BookmarkTest.php
index 097166736f..5499b18a96 100644
--- a/tests/PhpWordTests/Element/BookmarkTest.php
+++ b/tests/PhpWordTests/Element/BookmarkTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Footer.
- *
- * @runTestsInSeparateProcesses
*/
class BookmarkTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/CellTest.php b/tests/PhpWordTests/Element/CellTest.php
index 2fedcafc24..a29a864483 100644
--- a/tests/PhpWordTests/Element/CellTest.php
+++ b/tests/PhpWordTests/Element/CellTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Cell.
- *
- * @runTestsInSeparateProcesses
*/
class CellTest extends AbstractWebServerEmbedded
{
diff --git a/tests/PhpWordTests/Element/CheckBoxTest.php b/tests/PhpWordTests/Element/CheckBoxTest.php
index fbdbf36aa3..1b808ee53c 100644
--- a/tests/PhpWordTests/Element/CheckBoxTest.php
+++ b/tests/PhpWordTests/Element/CheckBoxTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\CheckBox.
- *
- * @runTestsInSeparateProcesses
*/
class CheckBoxTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/CommentTest.php b/tests/PhpWordTests/Element/CommentTest.php
index f76316d890..c066429839 100644
--- a/tests/PhpWordTests/Element/CommentTest.php
+++ b/tests/PhpWordTests/Element/CommentTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Header.
- *
- * @runTestsInSeparateProcesses
*/
class CommentTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/FieldTest.php b/tests/PhpWordTests/Element/FieldTest.php
index f624e9294d..d0018f1e1c 100644
--- a/tests/PhpWordTests/Element/FieldTest.php
+++ b/tests/PhpWordTests/Element/FieldTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Field.
- *
- * @runTestsInSeparateProcesses
*/
class FieldTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/FooterTest.php b/tests/PhpWordTests/Element/FooterTest.php
index f97b159cb9..7b97d52633 100644
--- a/tests/PhpWordTests/Element/FooterTest.php
+++ b/tests/PhpWordTests/Element/FooterTest.php
@@ -23,8 +23,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Footer.
- *
- * @runTestsInSeparateProcesses
*/
class FooterTest extends AbstractWebServerEmbedded
{
diff --git a/tests/PhpWordTests/Element/FootnoteTest.php b/tests/PhpWordTests/Element/FootnoteTest.php
index c6297cfc32..b51130532f 100644
--- a/tests/PhpWordTests/Element/FootnoteTest.php
+++ b/tests/PhpWordTests/Element/FootnoteTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Footnote.
- *
- * @runTestsInSeparateProcesses
*/
class FootnoteTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/FormulaTest.php b/tests/PhpWordTests/Element/FormulaTest.php
index dcb730e9cc..6a3fe44570 100644
--- a/tests/PhpWordTests/Element/FormulaTest.php
+++ b/tests/PhpWordTests/Element/FormulaTest.php
@@ -25,8 +25,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Formula.
- *
- * @runTestsInSeparateProcesses
*/
class FormulaTest extends AbstractWebServerEmbedded
{
diff --git a/tests/PhpWordTests/Element/HeaderTest.php b/tests/PhpWordTests/Element/HeaderTest.php
index 6d659dbd7c..323a43a52d 100644
--- a/tests/PhpWordTests/Element/HeaderTest.php
+++ b/tests/PhpWordTests/Element/HeaderTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Header.
- *
- * @runTestsInSeparateProcesses
*/
class HeaderTest extends AbstractWebServerEmbedded
{
diff --git a/tests/PhpWordTests/Element/LineTest.php b/tests/PhpWordTests/Element/LineTest.php
index f4a39b38d1..e9eac1743f 100644
--- a/tests/PhpWordTests/Element/LineTest.php
+++ b/tests/PhpWordTests/Element/LineTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\Line.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Line
- *
- * @runTestsInSeparateProcesses
*/
class LineTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/LinkTest.php b/tests/PhpWordTests/Element/LinkTest.php
index 5b5c6f77bf..91e1b787eb 100644
--- a/tests/PhpWordTests/Element/LinkTest.php
+++ b/tests/PhpWordTests/Element/LinkTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Element\Link.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Link
- *
- * @runTestsInSeparateProcesses
*/
class LinkTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/ListItemRunTest.php b/tests/PhpWordTests/Element/ListItemRunTest.php
index 69b5f990b0..8c9d0d6b14 100644
--- a/tests/PhpWordTests/Element/ListItemRunTest.php
+++ b/tests/PhpWordTests/Element/ListItemRunTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\ListItemRun.
- *
- * @runTestsInSeparateProcesses
*/
class ListItemRunTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/ListItemTest.php b/tests/PhpWordTests/Element/ListItemTest.php
index 3da9a8d101..f38040c345 100644
--- a/tests/PhpWordTests/Element/ListItemTest.php
+++ b/tests/PhpWordTests/Element/ListItemTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\ListItem.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\ListItem
- *
- * @runTestsInSeparateProcesses
*/
class ListItemTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/ObjectTest.php b/tests/PhpWordTests/Element/ObjectTest.php
index 2ef05567bc..c18bdaa373 100644
--- a/tests/PhpWordTests/Element/ObjectTest.php
+++ b/tests/PhpWordTests/Element/ObjectTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\OLEObject.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\OLEObject
- *
- * @runTestsInSeparateProcesses
*/
class ObjectTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/PreserveTextTest.php b/tests/PhpWordTests/Element/PreserveTextTest.php
index 746db6aeee..9bcb0b5b3b 100644
--- a/tests/PhpWordTests/Element/PreserveTextTest.php
+++ b/tests/PhpWordTests/Element/PreserveTextTest.php
@@ -23,8 +23,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\PreserveText.
- *
- * @runTestsInSeparateProcesses
*/
class PreserveTextTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/RowTest.php b/tests/PhpWordTests/Element/RowTest.php
index 6dc8335ffd..793914efdc 100644
--- a/tests/PhpWordTests/Element/RowTest.php
+++ b/tests/PhpWordTests/Element/RowTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\Row.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Row
- *
- * @runTestsInSeparateProcesses
*/
class RowTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/RubyTest.php b/tests/PhpWordTests/Element/RubyTest.php
index 44d2e5ba3c..16cdea0c3e 100644
--- a/tests/PhpWordTests/Element/RubyTest.php
+++ b/tests/PhpWordTests/Element/RubyTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Text.
- *
- * @runTestsInSeparateProcesses
*/
class RubyTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/SectionTest.php b/tests/PhpWordTests/Element/SectionTest.php
index bf38a33300..1929c6c186 100644
--- a/tests/PhpWordTests/Element/SectionTest.php
+++ b/tests/PhpWordTests/Element/SectionTest.php
@@ -29,8 +29,6 @@
* @covers \PhpOffice\PhpWord\Element\Section
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Section
- *
- * @runTestsInSeparateProcesses
*/
class SectionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TOCTest.php b/tests/PhpWordTests/Element/TOCTest.php
index 3770823f5f..c880ba6f77 100644
--- a/tests/PhpWordTests/Element/TOCTest.php
+++ b/tests/PhpWordTests/Element/TOCTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\TOC.
- *
- * @runTestsInSeparateProcesses
*/
class TOCTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TableTest.php b/tests/PhpWordTests/Element/TableTest.php
index a5169040a9..2643f7faee 100644
--- a/tests/PhpWordTests/Element/TableTest.php
+++ b/tests/PhpWordTests/Element/TableTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\Table.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Table
- *
- * @runTestsInSeparateProcesses
*/
class TableTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TextBoxTest.php b/tests/PhpWordTests/Element/TextBoxTest.php
index 9289d1ad47..3623cd3ef8 100644
--- a/tests/PhpWordTests/Element/TextBoxTest.php
+++ b/tests/PhpWordTests/Element/TextBoxTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Element\TextBox.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\TextBox
- *
- * @runTestsInSeparateProcesses
*/
class TextBoxTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TextBreakTest.php b/tests/PhpWordTests/Element/TextBreakTest.php
index 10ca058180..bf99c2a652 100644
--- a/tests/PhpWordTests/Element/TextBreakTest.php
+++ b/tests/PhpWordTests/Element/TextBreakTest.php
@@ -26,8 +26,6 @@
* Test class for PhpOffice\PhpWord\Element\TextBreak.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\TextBreak
- *
- * @runTestsInSeparateProcesses
*/
class TextBreakTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TextRunTest.php b/tests/PhpWordTests/Element/TextRunTest.php
index b18eca99e4..b18db03794 100644
--- a/tests/PhpWordTests/Element/TextRunTest.php
+++ b/tests/PhpWordTests/Element/TextRunTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\TextRun.
- *
- * @runTestsInSeparateProcesses
*/
class TextRunTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TextTest.php b/tests/PhpWordTests/Element/TextTest.php
index 693430a87f..d8c5b02eef 100644
--- a/tests/PhpWordTests/Element/TextTest.php
+++ b/tests/PhpWordTests/Element/TextTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\Text.
- *
- * @runTestsInSeparateProcesses
*/
class TextTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TitleTest.php b/tests/PhpWordTests/Element/TitleTest.php
index ab1e38102f..aea0aa7974 100644
--- a/tests/PhpWordTests/Element/TitleTest.php
+++ b/tests/PhpWordTests/Element/TitleTest.php
@@ -28,8 +28,6 @@
* Test class for PhpOffice\PhpWord\Element\Title.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Title
- *
- * @runTestsInSeparateProcesses
*/
class TitleTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Element/TrackChangeTest.php b/tests/PhpWordTests/Element/TrackChangeTest.php
index 1d37fb3dd4..6304578633 100644
--- a/tests/PhpWordTests/Element/TrackChangeTest.php
+++ b/tests/PhpWordTests/Element/TrackChangeTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Element\TrackChange.
- *
- * @runTestsInSeparateProcesses
*/
class TrackChangeTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/HTMLTest.php b/tests/PhpWordTests/Reader/HTMLTest.php
index 7a35a06f78..e9228cf840 100644
--- a/tests/PhpWordTests/Reader/HTMLTest.php
+++ b/tests/PhpWordTests/Reader/HTMLTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Reader\HTML.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\HTML
- *
- * @runTestsInSeparateProcesses
*/
class HTMLTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/MsDocTest.php b/tests/PhpWordTests/Reader/MsDocTest.php
index 3552271823..32aae8fe33 100644
--- a/tests/PhpWordTests/Reader/MsDocTest.php
+++ b/tests/PhpWordTests/Reader/MsDocTest.php
@@ -28,8 +28,6 @@
* Test class for PhpOffice\PhpWord\Reader\MsDoc.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\MsDoc
- *
- * @runTestsInSeparateProcesses
*/
class MsDocTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/ODTextTest.php b/tests/PhpWordTests/Reader/ODTextTest.php
index c05705a439..61c597cecf 100644
--- a/tests/PhpWordTests/Reader/ODTextTest.php
+++ b/tests/PhpWordTests/Reader/ODTextTest.php
@@ -28,8 +28,6 @@
* Test class for PhpOffice\PhpWord\Reader\ODText.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\ODText
- *
- * @runTestsInSeparateProcesses
*/
class ODTextTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/RTFTest.php b/tests/PhpWordTests/Reader/RTFTest.php
index a8f472571b..4b9e900033 100644
--- a/tests/PhpWordTests/Reader/RTFTest.php
+++ b/tests/PhpWordTests/Reader/RTFTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Reader\RTF.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\RTF
- *
- * @runTestsInSeparateProcesses
*/
class RTFTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php b/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
index cb8c255018..c6288cf719 100644
--- a/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
+++ b/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Reader\Word2007\Styles.
* Run in separate process because doc changes default font.
- *
- * @runTestsInSeparateProcesses
*/
class StyleTableTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Reader/Word2007Test.php b/tests/PhpWordTests/Reader/Word2007Test.php
index 65c8a4a71b..cdc8cbc1a8 100644
--- a/tests/PhpWordTests/Reader/Word2007Test.php
+++ b/tests/PhpWordTests/Reader/Word2007Test.php
@@ -37,8 +37,6 @@
* Test class for PhpOffice\PhpWord\Reader\Word2007.
*
* @coversDefaultClass \PhpOffice\PhpWord\Reader\Word2007
- *
- * @runTestsInSeparateProcesses
*/
class Word2007Test extends \PHPUnit\Framework\TestCase
{
From 908a70be749a19a425c4e8c383ed93262f4c2343 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Wed, 1 Oct 2025 09:16:02 -0700
Subject: [PATCH 115/153] 3 Related Test Failures
All call getRemoteGifImageUrl. Try setting those methods to separate process.
---
tests/PhpWordTests/Element/CellTest.php | 3 +++
tests/PhpWordTests/Element/FooterTest.php | 2 ++
tests/PhpWordTests/Element/HeaderTest.php | 2 ++
3 files changed, 7 insertions(+)
diff --git a/tests/PhpWordTests/Element/CellTest.php b/tests/PhpWordTests/Element/CellTest.php
index a29a864483..8ef1f49c08 100644
--- a/tests/PhpWordTests/Element/CellTest.php
+++ b/tests/PhpWordTests/Element/CellTest.php
@@ -163,6 +163,9 @@ public function testAddImageFooter(): void
/**
* Add image section by URL.
+ * Method getRemoteGifImageUrl seems to require separate process.
+ *
+ * @runInSeparateProcess
*/
public function testAddImageSectionByUrl(): void
{
diff --git a/tests/PhpWordTests/Element/FooterTest.php b/tests/PhpWordTests/Element/FooterTest.php
index 7b97d52633..6cfbe6fce0 100644
--- a/tests/PhpWordTests/Element/FooterTest.php
+++ b/tests/PhpWordTests/Element/FooterTest.php
@@ -113,6 +113,8 @@ public function testAddImage(): void
/**
* Add image by URL.
+ *
+ * @runInSeparateProcess
*/
public function testAddImageByUrl(): void
{
diff --git a/tests/PhpWordTests/Element/HeaderTest.php b/tests/PhpWordTests/Element/HeaderTest.php
index 323a43a52d..477f52dcf0 100644
--- a/tests/PhpWordTests/Element/HeaderTest.php
+++ b/tests/PhpWordTests/Element/HeaderTest.php
@@ -123,6 +123,8 @@ public function testAddImage(): void
/**
* Add image by URL.
+ *
+ * @runInSeparateProcess
*/
public function testAddImageByUrl(): void
{
From dc176e6bd1db828895b621cc6c0fea5c8ee6b112 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 2 Oct 2025 20:46:01 -0700
Subject: [PATCH 116/153] Finish Unneeded Separate Processes
---
src/PhpWord/Settings.php | 1 +
.../AbstractWebServerEmbedded.php | 6 ++---
tests/PhpWordTests/Element/FooterTest.php | 1 +
tests/PhpWordTests/Element/HeaderTest.php | 1 +
tests/PhpWordTests/PhpWordTest.php | 1 +
.../Reader/Word2007/StyleTableTest.php | 8 +++++-
tests/PhpWordTests/SettingsRtlTest.php | 11 ++------
.../PhpWordTests/Style/AbstractStyleTest.php | 2 --
tests/PhpWordTests/Style/CellTest.php | 2 --
tests/PhpWordTests/Style/ChartTest.php | 2 --
tests/PhpWordTests/Style/FontTest.php | 2 --
tests/PhpWordTests/Style/ImageTest.php | 2 --
tests/PhpWordTests/Style/LineTest.php | 2 --
tests/PhpWordTests/Style/ListItemTest.php | 2 --
.../PhpWordTests/Style/NumberingLevelTest.php | 2 --
tests/PhpWordTests/Style/PaperTest.php | 2 --
tests/PhpWordTests/Style/ParagraphTest.php | 5 +---
tests/PhpWordTests/Style/RowTest.php | 2 --
tests/PhpWordTests/Style/SectionTest.php | 2 --
.../PhpWordTests/Style/TablePositionTest.php | 2 --
tests/PhpWordTests/Style/TableTest.php | 7 +++--
tests/PhpWordTests/Style/TextBoxTest.php | 2 --
tests/PhpWordTests/StyleTest.php | 26 +++++++++++--------
tests/PhpWordTests/Writer/EPub3Test.php | 2 --
tests/PhpWordTests/Writer/HTML/PartTest.php | 12 ++++++---
tests/PhpWordTests/Writer/HTMLTest.php | 5 ++--
.../Writer/ODText/Style/Paragraph2Test.php | 5 ++++
.../Writer/ODText/Style/ParagraphTest.php | 2 ++
tests/PhpWordTests/Writer/ODTextTest.php | 2 --
tests/PhpWordTests/Writer/PDF/TCPDFTest.php | 2 ++
tests/PhpWordTests/Writer/RTFTest.php | 2 --
.../Writer/Word2007/Part/AbstractPartTest.php | 3 ---
.../Writer/Word2007/Part/CommentsTest.php | 2 --
.../Writer/Word2007/Part/DocumentTest.php | 2 --
.../Writer/Word2007/Part/FooterTest.php | 2 --
.../Writer/Word2007/Part/FootnotesTest.php | 2 --
.../Writer/Word2007/Part/HeaderTest.php | 2 --
.../Writer/Word2007/Part/NumberingTest.php | 2 --
.../Writer/Word2007/Part/StylesTest.php | 2 ++
.../Writer/Word2007/Style/FontTest.php | 2 --
.../Writer/Word2007/Style/ImageTest.php | 2 --
.../Writer/Word2007/Style/ParagraphTest.php | 2 --
.../Writer/Word2007/Style/SectionTest.php | 2 --
.../Writer/Word2007/Style/TableCellTest.php | 2 --
.../Writer/Word2007/Style/TableTest.php | 2 --
tests/PhpWordTests/Writer/Word2007Test.php | 5 ++--
46 files changed, 63 insertions(+), 96 deletions(-)
diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
index d8956d8428..89f8c48884 100644
--- a/src/PhpWord/Settings.php
+++ b/src/PhpWord/Settings.php
@@ -537,6 +537,7 @@ public static function restoreDefaults(): void
self::$defaultFontName = self::DEFAULT_FONT_NAME;
self::$defaultFontSize = self::DEFAULT_FONT_SIZE;
self::$defaultPaper = self::DEFAULT_PAPER;
+ self::$defaultRtl = null;
self::$measurementUnit = self::UNIT_TWIP;
self::$outputEscapingEnabled = false;
self::$pdfRendererName = null;
diff --git a/tests/PhpWordTests/AbstractWebServerEmbedded.php b/tests/PhpWordTests/AbstractWebServerEmbedded.php
index fde7e1007c..e55c5c57e7 100644
--- a/tests/PhpWordTests/AbstractWebServerEmbedded.php
+++ b/tests/PhpWordTests/AbstractWebServerEmbedded.php
@@ -51,7 +51,7 @@ protected static function getRemoteImageUrl()
return self::getBaseUrl() . '/images/new-php-logo.png';
}
- return 'http://php.net/images/logos/new-php-logo.png';
+ return 'https://www.php.net/images/logos/new-php-logo.png';
}
protected static function getRemoteImageUrlWithoutExtension(): string
@@ -69,7 +69,7 @@ protected static function getRemoteGifImageUrl()
return self::getBaseUrl() . '/images/mario.gif';
}
- return 'http://php.net/images/logos/php-med-trans-light.gif';
+ return 'https://www.php.net/images/logos/php-med-trans-light.gif';
}
protected static function getRemoteBmpImageUrl()
@@ -78,6 +78,6 @@ protected static function getRemoteBmpImageUrl()
return self::getBaseUrl() . '/images/duke_nukem.bmp';
}
- return 'https://samples.libav.org/image-samples/RACECAR.BMP';
+ return 'https://examplefiles.org/files/images/bmp-example-file-download-500x500.bmp';
}
}
diff --git a/tests/PhpWordTests/Element/FooterTest.php b/tests/PhpWordTests/Element/FooterTest.php
index 6cfbe6fce0..1d368834b1 100644
--- a/tests/PhpWordTests/Element/FooterTest.php
+++ b/tests/PhpWordTests/Element/FooterTest.php
@@ -113,6 +113,7 @@ public function testAddImage(): void
/**
* Add image by URL.
+ * Method getRemoteGifImageUrl seems to require separate process.
*
* @runInSeparateProcess
*/
diff --git a/tests/PhpWordTests/Element/HeaderTest.php b/tests/PhpWordTests/Element/HeaderTest.php
index 477f52dcf0..8e3d7e500c 100644
--- a/tests/PhpWordTests/Element/HeaderTest.php
+++ b/tests/PhpWordTests/Element/HeaderTest.php
@@ -123,6 +123,7 @@ public function testAddImage(): void
/**
* Add image by URL.
+ * Method getRemoteGifImageUrl seems to require separate process.
*
* @runInSeparateProcess
*/
diff --git a/tests/PhpWordTests/PhpWordTest.php b/tests/PhpWordTests/PhpWordTest.php
index 5150862c4e..8726b936b9 100644
--- a/tests/PhpWordTests/PhpWordTest.php
+++ b/tests/PhpWordTests/PhpWordTest.php
@@ -35,6 +35,7 @@ class PhpWordTest extends \PHPUnit\Framework\TestCase
*/
protected function tearDown(): void
{
+ Style::resetStyles();
Settings::restoreDefaults();
}
diff --git a/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php b/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
index c6288cf719..932cc3b595 100644
--- a/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
+++ b/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
@@ -20,15 +20,21 @@
use PhpOffice\PhpWord\Element\Table;
use PhpOffice\PhpWord\Reader\Word2007 as DocxReader;
+use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Style\Table as TableStyle;
/**
* Test class for PhpOffice\PhpWord\Reader\Word2007\Styles.
- * Run in separate process because doc changes default font.
*/
class StyleTableTest extends \PHPUnit\Framework\TestCase
{
+ // Reading this doc changes default font.
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test reading of table layout.
*/
diff --git a/tests/PhpWordTests/SettingsRtlTest.php b/tests/PhpWordTests/SettingsRtlTest.php
index b424c123d1..a68c8e0459 100644
--- a/tests/PhpWordTests/SettingsRtlTest.php
+++ b/tests/PhpWordTests/SettingsRtlTest.php
@@ -31,17 +31,10 @@
*/
class SettingsRtlTest extends TestCase
{
- /** @var bool */
- private $defaultRtl;
-
- protected function setUp(): void
- {
- $this->defaultRtl = Settings::isDefaultRtl();
- }
-
protected function tearDown(): void
{
- Settings::setDefaultRtl($this->defaultRtl);
+ Settings::restoreDefaults();
+ Style::resetStyles();
}
public function testSetGetDefaultRtl(): void
diff --git a/tests/PhpWordTests/Style/AbstractStyleTest.php b/tests/PhpWordTests/Style/AbstractStyleTest.php
index 3b3cef900e..74de4fc29e 100644
--- a/tests/PhpWordTests/Style/AbstractStyleTest.php
+++ b/tests/PhpWordTests/Style/AbstractStyleTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\AbstractStyle.
- *
- * @runTestsInSeparateProcesses
*/
class AbstractStyleTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/CellTest.php b/tests/PhpWordTests/Style/CellTest.php
index 56b099c05f..847ed484bf 100644
--- a/tests/PhpWordTests/Style/CellTest.php
+++ b/tests/PhpWordTests/Style/CellTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Style\Cell.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Cell
- *
- * @runTestsInSeparateProcesses
*/
class CellTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/ChartTest.php b/tests/PhpWordTests/Style/ChartTest.php
index e8e75901d7..8390bd53c7 100644
--- a/tests/PhpWordTests/Style/ChartTest.php
+++ b/tests/PhpWordTests/Style/ChartTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Style\Chart.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Chart
- *
- * @runTestsInSeparateProcesses
*/
class ChartTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/FontTest.php b/tests/PhpWordTests/Style/FontTest.php
index 4ba6a762f3..4a271d258e 100644
--- a/tests/PhpWordTests/Style/FontTest.php
+++ b/tests/PhpWordTests/Style/FontTest.php
@@ -27,8 +27,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\Font.
- *
- * @runTestsInSeparateProcesses
*/
class FontTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/ImageTest.php b/tests/PhpWordTests/Style/ImageTest.php
index 759a85441e..489abe4cf4 100644
--- a/tests/PhpWordTests/Style/ImageTest.php
+++ b/tests/PhpWordTests/Style/ImageTest.php
@@ -26,8 +26,6 @@
* Test class for PhpOffice\PhpWord\Style\Image.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Image
- *
- * @runTestsInSeparateProcesses
*/
class ImageTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/LineTest.php b/tests/PhpWordTests/Style/LineTest.php
index 26049d5cd8..1fa9a0e19d 100644
--- a/tests/PhpWordTests/Style/LineTest.php
+++ b/tests/PhpWordTests/Style/LineTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Style\Image.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Image
- *
- * @runTestsInSeparateProcesses
*/
class LineTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/ListItemTest.php b/tests/PhpWordTests/Style/ListItemTest.php
index 59cdfeeda1..4cf03aea0f 100644
--- a/tests/PhpWordTests/Style/ListItemTest.php
+++ b/tests/PhpWordTests/Style/ListItemTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Style\ListItem.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\ListItem
- *
- * @runTestsInSeparateProcesses
*/
class ListItemTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/NumberingLevelTest.php b/tests/PhpWordTests/Style/NumberingLevelTest.php
index b34e445e94..7c905e00ed 100644
--- a/tests/PhpWordTests/Style/NumberingLevelTest.php
+++ b/tests/PhpWordTests/Style/NumberingLevelTest.php
@@ -23,8 +23,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\NumberingLevel.
- *
- * @runTestsInSeparateProcesses
*/
class NumberingLevelTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/PaperTest.php b/tests/PhpWordTests/Style/PaperTest.php
index ea5a4fb674..9ba64862d7 100644
--- a/tests/PhpWordTests/Style/PaperTest.php
+++ b/tests/PhpWordTests/Style/PaperTest.php
@@ -23,8 +23,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\Paper.
- *
- * @runTestsInSeparateProcesses
*/
class PaperTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/ParagraphTest.php b/tests/PhpWordTests/Style/ParagraphTest.php
index 67645fa4d8..c01569beac 100644
--- a/tests/PhpWordTests/Style/ParagraphTest.php
+++ b/tests/PhpWordTests/Style/ParagraphTest.php
@@ -27,8 +27,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\Paragraph.
- *
- * @runTestsInSeparateProcesses
*/
class ParagraphTest extends \PHPUnit\Framework\TestCase
{
@@ -37,6 +35,7 @@ class ParagraphTest extends \PHPUnit\Framework\TestCase
*/
protected function tearDown(): void
{
+ Settings::restoreDefaults();
TestHelperDOCX::clear();
}
@@ -379,7 +378,5 @@ public function testBidiVisualSettings(): void
Settings::setDefaultRtl(false);
$object = new Paragraph();
self::assertFalse($object->isBidi());
-
- Settings::setDefaultRtl(null);
}
}
diff --git a/tests/PhpWordTests/Style/RowTest.php b/tests/PhpWordTests/Style/RowTest.php
index d3cc480ac7..1c6506eebd 100644
--- a/tests/PhpWordTests/Style/RowTest.php
+++ b/tests/PhpWordTests/Style/RowTest.php
@@ -24,8 +24,6 @@
* Test class for PhpOffice\PhpWord\Style\Row.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Row
- *
- * @runTestsInSeparateProcesses
*/
class RowTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/SectionTest.php b/tests/PhpWordTests/Style/SectionTest.php
index e03dbb7596..6d7692a750 100644
--- a/tests/PhpWordTests/Style/SectionTest.php
+++ b/tests/PhpWordTests/Style/SectionTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Style\Section.
*
* @coversDefaultClass \PhpOffice\PhpWord\Element\Section
- *
- * @runTestsInSeparateProcesses
*/
class SectionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/TablePositionTest.php b/tests/PhpWordTests/Style/TablePositionTest.php
index 695bb3d297..ab97ea91fb 100644
--- a/tests/PhpWordTests/Style/TablePositionTest.php
+++ b/tests/PhpWordTests/Style/TablePositionTest.php
@@ -22,8 +22,6 @@
/**
* Test class for PhpOffice\PhpWord\Style\Table.
- *
- * @runTestsInSeparateProcesses
*/
class TablePositionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Style/TableTest.php b/tests/PhpWordTests/Style/TableTest.php
index e53a51f5df..2049f59c72 100644
--- a/tests/PhpWordTests/Style/TableTest.php
+++ b/tests/PhpWordTests/Style/TableTest.php
@@ -27,11 +27,14 @@
/**
* Test class for PhpOffice\PhpWord\Style\Table.
- *
- * @runTestsInSeparateProcesses
*/
class TableTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Settings::restoreDefaults();
+ }
+
/**
* Test class construction.
*
diff --git a/tests/PhpWordTests/Style/TextBoxTest.php b/tests/PhpWordTests/Style/TextBoxTest.php
index 30c01bd368..f57861babd 100644
--- a/tests/PhpWordTests/Style/TextBoxTest.php
+++ b/tests/PhpWordTests/Style/TextBoxTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Style\Image.
*
* @coversDefaultClass \PhpOffice\PhpWord\Style\Image
- *
- * @runTestsInSeparateProcesses
*/
class TextBoxTest extends TestCase
{
diff --git a/tests/PhpWordTests/StyleTest.php b/tests/PhpWordTests/StyleTest.php
index 32d61e09f6..64a67168d4 100644
--- a/tests/PhpWordTests/StyleTest.php
+++ b/tests/PhpWordTests/StyleTest.php
@@ -28,6 +28,11 @@
*/
class StyleTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Style::resetStyles();
+ }
+
/**
* Add and get paragraph, font, link, title, and table styles.
*
@@ -45,6 +50,8 @@ class StyleTest extends \PHPUnit\Framework\TestCase
*/
public function testStyles(): void
{
+ Style::resetStyles();
+ self::assertCount(0, Style::getStyles());
$paragraph = ['alignment' => Jc::CENTER];
$font = ['italic' => true, '_bold' => true];
$table = ['bgColor' => 'CCCCCC'];
@@ -63,13 +70,13 @@ public function testStyles(): void
];
$styles = [
- 'Paragraph' => 'Paragraph',
- 'Font' => 'Font',
- 'Link' => 'Font',
- 'Table' => 'Table',
- 'Heading_1' => 'Font',
- 'Normal' => 'Paragraph',
- 'Numbering' => 'Numbering',
+ 'Paragraph' => Style\Paragraph::class,
+ 'Font' => Style\Font::class,
+ 'Link' => Style\Font::class,
+ 'Table' => Style\Table::class,
+ 'Heading_1' => Style\Font::class,
+ 'Normal' => Style\Paragraph::class,
+ 'Numbering' => Style\Numbering::class,
];
Style::addParagraphStyle('Paragraph', $paragraph);
@@ -82,12 +89,9 @@ public function testStyles(): void
self::assertCount(count($styles), Style::getStyles());
foreach ($styles as $name => $style) {
- self::assertInstanceOf("PhpOffice\\PhpWord\\Style\\{$style}", Style::getStyle($name));
+ self::assertInstanceOf($style, Style::getStyle($name));
}
self::assertNull(Style::getStyle('Unknown'));
-
- Style::resetStyles();
- self::assertCount(0, Style::getStyles());
}
/**
diff --git a/tests/PhpWordTests/Writer/EPub3Test.php b/tests/PhpWordTests/Writer/EPub3Test.php
index acdbb5e32f..7f3336c6c4 100644
--- a/tests/PhpWordTests/Writer/EPub3Test.php
+++ b/tests/PhpWordTests/Writer/EPub3Test.php
@@ -25,8 +25,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\Epub3.
- *
- * @runTestsInSeparateProcesses
*/
class EPub3Test extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/HTML/PartTest.php b/tests/PhpWordTests/Writer/HTML/PartTest.php
index 0fe43c2350..d5b842af64 100644
--- a/tests/PhpWordTests/Writer/HTML/PartTest.php
+++ b/tests/PhpWordTests/Writer/HTML/PartTest.php
@@ -21,6 +21,7 @@
use DOMXPath;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Shared\Converter;
+use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Writer\HTML\Part\Body;
/**
@@ -28,6 +29,11 @@
*/
class PartTest extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Style::resetStyles();
+ }
+
/**
* Test get parent writer exception.
*/
@@ -44,7 +50,7 @@ public function testGetParentWriterException(): void
public function testWriteSections(): void
{
$phpWord = new PhpWord();
- $phpWord->getSettings()->setThemeFontLang(new \PhpOffice\PhpWord\Style\Language('en-US'));
+ $phpWord->getSettings()->setThemeFontLang(new Style\Language('en-US'));
$section1 = $phpWord->addSection();
$mtop = 0.5 * Converter::INCH_TO_TWIP;
$mbot = 0.5 * Converter::INCH_TO_TWIP;
@@ -96,7 +102,7 @@ public function testWriteSections(): void
public function testThemeFontEastAsian(): void
{
$phpWord = new PhpWord();
- $phpWord->getSettings()->setThemeFontLang(new \PhpOffice\PhpWord\Style\Language('', 'hi-IN'));
+ $phpWord->getSettings()->setThemeFontLang(new Style\Language('', 'hi-IN'));
$section1 = $phpWord->addSection();
$section1->addText('??? ????? ???');
@@ -112,7 +118,7 @@ public function testThemeFontEastAsian(): void
public function testThemeBidirecional(): void
{
$phpWord = new PhpWord();
- $phpWord->getSettings()->setThemeFontLang(new \PhpOffice\PhpWord\Style\Language('', '', 'he-IL'));
+ $phpWord->getSettings()->setThemeFontLang(new Style\Language('', '', 'he-IL'));
$section1 = $phpWord->addSection();
$section1->addText('????');
diff --git a/tests/PhpWordTests/Writer/HTMLTest.php b/tests/PhpWordTests/Writer/HTMLTest.php
index cedd9f2f32..b7168ea9c1 100644
--- a/tests/PhpWordTests/Writer/HTMLTest.php
+++ b/tests/PhpWordTests/Writer/HTMLTest.php
@@ -26,8 +26,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\HTML.
- *
- * @runTestsInSeparateProcesses
*/
class HTMLTest extends AbstractWebServerEmbedded
{
@@ -95,6 +93,9 @@ public function testDefaultWhiteSpace(): void
/**
* Save.
+ * Method getRemoteGifImageUrl seems to require separate process.
+ *
+ * @runInSeparateProcess
*/
public function testSave(): void
{
diff --git a/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php b/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
index 4d59e1a90e..6024823332 100644
--- a/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
+++ b/tests/PhpWordTests/Writer/ODText/Style/Paragraph2Test.php
@@ -25,6 +25,11 @@
class Paragraph2Test extends \PHPUnit\Framework\TestCase
{
+ protected function tearDown(): void
+ {
+ Style::resetStyles();
+ }
+
/**
* Test textAlign.
*/
diff --git a/tests/PhpWordTests/Writer/ODText/Style/ParagraphTest.php b/tests/PhpWordTests/Writer/ODText/Style/ParagraphTest.php
index ecadd387d5..26cae1ea00 100644
--- a/tests/PhpWordTests/Writer/ODText/Style/ParagraphTest.php
+++ b/tests/PhpWordTests/Writer/ODText/Style/ParagraphTest.php
@@ -20,6 +20,7 @@
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Shared\Converter;
+use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWordTests\TestHelperDOCX;
/**
@@ -32,6 +33,7 @@ class ParagraphTest extends \PHPUnit\Framework\TestCase
*/
protected function tearDown(): void
{
+ Style::resetStyles();
TestHelperDOCX::clear();
}
diff --git a/tests/PhpWordTests/Writer/ODTextTest.php b/tests/PhpWordTests/Writer/ODTextTest.php
index 9746791379..9450be4176 100644
--- a/tests/PhpWordTests/Writer/ODTextTest.php
+++ b/tests/PhpWordTests/Writer/ODTextTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\ODText.
- *
- * @runTestsInSeparateProcesses
*/
class ODTextTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
index 2a623ec6ce..424aed9410 100644
--- a/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
+++ b/tests/PhpWordTests/Writer/PDF/TCPDFTest.php
@@ -21,6 +21,7 @@
use Exception;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Writer\PDF;
/**
@@ -31,6 +32,7 @@ class TCPDFTest extends \PHPUnit\Framework\TestCase
protected function tearDown(): void
{
Settings::restoreDefaults();
+ Style::resetStyles();
}
/**
diff --git a/tests/PhpWordTests/Writer/RTFTest.php b/tests/PhpWordTests/Writer/RTFTest.php
index 4f9f8944ac..06372030be 100644
--- a/tests/PhpWordTests/Writer/RTFTest.php
+++ b/tests/PhpWordTests/Writer/RTFTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\RTF.
- *
- * @runTestsInSeparateProcesses
*/
class RTFTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartTest.php
index 6ffda0c019..e429f7e8b5 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartTest.php
@@ -21,9 +21,6 @@
use Exception;
use PhpOffice\PhpWord\Writer\Word2007;
-/**
- * @runTestsInSeparateProcesses
- */
class AbstractPartTest extends \PHPUnit\Framework\TestCase
{
/**
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/CommentsTest.php b/tests/PhpWordTests/Writer/Word2007/Part/CommentsTest.php
index 8f8c8240a9..c7c9a70e66 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/CommentsTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/CommentsTest.php
@@ -24,8 +24,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Comment.
- *
- * @runTestsInSeparateProcesses
*/
class CommentsTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/DocumentTest.php b/tests/PhpWordTests/Writer/Word2007/Part/DocumentTest.php
index 63c52749e5..d13a975d53 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/DocumentTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/DocumentTest.php
@@ -28,8 +28,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Document.
- *
- * @runTestsInSeparateProcesses
*/
class DocumentTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/FooterTest.php b/tests/PhpWordTests/Writer/Word2007/Part/FooterTest.php
index beb6e971e2..aef48c6cc4 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/FooterTest.php
@@ -27,8 +27,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Footer.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Footer
- *
- * @runTestsInSeparateProcesses
*/
class FooterTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php
index d8bf678541..d795491cdc 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php
@@ -24,8 +24,6 @@
/**
* @coversNothing
- *
- * @runTestsInSeparateProcesses
*/
class FootnotesTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/HeaderTest.php b/tests/PhpWordTests/Writer/Word2007/Part/HeaderTest.php
index 164365f113..b506949a51 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/HeaderTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/HeaderTest.php
@@ -25,8 +25,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\Word2007\Part\Header.
- *
- * @runTestsInSeparateProcesses
*/
class HeaderTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/NumberingTest.php b/tests/PhpWordTests/Writer/Word2007/Part/NumberingTest.php
index 1cf596fc85..5c75d951fa 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/NumberingTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/NumberingTest.php
@@ -28,8 +28,6 @@
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Part\Numbering
*
- * @runTestsInSeparateProcesses
- *
* @since 0.10.0
*/
class NumberingTest extends \PHPUnit\Framework\TestCase
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php b/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
index 88274b3622..563b147884 100644
--- a/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Part/StylesTest.php
@@ -21,6 +21,7 @@
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\SimpleType\Jc;
+use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Style\Font;
use PhpOffice\PhpWord\Style\Paragraph;
use PhpOffice\PhpWordTests\TestHelperDOCX;
@@ -38,6 +39,7 @@ class StylesTest extends \PHPUnit\Framework\TestCase
protected function tearDown(): void
{
Settings::restoreDefaults();
+ Style::resetStyles();
TestHelperDOCX::clear();
}
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php b/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php
index c0e2653a7c..5cd3eef011 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/FontTest.php
@@ -26,8 +26,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Font.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Font
- *
- * @runTestsInSeparateProcesses
*/
class FontTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/ImageTest.php b/tests/PhpWordTests/Writer/Word2007/Style/ImageTest.php
index 2b5c25e01f..a14549410c 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/ImageTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/ImageTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Font.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Frame
- *
- * @runTestsInSeparateProcesses
*/
class ImageTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/ParagraphTest.php b/tests/PhpWordTests/Writer/Word2007/Style/ParagraphTest.php
index c1f985ccd2..238d2a2d28 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/ParagraphTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/ParagraphTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Paragraph
- *
- * @runTestsInSeparateProcesses
*/
class ParagraphTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/SectionTest.php b/tests/PhpWordTests/Writer/Word2007/Style/SectionTest.php
index f527ded190..80f0c1f989 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/SectionTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/SectionTest.php
@@ -25,8 +25,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Section.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Section
- *
- * @runTestsInSeparateProcesses
*/
class SectionTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/TableCellTest.php b/tests/PhpWordTests/Writer/Word2007/Style/TableCellTest.php
index bd3f587b75..25b5ec9355 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/TableCellTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/TableCellTest.php
@@ -26,8 +26,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Table.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Table
- *
- * @runTestsInSeparateProcesses
*/
class TableCellTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007/Style/TableTest.php b/tests/PhpWordTests/Writer/Word2007/Style/TableTest.php
index b10d836568..58b5186342 100644
--- a/tests/PhpWordTests/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWordTests/Writer/Word2007/Style/TableTest.php
@@ -28,8 +28,6 @@
* Test class for PhpOffice\PhpWord\Writer\Word2007\Style\Table.
*
* @coversDefaultClass \PhpOffice\PhpWord\Writer\Word2007\Style\Table
- *
- * @runTestsInSeparateProcesses
*/
class TableTest extends \PHPUnit\Framework\TestCase
{
diff --git a/tests/PhpWordTests/Writer/Word2007Test.php b/tests/PhpWordTests/Writer/Word2007Test.php
index 64f6a29b52..6cac9727ed 100644
--- a/tests/PhpWordTests/Writer/Word2007Test.php
+++ b/tests/PhpWordTests/Writer/Word2007Test.php
@@ -28,8 +28,6 @@
/**
* Test class for PhpOffice\PhpWord\Writer\Word2007.
- *
- * @runTestsInSeparateProcesses
*/
class Word2007Test extends AbstractWebServerEmbedded
{
@@ -76,6 +74,9 @@ public function testConstruct(): void
/**
* Save.
+ * Method getRemoteGifImageUrl seems to require separate process.
+ *
+ * @runInSeparateProcess
*/
public function testSave(): void
{
From f4aea9649cad98ebd9486f8e46b868f4b7e29ef5 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Fri, 3 Oct 2025 20:27:04 -0700
Subject: [PATCH 117/153] Different Way to Deal With Coveralls Failure
---
.github/workflows/php.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 796814aa17..48cf29ac69 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -143,10 +143,9 @@ jobs:
- name: Upload coverage results to Coveralls
if: matrix.php == '8.3'
- env:
- FAILURE_ACTION: "${{ matrix.php == '8.3' }}"
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: build/clover.xml
format: clover
+ fail-on-error: false
From 2e61f1022ff933e381ba1755f004ec89f70baf88 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 4 Oct 2025 01:14:41 -0700
Subject: [PATCH 118/153] Confirm Warnings etc. Become Exceptions
---
src/PhpWord/Helper/Handler.php | 47 +++++++++++++
tests/PhpWordTests/Helper/HandlerTest.php | 80 +++++++++++++++++++++++
2 files changed, 127 insertions(+)
create mode 100644 src/PhpWord/Helper/Handler.php
create mode 100644 tests/PhpWordTests/Helper/HandlerTest.php
diff --git a/src/PhpWord/Helper/Handler.php b/src/PhpWord/Helper/Handler.php
new file mode 100644
index 0000000000..e95d871e00
--- /dev/null
+++ b/src/PhpWord/Helper/Handler.php
@@ -0,0 +1,47 @@
+getMessage());
+ }
+ }
+
+ public function testNotice(): void
+ {
+ try {
+ Handler::notice('invalidtz');
+ self::fail('Expected error/exception did not happen');
+ } catch (Throwable $e) {
+ self::assertStringContainsString('Timezone', $e->getMessage());
+ }
+ }
+
+ public function testWarning(): void
+ {
+ try {
+ Handler::warning();
+ self::fail('Expected error/exception did not happen');
+ } catch (Throwable $e) {
+ self::assertStringContainsString('ailed to open stream', $e->getMessage());
+ }
+ }
+
+ public function testUserDeprecated(): void
+ {
+ try {
+ Handler::userDeprecated();
+ self::fail('Expected error/exception did not happen');
+ } catch (Throwable $e) {
+ self::assertStringContainsString('hello', $e->getMessage());
+ }
+ }
+
+ public function testUserNotice(): void
+ {
+ try {
+ Handler::userNotice();
+ self::fail('Expected error/exception did not happen');
+ } catch (Throwable $e) {
+ self::assertStringContainsString('userNotice', $e->getMessage());
+ }
+ }
+
+ public function testUserWarning(): void
+ {
+ try {
+ Handler::userWarning();
+ self::fail('Expected error/exception did not happen');
+ } catch (Throwable $e) {
+ self::assertStringContainsString('userWarning', $e->getMessage());
+ }
+ }
+}
From 3af64e43505a11eaa28397bcb94a9bd8d93c2444 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 4 Oct 2025 02:20:34 -0700
Subject: [PATCH 119/153] More Coverage
---
phpstan-baseline.neon | 10 ----------
phpstan-baseline.php7.neon | 10 ----------
phpstan-baseline.php73.neon | 10 ----------
src/PhpWord/Shared/ZipArchive.php | 5 +++--
tests/PhpWordTests/TemplateProcessorTest.php | 3 ++-
5 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index bd9206dd06..ad7b752455 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -390,11 +390,6 @@ parameters:
count: 2
path: src/PhpWord/Shared/ZipArchive.php
- -
- message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
- count: 1
- path: src/PhpWord/Shared/ZipArchive.php
-
-
message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
count: 1
@@ -1340,11 +1335,6 @@ parameters:
count: 2
path: tests/PhpWordTests/TemplateProcessorTest.php
- -
- message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/TemplateProcessorTest.php
-
-
message: "#^Cannot access offset 'end' on array\\\\|bool\\.$#"
count: 2
diff --git a/phpstan-baseline.php7.neon b/phpstan-baseline.php7.neon
index 93a737665a..58783bba94 100644
--- a/phpstan-baseline.php7.neon
+++ b/phpstan-baseline.php7.neon
@@ -375,11 +375,6 @@ parameters:
count: 2
path: src/PhpWord/Shared/ZipArchive.php
- -
- message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
- count: 1
- path: src/PhpWord/Shared/ZipArchive.php
-
-
message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
count: 1
@@ -1310,11 +1305,6 @@ parameters:
count: 2
path: tests/PhpWordTests/TemplateProcessorTest.php
- -
- message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/TemplateProcessorTest.php
-
-
message: "#^Cannot access offset 'end' on array\\\\|bool\\.$#"
count: 2
diff --git a/phpstan-baseline.php73.neon b/phpstan-baseline.php73.neon
index 5ebf3d7727..fccd6c38df 100644
--- a/phpstan-baseline.php73.neon
+++ b/phpstan-baseline.php73.neon
@@ -375,11 +375,6 @@ parameters:
count: 2
path: src/PhpWord/Shared/ZipArchive.php
- -
- message: "#^Call to method addFromString\\(\\) on an unknown class PclZip\\.$#"
- count: 1
- path: src/PhpWord/Shared/ZipArchive.php
-
-
message: "#^Call to method close\\(\\) on an unknown class PclZip\\.$#"
count: 1
@@ -1310,11 +1305,6 @@ parameters:
count: 2
path: tests/PhpWordTests/TemplateProcessorTest.php
- -
- message: "#^Call to an undefined method PhpOffice\\\\PhpWord\\\\Shared\\\\ZipArchive\\:\\:AddFromString\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/TemplateProcessorTest.php
-
-
message: "#^Cannot access offset 'end' on array\\\\|bool\\.$#"
count: 2
diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
index 462206c7f5..def835786c 100644
--- a/src/PhpWord/Shared/ZipArchive.php
+++ b/src/PhpWord/Shared/ZipArchive.php
@@ -236,7 +236,6 @@ public function getFromName($filename)
*/
public function pclzipAddFile($filename, $localname = null)
{
- /** @var PclZip $zip Type hint */
$zip = $this->zip;
// Bugfix GH-261 https://github.com/PHPOffice/PHPWord/pull/261
@@ -267,8 +266,10 @@ public function pclzipAddFile($filename, $localname = null)
if (!$this->usePclzip) {
$pathAdded = $pathAdded . '/' . ltrim(str_replace('\\', '/', substr($filename, strlen($pathRemoved))), '/');
//$res = $zip->addFile($filename, $pathAdded);
- $res = $zip->addFromString($pathAdded, file_get_contents($filename)); // addFile can't use subfolders in some cases
+ /** @var \ZipArchive $zip */
+ $res = $zip->addFromString($pathAdded, (string) file_get_contents($filename)); // addFile can't use subfolders in some cases
} else {
+ /** @var PclZip $zip */
$res = $zip->add($filename, PCLZIP_OPT_REMOVE_PATH, $pathRemoved, PCLZIP_OPT_ADD_PATH, $pathAdded);
}
diff --git a/tests/PhpWordTests/TemplateProcessorTest.php b/tests/PhpWordTests/TemplateProcessorTest.php
index 8ae4dfa59a..ee582c0b6f 100644
--- a/tests/PhpWordTests/TemplateProcessorTest.php
+++ b/tests/PhpWordTests/TemplateProcessorTest.php
@@ -96,7 +96,7 @@ public function xtestTemplateCanBeSavedInTemporaryLocation(string $templateFqfn,
}
$embeddingText = 'The quick Brown Fox jumped over the lazy^H^H^H^Htired unitTester';
- $templateProcessor->zip()->AddFromString('word/embeddings/fox.bin', $embeddingText);
+ $templateProcessor->zip()->addFromString('word/embeddings/fox.bin', $embeddingText);
$documentFqfn = $templateProcessor->save();
self::assertNotEmpty($documentFqfn, 'FQFN of the saved document is empty.');
@@ -855,6 +855,7 @@ public function testSetCheckboxWithCustomMacro(): void
/**
* @covers ::setImageValue
+ * @covers \PhpOffice\PhpWord\Shared\ZipArchive::pclzipAddFile
*/
public function testSetImageValue(): void
{
From ca6d2f0dd77e86b6e61f9fcbbc14478b88bb9a66 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Thu, 9 Oct 2025 08:37:06 -0700
Subject: [PATCH 120/153] Replace obsolete php-cs-fixer option
---
.php-cs-fixer.dist.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index cd46cac83e..66c1d345a9 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -80,6 +80,7 @@
'method_argument_space' => true,
'method_chaining_indentation' => true,
'modernize_types_casting' => true,
+ 'modifier_keywords' => ['elements' => ['property', 'method']], // not const
'multiline_comment_opening_closing' => true,
'multiline_whitespace_before_semicolons' => true,
'native_constant_invocation' => false, // Micro optimization that look messy
@@ -218,7 +219,6 @@
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
- 'visibility_required' => ['elements' => ['property', 'method']], // not const
'void_return' => true,
'whitespace_after_comma_in_array' => true,
'yoda_style' => false,
From 6bdb27a9be27f08d31998c6ba11ca9325d0a1d61 Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 15 Nov 2025 19:37:50 -0800
Subject: [PATCH 121/153] No Need for getMockForAbstractClass
Fix #2851. No source changes, only tests.
Since unit tests run with most recent components, and since Phpstan has been very capricious lately (178 new errors!), some other tests accompany this PR.
---
.php-cs-fixer.dist.php | 2 +-
phpstan-baseline.neon | 65 -------------------
phpstan-baseline.php7.neon | 22 -------
phpstan-baseline.php73.neon | 10 ---
.../Element/AbstractElementClass.php | 25 +++++++
.../Element/AbstractElementTest.php | 23 +------
.../PhpWordTests/Style/AbstractStyleClass.php | 28 ++++++++
.../PhpWordTests/Style/AbstractStyleTest.php | 51 ++-------------
tests/PhpWordTests/Style/FontTest.php | 8 ++-
tests/PhpWordTests/Style/TableTest.php | 36 ++++++----
tests/PhpWordTests/Style/TextBoxTest.php | 36 ++++++----
.../Writer/EPub3/Part/AbstractPartClass.php | 13 ++++
.../Writer/EPub3/Part/AbstractPartTest.php | 35 +---------
.../Writer/EPub3/Style/AbstractStyleClass.php | 13 ++++
.../Writer/EPub3/Style/AbstractStyleTest.php | 24 +------
.../Writer/HTML/Element/RubyTest.php | 11 +++-
.../Writer/HTML/Element/TableTest.php | 10 ++-
.../PhpWordTests/Writer/HTML/ElementTest.php | 62 ++++++++++++------
tests/PhpWordTests/Writer/HTML/Helper.php | 4 ++
.../Writer/ODText/Part/AbstractPartClass.php | 29 +++++++++
.../Writer/ODText/Part/AbstractPartTest.php | 35 +---------
.../Word2007/Part/AbstractPartClass.php | 29 +++++++++
.../Writer/Word2007/Part/AbstractPartTest.php | 35 +---------
tests/PhpWordTests/XmlDocument.php | 9 ++-
24 files changed, 277 insertions(+), 338 deletions(-)
create mode 100644 tests/PhpWordTests/Element/AbstractElementClass.php
create mode 100644 tests/PhpWordTests/Style/AbstractStyleClass.php
create mode 100644 tests/PhpWordTests/Writer/EPub3/Part/AbstractPartClass.php
create mode 100644 tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleClass.php
create mode 100644 tests/PhpWordTests/Writer/ODText/Part/AbstractPartClass.php
create mode 100644 tests/PhpWordTests/Writer/Word2007/Part/AbstractPartClass.php
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 66c1d345a9..cd46cac83e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -80,7 +80,6 @@
'method_argument_space' => true,
'method_chaining_indentation' => true,
'modernize_types_casting' => true,
- 'modifier_keywords' => ['elements' => ['property', 'method']], // not const
'multiline_comment_opening_closing' => true,
'multiline_whitespace_before_semicolons' => true,
'native_constant_invocation' => false, // Micro optimization that look messy
@@ -219,6 +218,7 @@
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
+ 'visibility_required' => ['elements' => ['property', 'method']], // not const
'void_return' => true,
'whitespace_after_comma_in_array' => true,
'yoda_style' => false,
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index ad7b752455..fb5c58147f 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1290,11 +1290,6 @@ parameters:
count: 1
path: tests/PhpWordTests/Shared/XMLWriterTest.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\Style\\\\AbstractStyleTest\\:\\:callProtectedMethod\\(\\) has no return type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/Style/AbstractStyleTest.php
-
-
message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\\\|object, class\\-string\\|false given\\.$#"
count: 1
@@ -1375,21 +1370,6 @@ parameters:
count: 1
path: tests/PhpWordTests/TestableTemplateProcesor.php
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 9
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 2
- path: tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
-
- -
- message: "#^Cannot call method item\\(\\) on DOMNodeList\\\\|false\\.$#"
- count: 11
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
-
message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
count: 3
@@ -1425,26 +1405,11 @@ parameters:
count: 1
path: tests/PhpWordTests/Writer/Word2007/Element/ChartTest.php
- -
- message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/Writer/Word2007/ElementTest.php
-
- -
- message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/Writer/Word2007/StyleTest.php
-
-
message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getElement\\(\\) should return DOMElement\\|null but returns DOMNode\\|null\\.$#"
count: 1
path: tests/PhpWordTests/XmlDocument.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getNodeList\\(\\) should return DOMNodeList\\ but returns DOMNodeList\\\\|false\\.$#"
- count: 1
- path: tests/PhpWordTests/XmlDocument.php
-
-
message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$path \\(string\\) does not accept string\\|false\\.$#"
count: 1
@@ -1460,33 +1425,3 @@ parameters:
message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\HTML\\\\Part\\\\AbstractPart is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:|]+$#"
count: 1
path: src/PhpWord/Writer/HTML.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Element\\\\AbstractElement is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 2
- path: tests/PhpWordTests/Element/AbstractElementTest.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Style\\\\AbstractStyle is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 4
- path: tests/PhpWordTests/Style/AbstractStyleTest.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\EPub3\\\\Style\\\\AbstractStyle is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 1
- path: tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleTest.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Part\\\\AbstractPart is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 2
- path: tests/PhpWordTests/Writer/ODText/Part/AbstractPartTest.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\Word2007\\\\Part\\\\AbstractPart is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 2
- path: tests/PhpWordTests/Writer/Word2007/Part/AbstractPartTest.php
diff --git a/phpstan-baseline.php7.neon b/phpstan-baseline.php7.neon
index 58783bba94..3d11dbeb00 100644
--- a/phpstan-baseline.php7.neon
+++ b/phpstan-baseline.php7.neon
@@ -1265,11 +1265,6 @@ parameters:
count: 1
path: tests/PhpWordTests/Shared/XMLWriterTest.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\Style\\\\AbstractStyleTest\\:\\:callProtectedMethod\\(\\) has no return type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/Style/AbstractStyleTest.php
-
-
message: "#^Cannot call method setLineHeight\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
count: 1
@@ -1349,11 +1344,6 @@ parameters:
message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
count: 9
path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 2
- path: tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
-
message: "#^Cannot call method item\\(\\) on DOMNodeList\\\\|false\\.$#"
@@ -1424,15 +1414,3 @@ parameters:
message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$xpath \\(DOMXPath\\) does not accept null\\.$#"
count: 1
path: tests/PhpWordTests/XmlDocument.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\EPub3\\\\Style\\\\AbstractStyle is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 1
- path: tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleTest.php
-
- # https://github.com/phpstan/phpstan/issues/8770
- -
- message: "#^PHPDoc tag @var with type PhpOffice\\\\PhpWord\\\\Writer\\\\ODText\\\\Part\\\\AbstractPart is not subtype of native type[\\sA-Za-z\\@\\\\\\/0-9\\.:]+$#"
- count: 2
- path: tests/PhpWordTests/Writer/ODText/Part/AbstractPartTest.php
diff --git a/phpstan-baseline.php73.neon b/phpstan-baseline.php73.neon
index fccd6c38df..3d11dbeb00 100644
--- a/phpstan-baseline.php73.neon
+++ b/phpstan-baseline.php73.neon
@@ -1265,11 +1265,6 @@ parameters:
count: 1
path: tests/PhpWordTests/Shared/XMLWriterTest.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\Style\\\\AbstractStyleTest\\:\\:callProtectedMethod\\(\\) has no return type specified\\.$#"
- count: 1
- path: tests/PhpWordTests/Style/AbstractStyleTest.php
-
-
message: "#^Cannot call method setLineHeight\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Font\\|string\\.$#"
count: 1
@@ -1349,11 +1344,6 @@ parameters:
message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
count: 9
path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 2
- path: tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
-
message: "#^Cannot call method item\\(\\) on DOMNodeList\\\\|false\\.$#"
diff --git a/tests/PhpWordTests/Element/AbstractElementClass.php b/tests/PhpWordTests/Element/AbstractElementClass.php
new file mode 100644
index 0000000000..407e8c934c
--- /dev/null
+++ b/tests/PhpWordTests/Element/AbstractElementClass.php
@@ -0,0 +1,25 @@
+$method(AbstractElement::class);
- } else {
- /** @var AbstractElement $stub */
- $stub = new class() extends AbstractElement {
- };
- }
+ $stub = new AbstractElementClass();
$ival = mt_rand(0, 100);
$stub->setElementIndex($ival);
self::assertEquals($ival, $stub->getElementIndex());
@@ -51,14 +39,7 @@ public function testElementIndex(): void
*/
public function testElementId(): void
{
- $method = self::$method;
- if (method_exists($this, $method)) {
- $stub = $this->$method(AbstractElement::class);
- } else {
- /** @var AbstractElement $stub */
- $stub = new class() extends AbstractElement {
- };
- }
+ $stub = new AbstractElementClass();
$stub->setElementId();
self::assertEquals(6, strlen($stub->getElementId()));
}
diff --git a/tests/PhpWordTests/Style/AbstractStyleClass.php b/tests/PhpWordTests/Style/AbstractStyleClass.php
new file mode 100644
index 0000000000..91c576c338
--- /dev/null
+++ b/tests/PhpWordTests/Style/AbstractStyleClass.php
@@ -0,0 +1,28 @@
+$method(AbstractStyle::class);
- } else {
- /** @var AbstractStyle $stub */
- $stub = new class() extends AbstractStyle {
- };
- }
+ $stub = new AbstractStyleClass();
$stub->setStyleByArray(['index' => 1]);
self::assertEquals(1, $stub->getIndex());
@@ -77,15 +60,7 @@ public function testSetStyleByArrayWithAlignment(): void
*/
public function testSetValNormal(): void
{
- $method = self::$mockAbstract;
- if (self::methodFound($method)) {
- $stub = $this->$method(AbstractStyle::class);
- } else {
- /** @var AbstractStyle $stub */
- $stub = new class() extends AbstractStyle {
- };
- }
-
+ $stub = new AbstractStyleClass();
self::assertTrue(self::callProtectedMethod($stub, 'setBoolVal', [true, false]));
self::assertEquals(12, self::callProtectedMethod($stub, 'setIntVal', [12, 200]));
self::assertEquals(871.1, self::callProtectedMethod($stub, 'setFloatVal', [871.1, 2.1]));
@@ -98,15 +73,7 @@ public function testSetValNormal(): void
*/
public function testSetValDefault(): void
{
- $method = self::$mockAbstract;
- if (self::methodFound($method)) {
- $stub = $this->$method(AbstractStyle::class);
- } else {
- /** @var AbstractStyle $stub */
- $stub = new class() extends AbstractStyle {
- };
- }
-
+ $stub = new AbstractStyleClass();
self::assertNotTrue(self::callProtectedMethod($stub, 'setBoolVal', ['a', false]));
self::assertEquals(200, self::callProtectedMethod($stub, 'setIntVal', ['foo', 200]));
self::assertEquals(2.1, self::callProtectedMethod($stub, 'setFloatVal', ['foo', 2.1]));
@@ -119,15 +86,7 @@ public function testSetValDefault(): void
public function testSetValEnumException(): void
{
$this->expectException(InvalidArgumentException::class);
- $method = self::$mockAbstract;
- if (self::methodFound($method)) {
- $stub = $this->$method(AbstractStyle::class);
- } else {
- /** @var AbstractStyle $stub */
- $stub = new class() extends AbstractStyle {
- };
- }
-
+ $stub = new AbstractStyleClass();
self::assertEquals('b', self::callProtectedMethod($stub, 'setEnumVal', ['z', ['a', 'b'], 'b']));
}
@@ -139,6 +98,8 @@ public function testSetValEnumException(): void
*
* @param mixed $object
* @param string $method
+ *
+ * @return mixed
*/
public static function callProtectedMethod($object, $method, array $args = [])
{
diff --git a/tests/PhpWordTests/Style/FontTest.php b/tests/PhpWordTests/Style/FontTest.php
index 4a271d258e..02d63a1ce9 100644
--- a/tests/PhpWordTests/Style/FontTest.php
+++ b/tests/PhpWordTests/Style/FontTest.php
@@ -83,7 +83,9 @@ public function testSetStyleValueWithNullOrEmpty(): void
'fallbackFont' => '',
];
foreach ($attributes as $key => $default) {
- $get = is_bool($default) ? "is{$key}" : "get{$key}";
+ $uckey = ucfirst($key);
+ $get = is_bool($default) ? "is{$uckey}" : "get{$uckey}";
+ self::assertTrue(method_exists($object, $get));
self::assertEquals($default, $object->$get());
$object->setStyleValue($key, null);
self::assertEquals($default, $object->$get());
@@ -128,7 +130,9 @@ public function testSetStyleValueNormal(): void
];
$object->setStyleByArray($attributes);
foreach ($attributes as $key => $value) {
- $get = is_bool($value) ? "is{$key}" : "get{$key}";
+ $uckey = ucfirst($key);
+ $get = is_bool($value) ? "is{$uckey}" : "get{$uckey}";
+ self::assertTrue(method_exists($object, $get));
self::assertEquals($value, $object->$get());
}
}
diff --git a/tests/PhpWordTests/Style/TableTest.php b/tests/PhpWordTests/Style/TableTest.php
index 2049f59c72..4b7906101b 100644
--- a/tests/PhpWordTests/Style/TableTest.php
+++ b/tests/PhpWordTests/Style/TableTest.php
@@ -75,32 +75,42 @@ public function testSetGetNormal(): void
{
$object = new Table();
- $attributes = [
+ $stringAttributes = [
'bgColor' => 'FF0000',
- 'borderTopSize' => 4,
'borderTopColor' => 'FF0000',
- 'borderLeftSize' => 4,
'borderLeftColor' => 'FF0000',
- 'borderRightSize' => 4,
'borderRightColor' => 'FF0000',
- 'borderBottomSize' => 4,
'borderBottomColor' => 'FF0000',
- 'borderInsideHSize' => 4,
'borderInsideHColor' => 'FF0000',
- 'borderInsideVSize' => 4,
'borderInsideVColor' => 'FF0000',
+ 'alignment' => JcTable::CENTER,
+ 'unit' => 'pct',
+ 'layout' => Table::LAYOUT_FIXED,
+ ];
+ $intAttributes = [
+ 'borderTopSize' => 4,
+ 'borderLeftSize' => 4,
+ 'borderRightSize' => 4,
+ 'borderBottomSize' => 4,
+ 'borderInsideHSize' => 4,
+ 'borderInsideVSize' => 4,
'cellMarginTop' => 240,
'cellMarginLeft' => 240,
'cellMarginRight' => 240,
'cellMarginBottom' => 240,
- 'alignment' => JcTable::CENTER,
'width' => 100,
- 'unit' => 'pct',
- 'layout' => Table::LAYOUT_FIXED,
];
- foreach ($attributes as $key => $value) {
- $set = "set{$key}";
- $get = "get{$key}";
+ foreach ($stringAttributes as $key => $value) {
+ $uckey = ucfirst($key);
+ $set = "set{$uckey}";
+ $get = "get{$uckey}";
+ $object->$set($value);
+ self::assertEquals($value, $object->$get());
+ }
+ foreach ($intAttributes as $key => $value) {
+ $uckey = ucfirst($key);
+ $set = "set{$uckey}";
+ $get = "get{$uckey}";
$object->$set($value);
self::assertEquals($value, $object->$get());
}
diff --git a/tests/PhpWordTests/Style/TextBoxTest.php b/tests/PhpWordTests/Style/TextBoxTest.php
index f57861babd..cc665524f2 100644
--- a/tests/PhpWordTests/Style/TextBoxTest.php
+++ b/tests/PhpWordTests/Style/TextBoxTest.php
@@ -35,29 +35,39 @@ public function testSetGetNormal(): void
{
$object = new TextBox();
- $properties = [
- 'width' => 200,
- 'height' => 200,
+ $stringProperties = [
'alignment' => Jc::START,
- 'marginTop' => 240,
- 'marginLeft' => 240,
'wrappingStyle' => 'inline',
'positioning' => 'absolute',
'posHorizontal' => 'center',
'posVertical' => 'top',
'posHorizontalRel' => 'margin',
'posVerticalRel' => 'page',
- 'innerMarginTop' => '5',
- 'innerMarginRight' => '5',
- 'innerMarginBottom' => '5',
- 'innerMarginLeft' => '5',
- 'borderSize' => '2',
'borderColor' => 'red',
'bgColor' => 'blue',
];
- foreach ($properties as $key => $value) {
- $set = "set{$key}";
- $get = "get{$key}";
+ foreach ($stringProperties as $key => $value) {
+ $uckey = ucfirst($key);
+ $set = "set{$uckey}";
+ $get = "get{$uckey}";
+ $object->$set($value);
+ self::assertEquals($value, $object->$get());
+ }
+ $intProperties = [
+ 'width' => 200,
+ 'height' => 200,
+ 'marginTop' => 240,
+ 'marginLeft' => 240,
+ 'innerMarginTop' => 5,
+ 'innerMarginRight' => 5,
+ 'innerMarginBottom' => 5,
+ 'innerMarginLeft' => 5,
+ 'borderSize' => 2,
+ ];
+ foreach ($intProperties as $key => $value) {
+ $uckey = ucfirst($key);
+ $set = "set{$uckey}";
+ $get = "get{$uckey}";
$object->$set($value);
self::assertEquals($value, $object->$get());
}
diff --git a/tests/PhpWordTests/Writer/EPub3/Part/AbstractPartClass.php b/tests/PhpWordTests/Writer/EPub3/Part/AbstractPartClass.php
new file mode 100644
index 0000000000..056ec6e1be
--- /dev/null
+++ b/tests/PhpWordTests/Writer/EPub3/Part/AbstractPartClass.php
@@ -0,0 +1,13 @@
+methodFound($mockAbstract)) {
- $this->part = $this->$mockAbstract(AbstractPart::class);
- } else {
- $this->part = new class() extends AbstractPart {
- public function write(): string
- {
- return '';
- }
- };
- }
- }
-
public function testParentWriter(): void
{
+ $part = new AbstractPartClass();
$writer = new EPub3();
- $this->part->setParentWriter($writer);
+ $part->setParentWriter($writer);
- self::assertInstanceOf(EPub3::class, $this->part->getParentWriter());
+ self::assertInstanceOf(EPub3::class, $part->getParentWriter());
}
}
diff --git a/tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleClass.php b/tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleClass.php
new file mode 100644
index 0000000000..2657e12693
--- /dev/null
+++ b/tests/PhpWordTests/Writer/EPub3/Style/AbstractStyleClass.php
@@ -0,0 +1,13 @@
+methodFound($mockAbstract)) {
- $style = $this->$mockAbstract(AbstractStyle::class);
- } else {
- /** @var AbstractStyle $style */
- $style = new class() extends AbstractStyle {
- public function write(): string
- {
- return '';
- }
- };
- }
+
+ $style = new AbstractStyleClass();
$result = $style->setParentWriter($parentWriter);
diff --git a/tests/PhpWordTests/Writer/HTML/Element/RubyTest.php b/tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
index 1cf7bdb07c..64509b7c9c 100644
--- a/tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
+++ b/tests/PhpWordTests/Writer/HTML/Element/RubyTest.php
@@ -49,7 +49,7 @@ public function testWriteRubyHtml(): void
$dom = Helper::getAsHTML($phpWord, '', '', ['ruby', 'rt', 'rp']);
$xpath = new DOMXPath($dom);
- self::assertSame(1, $xpath->query('/html/body/div/ruby')->length);
+ $this->checkLength(1, $xpath, '/html/body/div/ruby');
// ensure text is right
$rubyElement = $dom->getElementsByTagName('ruby')->item(0);
$rtElement = $dom->getElementsByTagName('rt')->item(0);
@@ -94,7 +94,7 @@ public function testWriteRubyHtmlParagraphStyle(): void
$dom = Helper::getAsHTML($phpWord, '', '', ['ruby', 'rt', 'rp']);
$xpath = new DOMXPath($dom);
- self::assertSame(2, $xpath->query('/html/body/div/ruby')->length);
+ $this->checkLength(2, $xpath, '/html/body/div/ruby');
// ensure text is right
$rubyElement = $dom->getElementsByTagName('ruby')->item(0);
$rtElement = $dom->getElementsByTagName('rt')->item(0);
@@ -118,4 +118,11 @@ public function testWriteRubyHtmlParagraphStyle(): void
self::assertSame('lineHeight10', $rubyElement2->attributes->getNamedItem('class')->textContent);
self::assertSame('line-height: 4;font-size:10pt;', $rtElement->attributes->getNamedItem('style')->textContent);
}
+
+ private function checkLength(int $expected, DOMXPath $xpath, string $location): void
+ {
+ $temp = $xpath->query($location);
+ self::assertNotFalse($temp);
+ self::assertSame($expected, $temp->length);
+ }
}
diff --git a/tests/PhpWordTests/Writer/HTML/Element/TableTest.php b/tests/PhpWordTests/Writer/HTML/Element/TableTest.php
index 30410925e8..df625d7fcc 100644
--- a/tests/PhpWordTests/Writer/HTML/Element/TableTest.php
+++ b/tests/PhpWordTests/Writer/HTML/Element/TableTest.php
@@ -18,6 +18,7 @@
namespace PhpOffice\PhpWordTests\Writer\HTML\Element;
+use DOMElement;
use DOMXPath;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\SimpleType\VerticalJc;
@@ -198,8 +199,9 @@ public function testWriteTableCellVAlign(): void
self::assertNotFalse($cell3Query);
self::assertCount(1, $cell3Query);
- $cell3Style = $cell3Query->item(0)->attributes->getNamedItem('style');
- self::assertNull($cell3Style);
+ $temp = $cell3Query->item(0);
+ self::assertInstanceOf(DOMElement::class, $temp);
+ self::assertNull($temp->attributes->getNamedItem('style'));
}
public function testWriteTableCellVMerge(): void
@@ -230,6 +232,8 @@ public function testWriteTableCellVMerge(): void
$cell3Query = $xpath->query('//table/tr[3]/td[1]');
self::assertNotFalse($cell3Query);
self::assertCount(1, $cell3Query);
- self::assertNull($cell3Query->item(0)->attributes->getNamedItem('rowspan'));
+ $temp = $cell3Query->item(0);
+ self::assertInstanceOf(DOMElement::class, $temp);
+ self::assertNull($temp->attributes->getNamedItem('rowspan'));
}
}
diff --git a/tests/PhpWordTests/Writer/HTML/ElementTest.php b/tests/PhpWordTests/Writer/HTML/ElementTest.php
index 28e785a237..0a71df4f56 100644
--- a/tests/PhpWordTests/Writer/HTML/ElementTest.php
+++ b/tests/PhpWordTests/Writer/HTML/ElementTest.php
@@ -20,6 +20,7 @@
use DateTime;
use DOMDocument;
+use DOMElement;
use DOMXPath;
use PhpOffice\PhpWord\Element\Text as TextElement;
use PhpOffice\PhpWord\Element\TextRun;
@@ -80,8 +81,8 @@ public function testWriteTrackChanges(): void
$dom = Helper::getAsHTML($phpWord);
$xpath = new DOMXPath($dom);
- self::assertEquals(1, $xpath->query('/html/body/div/p[1]/ins')->length);
- self::assertEquals(1, $xpath->query('/html/body/div/p[2]/del')->length);
+ $this->checkLength(1, $xpath, '/html/body/div/p[1]/ins');
+ $this->checkLength(1, $xpath, '/html/body/div/p[2]/del');
$node = $xpath->query('/html/body/div/p[2]/del');
self::assertNotFalse($node);
$allAttributes = $node[0]->attributes;
@@ -129,14 +130,14 @@ public function testWriteColSpan(): void
$dom = Helper::getAsHTML($phpWord);
$xpath = new DOMXPath($dom);
- self::assertEquals(1, $xpath->query('/html/body/div/table/tr[1]/td')->length);
- self::assertEquals('2', $xpath->query('/html/body/div/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
- self::assertEquals(2, $xpath->query('/html/body/div/table/tr[2]/td')->length);
+ $this->checkLength(1, $xpath, '/html/body/div/table/tr[1]/td');
+ $this->checkContent('2', $xpath, '/html/body/div/table/tr/td[1]', 0, 'colspan');
+ $this->checkLength(2, $xpath, '/html/body/div/table/tr[2]/td');
- self::assertEquals('#6086B8', $xpath->query('/html/body/div/table/tr[1]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
- self::assertEquals('#ffffff', $xpath->query('/html/body/div/table/tr[1]/td')->item(0)->attributes->getNamedItem('color')->textContent);
- self::assertEquals('#ffffff', $xpath->query('/html/body/div/table/tr[2]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
- self::assertNull($xpath->query('/html/body/div/table/tr[2]/td')->item(0)->attributes->getNamedItem('color'));
+ $this->checkContent('#6086B8', $xpath, '/html/body/div/table/tr[1]/td', 0, 'bgcolor');
+ $this->checkContent('#ffffff', $xpath, '/html/body/div/table/tr[1]/td', 0, 'color');
+ $this->checkContent('#ffffff', $xpath, '/html/body/div/table/tr[2]/td', 0, 'bgcolor');
+ $this->checkContent(null, $xpath, '/html/body/div/table/tr[2]/td', 0, 'color');
}
/**
@@ -163,9 +164,9 @@ public function testWriteRowSpan(): void
$dom = Helper::getAsHTML($phpWord);
$xpath = new DOMXPath($dom);
- self::assertEquals(2, $xpath->query('/html/body/div/table/tr[1]/td')->length);
- self::assertEquals('3', $xpath->query('/html/body/div/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
- self::assertEquals(1, $xpath->query('/html/body/div/table/tr[2]/td')->length);
+ $this->checkLength(2, $xpath, '/html/body/div/table/tr[1]/td');
+ $this->checkContent('3', $xpath, '/html/body/div/table/tr[1]/td[1]', 0, 'rowspan');
+ $this->checkLength(1, $xpath, '/html/body/div/table/tr[2]/td');
}
/**
@@ -195,14 +196,14 @@ public function testWriteRowSpanAndColSpan(): void
$dom = Helper::getAsHTML($phpWord);
$xpath = new DOMXPath($dom);
- self::assertEquals(3, $xpath->query('/html/body/div/table/tr[1]/td')->length);
- self::assertEquals('2', $xpath->query('/html/body/div/table/tr[1]/td[2]')->item(0)->attributes->getNamedItem('colspan')->textContent);
- self::assertEquals('3', $xpath->query('/html/body/div/table/tr[1]/td[3]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
+ $this->checkLength(3, $xpath, '/html/body/div/table/tr[1]/td');
+ $this->checkContent('2', $xpath, '/html/body/div/table/tr[1]/td[2]', 0, 'colspan');
+ $this->checkContent('3', $xpath, '/html/body/div/table/tr[1]/td[3]', 0, 'rowspan');
- self::assertEquals(1, $xpath->query('/html/body/div/table/tr[2]/td')->length);
- self::assertEquals('3', $xpath->query('/html/body/div/table/tr[2]/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
+ $this->checkLength(1, $xpath, '/html/body/div/table/tr[2]/td');
+ $this->checkContent('3', $xpath, '/html/body/div/table/tr[2]/td[1]', 0, 'colspan');
- self::assertEquals(3, $xpath->query('/html/body/div/table/tr[3]/td')->length);
+ $this->checkLength(3, $xpath, '/html/body/div/table/tr[3]/td');
}
public function testWriteTitleTextRun(): void
@@ -268,7 +269,28 @@ public function testWriteTableLayout(): void
$dom = Helper::getAsHTML($phpWord);
$xpath = new DOMXPath($dom);
- self::assertEquals('table-layout: fixed;', $xpath->query('/html/body/div/table[1]')->item(0)->attributes->getNamedItem('style')->textContent);
- self::assertEquals('table-layout: auto;', $xpath->query('/html/body/div/table[2]')->item(0)->attributes->getNamedItem('style')->textContent);
+ $this->checkContent('table-layout: fixed;', $xpath, '/html/body/div/table[1]', 0, 'style');
+ $this->checkContent('table-layout: auto;', $xpath, '/html/body/div/table[2]', 0, 'style');
+ }
+
+ private function checkContent(?string $expected, DOMXPath $xpath, string $location, int $index, string $namedItem): void
+ {
+ $temp = $xpath->query($location);
+ self::assertNotFalse($temp);
+ $temp = $temp->item($index);
+ self::assertInstanceOf(DOMElement::class, $temp);
+ $temp = $temp->attributes->getNamedItem($namedItem);
+ if ($temp === null) {
+ self::assertNull($expected);
+ } else {
+ self::assertSame($expected, $temp->textContent);
+ }
+ }
+
+ private function checkLength(int $expected, DOMXPath $xpath, string $location): void
+ {
+ $temp = $xpath->query($location);
+ self::assertNotFalse($temp);
+ self::assertSame($expected, $temp->length);
}
}
diff --git a/tests/PhpWordTests/Writer/HTML/Helper.php b/tests/PhpWordTests/Writer/HTML/Helper.php
index 2e7ee343c3..40acd8ae5c 100644
--- a/tests/PhpWordTests/Writer/HTML/Helper.php
+++ b/tests/PhpWordTests/Writer/HTML/Helper.php
@@ -19,6 +19,7 @@
namespace PhpOffice\PhpWordTests\Writer\HTML;
use DOMDocument;
+use DOMElement;
use DOMXPath;
use Exception;
use LibXMLError;
@@ -41,6 +42,7 @@ public static function getTextContent(DOMXPath $xpath, string $query, string $na
if ($item2 === null) {
self::fail('Unexpected null return requesting item');
} elseif ($namedItem !== '') {
+ self::assertInstanceOf(DOMElement::class, $item2);
$item3 = $item2->attributes->getNamedItem($namedItem);
if ($item3 === null) {
self::fail('Unexpected null return requesting namedItem');
@@ -48,6 +50,7 @@ public static function getTextContent(DOMXPath $xpath, string $query, string $na
$returnVal = $item3->textContent;
}
} else {
+ self::assertInstanceOf(DOMElement::class, $item2);
$returnVal = $item2->textContent;
}
}
@@ -67,6 +70,7 @@ public static function getNamedItem(DOMXPath $xpath, string $query, string $name
if ($item2 === null) {
self::fail('Unexpected null return requesting item');
} else {
+ self::assertInstanceOf(DOMElement::class, $item2);
$returnVal = $item2->attributes->getNamedItem($namedItem);
}
}
diff --git a/tests/PhpWordTests/Writer/ODText/Part/AbstractPartClass.php b/tests/PhpWordTests/Writer/ODText/Part/AbstractPartClass.php
new file mode 100644
index 0000000000..f366a90253
--- /dev/null
+++ b/tests/PhpWordTests/Writer/ODText/Part/AbstractPartClass.php
@@ -0,0 +1,29 @@
+$method(ODText\Part\AbstractPart::class);
- } else {
- /** @var ODText\Part\AbstractPart $object */
- $object = new class() extends ODText\Part\AbstractPart {
- public function write(): string
- {
- return '';
- }
- };
- }
+ $object = new AbstractPartClass();
$object->setParentWriter(new ODText());
self::assertEquals(new ODText(), $object->getParentWriter());
}
@@ -66,18 +46,7 @@ public function testSetGetParentWriterNull(): void
{
$this->expectException(Exception::class);
$this->expectExceptionMessage('No parent WriterInterface assigned.');
- $method = self::$mockAbstract;
- if (self::methodFound($method)) {
- $object = $this->$method(ODText\Part\AbstractPart::class);
- } else {
- /** @var ODText\Part\AbstractPart $object */
- $object = new class() extends ODText\Part\AbstractPart {
- public function write(): string
- {
- return '';
- }
- };
- }
+ $object = new AbstractPartClass();
$object->getParentWriter();
}
}
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartClass.php b/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartClass.php
new file mode 100644
index 0000000000..395c0f80da
--- /dev/null
+++ b/tests/PhpWordTests/Writer/Word2007/Part/AbstractPartClass.php
@@ -0,0 +1,29 @@
+$method(Word2007\Part\AbstractPart::class);
- } else {
- /** @var Word2007\Part\AbstractPart $stub */
- $stub = new class() extends Word2007\Part\AbstractPart {
- public function write(): string
- {
- return '';
- }
- };
- }
+ $stub = new AbstractPartClass();
$stub->setParentWriter(new Word2007());
self::assertEquals(new Word2007(), $stub->getParentWriter());
}
@@ -61,18 +41,7 @@ public function testSetGetParentWriterNull(): void
{
$this->expectException(Exception::class);
$this->expectExceptionMessage('No parent WriterInterface assigned.');
- $method = self::$mockAbstract;
- if (self::methodFound($method)) {
- $stub = $this->$method(Word2007\Part\AbstractPart::class);
- } else {
- /** @var Word2007\Part\AbstractPart $stub */
- $stub = new class() extends Word2007\Part\AbstractPart {
- public function write(): string
- {
- return '';
- }
- };
- }
+ $stub = new AbstractPartClass();
$stub->getParentWriter();
}
}
diff --git a/tests/PhpWordTests/XmlDocument.php b/tests/PhpWordTests/XmlDocument.php
index 8c865932ba..7a76c85dde 100644
--- a/tests/PhpWordTests/XmlDocument.php
+++ b/tests/PhpWordTests/XmlDocument.php
@@ -23,6 +23,7 @@
use DOMNode;
use DOMNodeList;
use DOMXPath;
+use Exception;
/**
* DOM wrapper class.
@@ -157,7 +158,13 @@ public function getNodeList(string $path, string $file = ''): DOMNodeList
$this->xpath->registerNamespace('w14', 'http://schemas.microsoft.com/office/word/2010/wordml');
}
- return $this->xpath->query($path);
+ $temp = $this->xpath->query($path);
+ if ($temp === false) {
+ throw new Exception('xpath query returned false');
+ }
+
+ /** @var DOMNodeList $temp */
+ return $temp;
}
/**
From 8bbd65d436c8e004d0fa11b71bd77943b5e3e67a Mon Sep 17 00:00:00 2001
From: oleibman <10341515+oleibman@users.noreply.github.com>
Date: Sat, 15 Nov 2025 20:01:55 -0800
Subject: [PATCH 122/153] Fix Phpstan for Php7.2/3
---
phpstan-baseline.php7.neon | 25 -------------------------
phpstan-baseline.php73.neon | 15 ---------------
phpstan.neon.php7.dist | 9 ---------
3 files changed, 49 deletions(-)
diff --git a/phpstan-baseline.php7.neon b/phpstan-baseline.php7.neon
index 3d11dbeb00..4768548812 100644
--- a/phpstan-baseline.php7.neon
+++ b/phpstan-baseline.php7.neon
@@ -1340,16 +1340,6 @@ parameters:
count: 1
path: tests/PhpWordTests/TestableTemplateProcesor.php
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 9
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
- -
- message: "#^Cannot call method item\\(\\) on DOMNodeList\\\\|false\\.$#"
- count: 11
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
-
message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
count: 3
@@ -1385,26 +1375,11 @@ parameters:
count: 1
path: tests/PhpWordTests/Writer/Word2007/Element/ChartTest.php
- -
- message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/Writer/Word2007/ElementTest.php
-
- -
- message: "#^Call to an undefined method object\\:\\:write\\(\\)\\.$#"
- count: 1
- path: tests/PhpWordTests/Writer/Word2007/StyleTest.php
-
-
message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getElement\\(\\) should return DOMElement\\|null but returns DOMNode\\|null\\.$#"
count: 1
path: tests/PhpWordTests/XmlDocument.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getNodeList\\(\\) should return DOMNodeList\\ but returns DOMNodeList\\\\|false\\.$#"
- count: 1
- path: tests/PhpWordTests/XmlDocument.php
-
-
message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$path \\(string\\) does not accept string\\|false\\.$#"
count: 1
diff --git a/phpstan-baseline.php73.neon b/phpstan-baseline.php73.neon
index 3d11dbeb00..beb197fa09 100644
--- a/phpstan-baseline.php73.neon
+++ b/phpstan-baseline.php73.neon
@@ -1340,16 +1340,6 @@ parameters:
count: 1
path: tests/PhpWordTests/TestableTemplateProcesor.php
- -
- message: "#^Cannot access property \\$length on DOMNodeList\\\\|false\\.$#"
- count: 9
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
- -
- message: "#^Cannot call method item\\(\\) on DOMNodeList\\\\|false\\.$#"
- count: 11
- path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
-
message: "#^Parameter \\#2 \\$libraryBaseDir of static method PhpOffice\\\\PhpWord\\\\Settings\\:\\:setPdfRenderer\\(\\) expects string, string\\|false given\\.$#"
count: 3
@@ -1400,11 +1390,6 @@ parameters:
count: 1
path: tests/PhpWordTests/XmlDocument.php
- -
- message: "#^Method PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:getNodeList\\(\\) should return DOMNodeList\\ but returns DOMNodeList\\\\|false\\.$#"
- count: 1
- path: tests/PhpWordTests/XmlDocument.php
-
-
message: "#^Property PhpOffice\\\\PhpWordTests\\\\XmlDocument\\:\\:\\$path \\(string\\) does not accept string\\|false\\.$#"
count: 1
diff --git a/phpstan.neon.php7.dist b/phpstan.neon.php7.dist
index e7f4bdc454..138268cf8a 100644
--- a/phpstan.neon.php7.dist
+++ b/phpstan.neon.php7.dist
@@ -35,15 +35,6 @@ parameters:
-
message: '#Parameter \#1 \$function of function call_user_func_array expects callable\(\): mixed, array{PhpOffice\\PhpWord\\Writer\\PDF\\AbstractRenderer, string} given.#'
path: src/PhpWord/Writer/PDF.php
- -
- message: '#PHPDoc tag @var with type PhpOffice\\PhpWord\\Element\\AbstractElement is not subtype of native type #'
- path: tests/PhpWordTests/Element/AbstractElementTest.php
- -
- message: '#PHPDoc tag @var with type PhpOffice\\PhpWord\\Style\\AbstractStyle is not subtype of native type #'
- path: tests/PhpWordTests/Style/AbstractStyleTest.php
-
message: '#Parameter \#1 \$objectOrClass of class ReflectionClass constructor expects class-string