Rebase & Fixed CI

Author: Progi1984

docs/changes/2.x/2.0.0.md

@@ -7,6 +7,7 @@
 - IOFactory : Added extractVariables method to extract variables from a document [@sibalonat](https://github.com/sibalonat) in [#2515](https://github.com/PHPOffice/PHPWord/pull/2515)
 - PDF Writer : Documented how to specify a PDF renderer, when working with the PDF writer, as well as the three available choices by [@settermjd](https://github.com/settermjd) in [#2642](https://github.com/PHPOffice/PHPWord/pull/2642)
 - Word2007 Reader: Support for Paragraph Border Style by [@damienfa](https://github.com/damienfa) in [#2651](https://github.com/PHPOffice/PHPWord/pull/2651)
+- Word2007 Writer: Support for field REF by [@crystoline](https://github.com/crystoline) in [#2652](https://github.com/PHPOffice/PHPWord/pull/2652)
 
 ### Bug fixes
 

docs/usage/elements/field.md

@@ -26,24 +26,24 @@ For instance for the INDEX field, you can do the following (See `Index Field for
 ``` php
 <?php
 
-//the $fieldText can be either a simple string
+// the $fieldText can be either a simple string
 $fieldText = 'The index value';
 
-//or a 'TextRun', to be able to format the text you want in the index
+// or a 'TextRun', to be able to format the text you want in the index
 $fieldText = new TextRun();
 $fieldText->addText('My ');
 $fieldText->addText('bold index', ['bold' => true]);
 $fieldText->addText(' entry');
 $section->addField('XE', array(), array(), $fieldText);
 
-//this actually adds the index
+// this actually adds the index
 $section->addField('INDEX', array(), array('\\e "	" \\h "A" \\c "3"'), 'right click to update index');
 
-//Adding reference to a bookmark
+// Adding reference to a bookmark
 $fieldText->addField('REF', [
-      'name' => 'bookmark'
-  ], [
-      'InsertParagraphNumberRelativeContext',
-      'CreateHyperLink',
-  ]);
+    'name' => 'bookmark'
+], [
+    'InsertParagraphNumberRelativeContext',
+    'CreateHyperLink',
+]);
 ```

src/PhpWord/Element/Field.php

@@ -91,10 +91,10 @@ class Field extends AbstractElement
             ],
             'options' => ['Path', 'PreserveFormat'],
         ],
-        'REF' => array(
-            'properties' => array('name' => ''),
-            'options'    => array('f', 'h', 'n', 'p', 'r', 't', 'w'),
-        ),
+        'REF' => [
+            'properties' => ['name' => ''],
+            'options' => ['f', 'h', 'n', 'p', 'r', 't', 'w'],
+        ],
     ];
 
     /**

src/PhpWord/Writer/Word2007/Element/Field.php

@@ -17,6 +17,9 @@
 
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
+use PhpOffice\PhpWord\Element\Field as ElementField;
+use PhpOffice\PhpWord\Element\TextRun;
+
 /**
  * Field element writer.
  *
@@ -30,7 +33,7 @@ class Field extends Text
     public function write(): void
     {
         $element = $this->getElement();
-        if (!$element instanceof \PhpOffice\PhpWord\Element\Field) {
+        if (!$element instanceof ElementField) {
             return;
         }
 
@@ -42,7 +45,7 @@ public function write(): void
         }
     }
 
-    private function writeDefault(\PhpOffice\PhpWord\Element\Field $element): void
+    private function writeDefault(ElementField $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
@@ -73,7 +76,7 @@ private function writeDefault(\PhpOffice\PhpWord\Element\Field $element): void
         $xmlWriter->endElement(); // w:r
 
         if ($element->getText() != null) {
-            if ($element->getText() instanceof \PhpOffice\PhpWord\Element\TextRun) {
+            if ($element->getText() instanceof TextRun) {
                 $containerWriter = new Container($xmlWriter, $element->getText(), true);
                 $containerWriter->write();
 
@@ -120,7 +123,7 @@ private function writeDefault(\PhpOffice\PhpWord\Element\Field $element): void
      *
      * //TODO A lot of code duplication with general method, should maybe be refactored
      */
-    protected function writeMacrobutton(\PhpOffice\PhpWord\Element\Field $element): void
+    protected function writeMacrobutton(ElementField $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
@@ -159,7 +162,7 @@ protected function writeMacrobutton(\PhpOffice\PhpWord\Element\Field $element):
         $this->endElementP(); // w:p
     }
 
-    private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $element)
+    private function buildPropertiesAndOptions(ElementField $element)
     {
         $propertiesAndOptions = '';
         $properties = $element->getProperties();
@@ -228,11 +231,9 @@ private function buildPropertiesAndOptions(\PhpOffice\PhpWord\Element\Field $ele
     }
 
     /**
-     * Writes a REF field
-     *
-     * @param \PhpOffice\PhpWord\Element\Field $element
+     * Writes a REF field.
      */
-    protected function writeRef(\PhpOffice\PhpWord\Element\Field $element)
+    protected function writeRef(ElementField $element): void
     {
         $xmlWriter = $this->getXmlWriter();
         $this->startElementP();
@@ -303,7 +304,7 @@ protected function writeRef(\PhpOffice\PhpWord\Element\Field $element)
         $this->endElementP(); // w:p
     }
 
-    private function convertRefOption($optionKey, $optionValue)
+    private function convertRefOption(string $optionKey, string $optionValue): string
     {
         if ($optionKey === 'NumberSeperatorSequence') {
             return '\\d ' . $optionValue;

tests/PhpWord/Writer/Word2007/Element/FieldTest.php

@@ -3,38 +3,38 @@
 namespace PhpOffice\PhpWord\Writer\Word2007\Element;
 
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\TestHelperDOCX;
+use PhpOffice\PhpWordTests\TestHelperDOCX;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test class for PhpOffice\PhpWord\Writer\Word2007\Field
+ * Test class for PhpOffice\PhpWord\Writer\Word2007\Field.
  */
 class FieldTest extends TestCase
 {
     /**
-     * Executed before each method of the class
+     * Executed before each method of the class.
      */
-    public function tearDown()
+    protected function tearDown(): void
     {
         TestHelperDOCX::clear();
     }
 
     /**
-     * Test Field write
+     * Test Field write.
      */
-    public function testWriteWithRefType()
+    public function testWriteWithRefType(): void
     {
         $phpWord = new PhpWord();
         $section = $phpWord->addSection();
         $section->addField(
             'REF',
-            array(
+            [
                 'name' => 'my-bookmark',
-            ),
-            array(
+            ],
+            [
                 'InsertParagraphNumberRelativeContext',
                 'CreateHyperLink',
-            )
+            ]
         );
 
         $section->addListItem('line one item');
@@ -45,18 +45,14 @@ public function testWriteWithRefType()
         $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
 
         $refFieldPath = '/w:document/w:body/w:p[1]/w:r[2]/w:instrText';
-
-        $this->assertTrue($doc->elementExists($refFieldPath));
+        self::assertTrue($doc->elementExists($refFieldPath));
 
         $bookMarkElement = $doc->getElement($refFieldPath);
-
-        $this->assertNotNull($bookMarkElement);
-
-        $this->assertEquals(' REF my-bookmark \r \h ', $bookMarkElement->textContent);
+        self::assertNotNull($bookMarkElement);
+        self::assertEquals(' REF my-bookmark \r \h ', $bookMarkElement->textContent);
 
         $bookmarkPath = '/w:document/w:body/w:bookmarkStart';
-
-        $this->assertTrue($doc->elementExists($bookmarkPath));
-        $this->assertEquals('my-bookmark', $doc->getElementAttribute("$bookmarkPath", 'w:name'));
+        self::assertTrue($doc->elementExists($bookmarkPath));
+        self::assertEquals('my-bookmark', $doc->getElementAttribute("$bookmarkPath", 'w:name'));
     }
 }