From 7762f0c85eaf4cfbb5b9a4d993b5cde1274cd17c Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 11 Apr 2019 18:22:38 -0600 Subject: [PATCH 1/2] * Revert renaming of `ClearCacheCommand` to ensure CLI GPM upgrades go smoothly --- CHANGELOG.md | 6 ++++++ .../Console/Cli/{CacheCommand.php => ClearCacheCommand.php} | 2 +- system/src/Grav/Console/ConsoleTrait.php | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) rename system/src/Grav/Console/Cli/{CacheCommand.php => ClearCacheCommand.php} (98%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce03877e2..79f267efc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.6.2 +## 04/11/2019 + +1. [](#bugfix) + * Revert renaming of `ClearCacheCommand` to ensure GPM upgrades go smoothly + # v1.6.1 ## 04/11/2019 diff --git a/system/src/Grav/Console/Cli/CacheCommand.php b/system/src/Grav/Console/Cli/ClearCacheCommand.php similarity index 98% rename from system/src/Grav/Console/Cli/CacheCommand.php rename to system/src/Grav/Console/Cli/ClearCacheCommand.php index 59c48c1a2..0ab4128b9 100644 --- a/system/src/Grav/Console/Cli/CacheCommand.php +++ b/system/src/Grav/Console/Cli/ClearCacheCommand.php @@ -13,7 +13,7 @@ use Grav\Common\Cache; use Grav\Console\ConsoleCommand; use Symfony\Component\Console\Input\InputOption; -class CacheCommand extends ConsoleCommand +class ClearCacheCommand extends ConsoleCommand { protected function configure() { diff --git a/system/src/Grav/Console/ConsoleTrait.php b/system/src/Grav/Console/ConsoleTrait.php index d3e2633c7..190109517 100644 --- a/system/src/Grav/Console/ConsoleTrait.php +++ b/system/src/Grav/Console/ConsoleTrait.php @@ -13,7 +13,7 @@ use Grav\Common\Cache; use Grav\Common\Grav; use Grav\Common\Composer; use Grav\Common\GravTrait; -use Grav\Console\Cli\CacheCommand; +use Grav\Console\Cli\ClearCacheCommand; use RocketTheme\Toolbox\File\YamlFile; use Symfony\Component\Console\Formatter\OutputFormatterStyle; use Symfony\Component\Console\Input\ArrayInput; @@ -107,7 +107,7 @@ trait ConsoleTrait $all = ['--all' => true]; } - $command = new CacheCommand(); + $command = new ClearCacheCommand(); $input = new ArrayInput($all); return $command->run($input, $this->output); } From 057bdd546bbc2b23fcad8f67b42e680d8b863a78 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 11 Apr 2019 18:25:38 -0600 Subject: [PATCH 2/2] prepare for release --- CHANGELOG.md | 2 +- system/defines.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79f267efc..712aa3edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 04/11/2019 1. [](#bugfix) - * Revert renaming of `ClearCacheCommand` to ensure GPM upgrades go smoothly + * Revert renaming of `ClearCacheCommand` to ensure CLI GPM upgrades go smoothly # v1.6.1 ## 04/11/2019 diff --git a/system/defines.php b/system/defines.php index 1bd874610..5cdbc3764 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.6.1'); +define('GRAV_VERSION', '1.6.2'); define('GRAV_TESTING', false); define('DS', '/');