Also override JsonObject's IEnumerable<KeyValuePair<string, string>>

Author: mythz

src/ServiceStack.Text/JsonObject.cs

@@ -78,7 +78,7 @@ public static Dictionary<string, string> ToDictionary(this JsonObject jsonObject
         }
     }
 
-    public class JsonObject : Dictionary<string, string>
+    public class JsonObject : Dictionary<string, string>, IEnumerable<KeyValuePair<string, string>>
     {
         /// <summary>
         /// Get JSON string value
@@ -89,7 +89,7 @@ public class JsonObject : Dictionary<string, string>
             set => base[key] = value;
         }
 
-        public Enumerator GetEnumerator()
+        public new Enumerator GetEnumerator()
         {
             var to = new Dictionary<string, string>();
             foreach (var key in Keys)
@@ -99,6 +99,9 @@ public Enumerator GetEnumerator()
             return to.GetEnumerator();
         }
 
+        IEnumerator<KeyValuePair<string, string>> IEnumerable<KeyValuePair<string, string>>.GetEnumerator()
+            => GetEnumerator();
+
         public static JsonObject Parse(string json)
         {
             return JsonSerializer.DeserializeFromString<JsonObject>(json);

tests/ServiceStack.Text.Tests/JsonObjectTests.cs

@@ -487,6 +487,34 @@ public void Enumerating_JsonObject_returns_same_unescaped_value_as_indexer()
                     Assert.That(entry.Value, Is.EqualTo("b\\c"));
                 }
             }
+            
+            var asEnumerable = (IEnumerable<KeyValuePair<string, string>>)obj;
+            foreach (var entry in asEnumerable)
+            {
+                if (entry.Key == "a")
+                {
+                    Assert.That(entry.Value, Is.EqualTo("b\\c"));
+                }
+            }
+            
+            var asIDict = (IDictionary<string, string>)obj;
+            foreach (var entry in asIDict)
+            {
+                if (entry.Key == "a")
+                {
+                    Assert.That(entry.Value, Is.EqualTo("b\\c"));
+                }
+            }
+
+            // Warning: can't override concrete Dictionary<string, string> enumerator
+            // var asDict = (Dictionary<string, string>)obj;
+            // foreach (var entry in asDict)
+            // {
+            //     if (entry.Key == "a")
+            //     {
+            //         Assert.That(entry.Value, Is.EqualTo("b\\c"));
+            //     }
+            // }
         }
 
     }