Merge branch '3.x-dev' into 4.x-dev

2 files changed, 10 insertions, 5 deletions

diff --git a/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php b/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
index 076cf9989a..9c1c95dde4 100644
--- a/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
+++ b/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\PrivacyManager\tests\Integration;
 use Piwik\Archive;
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\RawLogDao;
 use Piwik\Date;
 use Piwik\Db;
@@ -741,10 +742,14 @@ class DataPurgingTest extends IntegrationTestCase
         $range = $rangeStart->toString('Y-m-d') . "," . $rangeEnd->toString('Y-m-d');
 
         $rangeArchive = Archive::build(self::$idSite, 'range', $range);
-        $rangeArchive->getNumeric('nb_visits', 'nb_hits');
+        $rangeArchive->getNumeric(['nb_visits']);
 
         APIVisitorInterest::getInstance()->getNumberOfVisitsPerVisitDuration(self::$idSite, 'range', $range);
 
+        // remove invalidated
+        StaticContainer::get(Archive\ArchivePurger::class)->purgeInvalidatedArchivesFrom(Date::factory('2012-01-01'));
+        StaticContainer::get(Archive\ArchivePurger::class)->purgeInvalidatedArchivesFrom(Date::factory('2012-02-01'));
+
         // when archiving is initiated, the archive metrics & reports for EVERY loaded plugin
         // are archived. don't want this test to depend on every possible metric, so get rid of
         // the unwanted archive data now.
diff --git a/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php b/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
index 3cc563081f..27a8dbc52b 100644
--- a/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
+++ b/plugins/PrivacyManager/tests/Integration/Model/DataSubjectsTest.php
@@ -366,7 +366,7 @@ class DataSubjectsTest extends IntegrationTestCase
         $this->removeArchiveInvalidationOptions();
 
         $visitDate = Date::factory($this->theFixture->dateTime);
-        $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d') . '_12345';
+        $key = '4444_report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d') . '_12345';
         Option::set($key, '1');
 
         $this->assertArchivesHaveBeenInvalidated($visitDate, $idSite);
@@ -402,14 +402,14 @@ class DataSubjectsTest extends IntegrationTestCase
     private function assertArchivesHaveNotBeenInvalidated(Date $visitDate, $idSite)
     {
         $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d');
-        $value = Option::getLike($key . '%');
+        $value = Option::getLike('%' . $key . '%');
         $this->assertEmpty($value);
     }
 
     private function assertArchivesHaveBeenInvalidated(Date $visitDate, $idSite)
     {
         $key = 'report_to_invalidate_' . $idSite . '_' . $visitDate->toString('Y-m-d');
-        $value = Option::getLike($key . '%');
+        $value = Option::getLike('%' . $key . '%');
         $this->assertNotEmpty($value);
         $this->assertEquals('1', array_values($value)[0]);
     }
@@ -508,7 +508,7 @@ class DataSubjectsTest extends IntegrationTestCase
 
     private function removeArchiveInvalidationOptions()
     {
-        Option::deleteLike('report_to_invalidate_%');
+        Option::deleteLike('%report_to_invalidate_%');
     }
 
     private function setWebsiteTimezone($idSite, $timezone)