Fixed Formating

docs/changes/1.x/1.4.0.md

@@ -6,6 +6,7 @@
 
 - Writer ODText: Support for ListItemRun by [@Progi1984](https://github.com/Progi1984) fixing [#2159](https://github.com/PHPOffice/PHPWord/issues/2159), [#2620](https://github.com/PHPOffice/PHPWord/issues/2620) in [#2669](https://github.com/PHPOffice/PHPWord/pull/2669)
 - Writer HTML: Support for vAlign in Tables by [@SpraxDev](https://github.com/SpraxDev) in [#2675](https://github.com/PHPOffice/PHPWord/pull/2675)
+- Add Default font color for Word by [@Collie-IT](https://github.com/Collie-IT) in [#2700](https://github.com/PHPOffice/PHPWord/pull/2700)
 
 ### Bug fixes
 

docs/usage/introduction.md

@@ -128,13 +128,14 @@ You can alter the default paper by using the following function:
 
 ### Default font
 
-By default, every text appears in Arial 10 point. You can alter the
+By default, every text appears in Arial 10 point in the color black (000000). You can alter the
 default font by using the following two functions:
 
 ``` php
 <?php
 
 $phpWord->setDefaultFontName('Times New Roman');
+$phpWord->setDefaultFontColor('FF0000');
 $phpWord->setDefaultFontSize(12);
 ```
 
@@ -381,4 +382,4 @@ To control whether or not words in all capital letters shall be hyphenated use t
 <?php
 
 $phpWord->getSettings()->setDoNotHyphenateCaps(true);
-```
+```

phpword.ini.dist

@@ -14,6 +14,7 @@ outputEscapingEnabled = false
 
 defaultFontName = Arial
 defaultFontSize = 10
+defaultFontColor = 000000
 
 [Paper]
 

src/PhpWord/PhpWord.php

@@ -258,20 +258,16 @@ public function setDefaultFontName($fontName): void
 
     /**
      * Set default font color.
-     *
-     * @param string $fontColor
      */
-    public function setDefaultFontColor($fontColor): void
+    public function setDefaultFontColor(string $fontColor): void
     {
         Settings::setDefaultFontColor($fontColor);
     }
 
     /**
      * Get default font color.
-     *
-     * @return string
      */
-    public function getDefaultFontColor()
+    public function getDefaultFontColor(): string
     {
         return Settings::getDefaultFontColor();
     }

src/PhpWord/Reader/Word2007/Styles.php

@@ -46,6 +46,9 @@ public function read(PhpWord $phpWord): void
                 if (array_key_exists('size', $fontDefaultStyle)) {
                     $phpWord->setDefaultFontSize($fontDefaultStyle['size']);
                 }
+                if (array_key_exists('color', $fontDefaultStyle)) {
+                    $phpWord->setDefaultFontColor($fontDefaultStyle['color']);
+                }
                 if (array_key_exists('lang', $fontDefaultStyle)) {
                     $phpWord->getSettings()->setThemeFontLang(new Language($fontDefaultStyle['lang']));
                 }

tests/PhpWordTests/PhpWordTest.php

@@ -82,6 +82,18 @@ public function testSetGetDefaultFontSize(): void
         self::assertEquals($fontSize, $phpWord->getDefaultFontSize());
     }
 
+    /**
+     * Test set/get default font color.
+     */
+    public function testSetGetDefaultFontColor(): void
+    {
+        $phpWord = new PhpWord();
+        $fontColor = 'FF0000';
+        self::assertEquals(Settings::DEFAULT_FONT_COLOR, $phpWord->getDefaultFontColor());
+        $phpWord->setDefaultFontColor($fontColor);
+        self::assertEquals($fontColor, $phpWord->getDefaultFontColor());
+    }
+
     /**
      * Test set default paragraph style.
      */

tests/PhpWordTests/SettingsTest.php

@@ -30,6 +30,9 @@ class SettingsTest extends TestCase
 {
     private $compatibility;
 
+    /** @var string */
+    private $defaultFontColor;
+
     private $defaultFontSize;
 
     private $defaultFontName;
@@ -59,6 +62,7 @@ class SettingsTest extends TestCase
     protected function setUp(): void
     {
         $this->compatibility = Settings::hasCompatibility();
+        $this->defaultFontColor = Settings::getDefaultFontColor();
         $this->defaultFontSize = Settings::getDefaultFontSize();
         $this->defaultFontName = Settings::getDefaultFontName();
         $this->defaultPaper = Settings::getDefaultPaper();
@@ -75,6 +79,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         Settings::setCompatibility($this->compatibility);
+        Settings::setDefaultFontColor($this->defaultFontColor);
         Settings::setDefaultFontSize($this->defaultFontSize);
         Settings::setDefaultFontName($this->defaultFontName);
         Settings::setDefaultPaper($this->defaultPaper);
@@ -236,6 +241,20 @@ public function testSetGetDefaultFontSize(): void
         self::assertEquals(12.5, Settings::getDefaultFontSize());
     }
 
+    /**
+     * Test set/get default font color.
+     */
+    public function testSetGetDefaultFontColor(): void
+    {
+        self::assertEquals(Settings::DEFAULT_FONT_COLOR, Settings::getDefaultFontColor());
+        self::assertFalse(Settings::setDefaultFontColor(' '));
+        self::assertEquals(Settings::DEFAULT_FONT_COLOR, Settings::getDefaultFontColor());
+        self::assertTrue(Settings::setDefaultFontColor('FF0000'));
+        self::assertEquals('FF0000', Settings::getDefaultFontColor());
+        self::assertFalse(Settings::setDefaultFontColor(' '));
+        self::assertEquals('FF0000', Settings::getDefaultFontColor());
+    }
+
     /**
      * Test set/get default paper.
      */
@@ -271,6 +290,7 @@ public function testLoadConfig(): void
             'pdfRendererPath' => '',
             'defaultFontName' => 'Arial',
             'defaultFontSize' => 10,
+            'defaultFontColor' => '000000',
             'outputEscapingEnabled' => false,
             'defaultPaper' => 'A4',
         ];

tests/PhpWordTests/Writer/HTML/FontTest.php

@@ -33,13 +33,17 @@ class FontTest extends \PHPUnit\Framework\TestCase
     /** @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();
     }
 
     /**
@@ -49,6 +53,7 @@ protected function tearDown(): void
     {
         Settings::setDefaultFontName($this->defaultFontName);
         Settings::setDefaultFontSize($this->defaultFontSize);
+        Settings::setDefaultFontColor($this->defaultFontColor);
     }
 
     /**