From 3001e442cb541cec7f2fc4bf6d4fddf9852414bd Mon Sep 17 00:00:00 2001
From: Harrison Carter <harrison.carter@smartthings.com>
Date: Wed, 1 Apr 2026 10:33:51 -0500
Subject: [PATCH] update next to __pairs, rawget to __index

---
 .../SmartThings/matter-lock/src/new-matter-lock/init.lua | 8 ++++----
 .../air_quality_sensor_utils/utils.lua                   | 9 +++++----
 .../SmartThings/matter-switch/src/switch_utils/utils.lua | 8 ++++----
 .../matter-thermostat/src/thermostat_utils/utils.lua     | 8 ++++----
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
index cca7a56b27..1e7d461eda 100644
--- a/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
+++ b/drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua
@@ -324,15 +324,15 @@ local function deep_equals(a, b, opts, seen)
   end
 
   -- Compare keys/values from a
-  for k, v in next, a do
-    if not deep_equals(v, rawget(b, k), opts, seen) then
+  for k, v in pairs(a) do
+    if not deep_equals(v, b[k], opts, seen) then
       return false
     end
   end
 
   -- Ensure b doesn't have extra keys
-  for k in next, b do
-    if rawget(a, k) == nil then
+  for k in pairs(b) do
+    if a[k] == nil then
       return false
     end
   end
diff --git a/drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua b/drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua
index e23b9f7eeb..0ce7ffb266 100644
--- a/drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua
+++ b/drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua
@@ -102,15 +102,15 @@ function AirQualitySensorUtils.deep_equals(a, b, opts, seen)
   end
 
   -- Compare keys/values from a
-  for k, v in next, a do
-    if not AirQualitySensorUtils.deep_equals(v, rawget(b, k), opts, seen) then
+  for k, v in pairs(a) do
+    if not AirQualitySensorUtils.deep_equals(v, b[k], opts, seen) then
       return false
     end
   end
 
   -- Ensure b doesn't have extra keys
-  for k in next, b do
-    if rawget(a, k) == nil then
+  for k in pairs(b) do
+    if a[k] == nil then
       return false
     end
   end
@@ -121,4 +121,5 @@ function AirQualitySensorUtils.deep_equals(a, b, opts, seen)
   return AirQualitySensorUtils.deep_equals(mt_a, mt_b, opts, seen)
 end
 
+
 return AirQualitySensorUtils
diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
index 1afecb318f..f949a15a56 100644
--- a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
+++ b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua
@@ -351,15 +351,15 @@ function utils.deep_equals(a, b, opts, seen)
   end
 
   -- Compare keys/values from a
-  for k, v in next, a do
-    if not utils.deep_equals(v, rawget(b, k), opts, seen) then
+  for k, v in pairs(a) do
+    if not utils.deep_equals(v, b[k], opts, seen) then
       return false
     end
   end
 
   -- Ensure b doesn't have extra keys
-  for k in next, b do
-    if rawget(a, k) == nil then
+  for k in pairs(b) do
+    if a[k] == nil then
       return false
     end
   end
diff --git a/drivers/SmartThings/matter-thermostat/src/thermostat_utils/utils.lua b/drivers/SmartThings/matter-thermostat/src/thermostat_utils/utils.lua
index dd298bc987..a233a0c0e7 100644
--- a/drivers/SmartThings/matter-thermostat/src/thermostat_utils/utils.lua
+++ b/drivers/SmartThings/matter-thermostat/src/thermostat_utils/utils.lua
@@ -97,15 +97,15 @@ function ThermostatUtils.deep_equals(a, b, opts, seen)
   end
 
   -- Compare keys/values from a
-  for k, v in next, a do
-    if not ThermostatUtils.deep_equals(v, rawget(b, k), opts, seen) then
+  for k, v in pairs(a) do
+    if not ThermostatUtils.deep_equals(v, b[k], opts, seen) then
       return false
     end
   end
 
   -- Ensure b doesn't have extra keys
-  for k in next, b do
-    if rawget(a, k) == nil then
+  for k in pairs(b) do
+    if a[k] == nil then
       return false
     end
   end