Try to Catch Up

oleibman · oleibman · commit 8e6726c24a8e · 2025-01-09T16:55:59.000-08:00
diff --git a/composer.json b/composer.json
@@ -122,7 +122,7 @@
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^0.12.88 || ^1.0.0",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
-        "phpunit/phpunit": ">=7.0",
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0 || ^10.0",
         "symfony/process": "^4.4 || ^5.0",
         "tecnickcom/tcpdf": "^6.5"
     },
diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -417,7 +417,7 @@ protected static function parseChildNodes($node, $element, $styles, $data): void
      * @param AbstractContainer $element
      * @param array &$styles
      *
-     * @return \PhpOffice\PhpWord\Element\PageBreak|\PhpOffice\PhpWord\Element\TextRun
+     * @return \PhpOffice\PhpWord\Element\PageBreak|TextRun
      */
     protected static function parseParagraph($node, $element, &$styles)
     {
@@ -590,7 +590,7 @@ protected static function parseRow($node, $element, &$styles)
      * @param Table $element
      * @param array &$styles
      *
-     * @return \PhpOffice\PhpWord\Element\Cell|\PhpOffice\PhpWord\Element\TextRun $element
+     * @return \PhpOffice\PhpWord\Element\Cell|TextRun $element
      */
     protected static function parseCell($node, $element, &$styles)
     {
diff --git a/src/PhpWord/SimpleType/TextDirection.php b/src/PhpWord/SimpleType/TextDirection.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Reader/Html/CharsetTest.php b/tests/PhpWordTests/Reader/Html/CharsetTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php b/tests/PhpWordTests/Reader/Word2007/StyleTableTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/SettingsRtlTest.php b/tests/PhpWordTests/SettingsRtlTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Shared/Html2402Test.php b/tests/PhpWordTests/Shared/Html2402Test.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Shared/HtmlFullTest.php b/tests/PhpWordTests/Shared/HtmlFullTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Shared/HtmlHeadingsTest.php b/tests/PhpWordTests/Shared/HtmlHeadingsTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Shared/HtmlRtlTest.php b/tests/PhpWordTests/Shared/HtmlRtlTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
@@ -23,15 +24,15 @@
 use PhpOffice\PhpWord\Shared\Html;
 use PhpOffice\PhpWord\Style\Font;
 use PhpOffice\PhpWord\Style\Paragraph;
-use PhpOffice\PhpWordTests\AbstractWebServerEmbeddedTest;
+use PhpOffice\PhpWordTests\AbstractWebServerEmbedded;
 use PhpOffice\PhpWordTests\TestHelperDOCX;
 
 /**
  * Test class for PhpOffice\PhpWord\Shared\Html.
  *
  * @coversDefaultClass \PhpOffice\PhpWord\Shared\Html
  */
-class HtmlRtlTest extends AbstractWebServerEmbeddedTest
+class HtmlRtlTest extends AbstractWebServerEmbedded
 {
     /**
      * Tear down after each test.
diff --git a/tests/PhpWordTests/Shared/HtmlTest.php b/tests/PhpWordTests/Shared/HtmlTest.php
@@ -479,7 +479,7 @@ public function testParseTableAndCellWidth(): void
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection([
-            'orientation' => \PhpOffice\PhpWord\Style\Section::ORIENTATION_LANDSCAPE,
+            'orientation' => Style\Section::ORIENTATION_LANDSCAPE,
         ]);
 
         // borders & backgrounds are here just for better visual comparison
@@ -548,7 +548,7 @@ public function testParseTableRowHeight(): void
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection([
-            'orientation' => \PhpOffice\PhpWord\Style\Section::ORIENTATION_LANDSCAPE,
+            'orientation' => Style\Section::ORIENTATION_LANDSCAPE,
         ]);
 
         $html = <<<HTML
@@ -629,7 +629,7 @@ public function testParseTableCellspacingRowBgColor(): void
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection([
-            'orientation' => \PhpOffice\PhpWord\Style\Section::ORIENTATION_LANDSCAPE,
+            'orientation' => Style\Section::ORIENTATION_LANDSCAPE,
         ]);
 
         // borders & backgrounds are here just for better visual comparison
@@ -670,7 +670,7 @@ public function testParseTableStyleAttributeInlineStyle(): void
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection([
-            'orientation' => \PhpOffice\PhpWord\Style\Section::ORIENTATION_LANDSCAPE,
+            'orientation' => Style\Section::ORIENTATION_LANDSCAPE,
         ]);
 
         $html = '<table style="background-color:red;width:100%;" bgColor="lightgreen" width="50%">
diff --git a/tests/PhpWordTests/TemplateProcessorSectionTest.php b/tests/PhpWordTests/TemplateProcessorSectionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.
diff --git a/tests/PhpWordTests/Writer/RTF/RichTextTitleTest.php b/tests/PhpWordTests/Writer/RTF/RichTextTitleTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is part of PHPWord - A pure PHP library for reading and writing
  * word processing documents.

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ protected static function parseChildNodes($node, $element, $styles, $data): void`
`417`	`417`	`* @param AbstractContainer $element`
`418`	`418`	`* @param array &$styles`
`419`	`419`	`*`
`420`		`- * @return \PhpOffice\PhpWord\Element\PageBreak\|\PhpOffice\PhpWord\Element\TextRun`
	`420`	`+ * @return \PhpOffice\PhpWord\Element\PageBreak\|TextRun`
`421`	`421`	`*/`
`422`	`422`	`protected static function parseParagraph($node, $element, &$styles)`
`423`	`423`	`{`
`@@ -590,7 +590,7 @@ protected static function parseRow($node, $element, &$styles)`
`590`	`590`	`* @param Table $element`
`591`	`591`	`* @param array &$styles`
`592`	`592`	`*`
`593`		`- * @return \PhpOffice\PhpWord\Element\Cell\|\PhpOffice\PhpWord\Element\TextRun $element`
	`593`	`+ * @return \PhpOffice\PhpWord\Element\Cell\|TextRun $element`
`594`	`594`	`*/`
`595`	`595`	`protected static function parseCell($node, $element, &$styles)`
`596`	`596`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`/**`
`3`	`4`	`* This file is part of PHPWord - A pure PHP library for reading and writing`
`4`	`5`	`* word processing documents.`