Fixes #6079, move skip unique visitors calculation logic to small method in ArchiveProcessor\Rules and fix build.

2 files changed, 15 insertions, 3 deletions

diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index bd0b0e3d10..2df309d69c 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -10,6 +10,7 @@ namespace Piwik;
 
 use Exception;
 use Piwik\ArchiveProcessor\Parameters;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataTable\Manager;
@@ -119,8 +120,7 @@ class ArchiveProcessor
         $this->logAggregator = new LogAggregator($params);
         $this->archiveWriter = $archiveWriter;
 
-        $this->skipUniqueVisitorsCalculationForMultipleSites =
-            Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] == 1; // TODO: move logic to Rules
+        $this->skipUniqueVisitorsCalculationForMultipleSites = Rules::shouldSkipUniqueVisitorsCalculationForMultipleSites();
     }
 
     protected function getArchive()
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 03b26acf2f..223241e980 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -285,6 +285,18 @@ class Rules
     }
 
     /**
+     * Returns true if the archiving process should skip the calculation of unique visitors
+     * across several sites. The `[General] enable_processing_unique_visitors_multiple_sites`
+     * INI config option controls the value of this variable.
+     *
+     * @return bool
+     */
+    public static function shouldSkipUniqueVisitorsCalculationForMultipleSites()
+    {
+        return Config::getInstance()->General['enable_processing_unique_visitors_multiple_sites'] == 1;
+    }
+
+    /**
      * @param array $idSites
      * @param Segment $segment
      * @return bool
@@ -310,4 +322,4 @@ class Rules
         }
         return false;
     }
-}
+}
\ No newline at end of file