Merge pull request #3124 from kwizer15/fix/cmd-format-value

Fix PHP 8+ TypeError in cmd::formatValue() when round() receives non-…

Author: Sekiro-kost

core/class/cmd.class.php

@@ -1042,6 +1042,10 @@ public function formatValue($_value, $_quote = false) {
 					return intval($binary xor boolval($this->getConfiguration('invertBinary', false)));
 				case 'numeric':
 					if ($this->getConfiguration('historizeRound') !== '' && is_numeric($this->getConfiguration('historizeRound')) && $this->getConfiguration('historizeRound') >= 0) {
+                        if (!is_numeric($_value)) {
+                            log::add('cmd', 'error', __('La formule de calcul doit retourner une valeur numérique uniquement : ', __FILE__) . $this->getHumanName() . ' => ' . $_value);
+                            $_value = (float) (str_replace(',', '.', $_value));
+                        }
 						$_value = round($_value, $this->getConfiguration('historizeRound'));
 					}
 					if ($_value > $this->getConfiguration('maxValue', $_value)) {

tests/class/cmdTest.php

@@ -0,0 +1,34 @@
+<?php
+
+/* This file is part of Jeedom.
+*
+* Jeedom is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* Jeedom is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with Jeedom. If not, see <http://www.gnu.org/licenses/>.
+*/
+use PHPUnit\Framework\TestCase;
+
+class cmdTest extends TestCase
+{
+    public function testFormatValueNumericRoundWithNonNumericCalculResult()
+    {
+        $cmd = new cmd();
+        $cmd->setType('info');
+        $cmd->setSubType('numeric');
+        $cmd->setConfiguration('historizeRound', 1);
+        $cmd->setConfiguration('calculValueOffset', '#value# * 2 ~ \'mm\'');
+
+        $actualResult = $cmd->formatValue('1,2');
+
+        self::assertSame(2.4, $actualResult);
+    }
+}