diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-11-16 03:13:54 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-16 03:13:54 +0300 |
commit | 3b00013819863472afe30cc04de49c4365c22d21 (patch) | |
tree | e9fde69cde444d190d072386462be74bc50c7d40 /plugins/SitesManager | |
parent | c4431ba4a12672d8bbb83c4063ff54df39f80b81 (diff) |
Fix some PHP8.1 deprecation warnings occurred while running tests (#18314)
* Fix some PHP8.1 deprecation warnings occurred while running tests
* some more fixes
* avoid null values in names to prevent php 8.1 deprecation warning
* some more fixes
* updates expected test files
* apply review feedback
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r-- | plugins/SitesManager/API.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 666cada1cf..2c800586c5 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -621,15 +621,15 @@ class API extends \Piwik\Plugin\API $coreProperties = $this->setSettingValue('ecommerce', $ecommerce, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('group', $group, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('sitesearch', $siteSearch, $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('sitesearch_keyword_parameters', explode(',', $searchKeywordParameters), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('sitesearch_category_parameters', explode(',', $searchCategoryParameters), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('sitesearch_keyword_parameters', explode(',', $searchKeywordParameters ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('sitesearch_category_parameters', explode(',', $searchCategoryParameters ?? ''), $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('keep_url_fragment', $keepURLFragments, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('exclude_unknown_urls', $excludeUnknownUrls, $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_ips', explode(',', $excludedIps), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_parameters', explode(',', $excludedQueryParameters), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_user_agents', explode(',', $excludedUserAgents), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_ips', explode(',', $excludedIps ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_parameters', explode(',', $excludedQueryParameters ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_user_agents', explode(',', $excludedUserAgents ?? ''), $coreProperties, $settingValues); - $timezone = trim($timezone); + $timezone = trim($timezone ?? ''); if (empty($timezone)) { $timezone = $this->getDefaultTimezone(); } @@ -1252,13 +1252,13 @@ class API extends \Piwik\Plugin\API $coreProperties = $this->setSettingValue('group', $group, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('ecommerce', $ecommerce, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('sitesearch', $siteSearch, $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('sitesearch_keyword_parameters', explode(',', $searchKeywordParameters), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('sitesearch_category_parameters', explode(',', $searchCategoryParameters), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('sitesearch_keyword_parameters', explode(',', $searchKeywordParameters ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('sitesearch_category_parameters', explode(',', $searchCategoryParameters ?? ''), $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('keep_url_fragment', $keepURLFragments, $coreProperties, $settingValues); $coreProperties = $this->setSettingValue('exclude_unknown_urls', $excludeUnknownUrls, $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_ips', explode(',', $excludedIps), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_parameters', explode(',', $excludedQueryParameters), $coreProperties, $settingValues); - $coreProperties = $this->setSettingValue('excluded_user_agents', explode(',', $excludedUserAgents), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_ips', explode(',', $excludedIps ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_parameters', explode(',', $excludedQueryParameters ?? ''), $coreProperties, $settingValues); + $coreProperties = $this->setSettingValue('excluded_user_agents', explode(',', $excludedUserAgents ?? ''), $coreProperties, $settingValues); if (isset($currency)) { $currency = trim($currency); |