Merge pull request #770 from Progi1984/pr761

Fixed broken powerpoint presentations due to MS Office update 2309
PHPOffice · Dec 4, 2023 · f6f0120 · f6f0120
2 parents 273e776 + c858a7b
commit f6f0120
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/docs/changes/1.1.0.md b/docs/changes/1.1.0.md
@@ -9,8 +9,9 @@
 - Support for Hyperlink Text Color - [@MartynasJanu](https://github.com/MartynasJanu) & [@Progi1984](https://github.com/Progi1984) in [#682](https://github.com/PHPOffice/PHPPresentation/pull/682)
     - PowerPoint2007 Reader
     - PowerPoint2007 Writer
-- Added support for PHP 8.2 & 8.3 - [@Progi1984](https://github.com/Progi1984) in [#766](https://github.com/PHPOffice/PHPPresentation/pull/766)
+- Added support for PHP 8.2 & 8.3 - [@Progi1984](https://github.com/Progi1984) in [#769](https://github.com/PHPOffice/PHPPresentation/pull/769)
 
 ## Bugfixes
 
-- Fixed CI - [@Progi1984](https://github.com/Progi1984) in [#766](https://github.com/PHPOffice/PHPPresentation/pull/766)
+- Fixed CI - [@Progi1984](https://github.com/Progi1984) in [#766](https://github.com/PHPOffice/PHPPresentation/pull/766)
+- Fixed broken PPT Presentations due to MS Office update 2309 - [@WFarmerEthisphere](https://github.com/WFarmerEthisphere) in [#770](https://github.com/PHPOffice/PHPPresentation/pull/770)
diff --git a/src/PhpPresentation/Shape/Chart/Axis.php b/src/PhpPresentation/Shape/Chart/Axis.php
@@ -41,6 +41,8 @@ class Axis implements ComparableInterface
     public const CROSSES_MIN = 'min';
     public const CROSSES_MAX = 'max';
 
+    public const DEFAULT_FORMAT_CODE = 'general';
+
     /**
      * Title.
      *
@@ -58,7 +60,7 @@ class Axis implements ComparableInterface
      *
      * @var string
      */
-    private $formatCode = '';
+    private $formatCode = self::DEFAULT_FORMAT_CODE;
 
     /**
      * Font.
@@ -191,7 +193,7 @@ public function getFormatCode(): string
     /**
      * Set Format Code.
      */
-    public function setFormatCode(string $value = ''): self
+    public function setFormatCode(string $value = self::DEFAULT_FORMAT_CODE): self
     {
         $this->formatCode = $value;
 

diff --git a/tests/PhpPresentation/Tests/Shape/Chart/AxisTest.php b/tests/PhpPresentation/Tests/Shape/Chart/AxisTest.php
@@ -92,8 +92,9 @@ public function testFont(): void
     public function testFormatCode(): void
     {
         $object = new Axis();
+        self::assertEquals(Axis::DEFAULT_FORMAT_CODE, $object->getFormatCode());
         self::assertInstanceOf(Axis::class, $object->setFormatCode());
-        self::assertEquals('', $object->getFormatCode());
+        self::assertEquals(Axis::DEFAULT_FORMAT_CODE, $object->getFormatCode());
         self::assertInstanceOf(Axis::class, $object->setFormatCode('AAAA'));
         self::assertEquals('AAAA', $object->getFormatCode());
     }