Fixes #6383 Invalidate caches before running the upgrade.

matomo-org · Oct 6, 2014 · eb25aea · eb25aea
1 parent 092fda6
commit eb25aea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/plugins/CoreConsole/Commands/ClearCaches.php b/plugins/CoreConsole/Commands/ClearCaches.php
@@ -30,6 +30,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        // Note: the logic for this command must be refactored in this helper function below.
         Filesystem::deleteAllCacheOnUpdate();
 
         $this->writeSuccessMessage($output, array('Caches cleared'));

diff --git a/plugins/CoreUpdater/Commands/Update.php b/plugins/CoreUpdater/Commands/Update.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CoreUpdater\Commands;
 
+use Piwik\Filesystem;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\CoreUpdater\Controller;
 use Piwik\Plugins\CoreUpdater\NoUpdatesFoundException;
@@ -35,6 +36,8 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->executeClearCaches();
+
         $doDryRun = (bool) $input->getOption('dry-run');
 
         try {
@@ -54,6 +57,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
+    protected function executeClearCaches()
+    {
+        Filesystem::deleteAllCacheOnUpdate();
+    }
+
     protected function makeUpdate(InputInterface $input, OutputInterface $output, $doDryRun)
     {
         $this->checkAllRequiredOptionsAreNotEmpty($input);