diff options
| -rw-r--r-- | config/environment/ui-test.php | 2 | ||||
| -rw-r--r-- | core/SettingsPiwik.php | 2 | ||||
| -rw-r--r-- | plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php | 2 | ||||
| -rw-r--r-- | plugins/CoreVisualizations/Visualizations/Sparklines.php | 4 | ||||
| -rw-r--r-- | plugins/SitesManager/SitesManager.php | 2 | ||||
| -rw-r--r-- | tests/PHPUnit/Fixtures/DisablePluginArchive.php | 34 |
6 files changed, 16 insertions, 30 deletions
diff --git a/config/environment/ui-test.php b/config/environment/ui-test.php index 3e4c9a6d41..49126b20b6 100644 --- a/config/environment/ui-test.php +++ b/config/environment/ui-test.php @@ -50,7 +50,7 @@ return array( } // remove PIWIK_INCLUDE_PATH from result so tests don't change based on the machine used - $result = str_replace(realpath(PIWIK_INCLUDE_PATH), '', $result); + $result = str_replace(realpath(PIWIK_INCLUDE_PATH), '', $result ?? ''); })), array('Controller.RssWidget.rssPiwik.end', DI\value(function (&$result, $parameters) { diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php index 14f4547d28..a78f0a84c5 100644 --- a/core/SettingsPiwik.php +++ b/core/SettingsPiwik.php @@ -31,7 +31,7 @@ class SettingsPiwik { static $salt = null; if (is_null($salt)) { - $salt = @Config::getInstance()->General['salt']; + $salt = Config::getInstance()->General['salt'] ?? ''; } return $salt; } diff --git a/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php b/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php index 446eb6cd59..e1293b9364 100644 --- a/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php +++ b/plugins/API/Filter/DataComparisonFilter/ComparisonRowGenerator.php @@ -125,7 +125,7 @@ class ComparisonRowGenerator 'totals' => $totals, ]); - $allTotalsTables = $table->getMetadata('comparisonTotals'); + $allTotalsTables = $table->getMetadata('comparisonTotals') ?: []; $allTotalsTables[] = $comparisonTotalsEntry; $table->setMetadata('comparisonTotals', $allTotalsTables); } diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines.php b/plugins/CoreVisualizations/Visualizations/Sparklines.php index d4f471a6ae..ad9373f329 100644 --- a/plugins/CoreVisualizations/Visualizations/Sparklines.php +++ b/plugins/CoreVisualizations/Visualizations/Sparklines.php @@ -303,6 +303,10 @@ class Sparklines extends ViewDataTable return $columns; } + if (!is_array($columns)) { + $columns = [$columns]; + } + return array_diff($columns, ['nb_users', 'nb_uniq_visitors']); } } diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 246ebec8b5..2b4746c326 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -373,7 +373,7 @@ class SitesManager extends \Piwik\Plugin self::SITE_TYPE_WEBFLOW => 'https://matomo.org/faq/new-to-piwik/how-do-i-install-the-matomo-tracking-code-on-webflow', ]; - return $map[$siteType] ? $map[$siteType] : false; + return $map[$siteType] ?? false; } public function getClientSideTranslationKeys(&$translationKeys) diff --git a/tests/PHPUnit/Fixtures/DisablePluginArchive.php b/tests/PHPUnit/Fixtures/DisablePluginArchive.php index ff7e720ca6..4c96561b62 100644 --- a/tests/PHPUnit/Fixtures/DisablePluginArchive.php +++ b/tests/PHPUnit/Fixtures/DisablePluginArchive.php @@ -56,10 +56,6 @@ class DisablePluginArchive extends Fixture Cache::clearCacheGeneral(); Cache::regenerateCacheWebsiteAttributes(array($idSite)); - if ($this->useThirdPartyCookies) { - $t->DEBUG_APPEND_URL = '&forceUseThirdPartyCookie=1'; - } - $t->disableCookieSupport(); $t->setUrlReferrer('http://referrer.com/page.htm?param=valuewith some spaces'); @@ -71,9 +67,9 @@ class DisablePluginArchive extends Fixture 'new name', $url = array('http://site.com'), $ecommerce = 0, - $siteSearch = $this->useSiteSearch ? 1 : 0, - $searchKeywordParameters = $this->useSiteSearch ? '' : null, - $searchCategoryParameters = $this->useSiteSearch ? 'notparam' : null, + $siteSearch = 0, + $searchKeywordParameters = null, + $searchCategoryParameters = null, $excludedIps = null, $parameterToExclude . ',anotherParameter', $timezone = null, @@ -129,25 +125,11 @@ class DisablePluginArchive extends Fixture $t->setBrowserLanguage('fr'); - if ($this->useSiteSearch) { - // Site Search request - $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.42)->getDatetime()); - $t->setUrl('http://example.org/index.htm?q=Banks Own The World'); - $t->setPerformanceTimings(17, 236, 385, 1025, 199, 266); - self::checkResponse($t->doTrackPageView('Site Search request')); - - // Final page view (after 27 min) - $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.45)->getDatetime()); - $t->setUrl('http://example.org/index.htm'); - $t->setPerformanceTimings(42, 96, 200, 955, 566, 200); - self::checkResponse($t->doTrackPageView('Looking at homepage after site search...')); - } else { - // Final page view (after 27 min) - $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.45)->getDatetime()); - $t->setUrl('http://example.org/index.htm#ignoredFragment#'); - $t->setPerformanceTimings(0, 222, 333, 1111, 666, 333); - self::checkResponse($t->doTrackPageView('Looking at homepage (again)...')); - } + // Final page view (after 27 min) + $t->setForceVisitDateTime(Date::factory($dateTime)->addHour(0.45)->getDatetime()); + $t->setUrl('http://example.org/index.htm#ignoredFragment#'); + $t->setPerformanceTimings(0, 222, 333, 1111, 666, 333); + self::checkResponse($t->doTrackPageView('Looking at homepage (again)...')); // - // End of first visit: 24min |