Merge branch 'master' into add-broker-itip-process-tz-tests

CHANGELOG.md

@@ -1,6 +1,21 @@
 ChangeLog
 =========
 
+4.2.2-dev (XXXX-XX-XX)
+------------------
+
+*
+
+4.2.1 (2019-12-18)
+------------------
+
+* #469, #451: fix compat with php 7.4
+* #443: prevent running in indefinte loop
+* #449: Preventing creating a component for a root document
+* #450: Fix parse with option Forgiving with trailing equal
+* #459: fixed typo in VCalendar which resulting in usage of the wrong TimeZone
+* #462: Broker::parseEventForOrganizer copies DTSTAMP from $eventInfo that causes broken scheduling
+
 4.2.0 (2019-02-19)
 ------------------
 

lib/Cli.php

@@ -289,7 +289,7 @@ protected function showHelp()
         $this->log($this->colorize('green', '  validate').' source_file              Validates a file for correctness.');
         $this->log($this->colorize('green', '  repair').' source_file [output_file]  Repairs a file.');
         $this->log($this->colorize('green', '  convert').' source_file [output_file] Converts a file.');
-        $this->log($this->colorize('green', '  color').' source_file                 Colorize a file, useful for debbugging.');
+        $this->log($this->colorize('green', '  color').' source_file                 Colorize a file, useful for debugging.');
         $this->log(
         <<<HELP
 

lib/Version.php

@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.2.0';
+    const VERSION = '4.2.2-dev';
 }