TrackChange doesn't handle all return types of \DateTime::createFromF…

…ormat(...) (#1584) * Added boolean check before setting the date
PHPOffice · Feb 23, 2019 · 81a1b2a · 81a1b2a
1 parent 9958a48
commit 81a1b2a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -41,4 +41,22 @@ public function testConstructDefault()
  $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());
+ }
 }