Fix a couple a possible warning in PHP 8.1

matomo-org · Aug 10, 2021 · 74a6b6c · 74a6b6c
1 parent 1c287f1
commit 74a6b6c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/core/Access.php b/core/Access.php
@@ -161,7 +161,7 @@ public function reloadAccess(Auth $auth = null)
         $forceApiSessionGet = Common::getRequestVar('force_api_session', 0, 'int', $_GET);
         $isApiRequest = Piwik::getModule() === 'API' && (Piwik::getAction() === 'index' || !Piwik::getAction());
         $apiMethod = Request::getMethodIfApiRequest(null);
-        $isGetApiRequest = 1 === substr_count($apiMethod, '.') && strpos($apiMethod, '.get') > 0;
+        $isGetApiRequest = !empty($apiMethod) && 1 === substr_count($apiMethod, '.') && strpos($apiMethod, '.get') > 0;
 
         if (($forceApiSessionPost && $isApiRequest) || ($forceApiSessionGet && $isApiRequest && $isGetApiRequest)) {
             $request = ($forceApiSessionGet && $isApiRequest && $isGetApiRequest) ? $_GET : $_POST;

diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php
@@ -32,7 +32,7 @@ public function piwikVersionBasedCacheBuster($pluginNames = false)
         if (empty($cachedCacheBuster) || $pluginNames !== false) {
 
             $masterFile     = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
-            $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+            $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : '';
             $manager = Manager::getInstance();
 
             $plugins = !$pluginNames ? $manager->getActivatedPlugins() : $pluginNames;

diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php b/plugins/GeoIp2/LocationProvider/GeoIp2/Php.php
@@ -253,7 +253,7 @@ protected function setCityResults($lookupResult, &$result)
         if (is_array($lookupResult->subdivisions) && count($lookupResult->subdivisions) > 0) {
             $subdivisions = $lookupResult->subdivisions;
             $subdivision = $this->determinSubdivision($subdivisions, $result[self::COUNTRY_CODE_KEY]);
-            $result[self::REGION_CODE_KEY] = strtoupper($subdivision->isoCode) ?: $this->determineRegionIsoCodeByNameAndCountryCode($subdivision->name, $result[self::COUNTRY_CODE_KEY]);
+            $result[self::REGION_CODE_KEY] = $subdivision->isoCode ? strtoupper($subdivision->isoCode) : $this->determineRegionIsoCodeByNameAndCountryCode($subdivision->name, $result[self::COUNTRY_CODE_KEY]);
             $result[self::REGION_NAME_KEY] = $subdivision->name;
         }
     }

diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php
@@ -310,7 +310,7 @@ protected function detectReferrerSocialNetwork()
     protected function detectCampaignFromString($string)
     {
         foreach ($this->campaignNames as $campaignNameParameter) {
-            $campaignName = trim(urldecode(UrlHelper::getParameterFromQueryString($string, $campaignNameParameter)));
+            $campaignName = trim(urldecode(UrlHelper::getParameterFromQueryString($string, $campaignNameParameter) ?? ''));
             if (!empty($campaignName)) {
                 break;
             }
@@ -496,7 +496,7 @@ protected function detectReferrerCampaign(Request $request, Visitor $visitor)
         $referrerNameAnalayzed = mb_strtolower($this->nameReferrerAnalyzed);
         $referrerNameAnalayzed = $this->truncateReferrerName($referrerNameAnalayzed);
 
-        $isCurrentVisitACampaignWithSameName = mb_strtolower($visitor->getVisitorColumn('referer_name')) == $referrerNameAnalayzed;
+        $isCurrentVisitACampaignWithSameName = mb_strtolower($visitor->getVisitorColumn('referer_name') ?? '') == $referrerNameAnalayzed;
         $isCurrentVisitACampaignWithSameName = $isCurrentVisitACampaignWithSameName && $visitor->getVisitorColumn('referer_type') == Common::REFERRER_TYPE_CAMPAIGN;
 
         // if we detected a campaign but there is still no keyword set, we set the keyword to the Referrer host
@@ -632,7 +632,7 @@ protected function isReferrerInformationNew(Visitor $visitor, $information)
 
     protected function hasReferrerColumnChanged(Visitor $visitor, $information, $infoName)
     {
-        $existing = mb_strtolower($visitor->getVisitorColumn($infoName));
+        $existing = mb_strtolower($visitor->getVisitorColumn($infoName) ?? '');
         $new = mb_strtolower($information[$infoName]);
 
         $result = $existing != $new;

diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php
@@ -266,7 +266,7 @@ public function extractInformationFromUrl($referrerUrl)
                 } else {
                     // search for keywords now &vname=keyword
                     $key = UrlHelper::getParameterFromQueryString($query, $variableName);
-                    $key = trim(urldecode($key));
+                    $key = trim(urldecode($key ?? ''));
 
                     // Special cases: empty keywords
                     if (empty($key)