Word2007 Writer : Fixed first footnote appearing as separator (#2635)

jacksleight · Progi1984 · web-flow · commit dbf0a3e427bc · 2024-08-14T04:50:25.000+02:00
* Fix first footnote appearing as separator

* Add test

* Update changelog

* Fixed changelog

---------

Co-authored-by: Progi1984 &lt;progi1984@gmail.com&gt;
diff --git a/docs/changes/2.x/2.0.0.md b/docs/changes/2.x/2.0.0.md
@@ -25,6 +25,7 @@
 - Documentation : Updated Comment element by [@laminga](https://github.com/laminga) in [#2650](https://github.com/PHPOffice/PHPWord/pull/2650)
 - HTML Reader : Read width & height attributes in points fixing [#2589](https://github.com/PHPOffice/PHPWord/issues/2589) by [@Progi1984](https://github.com/Progi1984) in [#2654](https://github.com/PHPOffice/PHPWord/pull/2654)
 - 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)
 
 ### Miscellaneous
 
diff --git a/src/PhpWord/Writer/Word2007/Element/Footnote.php b/src/PhpWord/Writer/Word2007/Element/Footnote.php
@@ -51,7 +51,7 @@ public function write(): void
         $xmlWriter->endElement(); // w:rStyle
         $xmlWriter->endElement(); // w:rPr
         $xmlWriter->startElement("w:{$this->referenceType}");
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationId() + 1);
         $xmlWriter->endElement(); // w:$referenceType
         $xmlWriter->endElement(); // w:r
 
diff --git a/src/PhpWord/Writer/Word2007/Part/Footnotes.php b/src/PhpWord/Writer/Word2007/Part/Footnotes.php
@@ -141,7 +141,7 @@ public function setElements($elements)
     protected function writeNote(XMLWriter $xmlWriter, $element): void
     {
         $xmlWriter->startElement($this->elementNode);
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationId() + 1);
         $xmlWriter->startElement('w:p');
 
         // Paragraph style
diff --git a/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWordTests/Writer/Word2007/Part/FootnotesTest.php
@@ -49,5 +49,8 @@ public function testWriteFootnotes(): void
 
         self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference'));
         self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:endnoteReference'));
+
+        self::assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference[@w:id="0"]'));
+        self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference[@w:id="1"]'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public function setElements($elements)`
`141`	`141`	`protected function writeNote(XMLWriter $xmlWriter, $element): void`
`142`	`142`	`{`
`143`	`143`	`$xmlWriter->startElement($this->elementNode);`
`144`		`- $xmlWriter->writeAttribute('w:id', $element->getRelationId());`
	`144`	`+ $xmlWriter->writeAttribute('w:id', $element->getRelationId() + 1);`
`145`	`145`	`$xmlWriter->startElement('w:p');`
`146`	`146`
`147`	`147`	`// Paragraph style`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,8 @@ public function testWriteFootnotes(): void`
`49`	`49`
`50`	`50`	`self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference'));`
`51`	`51`	`self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:endnoteReference'));`
	`52`	`+`
	`53`	`+ self::assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference[@w:id="0"]'));`
	`54`	`+ self::assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:footnoteReference[@w:id="1"]'));`
`52`	`55`	`}`
`53`	`56`	`}`