From 80521e6f4bb8ae12561a4ba387a526f5e1d109c8 Mon Sep 17 00:00:00 2001 From: Brovning <39644775+Brovning@users.noreply.github.com> Date: Sat, 26 Feb 2022 10:29:06 +0100 Subject: [PATCH] all "&=" replaced with "= $returnValue &&" --- libs/myFunctions.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/myFunctions.php b/libs/myFunctions.php index 0b65263..d3ea839 100644 --- a/libs/myFunctions.php +++ b/libs/myFunctions.php @@ -172,7 +172,7 @@ private function deleteInstanceNotInUse(int $connectionId_Old, string $moduleId) // Loesche Connection-Instanz (bspw. ModbusAddress, ClientSocket,...), wenn nicht mehr in Verwendung if (!$inUse) { - $returnValue &= IPS_DeleteInstance($connectionId_Old); + $returnValue = $returnValue && IPS_DeleteInstance($connectionId_Old); } } @@ -352,16 +352,16 @@ private function createVarProfile(string $ProfilName, int $ProfileType, string $ if (!IPS_VariableProfileExists($ProfilName)) { - $returnValue &= IPS_CreateVariableProfile($ProfilName, $ProfileType); - $returnValue &= IPS_SetVariableProfileText($ProfilName, '', $Suffix); + $returnValue = $returnValue && IPS_CreateVariableProfile($ProfilName, $ProfileType); + $returnValue = $returnValue && IPS_SetVariableProfileText($ProfilName, '', $Suffix); if (in_array($ProfileType, array(VARIABLETYPE_INTEGER, VARIABLETYPE_FLOAT))) { - $returnValue &= IPS_SetVariableProfileValues($ProfilName, $MinValue, $MaxValue, $StepSize); - $returnValue &= IPS_SetVariableProfileDigits($ProfilName, $Digits); + $returnValue = $returnValue && IPS_SetVariableProfileValues($ProfilName, $MinValue, $MaxValue, $StepSize); + $returnValue = $returnValue && IPS_SetVariableProfileDigits($ProfilName, $Digits); } - $returnValue &= IPS_SetVariableProfileIcon($ProfilName, $Icon); + $returnValue = $returnValue && IPS_SetVariableProfileIcon($ProfilName, $Icon); foreach ($Associations as $a) { @@ -369,7 +369,7 @@ private function createVarProfile(string $ProfilName, int $ProfileType, string $ $n = isset($a['Name']) ? $a['Name'] : ''; $i = isset($a['Icon']) ? $a['Icon'] : ''; $f = isset($a['Farbe']) ? $a['Farbe'] : -1; - $returnValue &= IPS_SetVariableProfileAssociation($ProfilName, $w, $n, $i, $f); + $returnValue = $returnValue && IPS_SetVariableProfileAssociation($ProfilName, $w, $n, $i, $f); } $this->SendDebug("Variable-Profile", "Profile ".$ProfilName." created", 0); @@ -392,7 +392,7 @@ private function deleteModbusInstancesRecursive(array $inverterModelRegister_arr $instanceId = @IPS_GetObjectIDByIdent($register[IMR_START_REGISTER].$uniqueIdent, $categoryId); if (false !== $instanceId) { - $returnValue &= $this->deleteInstanceRecursive($instanceId); + $returnValue = $returnValue && $this->deleteInstanceRecursive($instanceId); $this->SendDebug("delete Modbus address", "REG_".$register[IMR_START_REGISTER]." - ".$register[IMR_NAME].", ID=".$instanceId, 0); } @@ -406,9 +406,9 @@ private function deleteInstanceRecursive(int $instanceId): bool $returnValue = true; foreach (IPS_GetChildrenIDs($instanceId) as $childChildId) { - $returnValue &= IPS_DeleteVariable($childChildId); + $returnValue = $returnValue && IPS_DeleteVariable($childChildId); } - $returnValue &= IPS_DeleteInstance($instanceId); + $returnValue = $returnValue && IPS_DeleteInstance($instanceId); return (bool)$returnValue; }