Simple fixes for PHP8.1 (#17929)

matomo-org · Sep 3, 2021 · 0914642 · 0914642
1 parent 3182379
commit 0914642
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
@@ -318,7 +318,7 @@ public function insertNumericRecords($numericRecords)
      */
     public function insertNumericRecord($name, $value)
     {
-        $value = round($value, 2);
+        $value = round($value ?? 0, 2);
         $value = Common::forceDotAsSeparatorForDecimalPoint($value);
 
         $this->archiveWriter->insertRecord($name, $value);

diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php
@@ -46,7 +46,7 @@ public function piwikVersionBasedCacheBuster($pluginNames = false)
                 }
             }
 
-            $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
+            $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash ?? ''));
 
             if ($pluginNames !== false) {
                 return $cacheBuster;

diff --git a/core/Common.php b/core/Common.php
@@ -420,7 +420,7 @@ private static function sanitizeString($value)
      */
     public static function unsanitizeInputValue($value)
     {
-        return htmlspecialchars_decode($value, self::HTML_ENCODING_QUOTE_STYLE);
+        return htmlspecialchars_decode($value ?? '', self::HTML_ENCODING_QUOTE_STYLE);
     }
 
     /**
@@ -456,7 +456,7 @@ public static function unsanitizeInputValues($value)
      */
     public static function sanitizeLineBreaks($value)
     {
-        return str_replace(array("\n", "\r"), '', $value);
+        return is_null($value) ? '' : str_replace(array("\n", "\r"), '', $value);
     }
 
     /**

diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -68,7 +68,7 @@ public function filter($table)
             $this->deleteRowsWithNoVisit($table);
         }
 
-        $extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
+        $extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME) ?: [];
 
         $extraProcessedMetrics[] = new ConversionRate();
         $extraProcessedMetrics[] = new ActionsPerVisit();

diff --git a/core/Translation/Translator.php b/core/Translation/Translator.php
@@ -85,6 +85,7 @@ public static function clean($s)
     public function translate($translationId, $args = array(), $language = null)
     {
         $args = is_array($args) ? $args : array($args);
+        $translationId = $translationId ?? '';
 
         if (strpos($translationId, "_") !== false) {
             list($plugin, $key) = explode("_", $translationId, 2);

diff --git a/core/Twig.php b/core/Twig.php
@@ -54,7 +54,7 @@ function piwik_fix_lbrace($string)
         $replace = array_map(function ($val) { return $val . '&#8291;' . $val; }, $chars);
     }
 
-    $replacedString = str_replace($search, $replace, $string);
+    $replacedString = is_null($string) ? $string : str_replace($search, $replace, $string);
 
     // try to replace characters until there are no changes
     if ($string !== $replacedString) {