From e90bdedff7fbb8f1d69b5ded905fd450cd3b7bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 19 Feb 2019 12:23:17 +0100
Subject: [PATCH 1/2] Release 4.2.0

---
 CHANGELOG.md    | 9 ++++++++-
 lib/Version.php | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfe8955f5..7a2c935fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,16 @@
 ChangeLog
 =========
 
-4.2.0-alpha1 (2018-09-26)
+4.2.0 (2019-02-19)
 ------------------
 
+* #432: DTSTAMP must be specified in UTC
+* #435: ORGANIZER e-mail address are case-insensitive
+* #441: Repairing BASE64 encoded vCard version 3
+
+4.2.0-alpha1 (2018-09-26)
+-------------------------
+
 * #412: Broker: add timezone to CANCEL messages
 * #424: Support php7.3
 
diff --git a/lib/Version.php b/lib/Version.php
index 4b23e0690..257e66a79 100644
--- a/lib/Version.php
+++ b/lib/Version.php
@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.1.7';
+    const VERSION = '4.2.0';
 }

From 7873294fb51867d41a13a43cbf3c0b3d69f2ddd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 19 Feb 2019 12:29:11 +0100
Subject: [PATCH 2/2] Fix code style

---
 lib/Parser/MimeDir.php               | 2 +-
 lib/Property.php                     | 2 +-
 lib/Property/VCard/DateAndOrTime.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
index 8b56d628f..10dcec89c 100644
--- a/lib/Parser/MimeDir.php
+++ b/lib/Parser/MimeDir.php
@@ -233,7 +233,7 @@ protected function parseLine($line)
      *
      * If that was not the case, we store it here.
      *
-     * @var null|string
+     * @var string|null
      */
     protected $lineBuffer;
 
diff --git a/lib/Property.php b/lib/Property.php
index 493f38ad8..6105cb0f0 100644
--- a/lib/Property.php
+++ b/lib/Property.php
@@ -158,7 +158,7 @@ public function getParts()
      * If nameless parameter is added, we try to guess its name.
      *
      * @param string            $name
-     * @param string|null|array $value
+     * @param string|array|null $value
      */
     public function add($name, $value = null)
     {
diff --git a/lib/Property/VCard/DateAndOrTime.php b/lib/Property/VCard/DateAndOrTime.php
index bf923e49d..b7e17492a 100644
--- a/lib/Property/VCard/DateAndOrTime.php
+++ b/lib/Property/VCard/DateAndOrTime.php
@@ -24,7 +24,7 @@ class DateAndOrTime extends Property
     /**
      * Field separator.
      *
-     * @var null|string
+     * @var string|null
      */
     public $delimiter = null;