Make sure purgeOutdatedArchives task is executed in scheduled task run after core:archive run (regression caused by scheduled task execution refactor).

2 files changed, 33 insertions, 1 deletions

diff --git a/plugins/CoreAdminHome/Tasks.php b/plugins/CoreAdminHome/Tasks.php
index 2fe5a83ed9..01290f0cff 100644
--- a/plugins/CoreAdminHome/Tasks.php
+++ b/plugins/CoreAdminHome/Tasks.php
@@ -51,11 +51,15 @@ class Tasks extends \Piwik\Plugin\Tasks
         $this->weekly('updateSpammerBlacklist');
     }
 
+    /**
+     * @return bool `true` if the purge was executed, `false` if it was skipped.
+     * @throws \Exception
+     */
     public function purgeOutdatedArchives()
     {
         if ($this->willPurgingCausePotentialProblemInUI()) {
             $this->logger->info("Purging temporary archives: skipped (browser triggered archiving not enabled & not running after core:archive)");
-            return;
+            return false;
         }
 
         $archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
@@ -86,6 +90,8 @@ class Tasks extends \Piwik\Plugin\Tasks
                 $this->logger->info("Skipping purging of archive tables *_{year}_{month}, year <= 1990.", array('year' => $year, 'month' => $month));
             }
         }
+
+        return true;
     }
 
     public function purgeInvalidatedArchives()
diff --git a/plugins/CoreAdminHome/tests/Integration/TasksTest.php b/plugins/CoreAdminHome/tests/Integration/TasksTest.php
index ff4822fbce..1b25833712 100644
--- a/plugins/CoreAdminHome/tests/Integration/TasksTest.php
+++ b/plugins/CoreAdminHome/tests/Integration/TasksTest.php
@@ -8,6 +8,7 @@
 namespace Piwik\Plugins\CoreAdminHome\tests\Integration;
 
 use Piwik\Archive\ArchivePurger;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\Date;
 use Piwik\Plugins\CoreAdminHome\Tasks;
 use Piwik\Plugins\CoreAdminHome\Tasks\ArchivesToPurgeDistributedList;
@@ -55,6 +56,13 @@ class TasksTest extends IntegrationTestCase
         $this->tasks = new Tasks($archivePurger, new NullLogger());
     }
 
+    public function tearDown()
+    {
+        unset($_GET['trigger']);
+
+        parent::tearDown();
+    }
+
     public function test_purgeInvalidatedArchives_PurgesCorrectInvalidatedArchives_AndOnlyPurgesDataForDatesAndSites_InInvalidatedReportsDistributedList()
     {
         $this->setUpInvalidatedReportsDistributedList($dates = array($this->february));
@@ -71,6 +79,24 @@ class TasksTest extends IntegrationTestCase
         $this->assertEmpty($yearMonths);
     }
 
+    public function test_purgeOutdatedArchives_SkipsPurging_WhenBrowserArchivingDisabled_AndCronArchiveTriggerNotPresent()
+    {
+        Rules::setBrowserTriggerArchiving(false);
+        unset($_GET['trigger']);
+
+        $wasPurged = $this->tasks->purgeOutdatedArchives();
+        $this->assertFalse($wasPurged);
+    }
+
+    public function test_purgeOutdatedArchives_Purges_WhenBrowserArchivingEnabled_AndCronArchiveTriggerPresent()
+    {
+        Rules::setBrowserTriggerArchiving(false);
+        $_GET['trigger'] = 'archivephp';
+
+        $wasPurged = $this->tasks->purgeOutdatedArchives();
+        $this->assertTrue($wasPurged);
+    }
+
     /**
      * @param Date[] $dates
      */