Merge pull request #1555 from stripe/richardm-fix-pinning-for-stripec…

…lient Pin version in StripeClient
stripe · Aug 18, 2023 · 7977510 · 7977510
2 parents 8860217 + 68086b4
commit 7977510
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/BaseStripeClient.php b/lib/BaseStripeClient.php
@@ -18,8 +18,7 @@ class BaseStripeClient implements StripeClientInterface, StripeStreamingClientIn
         'api_key' => null,
         'client_id' => null,
         'stripe_account' => null,
-        // Note, even if null, ApiRequestor will default this to Stripe::$apiVersion
-        'stripe_version' => null,
+        'stripe_version' => \Stripe\Util\ApiVersion::CURRENT,
         'api_base' => self::DEFAULT_API_BASE,
         'connect_base' => self::DEFAULT_CONNECT_BASE,
         'files_base' => self::DEFAULT_FILES_BASE,

diff --git a/tests/Stripe/BaseStripeClientTest.php b/tests/Stripe/BaseStripeClientTest.php
@@ -8,6 +8,7 @@
  */
 final class BaseStripeClientTest extends \Stripe\TestCase
 {
+    use TestHelper;
     /** @var \ReflectionProperty */
     private $optsReflector;
 
@@ -202,4 +203,21 @@ public function testRequestWithOptsInParamsWarns()
         static::assertNotNull($charge);
         static::assertSame('acct_456', $this->optsReflector->getValue($charge)->headers['Stripe-Account']);
     }
+
+    public function testRequestWithNoVersionDefaultsToPinnedVersion()
+    {
+        $client = new BaseStripeClient([
+            'api_key' => 'sk_test_client',
+            'api_base' => MOCK_URL,
+        ]);
+        $this->expectsRequest('get', '/v1/charges/ch_123', null, [
+            'Stripe-Version: ' . \Stripe\Util\ApiVersion::CURRENT,
+        ]);
+        $charge = $client->request(
+            'get',
+            '/v1/charges/ch_123',
+            [],
+            []
+        );
+    }
 }