โ');
diff --git a/plugins/GeoIp2/Controller.php b/plugins/GeoIp2/Controller.php
index 9a66c885bbf..e908e9a3bb0 100644
--- a/plugins/GeoIp2/Controller.php
+++ b/plugins/GeoIp2/Controller.php
@@ -150,7 +150,10 @@ public function downloadMissingGeoIpDb()
// download part of the file
$result = Http::downloadChunk(
- $url, $outputPath, Common::getRequestVar('continue', true, 'int'));
+ $url,
+ $outputPath,
+ Common::getRequestVar('continue', true, 'int')
+ );
// if the file is done
if ($result['current_size'] >= $result['expected_file_size']) {
diff --git a/plugins/GeoIp2/GeoIP2AutoUpdater.php b/plugins/GeoIp2/GeoIP2AutoUpdater.php
index b4129c9e11d..e33fc735ca3 100644
--- a/plugins/GeoIp2/GeoIP2AutoUpdater.php
+++ b/plugins/GeoIp2/GeoIP2AutoUpdater.php
@@ -232,8 +232,10 @@ public static function unzipDownloadedFile($path, $dbType, $url, $unlink = false
$content = $unzip->listContent();
if (empty($content)) {
- throw new Exception(Piwik::translate('GeoIp2_CannotListContent',
- array("'$path'", $unzip->errorInfo())));
+ throw new Exception(Piwik::translate(
+ 'GeoIp2_CannotListContent',
+ array("'$path'", $unzip->errorInfo())
+ ));
}
$fileToExtract = null;
@@ -249,16 +251,20 @@ public static function unzipDownloadedFile($path, $dbType, $url, $unlink = false
}
if ($fileToExtract === null) {
- throw new Exception(Piwik::translate('GeoIp2_CannotFindGeoIPDatabaseInArchive',
- array("'$path'")));
+ throw new Exception(Piwik::translate(
+ 'GeoIp2_CannotFindGeoIPDatabaseInArchive',
+ array("'$path'")
+ ));
}
// extract JUST the .dat file
$unzipped = $unzip->extractInString($fileToExtract);
if (empty($unzipped)) {
- throw new Exception(Piwik::translate('GeoIp2_CannotUnzipGeoIPFile',
- array("'$path'", $unzip->errorInfo())));
+ throw new Exception(Piwik::translate(
+ 'GeoIp2_CannotUnzipGeoIPFile',
+ array("'$path'", $unzip->errorInfo())
+ ));
}
$dbFilename = basename($fileToExtract);
@@ -285,8 +291,10 @@ public static function unzipDownloadedFile($path, $dbType, $url, $unlink = false
$success = $unzip->extract($outputPath);
if ($success !== true) {
- throw new Exception(Piwik::translate('General_CannotUnzipFile',
- array("'$path'", $unzip->errorInfo())));
+ throw new Exception(Piwik::translate(
+ 'General_CannotUnzipFile',
+ array("'$path'", $unzip->errorInfo())
+ ));
}
if ($isDbIpUnknownDbType) {
@@ -578,7 +586,8 @@ public static function getMissingDatabases()
// if a database of the type does not exist, but there's a url to update, then
// a database is missing
$path = LocationProviderGeoIp2::getPathToGeoIpDatabase(
- LocationProviderGeoIp2::$dbNames[$key]);
+ LocationProviderGeoIp2::$dbNames[$key]
+ );
if ($path === false) {
$result[] = $key;
}
diff --git a/plugins/GeoIp2/GeoIp2.php b/plugins/GeoIp2/GeoIp2.php
index 273cffeacdd..4eb29a052c1 100644
--- a/plugins/GeoIp2/GeoIp2.php
+++ b/plugins/GeoIp2/GeoIp2.php
@@ -82,7 +82,10 @@ public function getClientSideTranslationKeys(&$translationKeys)
*/
public function installationFormInit(FormDefaultSettings $form)
{
- $form->addElement('checkbox', 'setup_geoip2', null,
+ $form->addElement(
+ 'checkbox',
+ 'setup_geoip2',
+ null,
[
'content' => ' ' . Piwik::translate('GeoIp2_AutomaticSetup')
]
@@ -116,8 +119,11 @@ public function installationFormSubmit(FormDefaultSettings $form)
// otherwise ensure it will be run soonish as scheduled task
if ($cliMulti->supportsAsync()) {
$phpCli = new CliMulti\CliPhp();
- $command = sprintf('%s %s/console core:run-scheduled-tasks --force "Piwik\Plugins\GeoIp2\GeoIP2AutoUpdater.update" > /dev/null 2>&1 &',
- $phpCli->findPhpBinary(), PIWIK_INCLUDE_PATH);
+ $command = sprintf(
+ '%s %s/console core:run-scheduled-tasks --force "Piwik\Plugins\GeoIp2\GeoIP2AutoUpdater.update" > /dev/null 2>&1 &',
+ $phpCli->findPhpBinary(),
+ PIWIK_INCLUDE_PATH
+ );
shell_exec($command);
} else {
/** @var Scheduler $scheduler */
diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php b/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php
index 1841c12cd52..03baef50c1d 100644
--- a/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php
+++ b/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php
@@ -432,8 +432,10 @@ public function getInfo()
$desc = Piwik::translate('GeoIp2_LocationProviderDesc_Php') . '
';
if (extension_loaded('maxminddb')) {
- $desc .= Piwik::translate('GeoIp2_LocationProviderDesc_Php_WithExtension',
- array('', ''));
+ $desc .= Piwik::translate(
+ 'GeoIp2_LocationProviderDesc_Php_WithExtension',
+ array('', '')
+ );
}
$installDocs = ''
diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2/ServerModule.php b/plugins/GeoIp2/LocationProvider/GeoIp2/ServerModule.php
index 07658e43556..16a7721a95a 100644
--- a/plugins/GeoIp2/LocationProvider/GeoIp2/ServerModule.php
+++ b/plugins/GeoIp2/LocationProvider/GeoIp2/ServerModule.php
@@ -220,8 +220,10 @@ public function getInfo()
. '
'
. Piwik::translate('GeoIp2_GeoIPLocationProviderDesc_ServerBasedAnonWarn')
. '
'
- . Piwik::translate('GeoIp2_LocationProviderDesc_ServerModule2',
- array('', '', '', ''));
+ . Piwik::translate(
+ 'GeoIp2_LocationProviderDesc_ServerModule2',
+ array('', '', '', '')
+ );
$installDocs =
''
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 6c0c12df7ff..7cc4fb10628 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -541,8 +541,10 @@ public function get($idSite, $period, $date, $segment = false, $idGoal = false,
} finally {
\Piwik\Plugin\Archiver::$ARCHIVE_DEPENDENT = $startingArchiveDependent;
}
- $tableSegmented->filter('Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames',
- array($appendToMetricName));
+ $tableSegmented->filter(
+ 'Piwik\Plugins\Goals\DataTable\Filter\AppendNameToColumnNames',
+ array($appendToMetricName)
+ );
if (!isset($table)) {
$table = $tableSegmented;
@@ -779,11 +781,19 @@ protected function getGoalSpecificDataTable($recordName, $idSite, $period, $date
public function getDaysToConversion($idSite, $period, $date, $segment = false, $idGoal = false)
{
$dataTable = $this->getGoalSpecificDataTable(
- Archiver::DAYS_UNTIL_CONV_RECORD_NAME, $idSite, $period, $date, $segment, $idGoal);
+ Archiver::DAYS_UNTIL_CONV_RECORD_NAME,
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ $idGoal
+ );
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter(
- 'BeautifyRangeLabels', array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays')));
+ 'BeautifyRangeLabels',
+ array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays'))
+ );
return $dataTable;
}
@@ -804,11 +814,19 @@ public function getDaysToConversion($idSite, $period, $date, $segment = false, $
public function getVisitsUntilConversion($idSite, $period, $date, $segment = false, $idGoal = false)
{
$dataTable = $this->getGoalSpecificDataTable(
- Archiver::VISITS_UNTIL_RECORD_NAME, $idSite, $period, $date, $segment, $idGoal);
+ Archiver::VISITS_UNTIL_RECORD_NAME,
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ $idGoal
+ );
$dataTable->queueFilter('Sort', array('label', 'asc', true, false));
$dataTable->queueFilter(
- 'BeautifyRangeLabels', array(Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits')));
+ 'BeautifyRangeLabels',
+ array(Piwik::translate('General_OneVisit'), Piwik::translate('General_NVisits'))
+ );
return $dataTable;
}
@@ -830,8 +848,14 @@ protected function enrichItemsTableWithViewMetrics($dataTable, $recordName, $idS
}
// Enrich the datatable with Product/Categories views, and conversion rates
- $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables($idSite, $period, $date, $segment, $expanded = false,
- $_leavePiwikCoreVariables = true);
+ $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables(
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ $expanded = false,
+ $_leavePiwikCoreVariables = true
+ );
$mapping = array(
'Goals_ItemsSku' => '_pks',
'Goals_ItemsName' => '_pkn',
diff --git a/plugins/Goals/Commands/CalculateConversionPages.php b/plugins/Goals/Commands/CalculateConversionPages.php
index 843c753cc6a..9ee21273ebb 100644
--- a/plugins/Goals/Commands/CalculateConversionPages.php
+++ b/plugins/Goals/Commands/CalculateConversionPages.php
@@ -32,8 +32,12 @@ protected function configure()
$this->setDescription('Calculate the pages before metric for historic conversions');
$this->addOptionalValueOption('dates', null, 'Calculate for conversions in this date range. Eg, 2012-01-01,2013-01-01', null);
$this->addOptionalValueOption('last-n', null, 'Calculate just the last n conversions', 0);
- $this->addOptionalValueOption('idsite', null,
- 'Calculate for conversions belonging to the site with this ID. Comma separated list of website id. Eg, 1, 2, 3, etc. By default conversions from all sites are calculated.', null);
+ $this->addOptionalValueOption(
+ 'idsite',
+ null,
+ 'Calculate for conversions belonging to the site with this ID. Comma separated list of website id. Eg, 1, 2, 3, etc. By default conversions from all sites are calculated.',
+ null
+ );
$this->addOptionalValueOption('idgoal', null, 'Calculate conversions for this goal. A comma separated list of goal ids can be used only if a single site is specified. Eg, 1, 2, 3, etc. By default conversions for all goals are calculated.', null);
$this->addOptionalValueOption('force-recalc', null, 'Recalculate for conversions which already have a pages before value', 0);
}
@@ -70,8 +74,8 @@ protected function doExecute(): int
"Preparing to calculate the pages before metric for %s conversions belonging to %s %sfor %s.",
$lastN ? "the last " . $lastN : 'all',
$idSite ? "website $idSite" : "ALL websites",
- !empty($dates) ? "between " . $from . " and " . $to . " " : '',
- $idGoal ? "goal id $idGoal" : "ALL goals"
+ !empty($dates) ? "between " . $from . " and " . $to . " " : '',
+ $idGoal ? "goal id $idGoal" : "ALL goals"
));
$timer = new Timer();
@@ -108,8 +112,10 @@ public static function calculateYesterdayAndToday(): void
{
$migration = StaticContainer::get(MigrationFactory::class);
- $queries = self::getQueries(Date::factory('yesterday')->getDatetime(),
- Date::factory('today')->getEndOfDay()->getDatetime());
+ $queries = self::getQueries(
+ Date::factory('yesterday')->getDatetime(),
+ Date::factory('today')->getEndOfDay()->getDatetime()
+ );
$migrations = [];
foreach ($queries as $query) {
diff --git a/plugins/Goals/RecordBuilders/GeneralGoalsRecords.php b/plugins/Goals/RecordBuilders/GeneralGoalsRecords.php
index c57205e3b2e..283192e868d 100644
--- a/plugins/Goals/RecordBuilders/GeneralGoalsRecords.php
+++ b/plugins/Goals/RecordBuilders/GeneralGoalsRecords.php
@@ -69,10 +69,16 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
if ($siteHasEcommerceOrGoals) {
$selects = [];
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- self::VISITS_COUNT_FIELD, Archiver::$visitCountRanges, self::LOG_CONVERSION_TABLE, $prefixes[Archiver::VISITS_UNTIL_RECORD_NAME]
+ self::VISITS_COUNT_FIELD,
+ Archiver::$visitCountRanges,
+ self::LOG_CONVERSION_TABLE,
+ $prefixes[Archiver::VISITS_UNTIL_RECORD_NAME]
));
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- 'FLOOR(log_conversion.' . self::SECONDS_SINCE_FIRST_VISIT_FIELD . ' / 86400)', Archiver::$daysToConvRanges, self::LOG_CONVERSION_TABLE, $prefixes[Archiver::DAYS_UNTIL_CONV_RECORD_NAME]
+ 'FLOOR(log_conversion.' . self::SECONDS_SINCE_FIRST_VISIT_FIELD . ' / 86400)',
+ Archiver::$daysToConvRanges,
+ self::LOG_CONVERSION_TABLE,
+ $prefixes[Archiver::DAYS_UNTIL_CONV_RECORD_NAME]
));
$query = $logAggregator->queryConversionsByDimension([], false, $selects);
diff --git a/plugins/Goals/TranslationHelper.php b/plugins/Goals/TranslationHelper.php
index 06d13f64f1a..f85b9530791 100644
--- a/plugins/Goals/TranslationHelper.php
+++ b/plugins/Goals/TranslationHelper.php
@@ -89,19 +89,22 @@ protected function getTranslationForPattern($patternType, $pattern)
{
switch ($patternType) {
case 'regex':
- return sprintf('%s %s',
+ return sprintf(
+ '%s %s',
Piwik::translate('Goals_Pattern'),
Piwik::translate('Goals_MatchesExpression', array($pattern))
);
case 'contains':
- return sprintf('%s %s',
+ return sprintf(
+ '%s %s',
Piwik::translate('Goals_Pattern'),
Piwik::translate('Goals_Contains', array($pattern))
);
case 'exact':
- return sprintf('%s %s',
+ return sprintf(
+ '%s %s',
Piwik::translate('Goals_Pattern'),
Piwik::translate('Goals_IsExactly', array($pattern))
);
diff --git a/plugins/Goals/tests/System/CalculateConversionPagesCommandTest.php b/plugins/Goals/tests/System/CalculateConversionPagesCommandTest.php
index 7933fa885a5..5e64c74a97d 100644
--- a/plugins/Goals/tests/System/CalculateConversionPagesCommandTest.php
+++ b/plugins/Goals/tests/System/CalculateConversionPagesCommandTest.php
@@ -71,8 +71,10 @@ public function test_CommandSuccessfullyCalculates_ForLastN()
*/
private function unsetPageviewsBefore(): void
{
- Db::query('UPDATE ' . Common::prefixTable('log_conversion') . ' SET pageviews_before = NULL WHERE idsite = ?',
- [self::$fixture->idSite]);
+ Db::query(
+ 'UPDATE ' . Common::prefixTable('log_conversion') . ' SET pageviews_before = NULL WHERE idsite = ?',
+ [self::$fixture->idSite]
+ );
}
/**
diff --git a/plugins/Goals/tests/System/NumericAttributeGoalTrackingTest.php b/plugins/Goals/tests/System/NumericAttributeGoalTrackingTest.php
index 0691a5679ba..7dfe4c1ec59 100644
--- a/plugins/Goals/tests/System/NumericAttributeGoalTrackingTest.php
+++ b/plugins/Goals/tests/System/NumericAttributeGoalTrackingTest.php
@@ -57,7 +57,9 @@ protected static function configureFixture($fixture)
private function getConversionCount($idGoal)
{
- return Db::fetchOne('SELECT COUNT(*) FROM ' . Common::prefixTable('log_conversion') . ' WHERE idsite = ? AND idgoal = ?',
- [$this->idSite, $idGoal]);
+ return Db::fetchOne(
+ 'SELECT COUNT(*) FROM ' . Common::prefixTable('log_conversion') . ' WHERE idsite = ? AND idgoal = ?',
+ [$this->idSite, $idGoal]
+ );
}
}
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index 14f96a7860f..c101330fbdc 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -244,10 +244,10 @@ public function get(
$ordinateColumns[] = key($metadata['metrics']);
} else {
throw new Exception(
- Piwik::translate(
- 'ImageGraph_ColumnOrdinateMissing',
- array(self::DEFAULT_ORDINATE_METRIC, implode(',', array_keys($reportColumns)))
- )
+ Piwik::translate(
+ 'ImageGraph_ColumnOrdinateMissing',
+ array(self::DEFAULT_ORDINATE_METRIC, implode(',', array_keys($reportColumns)))
+ )
);
}
} else {
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index 464383007e7..a2830d16476 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -339,7 +339,9 @@ protected function getTextWidthHeight($text, $fontSize = false)
// could not find a way to get pixel perfect width & height info using imageftbbox
$textInfo = $this->pImage->drawText(
- 0, 0, $text,
+ 0,
+ 0,
+ $text,
array(
'Alpha' => 0,
'FontSize' => $fontSize,
diff --git a/plugins/Insights/tests/Unit/InsightReportTest.php b/plugins/Insights/tests/Unit/InsightReportTest.php
index 19a88dbb030..4ed8def81a2 100644
--- a/plugins/Insights/tests/Unit/InsightReportTest.php
+++ b/plugins/Insights/tests/Unit/InsightReportTest.php
@@ -438,8 +438,19 @@ private function generateMoverAndShaker($totalValue, $lastTotalValue, $orderBy =
$reportMetadata = array('name' => 'TestReport', 'metrics' => array('nb_visits' => 'Visits'));
$report = $this->insightReport->generateMoverAndShaker(
- $reportMetadata, 'day', '2012-12-12', '2012-12-11', 'nb_visits', $this->currentTable, $this->pastTable,
- $totalValue, $lastTotalValue, $orderBy, $limitIncreaser, $limitDecreaser);
+ $reportMetadata,
+ 'day',
+ '2012-12-12',
+ '2012-12-11',
+ 'nb_visits',
+ $this->currentTable,
+ $this->pastTable,
+ $totalValue,
+ $lastTotalValue,
+ $orderBy,
+ $limitIncreaser,
+ $limitDecreaser
+ );
return $report;
}
@@ -453,9 +464,23 @@ private function generateInsight($minMoversPercent, $minNewPercent, $minDisappea
$reportMetadata = array('name' => 'TestReport', 'metrics' => array('nb_visits' => 'Visits'));
$report = $this->insightReport->generateInsight(
- $reportMetadata, 'day', '2012-12-12', '2012-12-11', 'nb_visits', $this->currentTable, $this->pastTable,
- $totalValue = 200, $minMoversPercent, $minNewPercent, $minDisappearedPercent,
- $minGrowthPercentPositive, $minGrowthPercentNegative, $orderBy, $limitIncreaser, $limitDecreaser);
+ $reportMetadata,
+ 'day',
+ '2012-12-12',
+ '2012-12-11',
+ 'nb_visits',
+ $this->currentTable,
+ $this->pastTable,
+ $totalValue = 200,
+ $minMoversPercent,
+ $minNewPercent,
+ $minDisappearedPercent,
+ $minGrowthPercentPositive,
+ $minGrowthPercentNegative,
+ $orderBy,
+ $limitIncreaser,
+ $limitDecreaser
+ );
return $report;
}
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 30d00d32225..2f13ecbfc42 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -289,9 +289,11 @@ function setupSuperUser()
$loginName = $form->getSubmitValue('login');
$email = $form->getSubmitValue('email');
- $this->createSuperUser($loginName,
- $form->getSubmitValue('password'),
- $email);
+ $this->createSuperUser(
+ $loginName,
+ $form->getSubmitValue('password'),
+ $email
+ );
$newsletterPiwikORG = $form->getSubmitValue('subscribe_newsletter_piwikorg');
$newsletterProfessionalServices = $form->getSubmitValue('subscribe_newsletter_professionalservices');
@@ -628,7 +630,8 @@ private function checkPiwikIsNotInstalled($possibleErrorMessage = null)
$possibleErrorMessage = $possibleErrorMessage ? sprintf('
Original error was "%s".
', $possibleErrorMessage) : '';
\Piwik\Plugins\Login\Controller::clearSession();
- $message = Piwik::translate('Installation_InvalidStateError',
+ $message = Piwik::translate(
+ 'Installation_InvalidStateError',
array($possibleErrorMessage . '
',
// piwik-is-already-installed is checked against in checkPiwikServerWorking
'',
diff --git a/plugins/Installation/Menu.php b/plugins/Installation/Menu.php
index 5e20199fae4..836291b752c 100644
--- a/plugins/Installation/Menu.php
+++ b/plugins/Installation/Menu.php
@@ -17,9 +17,11 @@ class Menu extends \Piwik\Plugin\Menu
public function configureAdminMenu(MenuAdmin $menu)
{
if (Piwik::hasUserSuperUserAccess() && Manager::getInstance()->isPluginActivated('Diagnostics')) {
- $menu->addDiagnosticItem('Installation_SystemCheck',
- $this->urlForAction('systemCheckPage'),
- $order = 1);
+ $menu->addDiagnosticItem(
+ 'Installation_SystemCheck',
+ $this->urlForAction('systemCheckPage'),
+ $order = 1
+ );
}
}
}
diff --git a/plugins/Installation/ServerFilesGenerator.php b/plugins/Installation/ServerFilesGenerator.php
index 04e98110909..b92408abfc2 100644
--- a/plugins/Installation/ServerFilesGenerator.php
+++ b/plugins/Installation/ServerFilesGenerator.php
@@ -128,7 +128,8 @@ protected static function createWebConfigFiles()
if (!SettingsServer::isIIS()) {
return;
}
- @file_put_contents(PIWIK_INCLUDE_PATH . '/web.config',
+ @file_put_contents(
+ PIWIK_INCLUDE_PATH . '/web.config',
'
@@ -167,7 +168,8 @@ protected static function createWebConfigFiles()
-');
+'
+ );
// deny direct access to .php files
$directoriesToProtect = array(
@@ -183,7 +185,8 @@ protected static function createWebConfigFiles()
';
foreach ($directoriesToProtect as $directoryToProtect) {
- @file_put_contents(PIWIK_INCLUDE_PATH . $directoryToProtect . '/web.config',
+ @file_put_contents(
+ PIWIK_INCLUDE_PATH . $directoryToProtect . '/web.config',
'
@@ -195,7 +198,8 @@ protected static function createWebConfigFiles()
-');
+'
+ );
}
}
diff --git a/plugins/Intl/DateTimeFormatProvider.php b/plugins/Intl/DateTimeFormatProvider.php
index e4fa6ac2358..88c1b70793a 100644
--- a/plugins/Intl/DateTimeFormatProvider.php
+++ b/plugins/Intl/DateTimeFormatProvider.php
@@ -101,7 +101,8 @@ public function getRangeFormatPattern($short = false, $maxDifference = 'Y')
'Intl_Format_Interval_%s_%s',
$short ? 'Short' : 'Long',
$maxDifference
- ));
+ )
+ );
}
protected function getTimeFormat()
diff --git a/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php b/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php
index 8ed41e8783a..017d8f7172c 100644
--- a/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php
+++ b/plugins/IntranetMeasurable/tests/Fixtures/IntranetSitesWithVisits.php
@@ -38,9 +38,15 @@ private function setUpWebsites()
{
if (!self::siteCreated($this->idSite)) {
Fixture::createWebsite(
- '2014-01-02 03:04:05', $ecommerce = 0, $siteName = false, $siteUrl = false,
- $siteSearch = 1, $searchKeywordParameters = null,
- $searchCategoryParameters = null, $timezone = null, Type::ID
+ '2014-01-02 03:04:05',
+ $ecommerce = 0,
+ $siteName = false,
+ $siteUrl = false,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $timezone = null,
+ Type::ID
);
}
diff --git a/plugins/LanguagesManager/Commands/SetTranslations.php b/plugins/LanguagesManager/Commands/SetTranslations.php
index 29b4c58b3d1..5392890726e 100644
--- a/plugins/LanguagesManager/Commands/SetTranslations.php
+++ b/plugins/LanguagesManager/Commands/SetTranslations.php
@@ -41,14 +41,16 @@ protected function doExecute(): int
$languageCodes = (new API())->getAvailableLanguages(true);
if (empty($languageCode) || !in_array($languageCode, $languageCodes)) {
- $languageCode = $this->askAndValidate('Please provide a valid language code: ',
+ $languageCode = $this->askAndValidate(
+ 'Please provide a valid language code: ',
function ($code) use ($languageCodes) {
if (!in_array($code, array_values($languageCodes))) {
throw new \InvalidArgumentException(sprintf('Language code "%s" is invalid.', $code));
}
return $code;
- });
+ }
+ );
}
if (empty($filename) || !file_exists($filename)) {
diff --git a/plugins/LanguagesManager/Menu.php b/plugins/LanguagesManager/Menu.php
index 76a46f040a3..951f6421796 100644
--- a/plugins/LanguagesManager/Menu.php
+++ b/plugins/LanguagesManager/Menu.php
@@ -27,8 +27,10 @@ public function configureTopMenu(MenuTop $menu)
public function configureAdminMenu(MenuAdmin $menu)
{
if (Development::isEnabled() && Piwik::isUserHasSomeAdminAccess()) {
- $menu->addDevelopmentItem('LanguagesManager_TranslationSearch',
- $this->urlForAction('searchTranslation'));
+ $menu->addDevelopmentItem(
+ 'LanguagesManager_TranslationSearch',
+ $this->urlForAction('searchTranslation')
+ );
}
}
}
diff --git a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php b/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
index d04fc22027a..82e223200d8 100644
--- a/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
+++ b/plugins/LanguagesManager/tests/Integration/LanguagesManagerTest.php
@@ -147,8 +147,11 @@ function testTranslationsUseNumberedPlaceholders()
$translations = $translator->getAllTranslations();
foreach ($translations as $plugin => $pluginTranslations) {
foreach ($pluginTranslations as $key => $pluginTranslation) {
- $this->assertLessThanOrEqual(1, substr_count($pluginTranslation, '%s'),
- sprintf('%s.%s must use numbered placeholders instead of multiple %%s', $plugin, $key));
+ $this->assertLessThanOrEqual(
+ 1,
+ substr_count($pluginTranslation, '%s'),
+ sprintf('%s.%s must use numbered placeholders instead of multiple %%s', $plugin, $key)
+ );
}
}
}
@@ -173,8 +176,11 @@ function testTranslationsUseEscapedPercentSigns()
foreach ($pluginTranslations as $key => $pluginTranslation) {
$pluginTranslation = preg_replace('/(%(?:[1-9]\$)?[a-z])/', '', $pluginTranslation); // remove placeholders
$pluginTranslation = str_replace('%%', '', $pluginTranslation); // remove already escaped symbols
- $this->assertEquals(0, substr_count($pluginTranslation, '%'),
- sprintf('%s.%s must use escaped %% symbols', $plugin, $key));
+ $this->assertEquals(
+ 0,
+ substr_count($pluginTranslation, '%'),
+ sprintf('%s.%s must use escaped %% symbols', $plugin, $key)
+ );
}
}
}
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 5e0e116f382..857e2ab3834 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -226,8 +226,17 @@ public function getVisitorProfile($idSite, $visitorId = false, $segment = false,
$limit = Config::getInstance()->General['live_visitor_profile_max_visits_to_aggregate'];
- $visits = $this->loadLastVisitsDetailsFromDatabase($idSite, $period = false, $date = false, $segment,
- $offset = 0, $limit, false, false, $visitorId);
+ $visits = $this->loadLastVisitsDetailsFromDatabase(
+ $idSite,
+ $period = false,
+ $date = false,
+ $segment,
+ $offset = 0,
+ $limit,
+ false,
+ false,
+ $visitorId
+ );
$this->addFilterToCleanVisitors($visits, $idSite, $flat = false, $doNotFetchActions = false, $filterNow = true);
if ($visits->getRowsCount() == 0) {
@@ -255,21 +264,38 @@ public function getMostRecentVisitorId($idSite, $segment = false)
$minTimestamp = Date::now()->subDay(7)->getTimestamp();
$dataTable = $this->loadLastVisitsDetailsFromDatabase(
- $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1, $minTimestamp
+ $idSite,
+ $period = false,
+ $date = false,
+ $segment,
+ $offset = 0,
+ $limit = 1,
+ $minTimestamp
);
if (0 >= $dataTable->getRowsCount()) {
$minTimestamp = Date::now()->subYear(1)->getTimestamp();
// no visitor found in last 7 days, look further back for up to 1 year. This query will be slower
$dataTable = $this->loadLastVisitsDetailsFromDatabase(
- $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1, $minTimestamp
+ $idSite,
+ $period = false,
+ $date = false,
+ $segment,
+ $offset = 0,
+ $limit = 1,
+ $minTimestamp
);
}
if (0 >= $dataTable->getRowsCount()) {
// no visitor found in last year, look over all logs. This query might be quite slow
$dataTable = $this->loadLastVisitsDetailsFromDatabase(
- $idSite, $period = false, $date = false, $segment, $offset = 0, $limit = 1
+ $idSite,
+ $period = false,
+ $date = false,
+ $segment,
+ $offset = 0,
+ $limit = 1
);
}
diff --git a/plugins/Live/Model.php b/plugins/Live/Model.php
index 226b6db3926..d4546b340ff 100644
--- a/plugins/Live/Model.php
+++ b/plugins/Live/Model.php
@@ -579,7 +579,8 @@ public function makeLogVisitsQueryString($idSite, $startDate, $endDate, $segment
if (!$visitorId) {
// for now let's not apply when looking for a specific visitor
- $innerQuery['sql'] = DbHelper::addMaxExecutionTimeHintToQuery($innerQuery['sql'],
+ $innerQuery['sql'] = DbHelper::addMaxExecutionTimeHintToQuery(
+ $innerQuery['sql'],
$this->getLiveQueryMaxExecutionTime()
);
}
diff --git a/plugins/Live/tests/Integration/ModelTest.php b/plugins/Live/tests/Integration/ModelTest.php
index 8b87c885867..20ca59ad102 100644
--- a/plugins/Live/tests/Integration/ModelTest.php
+++ b/plugins/Live/tests/Integration/ModelTest.php
@@ -215,15 +215,15 @@ public function test_makeLogVisitsQueryString()
$model = new Model();
list($dateStart, $dateEnd) = $model->getStartAndEndDate($idSite = 1, 'month', '2010-01-01');
list($sql, $bind) = $model->makeLogVisitsQueryString(
- $idSite = 1,
- $dateStart,
- $dateEnd,
- $segment = false,
- $offset = 0,
- $limit = 100,
- $visitorId = false,
- $minTimestamp = false,
- $filterSortOrder = false
+ $idSite = 1,
+ $dateStart,
+ $dateEnd,
+ $segment = false,
+ $offset = 0,
+ $limit = 100,
+ $visitorId = false,
+ $minTimestamp = false,
+ $filterSortOrder = false
);
$expectedSql = ' SELECT log_visit.*
FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
@@ -250,15 +250,15 @@ public function test_makeLogVisitsQueryString_withMultipleIdSites()
$model = new Model();
list($dateStart, $dateEnd) = $model->getStartAndEndDate($idSite = 1, 'month', '2010-01-01');
list($sql, $bind) = $model->makeLogVisitsQueryString(
- $idSite = 1,
- $dateStart,
- $dateEnd,
- $segment = false,
- $offset = 0,
- $limit = 100,
- $visitorId = false,
- $minTimestamp = false,
- $filterSortOrder = false
+ $idSite = 1,
+ $dateStart,
+ $dateEnd,
+ $segment = false,
+ $offset = 0,
+ $limit = 100,
+ $visitorId = false,
+ $minTimestamp = false,
+ $filterSortOrder = false
);
$expectedSql = ' SELECT log_visit.*
FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
@@ -284,15 +284,15 @@ public function test_makeLogVisitsQueryStringWithOffset()
list($dateStart, $dateEnd) = $model->getStartAndEndDate($idSite = 1, 'month', '2010-01-01');
list($sql, $bind) = $model->makeLogVisitsQueryString(
- $idSite = 1,
- $dateStart,
- $dateEnd,
- $segment = false,
- $offset = 15,
- $limit = 100,
- $visitorId = false,
- $minTimestamp = false,
- $filterSortOrder = false
+ $idSite = 1,
+ $dateStart,
+ $dateEnd,
+ $segment = false,
+ $offset = 15,
+ $limit = 100,
+ $visitorId = false,
+ $minTimestamp = false,
+ $filterSortOrder = false
);
$expectedSql = ' SELECT log_visit.*
FROM ' . Common::prefixTable('log_visit') . ' AS log_visit
diff --git a/plugins/Login/Emails/PasswordResetEmail.php b/plugins/Login/Emails/PasswordResetEmail.php
index c5954b94dcb..636848d311c 100644
--- a/plugins/Login/Emails/PasswordResetEmail.php
+++ b/plugins/Login/Emails/PasswordResetEmail.php
@@ -65,8 +65,10 @@ private function getDefaultSubject()
*/
private function getDefaultBodyText(): string
{
- return Piwik::translate('Login_MailPasswordChangeBody2',
- [Common::sanitizeInputValue($this->login), Common::sanitizeInputValue($this->ip), Common::sanitizeInputValue($this->resetUrl)]);
+ return Piwik::translate(
+ 'Login_MailPasswordChangeBody2',
+ [Common::sanitizeInputValue($this->login), Common::sanitizeInputValue($this->ip), Common::sanitizeInputValue($this->resetUrl)]
+ );
}
/**
@@ -79,11 +81,13 @@ private function getHTMLBody(): string
return '' . str_replace(
"\n\n",
"
",
- Piwik::translate('Login_MailPasswordChangeBody2',
+ Piwik::translate(
+ 'Login_MailPasswordChangeBody2',
[Common::sanitizeInputValue($this->login),
Common::sanitizeInputValue($this->ip),
'
' .
- Common::sanitizeInputValue($this->resetUrl) . '
'])
+ Common::sanitizeInputValue($this->resetUrl) . '']
+ )
) . "";
}
}
diff --git a/plugins/Marketplace/Api/Service.php b/plugins/Marketplace/Api/Service.php
index 7d7670e87ff..afbdbb50cda 100644
--- a/plugins/Marketplace/Api/Service.php
+++ b/plugins/Marketplace/Api/Service.php
@@ -98,17 +98,23 @@ public function download($url, $destinationPath = null, $timeout = null)
$file = Http::ensureDestinationDirectoryExists($destinationPath);
- $response = Http::sendHttpRequestBy($method,
- $url,
- $timeout,
- $userAgent = null,
- $destinationPath,
- $file,
- $followDepth = 0,
- $acceptLanguage = false,
- $acceptInvalidSslCertificate = false,
- $byteRange = false, $getExtendedInfo = false, $httpMethod = 'POST',
- $httpUsername = null, $httpPassword = null, $post);
+ $response = Http::sendHttpRequestBy(
+ $method,
+ $url,
+ $timeout,
+ $userAgent = null,
+ $destinationPath,
+ $file,
+ $followDepth = 0,
+ $acceptLanguage = false,
+ $acceptInvalidSslCertificate = false,
+ $byteRange = false,
+ $getExtendedInfo = false,
+ $httpMethod = 'POST',
+ $httpUsername = null,
+ $httpPassword = null,
+ $post
+ );
return $response;
}
diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
index d27a7d7d731..7a1ab89c137 100644
--- a/plugins/MobileMessaging/SMSProvider.php
+++ b/plugins/MobileMessaging/SMSProvider.php
@@ -117,7 +117,8 @@ public static function factory($provider)
$providers = self::findAvailableSmsProviders();
if (!array_key_exists($provider, $providers)) {
- throw new \Exception(Piwik::translate('MobileMessaging_Exception_UnknownProvider',
+ throw new \Exception(Piwik::translate(
+ 'MobileMessaging_Exception_UnknownProvider',
array($provider, implode(', ', array_keys($providers)))
));
}
diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
index 59cdc8f0cd2..49d0dec85ed 100644
--- a/plugins/Monolog/config/config.php
+++ b/plugins/Monolog/config/config.php
@@ -68,8 +68,14 @@
$handler->setLevel(Logger::DEBUG);
- $handler = new \Monolog\Handler\FingersCrossedHandler($handler, $activationStrategy = null, $bufferSize = 0,
- $bubble = true, $fingersCrossedStopBuffering, $passthruLevel);
+ $handler = new \Monolog\Handler\FingersCrossedHandler(
+ $handler,
+ $activationStrategy = null,
+ $bufferSize = 0,
+ $bubble = true,
+ $fingersCrossedStopBuffering,
+ $passthruLevel
+ );
}
$writers[$writerName] = $handler;
diff --git a/plugins/Morpheus/Controller.php b/plugins/Morpheus/Controller.php
index 7e54ffac2db..e8611129e10 100644
--- a/plugins/Morpheus/Controller.php
+++ b/plugins/Morpheus/Controller.php
@@ -254,7 +254,11 @@ public function demo()
// TODOO: handle arrays
$snippets[] = $this->formSnippet(
- 'language', ['language', 'phoneNumber', 'selectedExpand'], ['1', '[\'1\']', 'null'], [1, ['1'], null], '
+ 'language',
+ ['language', 'phoneNumber', 'selectedExpand'],
+ ['1', '[\'1\']', 'null'],
+ [1, ['1'], null],
+ '
-
');
+
');
- $snippets[] = $this->formSnippet('multitupletextvalue', 'values',
+ $snippets[] = $this->formSnippet(
+ 'multitupletextvalue',
+ 'values',
'[{\'index\': \'test\', \'value\':\'myfoo\'},{\'index\': \'test 2\', \'value\':\'myfoo 2\'}]',
- [['index' => 'test', 'value' => 'myfoo'], ['index' => 'test 2', 'value' => 'myfoo 2']], '
+ [['index' => 'test', 'value' => 'myfoo'], ['index' => 'test 2', 'value' => 'myfoo 2']],
+ '
-
');
+
+ [["index" => "test", "value" => "myfoo"]],
+ '
-
');
+
');
- $snippets[] = $this->formSnippet('multitupletextvalue2', 'values',
+ $snippets[] = $this->formSnippet(
+ 'multitupletextvalue2',
+ 'values',
"[{'index': 'test', 'value':'myfoo'},{'index': 'test 2', 'value':'myfoo 2'}]",
- [["index" => "test", "value" => "myfoo"], ["index" => "test 2", "value" => "myfoo 2"]], '
+ [["index" => "test", "value" => "myfoo"], ["index" => "test 2", "value" => "myfoo 2"]],
+ '
-
');
+
+ [['index' => 'test', 'value' => 'myfoo']],
+ '
-
');
+
');
- $snippets[] = $this->formSnippet('multitupletextvalue3', 'values',
+ $snippets[] = $this->formSnippet(
+ 'multitupletextvalue3',
+ 'values',
'[{\'index\': \'test\', \'value\':\'myfoo\'},{\'index\': \'test 2\', \'value\':\'myfoo 2\'}]',
- [["index" => "test", "value" => "myfoo"], ["index" => "test 2", "value" => "myfoo 2"]], '
+ [["index" => "test", "value" => "myfoo"], ["index" => "test 2", "value" => "myfoo 2"]],
+ '
-
');
+
+ $snippets[] = $this->formSnippet(
+ 'multitupleselect3',
+ 'values',
+ '[{\'index\': \'test\', \'value\': \'myfoo\'}]',
+ [["index" => "test", "value" => "myfoo"]],
+ '
-
');
+
+ [["index" => "test", "value" => "myfoo"]],
+ '
-
');
+
+ [["index" => "test", "value" => "myfoo"]],
+ '
-
');
+
');
- $snippets[] = $this->formSnippet('enableFeatures', ['enable', 'enableArray', 'defaultReportDate'],
- ['false', '[]', 'null'], [false, [], null], '
+ $snippets[] = $this->formSnippet(
+ 'enableFeatures',
+ ['enable', 'enableArray', 'defaultReportDate'],
+ ['false', '[]', 'null'],
+ [false, [], null],
+ '
-
');
+
getSitesWithAtLeastViewAccess($limit = false, $_restrictSitesToLogin);
}
} else {
- $sites = Request::processRequest('SitesManager.getPatternMatchSites',
+ $sites = Request::processRequest(
+ 'SitesManager.getPatternMatchSites',
array('pattern' => $pattern,
// added because caller could overwrite these
'limit' => SettingsPiwik::getWebsitesCountToDisplay(),
'showColumns' => '',
'hideColumns' => '',
- 'format' => 'original'));
+ 'format' => 'original')
+ );
if (!empty($sites)) {
Site::setSitesFromArray($sites);
diff --git a/plugins/Overlay/API.php b/plugins/Overlay/API.php
index da0a97e8861..9bdd1f88fc6 100644
--- a/plugins/Overlay/API.php
+++ b/plugins/Overlay/API.php
@@ -72,8 +72,15 @@ public function getFollowingPages($url, $idSite, $period, $date, $segment = fals
try {
$limitBeforeGrouping = Config::getInstance()->General['overlay_following_pages_limit'];
$transitionsReport = APITransitions::getInstance()->getTransitionsForAction(
- $url, $type = 'url', $idSite, $period, $date, $segment, $limitBeforeGrouping,
- $part = 'followingActions');
+ $url,
+ $type = 'url',
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ $limitBeforeGrouping,
+ $part = 'followingActions'
+ );
} catch (Exception $e) {
return $resultDataTable;
}
diff --git a/plugins/PagePerformance/Controller.php b/plugins/PagePerformance/Controller.php
index 01440c2fccd..ad9ad89d1b6 100644
--- a/plugins/PagePerformance/Controller.php
+++ b/plugins/PagePerformance/Controller.php
@@ -87,7 +87,11 @@ public function getRowEvolutionGraph($dataTable = null)
// set up the view data table
$view = ViewDataTableFactory::build(
- StackedBarEvolution::ID, $apiMethod, 'PagePerformance.getRowEvolutionGraph', $forceDefault = true);
+ StackedBarEvolution::ID,
+ $apiMethod,
+ 'PagePerformance.getRowEvolutionGraph',
+ $forceDefault = true
+ );
$view->setDataTable($dataTable);
$view->config->columns_to_display = array_keys(Metrics::getPagePerformanceMetrics());
diff --git a/plugins/PagePerformance/RecordBuilders/PerformanceTotals.php b/plugins/PagePerformance/RecordBuilders/PerformanceTotals.php
index 3823ad0b4d0..e62d2726ceb 100644
--- a/plugins/PagePerformance/RecordBuilders/PerformanceTotals.php
+++ b/plugins/PagePerformance/RecordBuilders/PerformanceTotals.php
@@ -74,8 +74,16 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
$joinLogActionOnColumn = array('idaction_url');
$where = sprintf("COALESCE(%s) IS NOT NULL", implode(',', $allColumns));
- $query = $logAggregator->queryActionsByDimension([], $where, $selects, false, null,
- $joinLogActionOnColumn, null, -1);
+ $query = $logAggregator->queryActionsByDimension(
+ [],
+ $where,
+ $selects,
+ false,
+ null,
+ $joinLogActionOnColumn,
+ null,
+ -1
+ );
$result = $query->fetchAll();
diff --git a/plugins/PagePerformance/tests/Integration/Tracker/PerformanceDataProcessorTest.php b/plugins/PagePerformance/tests/Integration/Tracker/PerformanceDataProcessorTest.php
index e57ca759b26..8b1f0bd72d4 100644
--- a/plugins/PagePerformance/tests/Integration/Tracker/PerformanceDataProcessorTest.php
+++ b/plugins/PagePerformance/tests/Integration/Tracker/PerformanceDataProcessorTest.php
@@ -108,11 +108,14 @@ public function test_shouldNotUseObviouslyTooHighNumbers()
protected function checkActionHasTimings($pageViewId, $network = null, $server = null, $transfer = null, $domProcessing = null, $domCompletion = null, $onload = null)
{
$result = Db::fetchRow(
- sprintf('SELECT time_network, time_server, time_transfer, time_dom_processing, time_dom_completion, time_on_load
+ sprintf(
+ 'SELECT time_network, time_server, time_transfer, time_dom_processing, time_dom_completion, time_on_load
FROM %1$s LEFT JOIN %2$s ON idaction_url = idaction WHERE idpageview = ? AND %2$s.type = 1',
Common::prefixTable('log_link_visit_action'),
Common::prefixTable('log_action')
- ), $pageViewId);
+ ),
+ $pageViewId
+ );
$this->assertEquals([
'time_network' => $network,
diff --git a/plugins/PrivacyManager/Commands/AnonymizeRawData.php b/plugins/PrivacyManager/Commands/AnonymizeRawData.php
index 3fd340cb741..1fd45d3df96 100644
--- a/plugins/PrivacyManager/Commands/AnonymizeRawData.php
+++ b/plugins/PrivacyManager/Commands/AnonymizeRawData.php
@@ -79,19 +79,23 @@ protected function doExecute(): int
}
if (!empty($visitColumnsToUnset)
- && !$this->confirmAnonymize($startDate,
- $endDate,
- 'unset the log_visit columns "' . implode(', ', $visitColumnsToUnset) . '"')) {
+ && !$this->confirmAnonymize(
+ $startDate,
+ $endDate,
+ 'unset the log_visit columns "' . implode(', ', $visitColumnsToUnset) . '"'
+ )) {
$visitColumnsToUnset = false;
$output->writeln('SKIPPING unset log_visit columns.');
}
if (!empty($linkVisitActionColumns)
- && !$this->confirmAnonymize($startDate,
- $endDate,
- 'unset the log_link_visit_action columns "' . implode(
- ', ',
- $linkVisitActionColumns
- ) . '"')) {
+ && !$this->confirmAnonymize(
+ $startDate,
+ $endDate,
+ 'unset the log_link_visit_action columns "' . implode(
+ ', ',
+ $linkVisitActionColumns
+ ) . '"'
+ )) {
$linkVisitActionColumns = false;
$output->writeln('SKIPPING unset log_link_visit_action columns.');
}
diff --git a/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php b/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
index 2f9cd86bb05..af058533a77 100644
--- a/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
+++ b/plugins/PrivacyManager/tests/Integration/DataPurgingTest.php
@@ -528,7 +528,8 @@ public function testPurgeLogDataConcurrency()
$this->unusedIdAction = Db::fetchOne(
"SELECT idaction FROM " . Common::prefixTable('log_action') . " WHERE name = ?",
- array('whatever.com/_40'));
+ array('whatever.com/_40')
+ );
$this->assertTrue($this->unusedIdAction > 0);
// purge data
@@ -541,7 +542,8 @@ public function testPurgeLogDataConcurrency()
// check that the unused action still exists
$count = Db::fetchOne(
"SELECT COUNT(*) FROM " . Common::prefixTable('log_action') . " WHERE idaction = ?",
- array($this->unusedIdAction));
+ array($this->unusedIdAction)
+ );
$this->assertEquals(1, $count);
$this->unusedIdAction = null; // so the hook won't get executed twice
@@ -680,10 +682,21 @@ protected static function _addLogData()
$t->doTrackContentImpression('SugarTransportAd', '/path/ad.jpg', 'http://www.satsumaprovince.jp');
$t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.2));
- $t->addEcommerceItem($sku = 'SKU2', $name = 'Canon SLR', $category = 'Electronics & Cameras',
- $price = 1500, $quantity = 1);
- $t->doTrackEcommerceOrder($orderId = '937nsjusu ' . $dateTime, $grandTotal = 1111.11, $subTotal = 1000,
- $tax = 111, $shipping = 0.11, $discount = 666);
+ $t->addEcommerceItem(
+ $sku = 'SKU2',
+ $name = 'Canon SLR',
+ $category = 'Electronics & Cameras',
+ $price = 1500,
+ $quantity = 1
+ );
+ $t->doTrackEcommerceOrder(
+ $orderId = '937nsjusu ' . $dateTime,
+ $grandTotal = 1111.11,
+ $subTotal = 1000,
+ $tax = 111,
+ $shipping = 0.11,
+ $discount = 666
+ );
}
Fixture::checkBulkTrackingResponse($t->doBulkTrack());
@@ -720,7 +733,10 @@ protected static function _addReportData()
$archive->getNumeric('nb_visits');
APIVisitorInterest::getInstance()->getNumberOfVisitsPerVisitDuration(
- self::$idSite, 'week', $dateTime);
+ self::$idSite,
+ 'week',
+ $dateTime
+ );
}
// add segment for one day
@@ -728,7 +744,11 @@ protected static function _addReportData()
$archive->getNumeric('nb_visits', 'nb_hits');
APIVisitorInterest::getInstance()->getNumberOfVisitsPerVisitDuration(
- self::$idSite, 'day', '2012-01-14', 'browserCode==FF');
+ self::$idSite,
+ 'day',
+ '2012-01-14',
+ 'browserCode==FF'
+ );
// add range within January
$rangeEnd = Date::factory('2012-01-29');
@@ -784,16 +804,24 @@ protected static function _addReportData()
VALUES (10000,?,1,?,?,?,?,?)";
// one metric for jan & one for feb
- Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])),
- array(self::GARBAGE_FIELD, $janDate1, $janDate1, 1, $janDate1, 100));
- Db::query(sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])),
- array(self::GARBAGE_FIELD, $febDate1, $febDate1, 1, $febDate1, 200));
+ Db::query(
+ sprintf($sql, Common::prefixTable($archiveTables['numeric'][0])),
+ array(self::GARBAGE_FIELD, $janDate1, $janDate1, 1, $janDate1, 100)
+ );
+ Db::query(
+ sprintf($sql, Common::prefixTable($archiveTables['numeric'][1])),
+ array(self::GARBAGE_FIELD, $febDate1, $febDate1, 1, $febDate1, 200)
+ );
// add garbage reports
- Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][0])),
- array(self::GARBAGE_FIELD, $janDate1, $janDate1, 10, $janDate1, 'blobval'));
- Db::query(sprintf($sql, Common::prefixTable($archiveTables['blob'][1])),
- array(self::GARBAGE_FIELD, $febDate1, $febDate1, 20, $febDate1, 'blobval'));
+ Db::query(
+ sprintf($sql, Common::prefixTable($archiveTables['blob'][0])),
+ array(self::GARBAGE_FIELD, $janDate1, $janDate1, 10, $janDate1, 'blobval')
+ );
+ Db::query(
+ sprintf($sql, Common::prefixTable($archiveTables['blob'][1])),
+ array(self::GARBAGE_FIELD, $febDate1, $febDate1, 20, $febDate1, 'blobval')
+ );
}
protected function _checkNoDataChanges()
diff --git a/plugins/PrivacyManager/tests/System/PurgeDataTest.php b/plugins/PrivacyManager/tests/System/PurgeDataTest.php
index 0f5a56056e1..5b15b16f1f7 100644
--- a/plugins/PrivacyManager/tests/System/PurgeDataTest.php
+++ b/plugins/PrivacyManager/tests/System/PurgeDataTest.php
@@ -201,8 +201,14 @@ private function purgeData($deleteReportsOlderThan, $reportPeriodsToKeep, $keepB
$metricsToKeep = PrivacyManager::getAllMetricsToKeep();
$maxRowsToDeletePerQuery = 100000;
- $purger = new ReportsPurger($deleteReportsOlderThan, $keepBasicMetrics, $reportPeriodsToKeep,
- $keepSegmentReports, $metricsToKeep, $maxRowsToDeletePerQuery);
+ $purger = new ReportsPurger(
+ $deleteReportsOlderThan,
+ $keepBasicMetrics,
+ $reportPeriodsToKeep,
+ $keepSegmentReports,
+ $metricsToKeep,
+ $maxRowsToDeletePerQuery
+ );
$purger->getPurgeEstimate();
$purger->purgeData();
}
diff --git a/plugins/Referrers/Categories/SearchEnginesSubcategory.php b/plugins/Referrers/Categories/SearchEnginesSubcategory.php
index 65dad28d2c9..c15f29e6495 100644
--- a/plugins/Referrers/Categories/SearchEnginesSubcategory.php
+++ b/plugins/Referrers/Categories/SearchEnginesSubcategory.php
@@ -21,10 +21,13 @@ class SearchEnginesSubcategory extends Subcategory
public function getHelp()
{
return '' . Piwik::translate('Referrers_SearchEnginesSubcategoryHelp1') . '
'
- . '' . Piwik::translate('Referrers_SearchEnginesSubcategoryHelp2',
+ . '
' . Piwik::translate(
+ 'Referrers_SearchEnginesSubcategoryHelp2',
['', '',
'', '']) . '
';
+ . '" rel="noreferrer noopener" target="_blank">',
+ '']
+ ) . '';
}
}
diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
index f97c216ea50..53d3ca745a6 100644
--- a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
+++ b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php
@@ -20,8 +20,10 @@ protected function init()
parent::init();
$this->dimension = new Keyword();
$this->name = Piwik::translate('Referrers_Campaigns');
- $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation',
- ['
', '', '']);
+ $this->documentation = Piwik::translate(
+ 'Referrers_CampaignsReportDocumentation',
+ ['
', '', '']
+ );
$this->isSubtableReport = true;
$this->order = 10;
}
diff --git a/plugins/Referrers/Reports/GetReferrerType.php b/plugins/Referrers/Reports/GetReferrerType.php
index 5d41bd334ad..e2c2b04e386 100644
--- a/plugins/Referrers/Reports/GetReferrerType.php
+++ b/plugins/Referrers/Reports/GetReferrerType.php
@@ -27,12 +27,18 @@ protected function init()
$this->name = Piwik::translate('Referrers_Type');
$this->documentation = Piwik::translate('Referrers_TypeReportDocumentation') . '
'
. '' . Piwik::translate('Referrers_DirectEntry') . ': ' . Piwik::translate('Referrers_DirectEntryDocumentation') . '
'
- . '' . Piwik::translate('Referrers_SearchEngines') . ': ' . Piwik::translate('Referrers_SearchEnginesDocumentation',
- array('
', '"' . Piwik::translate('Referrers_SubmenuSearchEngines') . '"')) . '
'
- . '' . Piwik::translate('Referrers_Websites') . ': ' . Piwik::translate('Referrers_WebsitesDocumentation',
- array('
', '"' . Piwik::translate('Referrers_SubmenuWebsitesOnly') . '"')) . '
'
- . '' . Piwik::translate('Referrers_Campaigns') . ': ' . Piwik::translate('Referrers_CampaignsDocumentation',
- array('
', '"' . Piwik::translate('Referrers_Campaigns') . '"'));
+ . '' . Piwik::translate('Referrers_SearchEngines') . ': ' . Piwik::translate(
+ 'Referrers_SearchEnginesDocumentation',
+ array('
', '"' . Piwik::translate('Referrers_SubmenuSearchEngines') . '"')
+ ) . '
'
+ . '' . Piwik::translate('Referrers_Websites') . ': ' . Piwik::translate(
+ 'Referrers_WebsitesDocumentation',
+ array('
', '"' . Piwik::translate('Referrers_SubmenuWebsitesOnly') . '"')
+ ) . '
'
+ . '' . Piwik::translate('Referrers_Campaigns') . ': ' . Piwik::translate(
+ 'Referrers_CampaignsDocumentation',
+ array('
', '"' . Piwik::translate('Referrers_Campaigns') . '"')
+ );
$this->constantRowsCount = true;
$this->hasGoalMetrics = true;
$this->order = 1;
diff --git a/plugins/ScheduledReports/Menu.php b/plugins/ScheduledReports/Menu.php
index d6df3fd265d..5c8c443aa4a 100644
--- a/plugins/ScheduledReports/Menu.php
+++ b/plugins/ScheduledReports/Menu.php
@@ -22,7 +22,8 @@ public function configureAdminMenu(MenuAdmin $menu)
{
$tooltip = Piwik::translate(
\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MobileMessaging')
- ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip');
+ ? 'MobileMessaging_TopLinkTooltip' : 'ScheduledReports_TopLinkTooltip'
+ );
$menu->addPersonalItem(
$this->getTopMenuTranslationKey(),
diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php
index 9bbeca63c1d..781fd9a3cf0 100644
--- a/plugins/ScheduledReports/tests/Integration/ApiTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php
@@ -116,8 +116,15 @@ public function getAttachments($report, $processedReports, $prettyDate)
});
$idReport = APIScheduledReports::getInstance()->addReport(
- $this->idSite, 'send report', 'never', 6, 'dummyreporttype', 'dummyreportformat',
- $reportIds, [ScheduledReports::DISPLAY_FORMAT_PARAMETER => ScheduledReports::DISPLAY_FORMAT_TABLES_ONLY]);
+ $this->idSite,
+ 'send report',
+ 'never',
+ 6,
+ 'dummyreporttype',
+ 'dummyreportformat',
+ $reportIds,
+ [ScheduledReports::DISPLAY_FORMAT_PARAMETER => ScheduledReports::DISPLAY_FORMAT_TABLES_ONLY]
+ );
$eventCalledWith = [];
Piwik::addAction(APIScheduledReports::SEND_REPORT_EVENT, function (
@@ -436,7 +443,8 @@ public function testGetScheduledTasks()
->disableOriginalConstructor()
->getMock();
$stubbedAPIScheduledReports->expects($this->any())->method('getReports')->will($this->returnValue(
- array($report1, $report2, $report3, $report4, $report5, $report6)));
+ array($report1, $report2, $report3, $report4, $report5, $report6)
+ ));
\Piwik\Plugins\ScheduledReports\API::setSingletonInstance($stubbedAPIScheduledReports);
// initialize sites 1 and 2
@@ -498,7 +506,8 @@ public function getGetReportSubjectAndReportTitleTestCases()
public function testGetReportSubjectAndReportTitle($expectedReportSubject, $expectedReportTitle, $websiteName, $reports)
{
$getReportSubjectAndReportTitle = new ReflectionMethod(
- '\\Piwik\\Plugins\\ScheduledReports\\API', 'getReportSubjectAndReportTitle'
+ '\\Piwik\\Plugins\\ScheduledReports\\API',
+ 'getReportSubjectAndReportTitle'
);
$getReportSubjectAndReportTitle->setAccessible(true);
@@ -549,8 +558,12 @@ public function test_generateReport_CatchesIndividualReportProcessExceptions_Wit
);
ob_start();
- $result = APIScheduledReports::getInstance()->generateReport($idReport, Date::factory('now')->toString(),
- $language = false, $outputType = APIScheduledReports::OUTPUT_RETURN);
+ $result = APIScheduledReports::getInstance()->generateReport(
+ $idReport,
+ Date::factory('now')->toString(),
+ $language = false,
+ $outputType = APIScheduledReports::OUTPUT_RETURN
+ );
ob_end_clean();
self::assertStringContainsString('id="VisitsSummary_get"', $result);
@@ -578,8 +591,12 @@ public function test_generateReport_throwsIfMultiplePeriodsRequested()
array(ScheduledReports::DISPLAY_FORMAT_PARAMETER => ScheduledReports::DISPLAY_FORMAT_TABLES_ONLY)
);
- APIScheduledReports::getInstance()->generateReport($idReport, '2012-03-03,2012-03-23',
- $language = false, $outputType = APIScheduledReports::OUTPUT_RETURN);
+ APIScheduledReports::getInstance()->generateReport(
+ $idReport,
+ '2012-03-03,2012-03-23',
+ $language = false,
+ $outputType = APIScheduledReports::OUTPUT_RETURN
+ );
}
public function test_generateReport_throwsIfInvalidDateRequested(): void
@@ -1002,7 +1019,8 @@ private static function updateReport($idReport, $data)
$data['type'],
$data['format'],
$data['reports'],
- $data['parameters']);
+ $data['parameters']
+ );
return $idReport;
}
diff --git a/plugins/SegmentEditor/SegmentQueryDecorator.php b/plugins/SegmentEditor/SegmentQueryDecorator.php
index 0d045833a30..1caa1671ab9 100644
--- a/plugins/SegmentEditor/SegmentQueryDecorator.php
+++ b/plugins/SegmentEditor/SegmentQueryDecorator.php
@@ -43,8 +43,16 @@ public function getSelectQueryString(
$orderBy,
$limit
) {
- $result = parent::getSelectQueryString($segmentExpression, $select, $from, $where, $bind, $groupBy, $orderBy,
- $limit);
+ $result = parent::getSelectQueryString(
+ $segmentExpression,
+ $select,
+ $from,
+ $where,
+ $bind,
+ $groupBy,
+ $orderBy,
+ $limit
+ );
$prefixParts = array();
diff --git a/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php
index 35d2d875d99..49219149f7c 100644
--- a/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php
+++ b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php
@@ -156,7 +156,8 @@ public function test_UpdateSegment()
'login' => Piwik::getCurrentUserLogin(),
'deleted' => '0',
);
- API::getInstance()->update($idSegment2,
+ API::getInstance()->update(
+ $idSegment2,
$updatedSegment['name'],
$updatedSegment['definition'],
$updatedSegment['enable_only_idsite'],
diff --git a/plugins/SegmentEditor/tests/Integration/SegmentQueryDecoratorTest.php b/plugins/SegmentEditor/tests/Integration/SegmentQueryDecoratorTest.php
index 7cc9158cd0b..3cd8bec568f 100644
--- a/plugins/SegmentEditor/tests/Integration/SegmentQueryDecoratorTest.php
+++ b/plugins/SegmentEditor/tests/Integration/SegmentQueryDecoratorTest.php
@@ -35,13 +35,15 @@ public function setUp(): void
Fixture::createWebsite('2011-01-01');
$this->segmentQueryDecorator = self::$fixture->piwikEnvironment->getContainer()->get(
- 'Piwik\Plugins\SegmentEditor\SegmentQueryDecorator');
+ 'Piwik\Plugins\SegmentEditor\SegmentQueryDecorator'
+ );
Rules::setBrowserTriggerArchiving(false);
/** @var API $segmentEditorApi */
$segmentEditorApi = self::$fixture->piwikEnvironment->getContainer()->get(
- 'Piwik\Plugins\SegmentEditor\API');
+ 'Piwik\Plugins\SegmentEditor\API'
+ );
$segmentEditorApi->add('segment 1', 'visitCount<2', $idSite = false, $autoArchive = true);
$segmentEditorApi->add('segment 2', 'countryCode==fr', $idSite = false, $autoArchive = true);
$segmentEditorApi->add('segment 3', 'visitCount<2', 1, $autoArchive = true);
diff --git a/plugins/SegmentEditor/tests/System/UnprocessedSegmentsTest.php b/plugins/SegmentEditor/tests/System/UnprocessedSegmentsTest.php
index b6627a9e26a..a8c0ed89d33 100644
--- a/plugins/SegmentEditor/tests/System/UnprocessedSegmentsTest.php
+++ b/plugins/SegmentEditor/tests/System/UnprocessedSegmentsTest.php
@@ -118,8 +118,12 @@ public function test_apiOutput_whenPreprocessedSegmentUsed_WithBrowserArchivingD
$this->assertNotEmpty($storedSegment);
Rules::setBrowserTriggerArchiving(true);
- VisitsSummary\API::getInstance()->get(self::$fixture->idSite, 'week',
- Date::factory(self::$fixture->dateTime)->toString(), self::TEST_SEGMENT); // archive (make sure there's data for actual test)
+ VisitsSummary\API::getInstance()->get(
+ self::$fixture->idSite,
+ 'week',
+ Date::factory(self::$fixture->dateTime)->toString(),
+ self::TEST_SEGMENT
+ ); // archive (make sure there's data for actual test)
Rules::setBrowserTriggerArchiving(false);
$segments = Rules::getSegmentsToProcess([self::$fixture->idSite]);
@@ -135,8 +139,12 @@ public function test_apiOutput_whenPreprocessedSegmentUsed_WithBrowserArchivingD
public function test_apiOutput_whenPreprocessedCustomSegmentUsed_WithBrowserArchivingDisabled()
{
- VisitsSummary\API::getInstance()->get(self::$fixture->idSite, 'week',
- Date::factory(self::$fixture->dateTime)->toString(), self::TEST_SEGMENT); // archive
+ VisitsSummary\API::getInstance()->get(
+ self::$fixture->idSite,
+ 'week',
+ Date::factory(self::$fixture->dateTime)->toString(),
+ self::TEST_SEGMENT
+ ); // archive
Rules::setBrowserTriggerArchiving(false);
@@ -162,8 +170,12 @@ public function test_apiOutput_whenPreprocessedSegmentUsed_WithNoData_AndBrowser
$storedSegment = API::getInstance()->get($idSegment);
$this->assertNotEmpty($storedSegment);
- VisitsSummary\API::getInstance()->get(self::$fixture->idSite, 'week',
- Date::factory(self::$fixture->dateTime)->toString(), self::TEST_SEGMENT); // archive
+ VisitsSummary\API::getInstance()->get(
+ self::$fixture->idSite,
+ 'week',
+ Date::factory(self::$fixture->dateTime)->toString(),
+ self::TEST_SEGMENT
+ ); // archive
$segments = Rules::getSegmentsToProcess([self::$fixture->idSite]);
self::assertTrue(in_array(self::TEST_SEGMENT, $segments));
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index ce75d784763..4bf24aa974d 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -289,8 +289,10 @@ private function getGoogleAnalyticsImporterInstruction()
'id' => 'GoogleAnalyticsImporter',
'name' => Piwik::translate('CoreAdminHome_ImportFromGoogleAnalytics'),
'type' => SiteContentDetectionAbstract::TYPE_OTHER,
- 'othersInstruction' => Piwik::translate('CoreAdminHome_ImportFromGoogleAnalyticsDescription',
- ['', '']),
+ 'othersInstruction' => Piwik::translate(
+ 'CoreAdminHome_ImportFromGoogleAnalyticsDescription',
+ ['', '']
+ ),
];
}
@@ -321,29 +323,37 @@ private function renderOthersTab($othersInstructions): string
'id' => 'ImageTracking',
'name' => Piwik::translate('CoreAdminHome_ImageTracking'),
'type' => SiteContentDetectionAbstract::TYPE_OTHER,
- 'othersInstruction' => Piwik::translate('SitesManager_ImageTrackingDescription',
- ['', '']),
+ 'othersInstruction' => Piwik::translate(
+ 'SitesManager_ImageTrackingDescription',
+ ['', '']
+ ),
],
[
'id' => 'LogAnalytics',
'name' => Piwik::translate('SitesManager_LogAnalytics'),
'type' => SiteContentDetectionAbstract::TYPE_OTHER,
- 'othersInstruction' => Piwik::translate('SitesManager_LogAnalyticsDescription',
- ['', '']),
+ 'othersInstruction' => Piwik::translate(
+ 'SitesManager_LogAnalyticsDescription',
+ ['', '']
+ ),
],
[
'id' => 'MobileAppsAndSDKs',
'name' => Piwik::translate('SitesManager_MobileAppsAndSDKs'),
'type' => SiteContentDetectionAbstract::TYPE_OTHER,
- 'othersInstruction' => Piwik::translate('SitesManager_MobileAppsAndSDKsDescription',
- ['', '']),
+ 'othersInstruction' => Piwik::translate(
+ 'SitesManager_MobileAppsAndSDKsDescription',
+ ['', '']
+ ),
],
[
'id' => 'HttpTrackingApi',
'name' => Piwik::translate('CoreAdminHome_HttpTrackingApi'),
'type' => SiteContentDetectionAbstract::TYPE_OTHER,
- 'othersInstruction' => Piwik::translate('CoreAdminHome_HttpTrackingApiDescription',
- ['', '']),
+ 'othersInstruction' => Piwik::translate(
+ 'CoreAdminHome_HttpTrackingApiDescription',
+ ['', '']
+ ),
]
);
diff --git a/plugins/SitesManager/Model.php b/plugins/SitesManager/Model.php
index a2e472b7265..dc1b33d4369 100644
--- a/plugins/SitesManager/Model.php
+++ b/plugins/SitesManager/Model.php
@@ -151,10 +151,11 @@ public function getSitesIdFromSiteUrlHavingAccess($login, $urls)
WHERE url IN ( ' . Common::getSqlStringFieldsArray($urls) . ')' .
'AND idsite IN (' . $sqlAccessSite . ')',
// Bind
- array_merge( $urls,
- array( $login ),
- $urls,
- array( $login )
+ array_merge(
+ $urls,
+ array( $login ),
+ $urls,
+ array( $login )
)
);
diff --git a/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php b/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php
index d6654e59f94..42028ce54ee 100644
--- a/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php
+++ b/plugins/SitesManager/SiteContentDetection/MatomoTagManager.php
@@ -51,7 +51,9 @@ public function isDetected(?string $data = null, ?array $headers = null): bool
public function renderInstructionsTab(SiteContentDetector $detector): string
{
return '' . Piwik::translate('SitesManager_SiteWithoutDataMatomoTagManager') . '
- ' . Piwik::translate( 'SitesManager_SiteWithoutDataMatomoTagManagerNotActive',
- ['', '']) . '
';
+ ' . Piwik::translate(
+ 'SitesManager_SiteWithoutDataMatomoTagManagerNotActive',
+ ['', '']
+ ) . '
';
}
}
diff --git a/plugins/TestRunner/Commands/CodeCoverage.php b/plugins/TestRunner/Commands/CodeCoverage.php
index f6916994c7d..674c32b6472 100644
--- a/plugins/TestRunner/Commands/CodeCoverage.php
+++ b/plugins/TestRunner/Commands/CodeCoverage.php
@@ -66,10 +66,12 @@ protected function doExecute(): int
$xdebugFile = trim($extensionDir) . DIRECTORY_SEPARATOR . 'xdebug.so';
if (!file_exists($xdebugFile)) {
- $xdebugFile = $this->askAndValidate('xdebug not found. Please provide path to xdebug.so',
+ $xdebugFile = $this->askAndValidate(
+ 'xdebug not found. Please provide path to xdebug.so',
function ($xdebugFile) {
return file_exists($xdebugFile);
- });
+ }
+ );
} else {
$output->writeln('xdebug extension found in extension path.');
diff --git a/plugins/TestRunner/Commands/TestsRun.php b/plugins/TestRunner/Commands/TestsRun.php
index c3b43424fe7..8624ab31b8a 100644
--- a/plugins/TestRunner/Commands/TestsRun.php
+++ b/plugins/TestRunner/Commands/TestsRun.php
@@ -74,10 +74,12 @@ protected function doExecute(): int
$xdebugFile = trim($extensionDir) . DIRECTORY_SEPARATOR . 'xdebug.so';
if (!file_exists($xdebugFile)) {
- $xdebugFile = $this->askAndValidate('xdebug not found. Please provide path to xdebug.so',
+ $xdebugFile = $this->askAndValidate(
+ 'xdebug not found. Please provide path to xdebug.so',
function ($xdebugFile) {
return file_exists($xdebugFile);
- });
+ }
+ );
} else {
$output->writeln('xdebug extension found in extension path.');
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index a4b7013eafa..202347fc52f 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -49,41 +49,82 @@ protected function configure()
$this->setName('tests:setup-fixture');
$this->setDescription('Create a database and fill it with data using a Piwik test fixture.');
- $this->addRequiredArgument('fixture',
+ $this->addRequiredArgument(
+ 'fixture',
"The class name of the fixture to apply. Doesn't need to have a namespace if it exists in the " .
- "Piwik\\Tests\\Fixtures namespace.");
-
- $this->addRequiredValueOption('db-name', null,
- "The name of the database that will contain the fixture data. This option is required to be set.");
- $this->addRequiredValueOption('file', null,
- "The file location of the fixture. If this option is included the file will be required explicitly.");
- $this->addRequiredValueOption('db-host', null,
- "The hostname of the MySQL database to use. Uses the default config value if not specified.");
- $this->addRequiredValueOption('db-user', null,
- "The name of the MySQL user to use. Uses the default config value if not specified.");
- $this->addRequiredValueOption('db-pass', null,
- "The MySQL user password to use. Uses the default config value if not specified.");
- $this->addNoValueOption('teardown', null,
+ "Piwik\\Tests\\Fixtures namespace."
+ );
+
+ $this->addRequiredValueOption(
+ 'db-name',
+ null,
+ "The name of the database that will contain the fixture data. This option is required to be set."
+ );
+ $this->addRequiredValueOption(
+ 'file',
+ null,
+ "The file location of the fixture. If this option is included the file will be required explicitly."
+ );
+ $this->addRequiredValueOption(
+ 'db-host',
+ null,
+ "The hostname of the MySQL database to use. Uses the default config value if not specified."
+ );
+ $this->addRequiredValueOption(
+ 'db-user',
+ null,
+ "The name of the MySQL user to use. Uses the default config value if not specified."
+ );
+ $this->addRequiredValueOption(
+ 'db-pass',
+ null,
+ "The MySQL user password to use. Uses the default config value if not specified."
+ );
+ $this->addNoValueOption(
+ 'teardown',
+ null,
"If specified, the fixture will be torn down and the database deleted. Won't work if the --db-name " .
- "option isn't supplied.");
- $this->addNoValueOption('persist-fixture-data', null,
+ "option isn't supplied."
+ );
+ $this->addNoValueOption(
+ 'persist-fixture-data',
+ null,
"If specified, the database will not be dropped after the fixture is setup. If the database already " .
- "and the fixture was successfully setup before, nothing will happen.");
- $this->addNoValueOption('drop', null,
+ "and the fixture was successfully setup before, nothing will happen."
+ );
+ $this->addNoValueOption(
+ 'drop',
+ null,
"Forces the database to be dropped before setting up the fixture. Should be used in conjunction with" .
- " --persist-fixture-data when updating a pre-existing test database.");
- $this->addRequiredValueOption('sqldump', null,
- "Creates an SQL dump after setting up the fixture and outputs the dump to the file specified by this option.");
- $this->addNoValueOption('save-config', null,
+ " --persist-fixture-data when updating a pre-existing test database."
+ );
+ $this->addRequiredValueOption(
+ 'sqldump',
+ null,
+ "Creates an SQL dump after setting up the fixture and outputs the dump to the file specified by this option."
+ );
+ $this->addNoValueOption(
+ 'save-config',
+ null,
"Saves the current configuration file as a config for a new Piwik domain. For example save-config --matomo-domain=mytest.localhost.com will create "
- . "a mytest.config.ini.php file in the config/ directory. Using /etc/hosts you can redirect to 127.0.0.1 and use the saved "
- . "config.");
- $this->addNoValueOption('set-symlinks', null,
- "Used by UI tests. Creates symlinks to root directory in tests/PHPUnit/proxy.");
- $this->addRequiredValueOption('server-global', null,
- "Used by UI tests. Sets the \$_SERVER global variable from a JSON string.");
- $this->addRequiredValueOption('plugins', null,
- "Used by UI tests. Comma separated list of plugin names to activate and install when setting up a fixture.");
+ . "a mytest.config.ini.php file in the config/ directory. Using /etc/hosts you can redirect to 127.0.0.1 and use the saved "
+ . "config."
+ );
+ $this->addNoValueOption(
+ 'set-symlinks',
+ null,
+ "Used by UI tests. Creates symlinks to root directory in tests/PHPUnit/proxy."
+ );
+ $this->addRequiredValueOption(
+ 'server-global',
+ null,
+ "Used by UI tests. Sets the \$_SERVER global variable from a JSON string."
+ );
+ $this->addRequiredValueOption(
+ 'plugins',
+ null,
+ "Used by UI tests. Comma separated list of plugin names to activate and install when setting up a fixture."
+ );
$this->addNoValueOption('enable-logging', null, 'If enabled, tests will log to the configured log file.');
}
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index f3a3881e461..5c054c8b307 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -243,7 +243,12 @@ private function addFollowingActions($logAggregator, &$report, $idaction, $actio
{
$data = $this->queryFollowingActions(
- $idaction, $actionType, $logAggregator, $limitBeforeGrouping, $includeLoops);
+ $idaction,
+ $actionType,
+ $logAggregator,
+ $limitBeforeGrouping,
+ $includeLoops
+ );
foreach ($data as $tableName => $table) {
$report[$tableName] = $table;
@@ -587,7 +592,11 @@ protected function getTotalTransitionsToFollowingActions()
private function addExternalReferrers($logAggregator, &$report, $idaction, $actionType, $limitBeforeGrouping)
{
$data = $this->queryExternalReferrers(
- $idaction, $actionType, $logAggregator, $limitBeforeGrouping);
+ $idaction,
+ $actionType,
+ $logAggregator,
+ $limitBeforeGrouping
+ );
$report['pageMetrics']['entries'] = 0;
$report['referrers'] = array();
diff --git a/plugins/Transitions/tests/Integration/TransitionsMaxAllowedPeriodTest.php b/plugins/Transitions/tests/Integration/TransitionsMaxAllowedPeriodTest.php
index f430ad8f189..81603377f65 100644
--- a/plugins/Transitions/tests/Integration/TransitionsMaxAllowedPeriodTest.php
+++ b/plugins/Transitions/tests/Integration/TransitionsMaxAllowedPeriodTest.php
@@ -52,8 +52,13 @@ public function test_ShouldThrowException_IfPeriodNotAllowed()
Config::setSetting('Transitions_1', 'max_period_allowed', $period);
foreach ($invalids as $ip) {
try {
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url',
- 1, $ip, '2012-08-09');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ $ip,
+ '2012-08-09'
+ );
$this->fail("Failed asserting that exception 'PeriodNotAllowed' was thrown");
} catch (\Exception $e) {
$this->assertEquals('PeriodNotAllowed', $e->getMessage());
@@ -74,8 +79,13 @@ public function test_ShouldReturnData_IfPeriodAllowed()
foreach ($validPeriods as $period => $valids) {
Config::setSetting('Transitions_1', 'max_period_allowed', $period);
foreach ($valids as $vp) {
- $r = $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url',
- 1, $vp, '2012-08-09');
+ $r = $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ $vp,
+ '2012-08-09'
+ );
self::assertEquals(1, $r['pageMetrics']['pageviews']);
}
}
@@ -85,14 +95,28 @@ public function test_ShouldThrowException_IfInvalidLimitBeforeGroup()
{
$this->expectException(\Exception::class);
$this->expectExceptionMessage('limitBeforeGrouping has to be an integer.');
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2012-08-10', false, 'all');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2012-08-10',
+ false,
+ 'all'
+ );
}
public function test_ShouldPass_IfLimitBeforeGroupPassingIntAsString()
{
- $report = $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2012-08-10', false, '100');
+ $report = $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2012-08-10',
+ false,
+ '100'
+ );
$this->assertIsArray($report);
}
@@ -101,8 +125,13 @@ public function test_ShouldThrowException_IfRangeDayCountIsLargerThanDayPeriod()
Config::setSetting('Transitions_1', 'max_period_allowed', 'day');
$this->expectException(\Exception::class);
$this->expectExceptionMessage('PeriodNotAllowed');
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2012-08-10');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2012-08-10'
+ );
}
public function test_ShouldThrowException_IfRangeDayCountIsLargerThanWeekPeriod()
@@ -110,8 +139,13 @@ public function test_ShouldThrowException_IfRangeDayCountIsLargerThanWeekPeriod(
Config::setSetting('Transitions_1', 'max_period_allowed', 'day');
$this->expectException(\Exception::class);
$this->expectExceptionMessage('PeriodNotAllowed');
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2012-08-17');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2012-08-17'
+ );
}
public function test_ShouldThrowException_IfRangeDayCountIsLargerThanMonthPeriod()
@@ -119,8 +153,13 @@ public function test_ShouldThrowException_IfRangeDayCountIsLargerThanMonthPeriod
Config::setSetting('Transitions_1', 'max_period_allowed', 'day');
$this->expectException(\Exception::class);
$this->expectExceptionMessage('PeriodNotAllowed');
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2012-09-10');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2012-09-10'
+ );
}
public function test_ShouldThrowException_IfRangeDayCountIsLargerThanYearPeriod()
@@ -128,8 +167,13 @@ public function test_ShouldThrowException_IfRangeDayCountIsLargerThanYearPeriod(
Config::setSetting('Transitions_1', 'max_period_allowed', 'day');
$this->expectException(\Exception::class);
$this->expectExceptionMessage('PeriodNotAllowed');
- $this->api->getTransitionsForAction('http://example.org/page/one.html', 'url', 1,
- 'range', '2012-08-09,2013-08-10');
+ $this->api->getTransitionsForAction(
+ 'http://example.org/page/one.html',
+ 'url',
+ 1,
+ 'range',
+ '2012-08-09,2013-08-10'
+ );
}
public function test_ShouldUseSiteConfigInsteadOfGeneral_IfSiteConfigExists()
diff --git a/plugins/TwoFactorAuth/Controller.php b/plugins/TwoFactorAuth/Controller.php
index 877db981398..da80ab6d6e8 100644
--- a/plugins/TwoFactorAuth/Controller.php
+++ b/plugins/TwoFactorAuth/Controller.php
@@ -284,8 +284,10 @@ public function showRecoveryCodes()
$this->validator->check2FaEnabled();
$regenerateNonce = Common::getRequestVar('regenerateNonce', '', 'string', $_POST);
- $postedValidNonce = !empty($regenerateNonce) && Nonce::verifyNonce(self::REGENERATE_CODES_2FA_NONCE,
- $regenerateNonce);
+ $postedValidNonce = !empty($regenerateNonce) && Nonce::verifyNonce(
+ self::REGENERATE_CODES_2FA_NONCE,
+ $regenerateNonce
+ );
$regenerateSuccess = false;
$regenerateError = false;
diff --git a/plugins/TwoFactorAuth/FormTwoFactorAuthCode.php b/plugins/TwoFactorAuth/FormTwoFactorAuthCode.php
index e621d7846ee..0abd0dae803 100644
--- a/plugins/TwoFactorAuth/FormTwoFactorAuthCode.php
+++ b/plugins/TwoFactorAuth/FormTwoFactorAuthCode.php
@@ -23,8 +23,10 @@ function __construct($id = 'login_form', $method = 'post', $attributes = null, $
function init()
{
$this->addElement('text', 'form_authcode')
- ->addRule('required',
- Piwik::translate('General_Required', 'Authentication code'));
+ ->addRule(
+ 'required',
+ Piwik::translate('General_Required', 'Authentication code')
+ );
$this->addElement('hidden', 'form_nonce');
diff --git a/plugins/TwoFactorAuth/tests/Fixtures/TwoFactorFixture.php b/plugins/TwoFactorAuth/tests/Fixtures/TwoFactorFixture.php
index ad62829d44d..9d38705bdc2 100644
--- a/plugins/TwoFactorAuth/tests/Fixtures/TwoFactorFixture.php
+++ b/plugins/TwoFactorAuth/tests/Fixtures/TwoFactorFixture.php
@@ -70,8 +70,11 @@ public function setUpWebsite()
public function setUpUsers()
{
- \Piwik\Plugins\UsersManager\API::getInstance()->addUser($this->superUserWith2Fa, $this->userPassword,
- $this->superUserWith2Fa . '@matomo.org');
+ \Piwik\Plugins\UsersManager\API::getInstance()->addUser(
+ $this->superUserWith2Fa,
+ $this->userPassword,
+ $this->superUserWith2Fa . '@matomo.org'
+ );
$userUpdater = new UserUpdater();
$userUpdater->setSuperUserAccessWithoutCurrentPassword($this->superUserWith2Fa, true);
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index dce75bbe7bf..05ae0ab50c2 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -107,8 +107,11 @@ function ($label) use ($separator, $unk) {
$regionCode = getElementFromStringArray($label, $separator, 0, '');
$countryCode = getElementFromStringArray($label, $separator, 1, '');
- list($countryCode, $regionCode) = GeoIp2::convertRegionCodeToIso($countryCode,
- $regionCode, true);
+ list($countryCode, $regionCode) = GeoIp2::convertRegionCodeToIso(
+ $countryCode,
+ $regionCode,
+ true
+ );
$splitLabel = explode($separator, $label);
@@ -140,19 +143,27 @@ function ($label) {
$dataTable->filter('AddSegmentByLabel', array($segments, Archiver::LOCATION_SEPARATOR));
// split the label and put the elements into the 'region' and 'country' metadata fields
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'region', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 0, $unk)));
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'country', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 1, $unk)));
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'region', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 0, $unk))
+ );
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'country', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 1, $unk))
+ );
// add country name metadata
- $dataTable->filter('MetadataCallbackAddMetadata',
- array('country', 'country_name', __NAMESPACE__ . '\CountryTranslate', $applyToSummaryRow = false));
+ $dataTable->filter(
+ 'MetadataCallbackAddMetadata',
+ array('country', 'country_name', __NAMESPACE__ . '\CountryTranslate', $applyToSummaryRow = false)
+ );
// get the region name of each row and put it into the 'region_name' metadata
- $dataTable->filter('ColumnCallbackAddMetadata',
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
array('label', 'region_name', __NAMESPACE__ . '\getRegionName', $params = null,
- $applyToSummaryRow = false));
+ $applyToSummaryRow = false)
+ );
// add the country flag as a url to the 'logo' metadata field
$dataTable->filter('MetadataCallbackAddMetadata', array('country', 'logo', __NAMESPACE__ . '\getFlagFromCode'));
@@ -192,8 +203,11 @@ function ($label) use ($separator, $unk) {
$regionCode = getElementFromStringArray($label, $separator, 1, '');
$countryCode = getElementFromStringArray($label, $separator, 2, '');
- list($countryCode, $regionCode) = GeoIp2::convertRegionCodeToIso($countryCode,
- $regionCode, true);
+ list($countryCode, $regionCode) = GeoIp2::convertRegionCodeToIso(
+ $countryCode,
+ $regionCode,
+ true
+ );
$splitLabel = explode($separator, $label);
@@ -227,31 +241,45 @@ function ($label) {
// split the label and put the elements into the 'city_name', 'region', 'country',
// 'lat' & 'long' metadata fields
$strUnknown = Piwik::translate('General_Unknown');
- $dataTable->filter('ColumnCallbackAddMetadata',
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
array('label', 'city_name', __NAMESPACE__ . '\getElementFromStringArray',
- array($separator, 0, $strUnknown)));
- $dataTable->filter('MetadataCallbackAddMetadata',
+ array($separator, 0, $strUnknown))
+ );
+ $dataTable->filter(
+ 'MetadataCallbackAddMetadata',
array('city_name', 'city', function ($city) use ($strUnknown) {
if ($city == $strUnknown) {
return "xx";
} else {
return false;
}
- }));
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'region', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 1, $unk)));
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'country', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 2, $unk)));
+ })
+ );
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'region', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 1, $unk))
+ );
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'country', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 2, $unk))
+ );
// backwards compatibility: for reports that have lat|long in label
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'lat', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 3, false)));
- $dataTable->filter('ColumnCallbackAddMetadata',
- array('label', 'long', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 4, false)));
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'lat', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 3, false))
+ );
+ $dataTable->filter(
+ 'ColumnCallbackAddMetadata',
+ array('label', 'long', __NAMESPACE__ . '\getElementFromStringArray', array($separator, 4, false))
+ );
// add country name & region name metadata
- $dataTable->filter('MetadataCallbackAddMetadata',
- array('country', 'country_name', __NAMESPACE__ . '\countryTranslate', $applyToSummaryRow = false));
+ $dataTable->filter(
+ 'MetadataCallbackAddMetadata',
+ array('country', 'country_name', __NAMESPACE__ . '\countryTranslate', $applyToSummaryRow = false)
+ );
$getRegionName = '\\Piwik\\Plugins\\UserCountry\\getRegionNameFromCodes';
$dataTable->filter('MetadataCallbackAddMetadata', array(
diff --git a/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php b/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
index d84c2e5bafc..b819b967dbb 100644
--- a/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
+++ b/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
@@ -71,9 +71,13 @@ protected function configure()
$this->setName('usercountry:attribute');
$this->setDescription("Re-attribute existing raw data (visits & conversions) with geolocated location data, using the specified or configured location provider.");
$this->addRequiredArgument(self::DATES_RANGE_ARGUMENT, 'Attribute visits in this date range. Eg, 2012-01-01,2013-01-01');
- $this->addOptionalValueOption(self::PERCENT_STEP_ARGUMENT, null,
+ $this->addOptionalValueOption(
+ self::PERCENT_STEP_ARGUMENT,
+ null,
'How often to display the command progress. A status update will be printed after N percent of visits are processed, '
- . 'where N is the value of this option.', self::PERCENT_STEP_ARGUMENT_DEFAULT);
+ . 'where N is the value of this option.',
+ self::PERCENT_STEP_ARGUMENT_DEFAULT
+ );
$this->addRequiredValueOption(self::PROVIDER_ARGUMENT, null, 'Provider id which should be used to attribute visits. If empty then'
. ' Piwik will use the currently configured provider. If no provider is configured, the default provider is used.');
$this->addOptionalValueOption(self::SEGMENT_LIMIT_OPTION, null, 'Number of visits to process at a time.', self::SEGMENT_LIMIT_OPTION_DEFAULT);
@@ -96,8 +100,13 @@ protected function doExecute(): int
$this->amountOfVisits = $this->dao->countVisitsWithDatesLimit($from, $to);
$output->writeln(
- sprintf('Re-attribution for date range: %s to %s. %d visits to process with provider "%s".',
- $from, $to, $this->amountOfVisits, $this->visitorGeolocator->getProvider()->getId())
+ sprintf(
+ 'Re-attribution for date range: %s to %s. %d visits to process with provider "%s".',
+ $from,
+ $to,
+ $this->amountOfVisits,
+ $this->visitorGeolocator->getProvider()->getId()
+ )
);
$this->timer = new Timer();
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 6bbce30544e..7217d833039 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -124,7 +124,10 @@ public function getLocationUsingProvider()
'lang' => Common::getBrowserLanguage(),
'disable_fallbacks' => true));
$location = LocationProvider::prettyFormatLocation(
- $location, $newline = '
', $includeExtra = true);
+ $location,
+ $newline = '
',
+ $includeExtra = true
+ );
return $location;
}
diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php
index 2f0a804fe52..9a4777f87b5 100644
--- a/plugins/UserCountry/LocationProvider.php
+++ b/plugins/UserCountry/LocationProvider.php
@@ -369,7 +369,8 @@ public static function setCurrentProvider($providerId)
$provider = self::getProviderById($providerId);
if (empty($provider)) {
throw new Exception(
- "Invalid provider ID '$providerId'. The provider either does not exist or is not available");
+ "Invalid provider ID '$providerId'. The provider either does not exist or is not available"
+ );
}
$provider->activate();
diff --git a/plugins/UserCountry/Menu.php b/plugins/UserCountry/Menu.php
index c7890875314..b211ab519e6 100644
--- a/plugins/UserCountry/Menu.php
+++ b/plugins/UserCountry/Menu.php
@@ -16,9 +16,11 @@ class Menu extends \Piwik\Plugin\Menu
public function configureAdminMenu(MenuAdmin $menu)
{
if (UserCountry::isGeoLocationAdminEnabled() && Piwik::hasUserSuperUserAccess()) {
- $menu->addSystemItem('UserCountry_Geolocation',
- $this->urlForAction('adminIndex'),
- $order = 30);
+ $menu->addSystemItem(
+ 'UserCountry_Geolocation',
+ $this->urlForAction('adminIndex'),
+ $order = 30
+ );
}
}
}
diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php
index 3439df484c3..5c506f4a268 100644
--- a/plugins/UserCountry/Reports/Base.php
+++ b/plugins/UserCountry/Reports/Base.php
@@ -22,7 +22,8 @@ protected function init()
protected function getGeoIPReportDocSuffix()
{
- return Piwik::translate('UserCountry_GeoIPDocumentationSuffix',
+ return Piwik::translate(
+ 'UserCountry_GeoIPDocumentationSuffix',
array('',
'',
'',
@@ -47,14 +48,18 @@ protected function checkIfNoDataForGeoIpReport(ViewDataTable $view)
// if GeoIP is working, don't display this part of the message
if (!$userCountry->isGeoIPWorking()) {
$params = array('module' => 'UserCountry', 'action' => 'adminIndex');
- $footerMessage .= ' ' . Piwik::translate('UserCountry_NoDataForGeoIPReport2',
- array('',
+ $footerMessage .= ' ' . Piwik::translate(
+ 'UserCountry_NoDataForGeoIPReport2',
+ array('',
'',
'',
- ''));
+ '')
+ );
} else {
- $footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits',
- array('', ''));
+ $footerMessage .= ' ' . Piwik::translate(
+ 'UserCountry_ToGeolocateOldVisits',
+ array('', '')
+ );
}
$view->config->show_footer_message = $footerMessage;
diff --git a/plugins/UserCountry/Reports/GetCountry.php b/plugins/UserCountry/Reports/GetCountry.php
index af843a153d0..e93dd17ba90 100644
--- a/plugins/UserCountry/Reports/GetCountry.php
+++ b/plugins/UserCountry/Reports/GetCountry.php
@@ -38,8 +38,10 @@ public function configureView(ViewDataTable $view)
if (LocationProvider::getCurrentProviderId() == LocationProvider\DefaultProvider::ID) {
// if we're using the default location provider, add a note explaining how it works
$footerMessage = Piwik::translate("General_Note") . ': '
- . Piwik::translate('UserCountry_DefaultLocationProviderExplanation',
- ['', '']);
+ . Piwik::translate(
+ 'UserCountry_DefaultLocationProviderExplanation',
+ ['', '']
+ );
$view->config->show_footer_message = $footerMessage;
}
diff --git a/plugins/UserCountry/VisitorDetails.php b/plugins/UserCountry/VisitorDetails.php
index f3b04f589ed..3fae5146817 100644
--- a/plugins/UserCountry/VisitorDetails.php
+++ b/plugins/UserCountry/VisitorDetails.php
@@ -70,7 +70,9 @@ protected function getRegionName()
$region = $this->getRegionCode();
if ($region != '' && $region != Visit::UNKNOWN_CODE) {
return getRegionNameFromCodes(
- $this->details['location_country'], $region);
+ $this->details['location_country'],
+ $region
+ );
}
return null;
diff --git a/plugins/UserId/Reports/GetUsers.php b/plugins/UserId/Reports/GetUsers.php
index d2abdbf3935..37c97564537 100644
--- a/plugins/UserId/Reports/GetUsers.php
+++ b/plugins/UserId/Reports/GetUsers.php
@@ -60,8 +60,11 @@ public function configureView(ViewDataTable $view)
$view->config->show_insights = false;
$view->config->show_pivot_by_subtable = false;
$view->config->no_data_message = Piwik::translate('CoreHome_ThereIsNoDataForThisReport') . '
'
- . sprintf(Piwik::translate('UserId_ThereIsNoDataForThisReportHelp'),
- "", "");
+ . sprintf(
+ Piwik::translate('UserId_ThereIsNoDataForThisReportHelp'),
+ "",
+ ""
+ );
if ($view->isViewDataTableId(HtmlTable::ID)) {
$view->config->disable_row_evolution = false;
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index e4ae50f2c79..f95d650ddcb 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -521,12 +521,16 @@ public function recordAnonymousUserSettings()
$anonymousDefaultReport = Common::getRequestVar('anonymousDefaultReport');
$anonymousDefaultDate = Common::getRequestVar('anonymousDefaultDate');
$userLogin = 'anonymous';
- APIUsersManager::getInstance()->setUserPreference($userLogin,
+ APIUsersManager::getInstance()->setUserPreference(
+ $userLogin,
APIUsersManager::PREFERENCE_DEFAULT_REPORT,
- $anonymousDefaultReport);
- APIUsersManager::getInstance()->setUserPreference($userLogin,
+ $anonymousDefaultReport
+ );
+ APIUsersManager::getInstance()->setUserPreference(
+ $userLogin,
APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE,
- $anonymousDefaultDate);
+ $anonymousDefaultDate
+ );
$toReturn = $response->getResponse();
} catch (Exception $e) {
$toReturn = $response->getResponseException($e);
@@ -566,12 +570,16 @@ public function recordUserSettings()
'use12HourClock' => $timeFormat,
]);
- APIUsersManager::getInstance()->setUserPreference($userLogin,
+ APIUsersManager::getInstance()->setUserPreference(
+ $userLogin,
APIUsersManager::PREFERENCE_DEFAULT_REPORT,
- $defaultReport);
- APIUsersManager::getInstance()->setUserPreference($userLogin,
+ $defaultReport
+ );
+ APIUsersManager::getInstance()->setUserPreference(
+ $userLogin,
APIUsersManager::PREFERENCE_DEFAULT_REPORT_DATE,
- $defaultDate);
+ $defaultDate
+ );
$toReturn = $response->getResponse();
} catch (Exception $e) {
$toReturn = $response->getResponseException($e);
diff --git a/plugins/UsersManager/Model.php b/plugins/UsersManager/Model.php
index 288a7a7607b..df93b783210 100644
--- a/plugins/UsersManager/Model.php
+++ b/plugins/UsersManager/Model.php
@@ -309,8 +309,10 @@ public function generateRandomTokenAuth()
private function generateTokenAuth()
{
- return md5(Common::getRandomString(32,
- 'abcdef1234567890') . microtime(true) . Common::generateUniqId() . SettingsPiwik::getSalt());
+ return md5(Common::getRandomString(
+ 32,
+ 'abcdef1234567890'
+ ) . microtime(true) . Common::generateUniqId() . SettingsPiwik::getSalt());
}
/**
@@ -340,8 +342,11 @@ public function addTokenAuth(
throw new \Exception('User ' . $login . ' does not exist');
}
- BaseValidator::check('Description', $description,
- [new NotEmpty(), new CharacterLength(1, self::MAX_LENGTH_TOKEN_DESCRIPTION)]);
+ BaseValidator::check(
+ 'Description',
+ $description,
+ [new NotEmpty(), new CharacterLength(1, self::MAX_LENGTH_TOKEN_DESCRIPTION)]
+ );
if (empty($dateExpired)) {
$dateExpired = null;
@@ -354,8 +359,10 @@ public function addTokenAuth(
$tokenAuth = $this->hashTokenAuth($tokenAuth);
$db = $this->getDb();
- $db->query($insertSql,
- [$login, $description, $tokenAuth, $dateCreated, $dateExpired, $isSystemToken, self::TOKEN_HASH_ALGO, $secureOnly]);
+ $db->query(
+ $insertSql,
+ [$login, $description, $tokenAuth, $dateCreated, $dateExpired, $isSystemToken, self::TOKEN_HASH_ALGO, $secureOnly]
+ );
return $db->lastInsertId();
}
@@ -372,8 +379,10 @@ public function getUserTokenDescriptionByIdTokenAuth($idTokenAuth, $login)
{
$db = $this->getDb();
- $token = $db->fetchRow("SELECT description FROM " . $this->tokenTable . " WHERE `idusertokenauth` = ? and login = ? LIMIT 1",
- array($idTokenAuth, $login));
+ $token = $db->fetchRow(
+ "SELECT description FROM " . $this->tokenTable . " WHERE `idusertokenauth` = ? and login = ? LIMIT 1",
+ array($idTokenAuth, $login)
+ );
return $token ? $token['description'] : '';
}
@@ -425,16 +434,20 @@ public function deleteExpiredTokens($expiredSince)
{
$db = $this->getDb();
- return $db->query("DELETE FROM " . $this->tokenTable . " WHERE `date_expired` is not null and date_expired < ?",
- $expiredSince);
+ return $db->query(
+ "DELETE FROM " . $this->tokenTable . " WHERE `date_expired` is not null and date_expired < ?",
+ $expiredSince
+ );
}
public function getExpiredInvites($expiredSince)
{
$db = $this->getDb();
- return $db->fetchAll("SELECT * FROM " . $this->userTable . " WHERE `invite_expired_at` is not null and invite_expired_at < ?",
- $expiredSince);
+ return $db->fetchAll(
+ "SELECT * FROM " . $this->userTable . " WHERE `invite_expired_at` is not null and invite_expired_at < ?",
+ $expiredSince
+ );
}
public function checkUserHasUnexpiredToken($login)
@@ -442,8 +455,10 @@ public function checkUserHasUnexpiredToken($login)
$db = $this->getDb();
$expired = $this->getQueryNotExpiredToken();
$bind = array_merge(array($login), $expired['bind']);
- return $db->fetchOne("SELECT idusertokenauth FROM " . $this->tokenTable . " WHERE `login` = ? and " . $expired['sql'],
- $bind);
+ return $db->fetchOne(
+ "SELECT idusertokenauth FROM " . $this->tokenTable . " WHERE `login` = ? and " . $expired['sql'],
+ $bind
+ );
}
public function deleteAllTokensForUser($login)
@@ -461,8 +476,10 @@ public function getAllNonSystemTokensForLogin($login)
$expired = $this->getQueryNotExpiredToken();
$bind = array_merge(array($login), $expired['bind']);
- return $db->fetchAll("SELECT * FROM " . $this->tokenTable . " WHERE `login` = ? and system_token = 0 and " . $expired['sql'] . ' order by idusertokenauth ASC',
- $bind);
+ return $db->fetchAll(
+ "SELECT * FROM " . $this->tokenTable . " WHERE `login` = ? and system_token = 0 and " . $expired['sql'] . ' order by idusertokenauth ASC',
+ $bind
+ );
}
public function getAllHashedTokensForLogins($logins)
@@ -477,8 +494,10 @@ public function getAllHashedTokensForLogins($logins)
$expired = $this->getQueryNotExpiredToken();
$bind = array_merge($logins, $expired['bind']);
- $tokens = $db->fetchAll("SELECT password FROM " . $this->tokenTable . " WHERE `login` IN (" . $placeholder . ") and " . $expired['sql'],
- $bind);
+ $tokens = $db->fetchAll(
+ "SELECT password FROM " . $this->tokenTable . " WHERE `login` IN (" . $placeholder . ") and " . $expired['sql'],
+ $bind
+ );
return array_column($tokens, 'password');
}
@@ -486,8 +505,10 @@ public function deleteToken($idTokenAuth, $login)
{
$db = $this->getDb();
- return $db->query("DELETE FROM " . $this->tokenTable . " WHERE `idusertokenauth` = ? and login = ?",
- array($idTokenAuth, $login));
+ return $db->query(
+ "DELETE FROM " . $this->tokenTable . " WHERE `idusertokenauth` = ? and login = ?",
+ array($idTokenAuth, $login)
+ );
}
public function setTokenAuthWasUsed($tokenAuth, $dateLastUsed)
@@ -522,8 +543,10 @@ private function updateTokenAuthTable($idTokenAuth, $fields)
$bind[] = $idTokenAuth;
$db = $this->getDb();
- $db->query(sprintf('UPDATE `%s` SET %s WHERE `idusertokenauth` = ?', $this->tokenTable, implode(', ', $set)),
- $bind);
+ $db->query(
+ sprintf('UPDATE `%s` SET %s WHERE `idusertokenauth` = ?', $this->tokenTable, implode(', ', $set)),
+ $bind
+ );
}
public function getUserByEmail($userEmail)
@@ -737,8 +760,10 @@ public function deleteUserAccess($userLogin, $idSites = null)
$db->query("DELETE FROM " . Common::prefixTable("access") . " WHERE login = ?", $userLogin);
} else {
foreach ($idSites as $idsite) {
- $db->query("DELETE FROM " . Common::prefixTable("access") . " WHERE idsite = ? AND login = ?",
- [$idsite, $userLogin]);
+ $db->query(
+ "DELETE FROM " . Common::prefixTable("access") . " WHERE idsite = ? AND login = ?",
+ [$idsite, $userLogin]
+ );
}
}
}
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 128908a8c01..32b337a971a 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -70,8 +70,14 @@ public function addSystemSummaryItems(&$systemSummary)
$numUsers--;
}
- $systemSummary[] = new SystemSummary\Item($key = 'users', Piwik::translate('General_NUsers', $numUsers),
- $value = null, array('module' => 'UsersManager', 'action' => 'index'), $icon = 'icon-user', $order = 5);
+ $systemSummary[] = new SystemSummary\Item(
+ $key = 'users',
+ Piwik::translate('General_NUsers', $numUsers),
+ $value = null,
+ array('module' => 'UsersManager', 'action' => 'index'),
+ $icon = 'icon-user',
+ $order = 5
+ );
}
public function onPlatformInitialized()
@@ -175,12 +181,16 @@ public static function checkPassword($password)
Piwik::postEvent('UsersManager.checkPassword', array($password));
if (!self::isValidPasswordString($password)) {
- throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidPassword',
- array(self::PASSWORD_MIN_LENGTH)));
+ throw new Exception(Piwik::translate(
+ 'UsersManager_ExceptionInvalidPassword',
+ array(self::PASSWORD_MIN_LENGTH)
+ ));
}
if (mb_strlen($password) > self::PASSWORD_MAX_LENGTH) {
- throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidPasswordTooLong',
- array(self::PASSWORD_MAX_LENGTH)));
+ throw new Exception(Piwik::translate(
+ 'UsersManager_ExceptionInvalidPasswordTooLong',
+ array(self::PASSWORD_MAX_LENGTH)
+ ));
}
}
diff --git a/plugins/UsersManager/tests/Integration/TokenSecureOnlyTest.php b/plugins/UsersManager/tests/Integration/TokenSecureOnlyTest.php
index 8ee728610f2..b4ccae0e601 100644
--- a/plugins/UsersManager/tests/Integration/TokenSecureOnlyTest.php
+++ b/plugins/UsersManager/tests/Integration/TokenSecureOnlyTest.php
@@ -36,8 +36,15 @@ private static function createUserAndTokens()
UsersManagerAPI::getInstance()->setUserAccess('user1', 'view', [1]);
$userModel = new UsersManagerModel();
- $userModel->addTokenAuth('user1', self::$tokenSecureOnly, 'Secure Only', '2020-01-02 03:04:05',
- null, false, true);
+ $userModel->addTokenAuth(
+ 'user1',
+ self::$tokenSecureOnly,
+ 'Secure Only',
+ '2020-01-02 03:04:05',
+ null,
+ false,
+ true
+ );
}
}
diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php
index b4a8d745024..dc1fc4551a1 100644
--- a/plugins/UsersManager/tests/Integration/UsersManagerTest.php
+++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php
@@ -248,9 +248,11 @@ public function testAddUserWrongEmail()
public function testAddUserLongPassword()
{
$login = "geggeqgeqag";
- $this->api->addUser($login,
- "geqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaeg",
- "mgeagi@geq.com");
+ $this->api->addUser(
+ $login,
+ "geqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaegeqgeagaeg",
+ "mgeagi@geq.com"
+ );
$user = $this->api->getUser($login);
$this->assertEquals($login, $user['login']);
}
@@ -269,8 +271,10 @@ public function testAddUser()
$user = $this->model->getUser($login);
// check that the date registered is correct
- $this->assertTrue($time <= strtotime($user['date_registered']) && strtotime($user['date_registered']) <= time(),
- "the date_registered " . strtotime($user['date_registered']) . " is different from the time() " . time());
+ $this->assertTrue(
+ $time <= strtotime($user['date_registered']) && strtotime($user['date_registered']) <= time(),
+ "the date_registered " . strtotime($user['date_registered']) . " is different from the time() " . time()
+ );
// check that password and token are properly set
$this->assertEquals(60, strlen($user['password']));
@@ -487,10 +491,14 @@ public function testGetUsers()
);
$expectedUsers = array($user1, $user2, $user3);
$this->assertEquals($expectedUsers, $users);
- $this->assertEquals(array($user1),
- $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag')));
- $this->assertEquals(array($user1, $user2),
- $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag,geggeqge632ge56a4qag')));
+ $this->assertEquals(
+ array($user1),
+ $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag'))
+ );
+ $this->assertEquals(
+ array($user1, $user2),
+ $this->_removeNonTestableFieldsFromUsers($this->api->getUsers('gegg4564eqgeqag,geggeqge632ge56a4qag'))
+ );
}
public function testGetUsers_withViewAccess_shouldThrowAnException()
@@ -1168,8 +1176,10 @@ private function addSites($numberOfSites)
for ($index = 0; $index < $numberOfSites; $index++) {
$name = "test" . ($index + 1);
- $idSites[] = APISitesManager::getInstance()->addSite($name,
- array("http://piwik.net", "http://piwik.com/test/"));
+ $idSites[] = APISitesManager::getInstance()->addSite(
+ $name,
+ array("http://piwik.net", "http://piwik.com/test/")
+ );
}
return $idSites;
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index 7c6bb1c00c5..4128e42e1ae 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -71,8 +71,13 @@ public function getEvolutionGraph()
}
}
- $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns,
- $selectableColumns, $documentation);
+ $view = $this->getLastUnitGraphAcrossPlugins(
+ $this->pluginName,
+ __FUNCTION__,
+ $columns,
+ $selectableColumns,
+ $documentation
+ );
if (empty($view->config->columns_to_display)) {
$view->config->columns_to_display = array('nb_visits_returning');
diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
index 5f08685badf..77b3241bed8 100644
--- a/plugins/VisitorInterest/API.php
+++ b/plugins/VisitorInterest/API.php
@@ -66,7 +66,13 @@ public function getNumberOfVisitsPerPage($idSite, $period, $date, $segment = fal
public function getNumberOfVisitsByDaysSinceLast($idSite, $period, $date, $segment = false)
{
$dataTable = $this->getDataTable(
- Archiver::DAYS_SINCE_LAST_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS);
+ Archiver::DAYS_SINCE_LAST_RECORD_NAME,
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ Metrics::INDEX_NB_VISITS
+ );
$dataTable->queueFilter('AddSegmentByRangeLabel', array('daysSinceLastVisit'));
$dataTable->queueFilter('BeautifyRangeLabels', array(Piwik::translate('Intl_OneDay'), Piwik::translate('Intl_NDays')));
return $dataTable;
@@ -85,7 +91,13 @@ public function getNumberOfVisitsByDaysSinceLast($idSite, $period, $date, $segme
public function getNumberOfVisitsByVisitCount($idSite, $period, $date, $segment = false)
{
$dataTable = $this->getDataTable(
- Archiver::VISITS_COUNT_RECORD_NAME, $idSite, $period, $date, $segment, Metrics::INDEX_NB_VISITS);
+ Archiver::VISITS_COUNT_RECORD_NAME,
+ $idSite,
+ $period,
+ $date,
+ $segment,
+ Metrics::INDEX_NB_VISITS
+ );
$dataTable->queueFilter('AddSegmentByRangeLabel', array('visitCount'));
$dataTable->queueFilter('BeautifyRangeLabels', array(
diff --git a/plugins/VisitorInterest/RecordBuilders/Engagement.php b/plugins/VisitorInterest/RecordBuilders/Engagement.php
index f92a96551c3..096893dc546 100644
--- a/plugins/VisitorInterest/RecordBuilders/Engagement.php
+++ b/plugins/VisitorInterest/RecordBuilders/Engagement.php
@@ -43,17 +43,29 @@ protected function aggregate(ArchiveProcessor $archiveProcessor): array
// collect our extra aggregate select fields
$selects = array();
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- 'visit_total_time', Archiver::getSecondsGap(), 'log_visit', $prefixes[Archiver::TIME_SPENT_RECORD_NAME]
+ 'visit_total_time',
+ Archiver::getSecondsGap(),
+ 'log_visit',
+ $prefixes[Archiver::TIME_SPENT_RECORD_NAME]
));
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- 'visit_total_actions', Archiver::$pageGap, 'log_visit', $prefixes[Archiver::PAGES_VIEWED_RECORD_NAME]
+ 'visit_total_actions',
+ Archiver::$pageGap,
+ 'log_visit',
+ $prefixes[Archiver::PAGES_VIEWED_RECORD_NAME]
));
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- 'visitor_count_visits', Archiver::$visitNumberGap, 'log_visit', $prefixes[Archiver::VISITS_COUNT_RECORD_NAME]
+ 'visitor_count_visits',
+ Archiver::$visitNumberGap,
+ 'log_visit',
+ $prefixes[Archiver::VISITS_COUNT_RECORD_NAME]
));
$selects = array_merge($selects, LogAggregator::getSelectsFromRangedColumn(
- 'FLOOR(log_visit.visitor_seconds_since_last / 86400)', Archiver::$daysSinceLastVisitGap, 'log_visit', $prefixes[Archiver::DAYS_SINCE_LAST_RECORD_NAME],
+ 'FLOOR(log_visit.visitor_seconds_since_last / 86400)',
+ Archiver::$daysSinceLastVisitGap,
+ 'log_visit',
+ $prefixes[Archiver::DAYS_SINCE_LAST_RECORD_NAME],
$restrictToReturningVisitors = true
));
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 4ed57e1e9ac..9c62eadbea9 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -118,8 +118,10 @@ public function getSumVisitsLengthPretty($idSite, $period, $date, $segment = fal
$table = $this->getSumVisitsLength($idSite, $period, $date, $segment);
if (is_object($table)) {
- $table->filter('ColumnCallbackReplace',
- array('sum_visit_length', array($formatter, 'getPrettyTimeFromSeconds'), array(true)));
+ $table->filter(
+ 'ColumnCallbackReplace',
+ array('sum_visit_length', array($formatter, 'getPrettyTimeFromSeconds'), array(true))
+ );
} else {
$table = $formatter->getPrettyTimeFromSeconds($table, true);
}
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 31e00d9b7f8..d399c60358c 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -117,8 +117,13 @@ public function getEvolutionGraph()
}
// $callingAction may be specified to distinguish between
// "VisitsSummary_WidgetLastVisits" and "VisitsSummary_WidgetOverviewGraph"
- $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns,
- $selectableColumns, $documentation);
+ $view = $this->getLastUnitGraphAcrossPlugins(
+ $this->pluginName,
+ __FUNCTION__,
+ $columns,
+ $selectableColumns,
+ $documentation
+ );
if (empty($view->config->columns_to_display)) {
$view->config->columns_to_display = array('nb_visits');
diff --git a/tests/PHPUnit/Fixtures/DisablePluginArchive.php b/tests/PHPUnit/Fixtures/DisablePluginArchive.php
index ff130924aed..2568e186e93 100644
--- a/tests/PHPUnit/Fixtures/DisablePluginArchive.php
+++ b/tests/PHPUnit/Fixtures/DisablePluginArchive.php
@@ -61,19 +61,19 @@ private function trackVisits()
// testing URL excluded parameters
$parameterToExclude = 'excluded_parameter';
APISitesManager::getInstance()->updateSite(
- $idSite,
- 'new name',
- $url = array('http://site.com'),
- $ecommerce = 0,
- $siteSearch = 0,
- $searchKeywordParameters = null,
- $searchCategoryParameters = null,
- $excludedIps = null,
- $parameterToExclude . ',anotherParameter',
- $timezone = null,
- $currency = null,
- $group = null,
- $startDate = null
+ $idSite,
+ 'new name',
+ $url = array('http://site.com'),
+ $ecommerce = 0,
+ $siteSearch = 0,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = null,
+ $parameterToExclude . ',anotherParameter',
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null
);
// Record 1st page view
diff --git a/tests/PHPUnit/Fixtures/InvalidVisits.php b/tests/PHPUnit/Fixtures/InvalidVisits.php
index 881ca250192..319ff2cf677 100644
--- a/tests/PHPUnit/Fixtures/InvalidVisits.php
+++ b/tests/PHPUnit/Fixtures/InvalidVisits.php
@@ -102,10 +102,26 @@ private function trackVisits()
// test unknown url exclusion works
$urls = array("http://piwik.net", "http://my.stuff.com/");
- API::getInstance()->updateSite($idSite, $siteName = null, $urls, $ecommerce = null, $siteSearch = null,
- $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParams = null,
- $timezone = null, $currency = null, $group = null, $startDate = null, $excludedUserAgents = null,
- $keepUrlFragments = null, $type = null, $settings = null, $excludeUnknownUrls = 1);
+ API::getInstance()->updateSite(
+ $idSite,
+ $siteName = null,
+ $urls,
+ $ecommerce = null,
+ $siteSearch = null,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = null,
+ $excludedQueryParams = null,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepUrlFragments = null,
+ $type = null,
+ $settings = null,
+ $excludeUnknownUrls = 1
+ );
Cache::regenerateCacheWebsiteAttributes([1]);
$t->setIp("125.4.5.6");
@@ -118,10 +134,26 @@ private function trackVisits()
// undo exclude unknown urls change (important when multiple fixtures are setup together, as is done in OmniFixture)
- API::getInstance()->updateSite($idSite, $siteName = null, $urls, $ecommerce = null, $siteSearch = null,
- $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null, $excludedQueryParams = null,
- $timezone = null, $currency = null, $group = null, $startDate = null, $excludedUserAgents = null,
- $keepUrlFragments = null, $type = null, $settings = null, $excludeUnknownUrls = 0);
+ API::getInstance()->updateSite(
+ $idSite,
+ $siteName = null,
+ $urls,
+ $ecommerce = null,
+ $siteSearch = null,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = null,
+ $excludedQueryParams = null,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepUrlFragments = null,
+ $type = null,
+ $settings = null,
+ $excludeUnknownUrls = 0
+ );
Cache::regenerateCacheWebsiteAttributes([1]);
try {
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
index 2c739a06c20..bad019036d2 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogs.php
@@ -66,13 +66,21 @@ public function setUpWebsitesAndGoals()
}
if (!self::siteCreated($idSite = 2)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'Piwik test two',
- $siteUrl = 'http://example-site-two.com');
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'Piwik test two',
+ $siteUrl = 'http://example-site-two.com'
+ );
}
if (!self::siteCreated($idSite = 3)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'Piwik test three',
- $siteUrl = 'http://example-site-three.com');
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'Piwik test three',
+ $siteUrl = 'http://example-site-three.com'
+ );
}
}
diff --git a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
index e47ac948ff1..898990154af 100644
--- a/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
+++ b/tests/PHPUnit/Fixtures/ManySitesImportedLogsWithXssAttempts.php
@@ -72,22 +72,48 @@ public function setUpWebsitesAndGoals()
if (!self::goalExists($idSite = 1, $idGoal = 1)) {
APIGoals::getInstance()->addGoal(
- $this->idSite, $xssTesting->forTwig("goal name"), 'url', 'http', 'contains', false, 5, false, $xssTesting->forTwig("goal description"));
+ $this->idSite,
+ $xssTesting->forTwig("goal name"),
+ 'url',
+ 'http',
+ 'contains',
+ false,
+ 5,
+ false,
+ $xssTesting->forTwig("goal description")
+ );
}
if (!self::siteCreated($idSite = 2)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = $xssTesting->forAngular('Piwik test two'),
- $siteUrl = 'http://example-site-two.com');
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = $xssTesting->forAngular('Piwik test two'),
+ $siteUrl = 'http://example-site-two.com'
+ );
}
if (!self::goalExists($idSite = 2, $idGoal = 2)) {
APIGoals::getInstance()->addGoal(
- $this->idSite, $xssTesting->forAngular("second goal"), 'url', 'http', 'contains', false, 5, false, $xssTesting->forAngular("goal description"));
+ $this->idSite,
+ $xssTesting->forAngular("second goal"),
+ 'url',
+ 'http',
+ 'contains',
+ false,
+ 5,
+ false,
+ $xssTesting->forAngular("goal description")
+ );
}
if (!self::siteCreated($idSite = 3)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'Piwik test three',
- $siteUrl = 'http://example-site-three.com');
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'Piwik test three',
+ $siteUrl = 'http://example-site-three.com'
+ );
}
}
@@ -96,7 +122,11 @@ public function addAnnotations()
$xssTesting = new XssTesting();
APIAnnotations::getInstance()->add($this->idSite, '2012-08-09', "Note 1", $starred = 1);
APIAnnotations::getInstance()->add(
- $this->idSite, '2012-08-08', $xssTesting->forTwig("annotation"), $starred = 0);
+ $this->idSite,
+ '2012-08-08',
+ $xssTesting->forTwig("annotation"),
+ $starred = 0
+ );
APIAnnotations::getInstance()->add($this->idSite, '2012-08-10', $xssTesting->forAngular("Annotation note 3"), $starred = 1);
}
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 81c510d10b4..76b8f8c04df 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -224,7 +224,8 @@ protected function trackVisit(\MatomoTracker $t, $fixtureCounter, $visitorCounte
$date = $date->addHour(0.05);
$t->setForceVisitDateTime($date->getDatetime());
- $r = $t->doTrackEvent('Cat' . $visitorCounter,
+ $r = $t->doTrackEvent(
+ 'Cat' . $visitorCounter,
'Action' . $visitorCounter,
'Name' . $visitorCounter,
345.678 + $visitorCounter
diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
index 9f10cbe46c8..960528a198d 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithMockLocationProvider.php
@@ -250,7 +250,8 @@ private function trackAction(\MatomoTracker $t, $actionType, $visitorCounter, $a
{
if ($actionType == 'pageview') {
self::checkResponse($t->doTrackPageView(
- is_null($actionNum) ? "title_$visitorCounter" : "title_$visitorCounter / title_$actionNum"));
+ is_null($actionNum) ? "title_$visitorCounter" : "title_$visitorCounter / title_$actionNum"
+ ));
} else if ($actionType == 'download') {
$root = is_null($actionNum) ? "http://cloudsite$visitorCounter.com"
: "http://cloudsite$visitorCounter.com/$actionNum";
diff --git a/tests/PHPUnit/Fixtures/SomePageGoalVisitsWithConversions.php b/tests/PHPUnit/Fixtures/SomePageGoalVisitsWithConversions.php
index 97e7035f4c8..284755f0375 100644
--- a/tests/PHPUnit/Fixtures/SomePageGoalVisitsWithConversions.php
+++ b/tests/PHPUnit/Fixtures/SomePageGoalVisitsWithConversions.php
@@ -47,21 +47,40 @@ private function setUpWebsitesAndGoals()
// Newsletter signup goal
if (!self::goalExists($idSite = 1, $idGoal = 1)) {
- APIGoals::getInstance()->addGoal($this->idSite, 'Goal 1', 'event_action', 'click',
- 'contains', false, 10);
+ APIGoals::getInstance()->addGoal(
+ $this->idSite,
+ 'Goal 1',
+ 'event_action',
+ 'click',
+ 'contains',
+ false,
+ 10
+ );
}
// Contact me signup goal
if (!self::goalExists($idSite = 1, $idGoal = 2)) {
- APIGoals::getInstance()->addGoal($this->idSite, 'Goal "<2~$%+"', 'event_action', 'press',
- 'contains', false, 10);
+ APIGoals::getInstance()->addGoal(
+ $this->idSite,
+ 'Goal "<2~$%+"',
+ 'event_action',
+ 'press',
+ 'contains',
+ false,
+ 10
+ );
}
}
private function setUpSegment()
{
- APISegmentEditor::getInstance()->add('goalsByCountry', 'countryCode==' . $this->segmentCountryCode,
- $this->idSite, true, true);
+ APISegmentEditor::getInstance()->add(
+ 'goalsByCountry',
+ 'countryCode==' . $this->segmentCountryCode,
+ $this->idSite,
+ true,
+ true
+ );
}
private function doPageVisit($t, string $pageLetter, ?string $subPage = null)
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
index 6739e8580e7..39776a577bb 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsAllConversions.php
@@ -41,16 +41,28 @@ private function setUpWebsitesAndGoals()
// First, a goal that is only recorded once per visit
if (!self::goalExists($idSite = 1, $idGoal = 1)) {
API::getInstance()->addGoal(
- $this->idSite, 'triggered js ONCE', 'title', 'Thank you', 'contains', $caseSensitive = false,
- $revenue = 10, $allowMultipleConversions = false
+ $this->idSite,
+ 'triggered js ONCE',
+ 'title',
+ 'Thank you',
+ 'contains',
+ $caseSensitive = false,
+ $revenue = 10,
+ $allowMultipleConversions = false
);
}
// Second, a goal allowing multiple conversions
if (!self::goalExists($idSite = 1, $idGoal = 2)) {
API::getInstance()->addGoal(
- $this->idSite, 'triggered js MULTIPLE ALLOWED', 'manually', '', '', $caseSensitive = false,
- $revenue = 10, $allowMultipleConversions = true
+ $this->idSite,
+ 'triggered js MULTIPLE ALLOWED',
+ 'manually',
+ '',
+ '',
+ $caseSensitive = false,
+ $revenue = 10,
+ $allowMultipleConversions = true
);
}
diff --git a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
index 2835500b46c..0b2646f9763 100644
--- a/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
+++ b/tests/PHPUnit/Fixtures/SomeVisitsManyPageviewsWithTransitions.php
@@ -35,8 +35,13 @@ public function tearDown(): void
private function setUpWebsitesAndGoals()
{
if (!self::siteCreated($idSite = 1)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'Piwik test', $siteUrl = false,
- $siteSearch = 1);
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'Piwik test',
+ $siteUrl = false,
+ $siteSearch = 1
+ );
}
}
@@ -117,9 +122,15 @@ private function trackVisits()
$this->trackPageView($tracker, 0.2, 'page/one.html', $laterDate);
$this->trackPageView($tracker, 0.25, '', $laterDate, $pageViewType = 'download');
$this->trackPageView($tracker, 0.3, 'page/one.html', $laterDate);
- $this->trackPageView($tracker, 0.35, 'page/search.html#q=anotherkwd', $laterDate,
- $pageViewType = 'site-search', $searchKeyword = 'anotherkwd',
- $searchCategory = 'mysearchcat');
+ $this->trackPageView(
+ $tracker,
+ 0.35,
+ 'page/search.html#q=anotherkwd',
+ $laterDate,
+ $pageViewType = 'site-search',
+ $searchKeyword = 'anotherkwd',
+ $searchCategory = 'mysearchcat'
+ );
$tracker->setIp('156.5.3.8');
diff --git a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
index aad330e4509..10833c033a1 100644
--- a/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
+++ b/tests/PHPUnit/Fixtures/ThreeGoalsOnePageview.php
@@ -43,15 +43,27 @@ private function setUpWebsitesAndGoals()
if (!self::goalExists($idSite = 1, $idGoal = 1)) {
API::getInstance()->addGoal(
- $this->idSite, 'Goal 1 - Thank you', 'title', 'Thank you', 'contains', $caseSensitive = false,
- $revenue = 10, $allowMultipleConversions = 1
+ $this->idSite,
+ 'Goal 1 - Thank you',
+ 'title',
+ 'Thank you',
+ 'contains',
+ $caseSensitive = false,
+ $revenue = 10,
+ $allowMultipleConversions = 1
);
}
if (!self::goalExists($idSite = 1, $idGoal = 2)) {
API::getInstance()->addGoal(
- $this->idSite, 'Goal 2 - Hello', 'url', 'hellow', 'contains', $caseSensitive = false,
- $revenue = 10, $allowMultipleConversions = 0
+ $this->idSite,
+ 'Goal 2 - Hello',
+ 'url',
+ 'hellow',
+ 'contains',
+ $caseSensitive = false,
+ $revenue = 10,
+ $allowMultipleConversions = 0
);
}
diff --git a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
index f13ad515272..f74758b95c3 100644
--- a/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
+++ b/tests/PHPUnit/Fixtures/ThreeVisitsWithCustomEvents.php
@@ -38,8 +38,18 @@ private function setUpWebsitesAndGoals()
// These two goals are to check events don't trigger for URL or Title matching
APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'url', 'webradio', 'contains');
APIGoals::getInstance()->addGoal($this->idSite, 'triggered js', 'title', 'Music', 'contains');
- $idGoalTriggeredOnEventCategory = APIGoals::getInstance()->addGoal($this->idSite, 'event matching', 'event_category', 'CategoryTriggersGoal', 'contains', false,
- 8, true, '', true);
+ $idGoalTriggeredOnEventCategory = APIGoals::getInstance()->addGoal(
+ $this->idSite,
+ 'event matching',
+ 'event_category',
+ 'CategoryTriggersGoal',
+ 'contains',
+ false,
+ 8,
+ true,
+ '',
+ true
+ );
$this->assertEquals($idGoalTriggeredOnEventCategory, self::$idGoalTriggeredOnEventCategory);
}
diff --git a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
index 72761184353..24f9afaaf68 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesEcommerceOrderWithItems.php
@@ -47,8 +47,14 @@ private function setUpWebsitesAndGoals()
if (!self::goalExists($this->idSite, $this->idGoalStandard)) {
API::getInstance()->addGoal(
- $this->idSite, 'title match, triggered ONCE', 'title', 'incredible', 'contains',
- $caseSensitive = false, $revenue = 10, $allowMultipleConversions = true
+ $this->idSite,
+ 'title match, triggered ONCE',
+ 'title',
+ 'incredible',
+ 'contains',
+ $caseSensitive = false,
+ $revenue = 10,
+ $allowMultipleConversions = true
);
}
}
diff --git a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
index 68233a231d5..1a2642b740f 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php
@@ -43,9 +43,20 @@ private function setUpWebsitesAndGoals()
$siteCreated = $this->dateTime;
if (!self::siteCreated($idSite = 1)) {
- self::createWebsite($siteCreated, 0, false, false, 1, null,
- null, null, null, 0, null,
- self::EXCLUDED_REFERRER_URL);
+ self::createWebsite(
+ $siteCreated,
+ 0,
+ false,
+ false,
+ 1,
+ null,
+ null,
+ null,
+ null,
+ 0,
+ null,
+ self::EXCLUDED_REFERRER_URL
+ );
}
if (!self::goalExists($idSite = 1, $idGoal = 1)) {
@@ -54,7 +65,15 @@ private function setUpWebsitesAndGoals()
if (!self::goalExists($idSite = 1, $idGoal = 2)) {
API::getInstance()->addGoal(
- $this->idSite, 'another triggered php', 'manually', '', '', false, false, true);
+ $this->idSite,
+ 'another triggered php',
+ 'manually',
+ '',
+ '',
+ false,
+ false,
+ true
+ );
}
if (!self::siteCreated($idSite = 2)) {
diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
index 26ec6126072..3c66300bd47 100644
--- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
+++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php
@@ -67,15 +67,39 @@ private function setUpWebsitesAndGoals()
}
APISitesManager::getInstance()->updateSite(
- $this->idSite1, "Site 1", $urls = null, $ecommerce = null, $siteSearch = null,
- $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null,
- $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null,
- $startDate = null, $excludedUserAgents = null, $keepURLFragments = 2); // KEEP_URL_FRAGMENT_NO No for idSite 1
+ $this->idSite1,
+ "Site 1",
+ $urls = null,
+ $ecommerce = null,
+ $siteSearch = null,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = null,
+ $excludedQueryParameters = null,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 2
+ ); // KEEP_URL_FRAGMENT_NO No for idSite 1
APISitesManager::getInstance()->updateSite(
- $this->idSite2, "Site 2", $urls = null, $ecommerce = null, $siteSearch = null,
- $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIps = null,
- $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null,
- $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1); // KEEP_URL_FRAGMENT_YES Yes for idSite 2
+ $this->idSite2,
+ "Site 2",
+ $urls = null,
+ $ecommerce = null,
+ $siteSearch = null,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = null,
+ $excludedQueryParameters = null,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ ); // KEEP_URL_FRAGMENT_YES Yes for idSite 2
}
public function trackVisits()
diff --git a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
index 5589b50745b..96e48638b31 100644
--- a/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
+++ b/tests/PHPUnit/Fixtures/TwoVisitsWithCustomVariables.php
@@ -106,12 +106,24 @@ private function trackVisits()
self::checkResponse($visitorA->doTrackGoal($idGoal));
if ($this->doExtraQuoteTests) {
- $visitorA->setCustomVariable($id = 2, $name = 'var1', $value = 'looking at "profile page"',
- $scope = 'page');
- $visitorA->setCustomVariable($id = 3, $name = 'var2', $value = '\'looking at "\profile page"\'',
- $scope = 'page');
- $visitorA->setCustomVariable($id = 4, $name = 'var3', $value = '\\looking at "\profile page"\\',
- $scope = 'page');
+ $visitorA->setCustomVariable(
+ $id = 2,
+ $name = 'var1',
+ $value = 'looking at "profile page"',
+ $scope = 'page'
+ );
+ $visitorA->setCustomVariable(
+ $id = 3,
+ $name = 'var2',
+ $value = '\'looking at "\profile page"\'',
+ $scope = 'page'
+ );
+ $visitorA->setCustomVariable(
+ $id = 4,
+ $name = 'var3',
+ $value = '\\looking at "\profile page"\\',
+ $scope = 'page'
+ );
self::checkResponse($visitorA->doTrackPageView('Concurrent page views'));
}
diff --git a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
index a4f6a21abf5..6315805c240 100644
--- a/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
+++ b/tests/PHPUnit/Fixtures/VisitsInDifferentTimezones.php
@@ -34,14 +34,28 @@ private function setUpWebsitesAndGoals()
{
// tests run in UTC, the Tracker in UTC
if (!self::siteCreated($idSite = 1)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'site in AST', $siteUrl = false,
- $siteSearch = 1, $searchKeywordParameters = null,
- $searchCategoryParameters = null, $timezone = 'America/Barbados' /* AST = UTC-4 */);
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'site in AST',
+ $siteUrl = false,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $timezone = 'America/Barbados' /* AST = UTC-4 */
+ );
}
if (!self::siteCreated($idSite = 2)) {
- self::createWebsite($this->dateTime, $ecommerce = 0, $siteName = 'site in UTC', $siteUrl = false,
- $siteSearch = 1, $searchKeywordParameters = null,
- $searchCategoryParameters = null, $timezone = 'UTC');
+ self::createWebsite(
+ $this->dateTime,
+ $ecommerce = 0,
+ $siteName = 'site in UTC',
+ $siteUrl = false,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $timezone = 'UTC'
+ );
}
}
diff --git a/tests/PHPUnit/Framework/TestRequest/Collection.php b/tests/PHPUnit/Framework/TestRequest/Collection.php
index 2ac1b517833..fa152db0312 100644
--- a/tests/PHPUnit/Framework/TestRequest/Collection.php
+++ b/tests/PHPUnit/Framework/TestRequest/Collection.php
@@ -245,7 +245,8 @@ protected function generateApiUrlPermutations($parametersToSet)
// if no subtable found, throw
if (!isset($parametersToSet['idSubtable'])) {
throw new Exception(
- "Cannot find subtable to load for $apiId in {$this->testConfig->supertableApi}.");
+ "Cannot find subtable to load for $apiId in {$this->testConfig->supertableApi}."
+ );
}
}
diff --git a/tests/PHPUnit/Integration/ArchiveProcessingTest.php b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
index fc67079474b..0ad6f76dd4b 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessingTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessingTest.php
@@ -291,10 +291,13 @@ public function testTableInsertBatch()
$table = Common::prefixTable('site_url');
$data = $this->_getDataInsert();
try {
- $didWeUseBulk = BatchInsert::tableInsertBatch($table,
+ $didWeUseBulk = BatchInsert::tableInsertBatch(
+ $table,
array('idsite', 'url'),
$data,
- $throwException = true, 'utf8');
+ $throwException = true,
+ 'utf8'
+ );
} catch (Exception $e) {
$didWeUseBulk = $e->getMessage();
}
@@ -362,10 +365,13 @@ public function testTableInsertBatchBlob()
$data = $this->_getBlobDataInsert();
try {
- $didWeUseBulk = BatchInsert::tableInsertBatch($table,
+ $didWeUseBulk = BatchInsert::tableInsertBatch(
+ $table,
array('idarchive', 'name', 'idsite', 'date1', 'date2', 'period', 'ts_archived', 'value'),
$data,
- $throwException = true, $charset = 'latin1');
+ $throwException = true,
+ $charset = 'latin1'
+ );
} catch (Exception $e) {
$didWeUseBulk = $e->getMessage();
}
diff --git a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderTest.php b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderTest.php
index 08163f26726..1d46fde2d76 100644
--- a/tests/PHPUnit/Integration/ArchiveProcessor/LoaderTest.php
+++ b/tests/PHPUnit/Integration/ArchiveProcessor/LoaderTest.php
@@ -1635,8 +1635,10 @@ private function insertArchive(Parameters $params, $tsArchived = null, $visits =
$archiveWriter->finalizeArchive();
if ($tsArchived) {
- Db::query("UPDATE " . ArchiveTableCreator::getNumericTable($params->getPeriod()->getDateStart()) . " SET ts_archived = ?",
- [Date::factory($tsArchived)->getDatetime()]);
+ Db::query(
+ "UPDATE " . ArchiveTableCreator::getNumericTable($params->getPeriod()->getDateStart()) . " SET ts_archived = ?",
+ [Date::factory($tsArchived)->getDatetime()]
+ );
}
}
@@ -1657,8 +1659,10 @@ private function insertArchiveData($archiveRows)
$table = !empty($row['is_blob_data']) ? ArchiveTableCreator::getBlobTable($d) : ArchiveTableCreator::getNumericTable($d);
$tsArchived = isset($row['ts_archived']) ? $row['ts_archived'] : Date::now()->getDatetime();
- Db::query("INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
- [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]);
+ Db::query(
+ "INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+ [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]
+ );
}
if (!empty($archiveRows)) {
diff --git a/tests/PHPUnit/Integration/ArchiveTest.php b/tests/PHPUnit/Integration/ArchiveTest.php
index d90132c768c..6c324af966b 100644
--- a/tests/PHPUnit/Integration/ArchiveTest.php
+++ b/tests/PHPUnit/Integration/ArchiveTest.php
@@ -292,8 +292,16 @@ public function test_shouldNotArchivePeriodsStartingInTheFuture()
public function test_shouldArchivePeriodsStartingInTheFuture_IfWebSiteLocalTimeIsInNextDay()
{
// Create a site with a timezone ahead of UTC
- $idSite = Fixture::createWebsite('2014-05-06', 1, false, false,
- 1, null, null, 'Pacific/Auckland');
+ $idSite = Fixture::createWebsite(
+ '2014-05-06',
+ 1,
+ false,
+ false,
+ 1,
+ null,
+ null,
+ 'Pacific/Auckland'
+ );
self::$fixture->getTestEnvironment()->overrideConfig('General', 'browser_archiving_disabled_enforce', 0);
self::$fixture->getTestEnvironment()->overrideConfig('General', 'archiving_range_force_on_browser_request', 1);
@@ -348,8 +356,16 @@ public function test_shouldNotArchivePeriodsStartingInTheFuture_IfWebSiteLocalTi
{
// Create a site with a timezone behind of UTC
- $idSite = Fixture::createWebsite('2014-05-06', 1, false, false,
- 1, null, null, 'America/Vancouver'); // -8hrs
+ $idSite = Fixture::createWebsite(
+ '2014-05-06',
+ 1,
+ false,
+ false,
+ 1,
+ null,
+ null,
+ 'America/Vancouver'
+ ); // -8hrs
self::$fixture->getTestEnvironment()->overrideConfig('General', 'browser_archiving_disabled_enforce', 0);
self::$fixture->getTestEnvironment()->overrideConfig('General', 'archiving_range_force_on_browser_request', 1);
diff --git a/tests/PHPUnit/Integration/Concurrency/DistributedListTest.php b/tests/PHPUnit/Integration/Concurrency/DistributedListTest.php
index cd658a5ab9e..7a65bf17a6c 100644
--- a/tests/PHPUnit/Integration/Concurrency/DistributedListTest.php
+++ b/tests/PHPUnit/Integration/Concurrency/DistributedListTest.php
@@ -140,9 +140,11 @@ private function initOptionValue($data = false)
$data = $data ?: self::$defaultOptionValues;
$optionTable = Common::prefixTable('option');
- Db::query("INSERT INTO `$optionTable` (option_name, option_value, autoload) VALUES (?, ?, ?)
+ Db::query(
+ "INSERT INTO `$optionTable` (option_name, option_value, autoload) VALUES (?, ?, ?)
ON DUPLICATE KEY UPDATE option_value = ?",
- array(self::TEST_OPTION_NAME, serialize($data), 0, serialize($data)));
+ array(self::TEST_OPTION_NAME, serialize($data), 0, serialize($data))
+ );
}
private function getOptionValueForList()
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
index 639a0d013d7..78dd626cfcd 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveInvalidatorTest.php
@@ -138,8 +138,14 @@ public function test_markArchivesAsInvalidated_doesNotInvalidatePartialArchives(
/** @var ArchiveInvalidator $archiveInvalidator */
$archiveInvalidator = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Archive\ArchiveInvalidator');
- $archiveInvalidator->markArchivesAsInvalidated([1], ['2020-03-03'], 'day',
- null, $cascadeDown = true, false);
+ $archiveInvalidator->markArchivesAsInvalidated(
+ [1],
+ ['2020-03-03'],
+ 'day',
+ null,
+ $cascadeDown = true,
+ false
+ );
$invalidatedArchives = $this->getInvalidatedArchives();
$this->assertEmpty($invalidatedArchives);
@@ -603,8 +609,16 @@ public function test_markArchivesAsInvalidated_invalidatesPastPurgeThreshold_ifF
/** @var ArchiveInvalidator $archiveInvalidator */
$archiveInvalidator = self::$fixture->piwikEnvironment->getContainer()->get('Piwik\Archive\ArchiveInvalidator');
- $result = $archiveInvalidator->markArchivesAsInvalidated(array(1), array($dateBeforeThreshold), 'day',
- null, false, false, null, true);
+ $result = $archiveInvalidator->markArchivesAsInvalidated(
+ array(1),
+ array($dateBeforeThreshold),
+ 'day',
+ null,
+ false,
+ false,
+ null,
+ true
+ );
$this->assertEquals($thresholdDate->toString(), $result->minimumDateWithLogs);
@@ -1730,8 +1744,16 @@ public function test_markArchivesAsInvalidated_invalidatesIndividualPluginNames(
];
$plugin = 'ExamplePlugin';
- $this->test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives,
- $expectedInvalidatedArchives, $plugin);
+ $this->test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated(
+ $idSites,
+ $dates,
+ $period,
+ $segment,
+ $cascadeDown,
+ $expectedIdArchives,
+ $expectedInvalidatedArchives,
+ $plugin
+ );
}
public function test_markArchivesAsInvalidated_invalidatesIndividualReports()
@@ -1750,8 +1772,16 @@ public function test_markArchivesAsInvalidated_invalidatesIndividualReports()
];
$report = 'ExamplePlugin.someReport';
- $this->test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated($idSites, $dates, $period, $segment, $cascadeDown, $expectedIdArchives,
- $expectedInvalidatedArchives, $report);
+ $this->test_markArchivesAsInvalidated_MarksCorrectArchivesAsInvalidated(
+ $idSites,
+ $dates,
+ $period,
+ $segment,
+ $cascadeDown,
+ $expectedIdArchives,
+ $expectedInvalidatedArchives,
+ $report
+ );
}
public function test_markArchivesAsInvalidated_doesNotInsertDuplicateInvalidations()
@@ -1785,10 +1815,22 @@ public function test_markArchivesAsInvalidated_doesNotInsertDuplicateInvalidatio
$this->insertInvalidations($existingInvalidations);
- $archiveInvalidator->markArchivesAsInvalidated([1], ['2020-03-04', '2020-05-06'], 'week',
- $segment, $cascadeDown = true, false);
- $archiveInvalidator->markArchivesAsInvalidated([1], ['2020-05-01'], 'year',
- $segment, $cascadeDown = false, 'aReport');
+ $archiveInvalidator->markArchivesAsInvalidated(
+ [1],
+ ['2020-03-04', '2020-05-06'],
+ 'week',
+ $segment,
+ $cascadeDown = true,
+ false
+ );
+ $archiveInvalidator->markArchivesAsInvalidated(
+ [1],
+ ['2020-05-01'],
+ 'year',
+ $segment,
+ $cascadeDown = false,
+ 'aReport'
+ );
$expectedInvalidations = [
array (
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
index 4aef1966620..8b54b49ef36 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveSelectorTest.php
@@ -61,8 +61,14 @@ public function test_getArchiveIds_handlesCutOffGroupConcat()
$this->insertArchiveData($archiveRows);
- $archiveIds = ArchiveSelector::getArchiveIds([1], [Factory::build('day', '2020-03-01')], new Segment('', [1]), ['Funnels'],
- true, true);
+ $archiveIds = ArchiveSelector::getArchiveIds(
+ [1],
+ [Factory::build('day', '2020-03-01')],
+ new Segment('', [1]),
+ ['Funnels'],
+ true,
+ true
+ );
$expected = [
'done.Funnels' => [
@@ -167,8 +173,10 @@ private function insertArchiveData($archiveRows)
$d = Date::factory($row['date1']);
$table = !empty($row['is_blob_data']) ? ArchiveTableCreator::getBlobTable($d) : ArchiveTableCreator::getNumericTable($d);
$tsArchived = isset($row['ts_archived']) ? $row['ts_archived'] : Date::now()->getDatetime();
- Db::query("INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
- [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]);
+ Db::query(
+ "INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+ [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]
+ );
}
}
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveTableDaoTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveTableDaoTest.php
index d5c6f553c1c..fe0561db33a 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveTableDaoTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveTableDaoTest.php
@@ -33,7 +33,8 @@ public function setUp(): void
parent::setUp();
$this->archiveTableDao = self::$fixture->piwikEnvironment->getContainer()->get(
- 'Piwik\DataAccess\ArchiveTableDao');
+ 'Piwik\DataAccess\ArchiveTableDao'
+ );
ArchiveTableCreator::getBlobTable(Date::factory('2015-01-01'));
ArchiveTableCreator::getNumericTable(Date::factory('2015-01-01'));
@@ -50,35 +51,101 @@ public function test_getArchiveTableAnalysis_QueriesNumericAndBlobTable_Includin
$this->insertArchive($tableMonth, $idSite = 2, $period = 'day', $date1 = '2015-01-03', $date2 = '2015-01-03');
$this->insertArchive($tableMonth, $idSite = 1, $period = 'week', $date1 = '2015-01-04', $date2 = '2015-01-11');
$this->insertArchive($tableMonth, $idSite = 3, $period = 'month', $date1 = '2015-01-01', $date2 = '2015-01-31');
- $this->insertArchive($tableMonth, $idSite = 4, $period = 'year', $date1 = '2015-01-01', $date2 = '2015-12-31',
- $segment = 'browserCode==FF');
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 4,
+ $period = 'year',
+ $date1 = '2015-01-01',
+ $date2 = '2015-12-31',
+ $segment = 'browserCode==FF'
+ );
$this->insertArchive($tableMonth, $idSite = 1, $period = 'range', $date1 = '2015-01-15', $date2 = '2015-01-20');
// invalid
- $this->insertArchive($tableMonth, $idSite = 1, $period = 'day', $date1 = '2015-01-01', $date2 = '2015-01-01',
- $segment = false, $doneValue = ArchiveWriter::DONE_INVALIDATED);
- $this->insertArchive($tableMonth, $idSite = 1, $period = 'day', $date1 = '2015-01-01', $date2 = '2015-01-01',
- $segment = false, $doneValue = ArchiveWriter::DONE_INVALIDATED);
- $this->insertArchive($tableMonth, $idSite = 4, $period = 'year', $date1 = '2015-01-01', $date2 = '2015-12-31',
- $segment = 'browserCode==FF', $doneValue = ArchiveWriter::DONE_INVALIDATED);
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 1,
+ $period = 'day',
+ $date1 = '2015-01-01',
+ $date2 = '2015-01-01',
+ $segment = false,
+ $doneValue = ArchiveWriter::DONE_INVALIDATED
+ );
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 1,
+ $period = 'day',
+ $date1 = '2015-01-01',
+ $date2 = '2015-01-01',
+ $segment = false,
+ $doneValue = ArchiveWriter::DONE_INVALIDATED
+ );
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 4,
+ $period = 'year',
+ $date1 = '2015-01-01',
+ $date2 = '2015-12-31',
+ $segment = 'browserCode==FF',
+ $doneValue = ArchiveWriter::DONE_INVALIDATED
+ );
// temporary
- $this->insertArchive($tableMonth, $idSite = 1, $period = 'week', $date1 = '2015-01-04', $date2 = '2015-01-11',
- $segment = false, $doneValue = ArchiveWriter::DONE_OK_TEMPORARY);
- $this->insertArchive($tableMonth, $idSite = 3, $period = 'month', $date1 = '2015-01-01', $date2 = '2015-01-31',
- $segment = 'daysSinceFirstVisit==1', $doneValue = ArchiveWriter::DONE_OK_TEMPORARY);
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 1,
+ $period = 'week',
+ $date1 = '2015-01-04',
+ $date2 = '2015-01-11',
+ $segment = false,
+ $doneValue = ArchiveWriter::DONE_OK_TEMPORARY
+ );
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 3,
+ $period = 'month',
+ $date1 = '2015-01-01',
+ $date2 = '2015-01-31',
+ $segment = 'daysSinceFirstVisit==1',
+ $doneValue = ArchiveWriter::DONE_OK_TEMPORARY
+ );
// error
- $this->insertArchive($tableMonth, $idSite = 1, $period = 'week', $date1 = '2015-01-04', $date2 = '2015-01-11',
- $segment = false, $doneValue = ArchiveWriter::DONE_ERROR);
- $this->insertArchive($tableMonth, $idSite = 3, $period = 'month', $date1 = '2015-01-01', $date2 = '2015-01-31',
- $segment = 'daysSinceFirstVisit==1', $doneValue = ArchiveWriter::DONE_ERROR);
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 1,
+ $period = 'week',
+ $date1 = '2015-01-04',
+ $date2 = '2015-01-11',
+ $segment = false,
+ $doneValue = ArchiveWriter::DONE_ERROR
+ );
+ $this->insertArchive(
+ $tableMonth,
+ $idSite = 3,
+ $period = 'month',
+ $date1 = '2015-01-01',
+ $date2 = '2015-01-31',
+ $segment = 'daysSinceFirstVisit==1',
+ $doneValue = ArchiveWriter::DONE_ERROR
+ );
// blob only
- $this->insertBlobArchive($tableMonth, $idSite = 1, $period = 'day', $date1 = '2015-01-20',
- $date2 = '2015-01-20');
- $this->insertBlobArchive($tableMonth, $idSite = 2, $period = 'day', $date1 = '2015-01-21',
- $date2 = '2015-01-21', $segment = 'browserCode==SF');
+ $this->insertBlobArchive(
+ $tableMonth,
+ $idSite = 1,
+ $period = 'day',
+ $date1 = '2015-01-20',
+ $date2 = '2015-01-20'
+ );
+ $this->insertBlobArchive(
+ $tableMonth,
+ $idSite = 2,
+ $period = 'day',
+ $date1 = '2015-01-21',
+ $date2 = '2015-01-21',
+ $segment = 'browserCode==SF'
+ );
$expectedStats = array(
'1.2015-01-01.2015-01-01.1' => array(
diff --git a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
index 1dc8bff4436..79a791c826b 100644
--- a/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/ArchiveWriterTest.php
@@ -306,8 +306,10 @@ private function insertArchiveData($archiveRows)
$table = ArchiveTableCreator::getNumericTable($d);
$tsArchived = isset($row['ts_archived']) ? $row['ts_archived'] : Date::now()->getDatetime();
- Db::query("INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
- [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]);
+ Db::query(
+ "INSERT INTO `$table` (idarchive, idsite, period, date1, date2, `name`, `value`, ts_archived) VALUES (?, ?, ?, ?, ?, ?, ?, ?)",
+ [$row['idarchive'], $row['idsite'], $row['period'], $row['date1'], $row['date2'], $row['name'], $row['value'], $tsArchived]
+ );
}
}
diff --git a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
index 55d79792ad7..872b68bfab7 100644
--- a/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
+++ b/tests/PHPUnit/Integration/DataAccess/LogAggregatorTest.php
@@ -539,8 +539,16 @@ public function test_queryVisitsByDimension_ShouldAddJoinQueryHintOriginHintMaxE
DatabaseConfig::setConfigValue('enable_first_table_join_prefix', '1');
$this->logAggregator->setQueryOriginHint('MyPluginName');
- $query = $this->logAggregator->getQueryByDimensionSql($dimensions, false, [], false, false,
- false, 5, false);
+ $query = $this->logAggregator->getQueryByDimensionSql(
+ $dimensions,
+ false,
+ [],
+ false,
+ false,
+ false,
+ 5,
+ false
+ );
$expected = [
'sql' => "SELECT /*+ MAX_EXECUTION_TIME(5000) */ /*+ JOIN_PREFIX(log_visit) */ /* sites 1 */ /* 2010-03-01,2010-03-31 */ /* MyPluginName */
diff --git a/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php
index ccc56c4ff56..9a8136201f2 100644
--- a/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php
+++ b/tests/PHPUnit/Integration/DataTable/Filter/PivotByDimensionTest.php
@@ -211,8 +211,13 @@ public function test_filter_CorrectlyCreatesPivotTable_WhenSubtablesHaveNoRows()
$table = $this->getTableToFilter(false);
- $pivotFilter = new PivotByDimension($table, "CustomVariables.getCustomVariables", "CustomVariables.CustomVariableValue",
- 'nb_visits', $fetchBySegment = false);
+ $pivotFilter = new PivotByDimension(
+ $table,
+ "CustomVariables.getCustomVariables",
+ "CustomVariables.CustomVariableValue",
+ 'nb_visits',
+ $fetchBySegment = false
+ );
$pivotFilter->filter($table);
$expectedRows = array(
diff --git a/tests/PHPUnit/Integration/DocumentationGeneratorTest.php b/tests/PHPUnit/Integration/DocumentationGeneratorTest.php
index 076f3771667..dd6eb235c48 100644
--- a/tests/PHPUnit/Integration/DocumentationGeneratorTest.php
+++ b/tests/PHPUnit/Integration/DocumentationGeneratorTest.php
@@ -41,30 +41,36 @@ public function test_CheckDocumentation()
public function test_CheckIfMethodComment_ContainsHideAnnotation_andText()
{
$annotation = '@hideForAll test test';
- EventDispatcher::getInstance()->addObserver('API.DocumentationGenerator.@hideForAll',
+ EventDispatcher::getInstance()->addObserver(
+ 'API.DocumentationGenerator.@hideForAll',
function (&$hide) {
$hide = true;
- });
+ }
+ );
$this->assertEquals(Proxy::getInstance()->shouldHideAPIMethod($annotation), true);
}
public function test_CheckIfMethodComment_ContainsHideAnnotation_only()
{
$annotation = '@hideForAll';
- EventDispatcher::getInstance()->addObserver('API.DocumentationGenerator.@hideForAll',
+ EventDispatcher::getInstance()->addObserver(
+ 'API.DocumentationGenerator.@hideForAll',
function (&$hide) {
$hide = true;
- });
+ }
+ );
$this->assertEquals(Proxy::getInstance()->shouldHideAPIMethod($annotation), true);
}
public function test_CheckIfMethodComment_DoesNotContainHideAnnotation()
{
$annotation = '@not found here';
- EventDispatcher::getInstance()->addObserver('API.DocumentationGenerator.@hello',
+ EventDispatcher::getInstance()->addObserver(
+ 'API.DocumentationGenerator.@hello',
function (&$hide) {
$hide = true;
- });
+ }
+ );
$this->assertEquals(Proxy::getInstance()->shouldHideAPIMethod($annotation), false);
}
}
diff --git a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
index c8e7d26d339..127807b8987 100644
--- a/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
+++ b/tests/PHPUnit/Integration/Measurable/MeasurableSettingsTest.php
@@ -35,10 +35,17 @@ public function setUp(): void
if (!Fixture::siteCreated($this->idSite)) {
$type = WebsiteType::ID;
- Fixture::createWebsite('2015-01-01 00:00:00',
- $ecommerce = 0, $siteName = false, $siteUrl = false,
- $siteSearch = 1, $searchKeywordParameters = null,
- $searchCategoryParameters = null, $timezone = null, $type);
+ Fixture::createWebsite(
+ '2015-01-01 00:00:00',
+ $ecommerce = 0,
+ $siteName = false,
+ $siteUrl = false,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $timezone = null,
+ $type
+ );
}
$this->settings = $this->createSettings();
diff --git a/tests/PHPUnit/Integration/ProfessionalSupport/AdvertisingTest.php b/tests/PHPUnit/Integration/ProfessionalSupport/AdvertisingTest.php
index c78e3931308..aa33eb46d04 100644
--- a/tests/PHPUnit/Integration/ProfessionalSupport/AdvertisingTest.php
+++ b/tests/PHPUnit/Integration/ProfessionalSupport/AdvertisingTest.php
@@ -86,8 +86,13 @@ public function test_addPromoCampaignParametersToUrl_withoutContentWithoutQuery(
public function test_addPromoCampaignParametersToUrl_withContentWithoutQuery()
{
- $link = $this->advertising->addPromoCampaignParametersToUrl($this->exampleUrl, 'MyName', 'Installation_Start',
- 'MyContent', 'MySource');
+ $link = $this->advertising->addPromoCampaignParametersToUrl(
+ $this->exampleUrl,
+ 'MyName',
+ 'Installation_Start',
+ 'MyContent',
+ 'MySource'
+ );
$this->assertSame($this->exampleUrl . '?mtm_campaign=MyName&mtm_source=MySource&mtm_medium=Installation_Start.MyContent', $link);
}
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index 091ce661a48..1f101aaa133 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -262,11 +262,13 @@ private function assertFilesDoNotContain($files, $patternFailIfFound, $allowedFi
}
}
- $this->assertEmpty($foundPatterns,
- sprintf("Forbidden pattern \"%s\" was found in the following files ---> please manually delete these files from Git. \n\n\t%s",
- $patternFailIfFound,
- implode("\n\t", $foundPatterns)
- )
+ $this->assertEmpty(
+ $foundPatterns,
+ sprintf(
+ "Forbidden pattern \"%s\" was found in the following files ---> please manually delete these files from Git. \n\n\t%s",
+ $patternFailIfFound,
+ implode("\n\t", $foundPatterns)
+ )
);
}
@@ -292,8 +294,11 @@ public function testCheckThatGivenPluginsAreDisabledByDefault()
'DBStats'
);
foreach ($pluginsShouldBeDisabled as $pluginName) {
- $this->assertNotContains($pluginName, $this->globalConfig['Plugins']['Plugins'],
- "Plugin $pluginName is enabled by default but shouldn't.");
+ $this->assertNotContains(
+ $pluginName,
+ $this->globalConfig['Plugins']['Plugins'],
+ "Plugin $pluginName is enabled by default but shouldn't."
+ );
}
}
@@ -398,9 +403,11 @@ public function test_directoriesShouldBeChmod755()
$chmod = substr(decoct(fileperms($pathToTest)), -3);
$valid = array('777', '775', '755');
$command = "find $pluginsPath -type d -exec chmod 755 {} +";
- $this->assertTrue(in_array($chmod, $valid),
- "Some directories within plugins/ are not chmod 755 \n\nGot: $chmod for : $pathToTest \n\n" .
- "Run this command to set all directories to 755: \n$command\n");
+ $this->assertTrue(
+ in_array($chmod, $valid),
+ "Some directories within plugins/ are not chmod 755 \n\nGot: $chmod for : $pathToTest \n\n" .
+ "Run this command to set all directories to 755: \n$command\n"
+ );
}
}
@@ -436,7 +443,8 @@ public function test_DirectoriesInPluginsFolder_areKnown()
$enabled = in_array($pluginName, $pluginsBundledWithPiwik);
- $this->assertTrue( $enabled + $disabled === 1,
+ $this->assertTrue(
+ $enabled + $disabled === 1,
"Plugin $pluginName should be either enabled (in global.ini.php) or disabled (in Piwik\\Application\\Kernel\\PluginList).
It is currently (enabled=" . (int)$enabled . ", disabled=" . (int)$disabled . ")"
);
@@ -503,11 +511,13 @@ public function test_piwikJs_minified_isUpToDate()
{
shell_exec("sed '//,/<\/DEBUG>/d' < " . PIWIK_DOCUMENT_ROOT . "/js/piwik.js | sed 's/eval/replacedEvilString/' | java -jar " . PIWIK_DOCUMENT_ROOT . "/tests/resources/yuicompressor/yuicompressor-2.4.8.jar --type js --line-break 1000 | sed 's/replacedEvilString/eval/' | sed 's/^[/][*]/\/*!/' > " . PIWIK_DOCUMENT_ROOT . "/piwik-minified.js");
- $this->assertFileEquals(PIWIK_DOCUMENT_ROOT . '/piwik-minified.js',
+ $this->assertFileEquals(
+ PIWIK_DOCUMENT_ROOT . '/piwik-minified.js',
PIWIK_DOCUMENT_ROOT . '/piwik.js',
'minified /piwik.js is out of date, please re-generate the minified files using instructions in /js/README'
);
- $this->assertFileEquals(PIWIK_DOCUMENT_ROOT . '/piwik-minified.js',
+ $this->assertFileEquals(
+ PIWIK_DOCUMENT_ROOT . '/piwik-minified.js',
PIWIK_DOCUMENT_ROOT . '/js/piwik.min.js',
'minified /js/piwik.min.js is out of date, please re-generate the minified files using instructions in /js/README'
);
@@ -619,7 +629,8 @@ public function test_TotalPiwikFilesSize_isWithinReasonnableSize()
$this->assertLessThan(
$maximumTotalFilesizesExpectedInMb * 1024 * 1024,
$sumFilesizes,
- sprintf("Sum of all files should be less than $maximumTotalFilesizesExpectedInMb Mb.
+ sprintf(
+ "Sum of all files should be less than $maximumTotalFilesizesExpectedInMb Mb.
\nGot total file sizes of: %d Mb.
\nBiggest files: %s",
$sumFilesizes / 1024 / 1024,
diff --git a/tests/PHPUnit/Integration/ReportTest.php b/tests/PHPUnit/Integration/ReportTest.php
index 4f09c0bfedb..a31b42e0280 100644
--- a/tests/PHPUnit/Integration/ReportTest.php
+++ b/tests/PHPUnit/Integration/ReportTest.php
@@ -382,7 +382,9 @@ public function test_fetch_ShouldUseCorrectApiUrl()
$proxyMock = $this->getMockBuilder('stdClass')->addMethods(array('call', '__construct'))->getMock();
$proxyMock->expects($this->once())->method('call')->with(
- '\\Piwik\\Plugins\\ExampleReport\\API', 'getExampleReport', array(
+ '\\Piwik\\Plugins\\ExampleReport\\API',
+ 'getExampleReport',
+ array(
'idSite' => 1,
'date' => '2012-01-02',
'format' => 'original',
@@ -406,7 +408,9 @@ public function test_fetchSubtable_ShouldUseCorrectApiUrl()
$proxyMock = $this->getMockBuilder('stdClass')->addMethods(array('call', '__construct'))->getMock();
$proxyMock->expects($this->once())->method('call')->with(
- '\\Piwik\\Plugins\\Referrers\\API', 'getSearchEnginesFromKeywordId', array(
+ '\\Piwik\\Plugins\\Referrers\\API',
+ 'getSearchEnginesFromKeywordId',
+ array(
'idSubtable' => 23,
'idSite' => 1,
'date' => '2012-01-02',
diff --git a/tests/PHPUnit/Integration/ServeStaticFileTest.php b/tests/PHPUnit/Integration/ServeStaticFileTest.php
index 062157d0b0e..466c89a7197 100644
--- a/tests/PHPUnit/Integration/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Integration/ServeStaticFileTest.php
@@ -168,8 +168,10 @@ public function test_firstAccessNoCompression()
$this->assertEquals(filesize(TEST_FILE_LOCATION), $responseInfo["size_download"]);
// Tests if returned modified date is correctly set
- $this->assertEquals(gmdate('D, d M Y H:i:s', filemtime(TEST_FILE_LOCATION)) . ' GMT',
- $this->getLastModifiedValue($fullResponse));
+ $this->assertEquals(
+ gmdate('D, d M Y H:i:s', filemtime(TEST_FILE_LOCATION)) . ' GMT',
+ $this->getLastModifiedValue($fullResponse)
+ );
// Tests if cache control headers are correctly set
$this->assertEquals("public, must-revalidate", $this->getCacheControlValue($fullResponse));
@@ -422,8 +424,11 @@ public function test_partialFileServeNoCompression()
// check $partialResponse
$this->assertEquals(PARTIAL_BYTE_END - PARTIAL_BYTE_START, $responseInfo["size_download"]);
- $expectedPartialContents = substr(file_get_contents(TEST_FILE_LOCATION), PARTIAL_BYTE_START,
- PARTIAL_BYTE_END - PARTIAL_BYTE_START);
+ $expectedPartialContents = substr(
+ file_get_contents(TEST_FILE_LOCATION),
+ PARTIAL_BYTE_START,
+ PARTIAL_BYTE_END - PARTIAL_BYTE_START
+ );
$this->assertEquals($expectedPartialContents, $partialResponse);
}
@@ -450,8 +455,11 @@ public function test_partialFileServeWithCompression()
$this->assertFileNotExists($this->getCompressedFileLocation() . ".gz");
// check $partialResponse
- $expectedPartialContents = substr(file_get_contents(TEST_FILE_LOCATION), PARTIAL_BYTE_START,
- PARTIAL_BYTE_END - PARTIAL_BYTE_START);
+ $expectedPartialContents = substr(
+ file_get_contents(TEST_FILE_LOCATION),
+ PARTIAL_BYTE_START,
+ PARTIAL_BYTE_END - PARTIAL_BYTE_START
+ );
$this->assertEquals($expectedPartialContents, $partialResponse);
$this->removeCompressedFiles();
diff --git a/tests/PHPUnit/Integration/Settings/Storage/StorageTest.php b/tests/PHPUnit/Integration/Settings/Storage/StorageTest.php
index 1971379a64e..747c391e29e 100644
--- a/tests/PHPUnit/Integration/Settings/Storage/StorageTest.php
+++ b/tests/PHPUnit/Integration/Settings/Storage/StorageTest.php
@@ -95,8 +95,10 @@ public function test_save_shouldPersistValueInDatabase()
$this->storage->setValue($this->settingName, 'myRandomVal');
$this->storage->save();
- $this->assertEquals(array($this->settingName => 'myRandomVal'),
- $this->loadValuesFromBackend());
+ $this->assertEquals(
+ array($this->settingName => 'myRandomVal'),
+ $this->loadValuesFromBackend()
+ );
}
public function test_save_shouldPersistMultipleValues_ContainingInt()
@@ -105,8 +107,10 @@ public function test_save_shouldPersistMultipleValues_ContainingInt()
$this->storage->setValue('mySecondName', 5);
$this->storage->save();
- $this->assertEquals(array($this->settingName => 'myRandomVal', 'mySecondName' => 5),
- $this->loadValuesFromBackend());
+ $this->assertEquals(
+ array($this->settingName => 'myRandomVal', 'mySecondName' => 5),
+ $this->loadValuesFromBackend()
+ );
}
public function test_save_shouldNotClearTrackerCacheEntries_IfThereWasNoChange()
diff --git a/tests/PHPUnit/Integration/Tracker/ActionTest.php b/tests/PHPUnit/Integration/Tracker/ActionTest.php
index 86877a321d3..6d0b0729c18 100644
--- a/tests/PHPUnit/Integration/Tracker/ActionTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ActionTest.php
@@ -163,10 +163,22 @@ public function getTestUrls()
public function testExcludeQueryParametersNone($url, $filteredUrl)
{
$this->setUpRootAccess();
- $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
- $excludedIps = '', $excludedQueryParameters = '', $timezone = null, $currency = null,
- $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1);
+ $idSite = API::getInstance()->addSite(
+ "site1",
+ array('http://example.org'),
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = '',
+ $excludedQueryParameters = '',
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ );
$this->assertEquals($filteredUrl[0], PageUrl::excludeQueryParametersFromUrl($url, $idSite));
}
@@ -197,10 +209,22 @@ public function getTestAdvertisingClickIdUrls()
public function testExcludeQueryParametersAdvertisingClickIds($url, $filteredUrl)
{
$this->setUpRootAccess();
- $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
- $excludedIps = '', $excludedQueryParameters = '', $timezone = null, $currency = null,
- $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1);
+ $idSite = API::getInstance()->addSite(
+ "site1",
+ array('http://example.org'),
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = '',
+ $excludedQueryParameters = '',
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ );
$this->assertEquals($filteredUrl, PageUrl::excludeQueryParametersFromUrl($url, $idSite));
}
@@ -234,10 +258,22 @@ public function testExcludeQueryParametersSiteExcluded($url, $filteredUrl)
{
$excludedQueryParameters = 'p4, p2, var[value][date]';
$this->setUpRootAccess();
- $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
- $excludedIps = '', $excludedQueryParameters, $timezone = null, $currency = null,
- $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1);
+ $idSite = API::getInstance()->addSite(
+ "site1",
+ array('http://example.org'),
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = '',
+ $excludedQueryParameters,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ );
$this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite));
}
@@ -249,10 +285,22 @@ public function testExcludeQueryParametersRegExSiteExcluded($url, $filteredUrl)
{
$excludedQueryParameters = '/p[4|2]/, /^var.*/';
$this->setUpRootAccess();
- $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
- $excludedIps = '', $excludedQueryParameters, $timezone = null, $currency = null,
- $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1);
+ $idSite = API::getInstance()->addSite(
+ "site1",
+ array('http://example.org'),
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = '',
+ $excludedQueryParameters,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ );
$this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite));
}
@@ -266,10 +314,22 @@ public function testExcludeQueryParametersSiteAndGlobalExcluded($url, $filteredU
$excludedQueryParameters = 'P2,var[value][date]';
$excludedGlobalParameters = 'blabla, P4';
$this->setUpRootAccess();
- $idSite = API::getInstance()->addSite("site1", array('http://example.org'), $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null,
- $excludedIps = '', $excludedQueryParameters, $timezone = null, $currency = null,
- $group = null, $startDate = null, $excludedUserAgents = null, $keepURLFragments = 1);
+ $idSite = API::getInstance()->addSite(
+ "site1",
+ array('http://example.org'),
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIps = '',
+ $excludedQueryParameters,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgents = null,
+ $keepURLFragments = 1
+ );
API::getInstance()->setGlobalExcludedQueryParameters($excludedGlobalParameters);
$this->assertEquals($filteredUrl[1], PageUrl::excludeQueryParametersFromUrl($url, $idSite));
}
diff --git a/tests/PHPUnit/Integration/Tracker/ModelTest.php b/tests/PHPUnit/Integration/Tracker/ModelTest.php
index eb5c2ec80ec..4fb498e3a39 100644
--- a/tests/PHPUnit/Integration/Tracker/ModelTest.php
+++ b/tests/PHPUnit/Integration/Tracker/ModelTest.php
@@ -222,9 +222,11 @@ private function assertLogActionTableContainsTestAction($idaction)
private function insertSingleDuplicateAction()
{
$logActionTable = Common::prefixTable('log_action');
- Db::query("INSERT INTO $logActionTable (idaction, name, type, url_prefix, hash) VALUES (?, ?, ?, ?, CRC32(?))",
+ Db::query(
+ "INSERT INTO $logActionTable (idaction, name, type, url_prefix, hash) VALUES (?, ?, ?, ?, CRC32(?))",
array(5, self::TEST_ACTION_NAME, self::TEST_ACTION_TYPE, self::TEST_ACTION_URL_PREFIX,
- self::TEST_ACTION_NAME));
+ self::TEST_ACTION_NAME)
+ );
}
private function insertManyActions()
diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
index a63b26cd8d5..3c1ed9b0862 100644
--- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
+++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php
@@ -30,13 +30,22 @@ public function testJavascriptTrackingCode_withAllOptions()
'https://another-domain/piwik'
);
$idSite = \Piwik\Plugins\SitesManager\API::getInstance()->addSite('Site name here <-->', $urls);
- $jsTag = $generator->generate($idSite, 'http://piwik-server/piwik',
- $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true,
+ $jsTag = $generator->generate(
+ $idSite,
+ 'http://piwik-server/piwik',
+ $mergeSubdomains = true,
+ $groupPageTitlesByDomain = true,
+ $mergeAliasUrls = true,
$visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")),
$pageCustomVariables = array(array("page cvar", "page cvar value")),
- $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey",
- $doNotTrack = true, $disableCookies = false, $trackNoScript = true,
- $crossDomain = true, $excludedQueryParams = array("uid", "aid"));
+ $customCampaignNameQueryParam = "campaignKey",
+ $customCampaignKeywordParam = "keywordKey",
+ $doNotTrack = true,
+ $disableCookies = false,
+ $trackNoScript = true,
+ $crossDomain = true,
+ $excludedQueryParams = array("uid", "aid")
+ );
$expected = "<!-- Matomo -->
<script>
@@ -109,13 +118,22 @@ public function testJavascriptTrackingCode_withAllOptionsAndProtocolOverwrite()
$codeImpl['protocol'] = 'https://';
});
- $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik',
- $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true,
+ $jsTag = $generator->generate(
+ $idSite = 1,
+ $piwikUrl = 'http://localhost/piwik',
+ $mergeSubdomains = true,
+ $groupPageTitlesByDomain = true,
+ $mergeAliasUrls = true,
$visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")),
$pageCustomVariables = array(array("page cvar", "page cvar value")),
- $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey",
- $doNotTrack = true, $disableCookies = false, $trackNoScript = false,
- $crossDomain = false, $excludedQueryParams = array("uid", "aid"));
+ $customCampaignNameQueryParam = "campaignKey",
+ $customCampaignKeywordParam = "keywordKey",
+ $doNotTrack = true,
+ $disableCookies = false,
+ $trackNoScript = false,
+ $crossDomain = false,
+ $excludedQueryParams = array("uid", "aid")
+ );
$expected = "<!-- Matomo -->
<script>
@@ -158,13 +176,22 @@ public function testJavascriptTrackingCode_withAllOptionsAndOptionsBeforeTracker
$codeImpl['optionsBeforeTrackerUrl'] .= "_paq.push(['setAPIUrl', 'http://localhost/statistics']);\n ";
});
- $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik',
- $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true,
+ $jsTag = $generator->generate(
+ $idSite = 1,
+ $piwikUrl = 'http://localhost/piwik',
+ $mergeSubdomains = true,
+ $groupPageTitlesByDomain = true,
+ $mergeAliasUrls = true,
$visitorCustomVariables = array(array("name", "value"), array("name 2", "value 2")),
$pageCustomVariables = array(array("page cvar", "page cvar value")),
- $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey",
- $doNotTrack = true, $disableCookies = false, $trackNoScript = false,
- $crossDomain = false, $excludedQueryParams = array("uid", "aid"));
+ $customCampaignNameQueryParam = "campaignKey",
+ $customCampaignKeywordParam = "keywordKey",
+ $doNotTrack = true,
+ $disableCookies = false,
+ $trackNoScript = false,
+ $crossDomain = false,
+ $excludedQueryParams = array("uid", "aid")
+ );
$expected = "<!-- Matomo -->
<script>
@@ -208,8 +235,13 @@ public function testJavascriptTrackingCode_loadSync()
$codeImpl['loadAsync'] = false;
});
- $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik',
- $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true);
+ $jsTag = $generator->generate(
+ $idSite = 1,
+ $piwikUrl = 'http://localhost/piwik',
+ $mergeSubdomains = true,
+ $groupPageTitlesByDomain = true,
+ $mergeAliasUrls = true
+ );
$expected = "<!-- Matomo -->
<script>
diff --git a/tests/PHPUnit/Integration/Tracker/VisitTest.php b/tests/PHPUnit/Integration/Tracker/VisitTest.php
index ac8d1d80ac4..255e55c1036 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitTest.php
@@ -98,8 +98,15 @@ public function test_worksWhenSiteDoesNotExist()
*/
public function testIsVisitorIpExcluded($excludedIp, $tests)
{
- $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIp);
+ $idsite = API::getInstance()->addSite(
+ "name",
+ "http://piwik.net/",
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIp
+ );
$request = new RequestAuthenticated(array('idsite' => $idsite));
@@ -186,8 +193,14 @@ public function testExcludeByUrl($siteUrls, $excludeUnknownUrls, array $urlsTrac
*/
public function testVisitShouldNotBeExcluded_IfMadeViaChromeDataSaverCompressionProxy($ip, $isNonHumanBot)
{
- $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null);
+ $idsite = API::getInstance()->addSite(
+ "name",
+ "http://piwik.net/",
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null
+ );
$request = new RequestAuthenticated(array('idsite' => $idsite, 'cip' => $ip));
@@ -259,10 +272,21 @@ public function getExcludedUserAgentTestData()
*/
public function testIsVisitorUserAgentExcluded($excludedUserAgent, $tests)
{
- $idsite = API::getInstance()->addSite("name", "http://piwik.net/", $ecommerce = 0,
- $siteSearch = 1, $searchKeywordParameters = null, $searchCategoryParameters = null, $excludedIp = null,
- $excludedQueryParameters = null, $timezone = null, $currency = null, $group = null, $startDate = null,
- $excludedUserAgent);
+ $idsite = API::getInstance()->addSite(
+ "name",
+ "http://piwik.net/",
+ $ecommerce = 0,
+ $siteSearch = 1,
+ $searchKeywordParameters = null,
+ $searchCategoryParameters = null,
+ $excludedIp = null,
+ $excludedQueryParameters = null,
+ $timezone = null,
+ $currency = null,
+ $group = null,
+ $startDate = null,
+ $excludedUserAgent
+ );
$request = new Request(array('idsite' => $idsite));
@@ -435,13 +459,17 @@ public function test_markArchivedReportsAsInvalidIfArchiveAlreadyFinished_should
$oneHourAfterMidnight = $midnight->addHour(1)->getDatetime();
$oneHourBeforeMidnight = $midnight->subHour(1)->getDatetime();
- $idsite = API::getInstance()->addSite('name', 'http://piwik.net/', $ecommerce = null,
+ $idsite = API::getInstance()->addSite(
+ 'name',
+ 'http://piwik.net/',
+ $ecommerce = null,
$siteSearch = null,
$searchKeywordParameters = null,
$searchCategoryParameters = null,
$excludedIps = null,
$excludedQueryParameters = null,
- $timezone = 'UTC+5');
+ $timezone = 'UTC+5'
+ );
$expectedRemembered = array(
substr($oneHourAfterMidnight, 0, 10) => array($idsite),
diff --git a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
index ffe1e59868d..25c36b4bd4e 100644
--- a/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
+++ b/tests/PHPUnit/Integration/Tracker/VisitorRecognizerTest.php
@@ -32,8 +32,13 @@ class VisitorRecognizerTest extends IntegrationTestCase
public function setUp(): void
{
parent::setUp();
- $this->recognizer = new VisitorRecognizer(true, 1800, 24000,
- new Model(), EventDispatcher::getInstance());
+ $this->recognizer = new VisitorRecognizer(
+ true,
+ 1800,
+ 24000,
+ new Model(),
+ EventDispatcher::getInstance()
+ );
Fixture::createWebsite('2020-01-01 02:03:04');
}
diff --git a/tests/PHPUnit/System/DataComparisonTest.php b/tests/PHPUnit/System/DataComparisonTest.php
index 39a823c5aec..7d27bd4d62c 100644
--- a/tests/PHPUnit/System/DataComparisonTest.php
+++ b/tests/PHPUnit/System/DataComparisonTest.php
@@ -34,7 +34,10 @@ public static function setUpBeforeClass(): void
// the specific site and will be invalid in global context
// Added to avoid further regressions like: https://github.com/matomo-org/matomo/issues/21573
$idDimension = \Piwik\Plugins\CustomDimensions\API::getInstance()->configureNewCustomDimension(
- self::$fixture->idSite, 'test', CustomDimensions::SCOPE_VISIT, true
+ self::$fixture->idSite,
+ 'test',
+ CustomDimensions::SCOPE_VISIT,
+ true
);
Fixture::clearInMemoryCaches(false);
\Piwik\Plugins\SegmentEditor\API::getInstance()->add('custom dimension', "dimension$idDimension==test", self::$fixture->idSite);
diff --git a/tests/PHPUnit/System/LabelFilterTest.php b/tests/PHPUnit/System/LabelFilterTest.php
index 868bfabfb80..c57f2a107be 100644
--- a/tests/PHPUnit/System/LabelFilterTest.php
+++ b/tests/PHPUnit/System/LabelFilterTest.php
@@ -100,7 +100,8 @@ public function getApiForTesting()
' ' . // test trimming
urlencode('incredible parent title! <>,;') .
'>' .
- urlencode('subtitle <>,;')),
+ urlencode('subtitle <>,;')
+ ),
'expanded' => 0
)
));
diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
index ac3bec5097f..91d636a8606 100644
--- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
+++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php
@@ -222,7 +222,12 @@ public function testArchiveSitesWhenRestrictingToLogin()
try
{
Archive::build(
- 'all', 'day', self::$fixture->dateTime, $segment = false, $_restrictToLogin = 'anotherLogin');
+ 'all',
+ 'day',
+ self::$fixture->dateTime,
+ $segment = false,
+ $_restrictToLogin = 'anotherLogin'
+ );
$this->fail("Restricting sites to invalid login did not return 0 sites.");
} catch (Exception $ex)
{
diff --git a/tests/PHPUnit/Unit/ConfigTest.php b/tests/PHPUnit/Unit/ConfigTest.php
index 567767c0cad..67255d7e470 100644
--- a/tests/PHPUnit/Unit/ConfigTest.php
+++ b/tests/PHPUnit/Unit/ConfigTest.php
@@ -30,12 +30,12 @@ public function __construct($configLocal, $configGlobal, $configCommon, $configC
parent::__construct();
$this->iniFileChain = new DumpConfigTestMockIniFileChain(
- array(
+ array(
$this->pathGlobal => $configGlobal,
$this->pathCommon => $configCommon,
$this->pathLocal => $configLocal,
- ),
- $configCache
+ ),
+ $configCache
);
}
}
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php
index 79de18937ab..77e62be1de3 100644
--- a/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php
+++ b/tests/PHPUnit/Unit/DataTable/Filter/PrependSegmentFilterTest.php
@@ -50,13 +50,15 @@ public function test_filter_shouldRemoveAllMetadataEntriesHavingTheGivenName()
$this->table->filter($this->filter, array($prepend));
$metadata = $this->table->getRowsMetadata('segment');
- $this->assertSame(array(
+ $this->assertSame(
+ array(
false,
$prepend . 'country=NZ',
false,
$prepend . 'country=AU',
$prepend),
- $metadata);
+ $metadata
+ );
// should be still the same
$metadata = $this->table->getRowsMetadata('test');
diff --git a/tests/PHPUnit/Unit/Tracker/ResponseTest.php b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
index 5fad45d72b1..1264278f37e 100644
--- a/tests/PHPUnit/Unit/Tracker/ResponseTest.php
+++ b/tests/PHPUnit/Unit/Tracker/ResponseTest.php
@@ -128,8 +128,10 @@ public function test_outputResponse_shouldOutputPiwikMessage_InCaseNothingWasTra
$tracker->setCountOfLoggedRequests(0);
$this->response->outputResponse($tracker);
- $this->assertEquals("This resource is part of Matomo. Keep full control of your data with the leading free and open source web analytics & conversion optimisation platform.
\nThis file is the endpoint for the Matomo tracking API. If you want to access the Matomo UI or use the Reporting API, please use index.php instead.\n",
- $this->response->getOutput());
+ $this->assertEquals(
+ "This resource is part of Matomo. Keep full control of your data with the leading free and open source web analytics & conversion optimisation platform.
\nThis file is the endpoint for the Matomo tracking API. If you want to access the Matomo UI or use the Reporting API, please use index.php instead.\n",
+ $this->response->getOutput()
+ );
}
public function test_getMessageFromException_ShouldNotOutputAnyDetails_IfErrorContainsDbCredentials()
diff --git a/tests/PHPUnit/Unit/UrlHelperTest.php b/tests/PHPUnit/Unit/UrlHelperTest.php
index 6f19e03f5a3..d5a1f8e2a36 100644
--- a/tests/PHPUnit/Unit/UrlHelperTest.php
+++ b/tests/PHPUnit/Unit/UrlHelperTest.php
@@ -169,24 +169,34 @@ public function testGetPathAndQueryFromUrl()
$this->assertEquals('test/index.php?module=CoreHome', UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php?module=CoreHome'));
// Add parameters to existing params
- $this->assertEquals('test/index.php?module=CoreHome&abc=123&def=456',
- UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php?module=CoreHome', ['abc' => '123', 'def' => '456']));
+ $this->assertEquals(
+ 'test/index.php?module=CoreHome&abc=123&def=456',
+ UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php?module=CoreHome', ['abc' => '123', 'def' => '456'])
+ );
// Add parameters with no existing params
- $this->assertEquals('test/index.php?abc=123&def=456',
- UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php', ['abc' => '123', 'def' => '456']));
+ $this->assertEquals(
+ 'test/index.php?abc=123&def=456',
+ UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php', ['abc' => '123', 'def' => '456'])
+ );
// Preserve anchor
- $this->assertEquals('test/index.php#anchor',
- UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', [], true));
+ $this->assertEquals(
+ 'test/index.php#anchor',
+ UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', [], true)
+ );
// Do not preserve anchor
- $this->assertEquals('test/index.php',
- UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', [], false));
+ $this->assertEquals(
+ 'test/index.php',
+ UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', [], false)
+ );
// Add parameters with existing params, preserve anchor
- $this->assertEquals('test/index.php#anchor?abc=123&def=456',
- UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', ['abc' => '123', 'def' => '456'], true));
+ $this->assertEquals(
+ 'test/index.php#anchor?abc=123&def=456',
+ UrlHelper::getPathAndQueryFromUrl('http://piwik.org/test/index.php#anchor', ['abc' => '123', 'def' => '456'], true)
+ );
}
/**
diff --git a/tests/PHPUnit/Unit/UrlTest.php b/tests/PHPUnit/Unit/UrlTest.php
index 8f97831f621..7dd0cb6c8be 100644
--- a/tests/PHPUnit/Unit/UrlTest.php
+++ b/tests/PHPUnit/Unit/UrlTest.php
@@ -481,12 +481,16 @@ public function testAddCampaignParametersToMatomoLink_exceptIfDisabled()
$_GET['action'] = 'trackingCodeGenerator';
Config::getInstance()->General['disable_tracking_matomo_app_links'] = 1;
- $this->assertEquals('https://matomo.org/faq/123',
- Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/123'));
+ $this->assertEquals(
+ 'https://matomo.org/faq/123',
+ Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/123')
+ );
Config::getInstance()->General['disable_tracking_matomo_app_links'] = 0;
- $this->assertEquals('https://matomo.org/faq/123?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.CoreHomeAdmin.trackingCodeGenerator',
- Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/123'));
+ $this->assertEquals(
+ 'https://matomo.org/faq/123?mtm_campaign=Matomo_App&mtm_source=Matomo_App_OnPremise&mtm_medium=App.CoreHomeAdmin.trackingCodeGenerator',
+ Url::addCampaignParametersToMatomoLink('https://matomo.org/faq/123')
+ );
}
/**