Merging develop to master in preparation for master release.

.gitignore

@@ -1,3 +1,4 @@
+/.phpunit.result.cache
 /clover.xml
 /coveralls-upload.json
 /docs/html/

.travis.yml

@@ -33,6 +33,15 @@ matrix:
     - php: 7.3
       env:
         - DEPS=latest
+    - php: 7.4snapshot
+      env:
+        - DEPS=lowest
+    - php: 7.4snapshot
+      env:
+        - DEPS=locked
+    - php: 7.4snapshot
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -2,15 +2,15 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.1.3 - TBD
+## 2.2.0 - 2019-12-03
 
 ### Added
 
-- Nothing.
+- Adds PHP 7.4 support.
 
 ### Changed
 
-- Nothing.
+- [#63](https://github.com/phly/keep-a-changelog/pull/63) adds support for symfony/console v5 releases.
 
 ### Deprecated
 

composer.json

@@ -17,14 +17,17 @@
         "ocramius/package-versions": "^1.3",
         "php-http/guzzle6-adapter": "^1.1",
         "psr/event-dispatcher": "^1.0",
-        "symfony/console": "^3.4|^4.0"
+        "symfony/console": "^3.4 || ^4.0 || ^5.0"
     },
     "require-dev": {
         "captainhook/plugin-composer": "^4.0",
-        "phpunit/phpunit": "^7.4",
+        "phpunit/phpunit": "^8.4.3",
         "webimpress/coding-standard": "dev-master@dev",
         "zendframework/zend-coding-standard": "2.0.0-alpha.3@alpha || ^2.0"
     },
+    "conflict": {
+        "phpspec/prophecy": "<1.9.0"
+    },
     "autoload": {
         "psr-4": {
             "Phly\\KeepAChangelog\\": "src/"
@@ -40,8 +43,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev",
-            "dev-develop": "2.2.x-dev"
+            "dev-master": "2.2.x-dev",
+            "dev-develop": "2.3.x-dev"
         }
     },
     "bin": [