Merging develop to master in preparation for 1.6.0 release.

Author: weierophinney

.travis.yml

@@ -19,8 +19,6 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -30,9 +28,20 @@ matrix:
     - php: 7.2
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=locked
+    - php: 7.3
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -2,27 +2,59 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.5.2 - TBD
+## 1.6.0 - 2019-05-07
 
 ### Added
 
-- Nothing.
+- [#46](https://github.com/phly/keep-a-changelog/pull/46) adds the `--provider-domain` option to each of the `entry:*` and `release`
+  commands, and the corresponding `domain` key in `.keep-a-changelog.ini` files.
+  The option can be used to specify a custom domain for your chosen provider; it
+  will be used to determine which git remote to push tags to, to generate links
+  for changelog entries, and to make API calls to the provider.
+
+- [#44](https://github.com/phly/keep-a-changelog/pull/44) adds the command `bump:patch` as an alias to `bump`/`bump:bugfix`.
+
+- [#33](https://github.com/phly/keep-a-changelog/pull/33) adds support for usage with the symfony/console 3.4 series.
+
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) adds the command `version:list`, which will list all versions and
+  associated release dates from the changelog file.
+
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) adds the command `version:remove <version>`, which will remove the
+  changelog entry for the provided version, if it exists.
+
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) adds the command `version:show <version>`, which will show the full
+  release entry in the changelog for the provided version, along with its
+  release date.
 
 ### Changed
 
-- Nothing.
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) aliases the `edit` command to `version:edit`.
+
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) adds an optional `<version>` argument to the `version:edit` command,
+  allowing users to edit a specific release version entry.
 
 ### Deprecated
 
-- Nothing.
+- [#41](https://github.com/phly/keep-a-changelog/pull/41) deprecates the `edit` command in favor of `version:edit`.
 
 ### Removed
 
 - Nothing.
 
 ### Fixed
 
-- Nothing.
+- [#45](https://github.com/phly/keep-a-changelog/pull/45) updates the `GitHub` provider such that it now verifies that a signed
+  commit matching the release has been pushed before attempting to create a
+  release.
+
+- [#45](https://github.com/phly/keep-a-changelog/pull/45) updates the `release` command to no longer hard-code using "origin" as the
+  remote, and to instead lookup the remote based on the provider and package.
+  When multiple remotes match (which should not happen), it will prompt the user
+  to choose one, or abort.
+
+- [#43](https://github.com/phly/keep-a-changelog/pull/43) fixes the markup used to generate a link to a merge request when using
+  GitLab as your provider. In that scenario, the markup `[!{merge number}]` will
+  now be used instead of `[#{merge number}]`.
 
 ## 1.5.1 - 2018-11-08
 
@@ -292,28 +324,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.1.3 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.1.2 - 2018-04-12
 
 ### Added

README.md

@@ -53,6 +53,10 @@ The available providers are:
 
 Currently supported commands include:
 
+- `new` will create a new changelog file for you; specify `--initial-version` or
+  `-i` if you want to start with a version other than 0.1.0; use `--file` or
+  `-f` to specify a file other than `CHANGELOG.md`.
+
 - `config` will create a config file after prompting you for the preferred
   provider and its associated token. By default, the file is stored locally as
   `.keep-a-changelog.ini`; if the `--global` (or `-g`) option is provided, the
@@ -94,8 +98,16 @@ Currently supported commands include:
 - `entry:fixed` will add a new changelog entry to the Fixed section of the
   current changelog within the `CHANGELOG.md` file.
 
-- `edit` will open the most recent changelog section in the system editor
-  to allow editing the full entry at once.
+- `version:edit` will open the most recent changelog section in the system editor
+  to allow editing the full entry at once. If you provide a `<version>`
+  argument, it will edit that specific version.
+
+- `version:list` will list all versions in the changelog, along with associated
+  release dates.
+
+- `version:remove` will remove the given version's entry from the changelog.
+
+- `version:show` will show the entry associated with the given version.
 
 For a list of required parameters and all options for a command, run:
 

bin/keep-a-changelog

@@ -2,7 +2,7 @@
 <?php
 /**
  * @see       https://github.com/phly/keep-a-changelog for the canonical source repository
- * @copyright Copyright (c) 2018 Matthew Weier O'Phinney
+ * @copyright Copyright (c) 2018-2019 Matthew Weier O'Phinney
  * @license   https://github.com/phly/keep-a-changelog/blob/master/LICENSE.md New BSD License
  */
 
@@ -38,19 +38,24 @@ $application->getDefinition()
 $application->addCommands([
     new BumpCommand(BumpCommand::BUMP_BUGFIX, 'bump'),
     new BumpCommand(BumpCommand::BUMP_BUGFIX, 'bump:bugfix'),
+    new BumpCommand(BumpCommand::BUMP_BUGFIX, 'bump:patch'),
     new BumpCommand(BumpCommand::BUMP_MINOR, 'bump:minor'),
     new BumpCommand(BumpCommand::BUMP_MAJOR, 'bump:major'),
     new BumpToVersionCommand('bump:to-version'),
     new ConfigCommand('config'),
-    new EditCommand('edit'),
+    new EditCommand('edit', $deprecated = true),
+    new EditCommand('version:edit'),
     new EntryCommand('entry:added'),
     new EntryCommand('entry:changed'),
     new EntryCommand('entry:deprecated'),
     new EntryCommand('entry:removed'),
     new EntryCommand('entry:fixed'),
+    new ListVersionsCommand('version:list'),
     new NewChangelogCommand('new'),
     new ReadyCommand('ready'),
     new ReleaseCommand('release'),
+    new RemoveCommand('version:remove'),
+    new ShowVersionCommand('version:show'),
     new TaggerCommand('tag'),
 ]);
 $application->run();

composer.json

@@ -16,7 +16,7 @@
         "m4tthumphrey/php-gitlab-api": "^9.9",
         "ocramius/package-versions": "^1.3",
         "php-http/guzzle6-adapter": "^1.1",
-        "symfony/console": "^4.0"
+        "symfony/console": "^3.4|^4.0"
     },
     "require-dev": {
         "mikey179/vfsStream": "^1.6",
@@ -38,8 +38,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.5.x-dev",
-            "dev-develop": "1.6.x-dev"
+            "dev-master": "1.6.x-dev",
+            "dev-develop": "1.7.x-dev"
         }
     },
     "bin": [

composer.lock

@@ -26,6 +26,7 @@ class BumpCommand extends Command
     public const BUMP_BUGFIX = 'bugfix';
     public const BUMP_MAJOR = 'major';
     public const BUMP_MINOR = 'minor';
+    public const BUMP_PATCH = self::BUMP_BUGFIX;
 
     private const DESC_TEMPLATE = 'Create a new changelog entry for the next %s release.';