From 81a1b2acffd55a47d94b372963404c425adc1eee Mon Sep 17 00:00:00 2001
From: Nick Winfield <pioneer@superhaggis.com>
Date: Sat, 23 Feb 2019 23:24:49 +0000
Subject: [PATCH] TrackChange doesn't handle all return types of
 \DateTime::createFromFormat(...) (#1584)

* Added boolean check before setting the date
---
 src/PhpWord/Element/TrackChange.php       |  4 ++--
 tests/PhpWord/Element/TrackChangeTest.php | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/PhpWord/Element/TrackChange.php b/src/PhpWord/Element/TrackChange.php
index 410ffb7c..91c221f2 100644
--- a/src/PhpWord/Element/TrackChange.php
+++ b/src/PhpWord/Element/TrackChange.php
@@ -58,13 +58,13 @@ class TrackChange extends AbstractContainer
      *
      * @param string $changeType
      * @param string $author
-     * @param null|int|\DateTime $date
+     * @param null|int|bool|\DateTime $date
      */
     public function __construct($changeType = null, $author = null, $date = null)
     {
         $this->changeType = $changeType;
         $this->author = $author;
-        if ($date !== null) {
+        if ($date !== null && $date !== false) {
             $this->date = ($date instanceof \DateTime) ? $date : new \DateTime('@' . $date);
         }
     }
diff --git a/tests/PhpWord/Element/TrackChangeTest.php b/tests/PhpWord/Element/TrackChangeTest.php
index df86feb2..b6cea924 100644
--- a/tests/PhpWord/Element/TrackChangeTest.php
+++ b/tests/PhpWord/Element/TrackChangeTest.php
@@ -41,4 +41,22 @@ class TrackChangeTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($date, $oTrackChange->getDate());
         $this->assertEquals(TrackChange::INSERTED, $oTrackChange->getChangeType());
     }
+
+    /**
+     * New instance with invalid \DateTime (produced by \DateTime::createFromFormat(...))
+     */
+    public function testConstructDefaultWithInvalidDate()
+    {
+        $author = 'Test User';
+        $date = false;
+        $oTrackChange = new TrackChange(TrackChange::INSERTED, $author, $date);
+
+        $oText = new Text('dummy text');
+        $oText->setTrackChange($oTrackChange);
+
+        $this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TrackChange', $oTrackChange);
+        $this->assertEquals($author, $oTrackChange->getAuthor());
+        $this->assertEquals($date, null);
+        $this->assertEquals(TrackChange::INSERTED, $oTrackChange->getChangeType());
+    }
 }