From 871717611230c857ca639af39561e12e4158015f Mon Sep 17 00:00:00 2001
From: Olivier Bellone <ob@stripe.com>
Date: Fri, 21 Dec 2018 16:52:17 +0100
Subject: [PATCH] Minor fixes

---
 .../Infrastructure/Middleware/RequestStringBuilder.cs    | 9 +++------
 src/Stripe.net/Infrastructure/ParameterBuilder.cs        | 6 ------
 src/StripeTests/Infrastructure/ParameterBuilderTest.cs   | 1 -
 src/StripeTests/MockHttpClientFixture.cs                 | 4 ++--
 src/StripeTests/StripeMockFixture.cs                     | 8 ++++----
 5 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/Stripe.net/Infrastructure/Middleware/RequestStringBuilder.cs b/src/Stripe.net/Infrastructure/Middleware/RequestStringBuilder.cs
index e3724e670c..4dbcfd9414 100644
--- a/src/Stripe.net/Infrastructure/Middleware/RequestStringBuilder.cs
+++ b/src/Stripe.net/Infrastructure/Middleware/RequestStringBuilder.cs
@@ -214,13 +214,10 @@ private static List<Parameter> FlattenParamsList(List<object> list, string keyPr
             }
             else
             {
-                var listEnumerator = list.GetEnumerator();
-
-                for (int i = 0; listEnumerator.MoveNext() == true; i++)
+                foreach (var item in list.Select((value, index) => new { value, index }))
                 {
-                    object value = listEnumerator.Current;
-                    string newPrefix = $"{keyPrefix}[{i}]";
-                    flatParams.AddRange(FlattenParamsValue(value, newPrefix));
+                    string newPrefix = $"{keyPrefix}[{item.index}]";
+                    flatParams.AddRange(FlattenParamsValue(item.value, newPrefix));
                 }
             }
 
diff --git a/src/Stripe.net/Infrastructure/ParameterBuilder.cs b/src/Stripe.net/Infrastructure/ParameterBuilder.cs
index 0fbe45c1dd..a31e30da2f 100644
--- a/src/Stripe.net/Infrastructure/ParameterBuilder.cs
+++ b/src/Stripe.net/Infrastructure/ParameterBuilder.cs
@@ -54,12 +54,6 @@ public static string ApplyAllParameters<T>(this Service<T> service, BaseOptions
                     }
 
                     requestString = ApplyParameterToUrl(requestString, "expand[]", expandPropertyName);
-
-                    // note: I had no idea you could expand properties beyond the first level (up to 4 before stripe throws an exception).
-                    // something to consider adding to the project.
-                    //
-                    // example:
-                    // requestString = ApplyParameterToUrl(requestString, "expand[]", "data.charge.dispute.charge.dispute.charge.dispute");
                 }
             }
 
diff --git a/src/StripeTests/Infrastructure/ParameterBuilderTest.cs b/src/StripeTests/Infrastructure/ParameterBuilderTest.cs
index a7be264286..dcf83f3ecd 100644
--- a/src/StripeTests/Infrastructure/ParameterBuilderTest.cs
+++ b/src/StripeTests/Infrastructure/ParameterBuilderTest.cs
@@ -354,7 +354,6 @@ public void SetsUrl()
         {
             Assert.NotNull(this.service);
 
-            var testObject = new TestOptions();
             var url = this.service.ApplyAllParameters(null, "base_url", false);
             Assert.Equal("base_url", url);
         }
diff --git a/src/StripeTests/MockHttpClientFixture.cs b/src/StripeTests/MockHttpClientFixture.cs
index 37a6c04d39..a103f220f7 100644
--- a/src/StripeTests/MockHttpClientFixture.cs
+++ b/src/StripeTests/MockHttpClientFixture.cs
@@ -9,9 +9,9 @@ namespace StripeTests
 
     public class MockHttpClientFixture : IDisposable
     {
-        private Mock<HttpClientHandler> mockHandler;
+        private readonly Mock<HttpClientHandler> mockHandler;
 
-        private HttpMessageHandler origHandler;
+        private readonly HttpMessageHandler origHandler;
 
         public MockHttpClientFixture()
         {
diff --git a/src/StripeTests/StripeMockFixture.cs b/src/StripeTests/StripeMockFixture.cs
index c5b8b75db2..d2f1d2cdd6 100644
--- a/src/StripeTests/StripeMockFixture.cs
+++ b/src/StripeTests/StripeMockFixture.cs
@@ -14,11 +14,11 @@ public class StripeMockFixture : IDisposable
         /// </remarks>
         private const string MockMinimumVersion = "0.39.0";
 
-        private string origApiBase;
-        private string origFilesBase;
-        private string origApiKey;
+        private readonly string origApiBase;
+        private readonly string origFilesBase;
+        private readonly string origApiKey;
 
-        private string port;
+        private readonly string port;
 
         public StripeMockFixture()
         {