Merge branch 'master' into wordunimplemented2

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,4 +9,4 @@ Fixes # (issue)
 - [ ] My CI is :green_circle:
 - [ ] I have covered by unit tests my new code (check build/coverage for coverage report)
 - [ ] I have updated the [documentation](https://github.com/PHPOffice/PHPWord/tree/master/docs) to describe the changes
-- [ ] I have updated the [changelog](https://github.com/PHPOffice/PHPWord/blob/master/docs/changes/2.x/2.0.0.md)
+- [ ] I have updated the [changelog](https://github.com/PHPOffice/PHPWord/blob/master/docs/changes/1.x/1.4.0.md)

composer.json

@@ -74,7 +74,7 @@
         "ext-zip": "*",
         "ext-gd": "*",
         "ext-libxml": "*",
-        "dompdf/dompdf": "^2.0",
+        "dompdf/dompdf": "^2.0 || ^3.0",
         "mpdf/mpdf": "^8.1",
         "phpmd/phpmd": "^2.13",
         "phpunit/phpunit": ">=7.0",

docs/changes/2.x/2.0.0.md → docs/changes/1.x/1.3.0.md

@@ -1,6 +1,6 @@
-# [2.0.0](https://github.com/PHPOffice/PHPWord/tree/2.0.0) (WIP)
+# [1.3.0](https://github.com/PHPOffice/PHPWord/tree/1.3.0)
 
-[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/1.2.0...2.0.0)
+[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/1.2.0...1.3.0)
 
 ## Enhancements
 
@@ -10,6 +10,9 @@
 - Word2007 Writer: Support for field REF by [@crystoline](https://github.com/crystoline) in [#2652](https://github.com/PHPOffice/PHPWord/pull/2652)
 - Word2007 Reader : Support for FormFields by [@vincentKool](https://github.com/vincentKool) in [#2653](https://github.com/PHPOffice/PHPWord/pull/2653)
 - RTF Writer : Support for Table Border Style fixing [#345](https://github.com/PHPOffice/PHPWord/issues/345) by [@Progi1984](https://github.com/Progi1984) in [#2656](https://github.com/PHPOffice/PHPWord/pull/2656)
+- Word2007 Reader: Support the page break (<w:lastRenderedPageBreak/>) by [@stanolacko](https://github.com/stanolacko) in [#2662](https://github.com/PHPOffice/PHPWord/pull/2662)
+- MsDoc Reader: Support for UTF-8 characters by [@Progi1984] fixing [#881](https://github.com/PHPOffice/PHPWord/issues/881), [#1454](https://github.com/PHPOffice/PHPWord/issues/1454), [#1817](https://github.com/PHPOffice/PHPWord/issues/1817), [#1927](https://github.com/PHPOffice/PHPWord/issues/1927), [#2383](https://github.com/PHPOffice/PHPWord/issues/2383), [#2565](https://github.com/PHPOffice/PHPWord/issues/2565) in [#2664](https://github.com/PHPOffice/PHPWord/pull/2664)
+- Word2007 Writer: Added support for multiples comment for the same text by [@rodrigoq](https://github.com/rodrigoq) fixing [#2109](https://github.com/PHPOffice/PHPWord/issues/2109) in [#2665](https://github.com/PHPOffice/PHPWord/pull/2665)
 
 ### Bug fixes
 
@@ -27,6 +30,9 @@
 - Template Processor : Fixed bad naming of variables fixing [#2586](https://github.com/PHPOffice/PHPWord/issues/2586) by [@Progi1984](https://github.com/Progi1984) in [#2655](https://github.com/PHPOffice/PHPWord/pull/2655)
 - Word2007 Writer : Fix first footnote appearing as separator [#2634](https://github.com/PHPOffice/PHPWord/issues/2634) by [@jacksleight](https://github.com/jacksleight) in [#2635](https://github.com/PHPOffice/PHPWord/pull/2635)
 - Template Processor : Fixed images with transparent backgrounds displaying a white background by [@ElwynVdb](https://github.com/ElwynVdb) in [#2638](https://github.com/PHPOffice/PHPWord/pull/2638)
+- HTML Writer : Fixed rowspan for tables by [@andomiell](https://github.com/andomiell) in [#2659](https://github.com/PHPOffice/PHPWord/pull/2659)
+- Word2007 Writer : Fixed StrikeThrough property by [@noec764](https://github.com/noec764) fixing [#1722](https://github.com/PHPOffice/PHPWord/issues/1722) & [#1693](https://github.com/PHPOffice/PHPWord/issues/1693) in [#2661](https://github.com/PHPOffice/PHPWord/pull/2661)
+- HTML Reader : Fixed link without href by [@asmundstavdahl](https://github.com/asmundstavdahl) fixing [#1562](https://github.com/PHPOffice/PHPWord/issues/1562) in [#2663](https://github.com/PHPOffice/PHPWord/pull/2663)
 
 ### Miscellaneous
 

docs/changes/1.x/1.4.0.md

@@ -0,0 +1,15 @@
+# [1.4.0](https://github.com/PHPOffice/PHPWord/tree/1.4.0) (WIP)
+
+[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/1.3.0...1.4.0)
+
+## Enhancements
+
+
+### Bug fixes
+
+
+### Miscellaneous
+
+- Bump dompdf/dompdf from 2.0.4 to 3.0.0 by [@dependabot](https://github.com/dependabot) fixing [#2621](https://github.com/PHPOffice/PHPWord/issues/2621) in [#2666](https://github.com/PHPOffice/PHPWord/pull/2666)
+
+### BC Breaks

mkdocs.yml

@@ -86,9 +86,9 @@ nav:
   - How to: 'howto.md'
   - Credits: 'credits.md'
   - Releases:
-    - '2.x':
-      - '2.0.0 (WIP)': 'changes/2.x/2.0.0.md'
     - '1.x':
+      - '1.4.0 (WIP)': 'changes/1.x/1.4.0.md'
+      - '1.3.0': 'changes/1.x/1.3.0.md'
       - '1.2.0': 'changes/1.x/1.2.0.md'
       - '1.1.0': 'changes/1.x/1.1.0.md'
       - '1.0.0': 'changes/1.x/1.0.0.md'

phpstan-baseline.neon

@@ -1782,17 +1782,12 @@ parameters:
 
 		-
 			message: "#^Cannot access property \\$length on DOMNodeList\\<DOMNode\\>\\|false\\.$#"
-			count: 6
+			count: 9
 			path: tests/PhpWordTests/Writer/HTML/ElementTest.php
 
 		-
 			message: "#^Cannot call method item\\(\\) on DOMNodeList\\<DOMNode\\>\\|false\\.$#"
-			count: 8
-			path: tests/PhpWordTests/Writer/HTML/ElementTest.php
-
-		-
-			message: "#^Method PhpOffice\\\\PhpWordTests\\\\Writer\\\\HTML\\\\ElementTest\\:\\:getAsHTML\\(\\) has no return type specified\\.$#"
-			count: 1
+			count: 11
 			path: tests/PhpWordTests/Writer/HTML/ElementTest.php
 
 		-