Merge pull request #44 from NETWAYS/fix/substr-deprecation

martialblog · web-flow · commit b99be248dde4 · 2025-01-20T08:58:54.000+01:00
Add type check to substr_count to avoid deprecation warning
diff --git a/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php b/library/Grafana/ProvidedHook/Icingadb/IcingaDbGrapher.php
@@ -377,8 +377,7 @@ public function getPreviewHtml(Model $object, $report = false)
         }
 
         if ($this->repeatable === "yes") {
-            $panelEnd =  ($this->panelId - 1) +
-                intval(substr_count($object->state->performance_data, '=') / $this->numberMetrics);
+            $panelEnd =  ($this->panelId - 1) + intval(substr_count(strval($object->state->performance_data), '=') / $this->numberMetrics);
             $this->panelId = implode(
                 ',',
                 range($this->panelId, $panelEnd)

Original file line number	Diff line number	Diff line change
`@@ -377,8 +377,7 @@ public function getPreviewHtml(Model $object, $report = false)`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`if ($this->repeatable === "yes") {`
`380`		`- $panelEnd = ($this->panelId - 1) +`
`381`		`- intval(substr_count($object->state->performance_data, '=') / $this->numberMetrics);`
	`380`	`+ $panelEnd = ($this->panelId - 1) + intval(substr_count(strval($object->state->performance_data), '=') / $this->numberMetrics);`
`382`	`381`	`$this->panelId = implode(`
`383`	`382`	`',',`
`384`	`383`	`range($this->panelId, $panelEnd)`