Skip to content

Commit e7febeb

Browse files
MichaelRooszMichael Roosz
andauthored
Fix some "Passing null to parameter" warnings (matomo-org#19135)
* Fix "passing null to parameter" errors * Fix "passing null to parameter" error * Fix "passing null to parameter" errors * Fix "passing null to parameter" error * Update fix for "passing null to parameter" error Co-authored-by: Michael Roosz <[email protected]>
1 parent 5f376f7 commit e7febeb

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

core/Twig.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@ protected function addFilter_notification()
360360
protected function addFilter_safeDecodeRaw()
361361
{
362362
$rawSafeDecoded = new TwigFilter('rawSafeDecoded', function ($string) {
363+
364+
if ($string === null) {
365+
return '';
366+
}
367+
363368
$string = str_replace('+', '%2B', $string);
364369
$string = str_replace('&nbsp;', html_entity_decode('&nbsp;', ENT_COMPAT | ENT_HTML401, 'UTF-8'), $string);
365370

libs/HTML/QuickForm2/Rule/Nonempty.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ protected function validateOwner()
9393
} elseif (is_array($value)) {
9494
return count(array_filter($value, 'strlen')) >= $this->getConfig();
9595
} else {
96-
return (bool)strlen($value);
96+
return (bool)strlen($value ?? '');
9797
}
9898
}
9999

plugins/Referrers/Columns/Base.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ protected function detectCampaignKeywordFromReferrerUrl()
477477
*/
478478
protected function getParameterValueFromReferrerUrl($adsenseReferrerParameter)
479479
{
480-
$value = trim(urldecode(UrlHelper::getParameterFromQueryString($this->referrerUrlParse['query'], $adsenseReferrerParameter)));
480+
$value = trim(urldecode(UrlHelper::getParameterFromQueryString($this->referrerUrlParse['query'], $adsenseReferrerParameter) ?? ''));
481481
return $value;
482482
}
483483

@@ -522,7 +522,7 @@ protected function detectReferrerCampaign(Request $request, Visitor $visitor)
522522
return false;
523523
}
524524

525-
$this->keywordReferrerAnalyzed = mb_strtolower($this->keywordReferrerAnalyzed);
525+
$this->keywordReferrerAnalyzed = mb_strtolower($this->keywordReferrerAnalyzed ?? '');
526526
$this->nameReferrerAnalyzed = mb_strtolower($this->nameReferrerAnalyzed);
527527
return true;
528528
}

plugins/UsersManager/Model.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public function getSitesAccessFromUserWithFilters($userLogin, $limit = null, $of
207207

208208
$access = $db->fetchAll($sql, $bind);
209209
foreach ($access as &$entry) {
210-
$entry['access'] = explode('|', $entry['access']);
210+
$entry['access'] = explode('|', $entry['access'] ?? '');
211211
}
212212

213213
$count = $db->fetchOne("SELECT FOUND_ROWS()");
@@ -659,7 +659,7 @@ public function getUsersWithRole($idSite, $limit = null, $offset = null, $patter
659659

660660
$users = $db->fetchAll($sql, $bind);
661661
foreach ($users as &$user) {
662-
$user['access'] = explode('|', $user['access']);
662+
$user['access'] = explode('|', $user['access'] ?? '');
663663
}
664664

665665
$count = $db->fetchOne("SELECT FOUND_ROWS()");

0 commit comments

Comments
 (0)