Merge upstream and update generated code for v1314

stripe · Oct 18, 2024 · ed1bc9e · ed1bc9e
2 parents 9d1874b + 9a342aa
commit ed1bc9e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/OPENAPI_VERSION b/OPENAPI_VERSION
@@ -1 +1 @@
-v1313
+v1314
diff --git a/lib/V2/Billing/MeterEvent.php b/lib/V2/Billing/MeterEvent.php
@@ -17,5 +17,5 @@
  */
 class MeterEvent extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = 'billing.meter_event';
+    const OBJECT_NAME = 'v2.billing.meter_event';
 }
diff --git a/lib/V2/Billing/MeterEventAdjustment.php b/lib/V2/Billing/MeterEventAdjustment.php
@@ -16,7 +16,7 @@
  */
 class MeterEventAdjustment extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = 'billing.meter_event_adjustment';
+    const OBJECT_NAME = 'v2.billing.meter_event_adjustment';
 
     const STATUS_COMPLETE = 'complete';
     const STATUS_PENDING = 'pending';

diff --git a/lib/V2/Billing/MeterEventSession.php b/lib/V2/Billing/MeterEventSession.php
@@ -14,5 +14,5 @@
  */
 class MeterEventSession extends \Stripe\ApiResource
 {
-    const OBJECT_NAME = 'billing.meter_event_session';
+    const OBJECT_NAME = 'v2.billing.meter_event_session';
 }
diff --git a/tests/Stripe/BaseStripeClientTest.php b/tests/Stripe/BaseStripeClientTest.php
@@ -416,7 +416,7 @@ public function testRawRequestWithStripeContextOption()
     public function testV2GetRequest()
     {
         $this->curlClientStub->method('executeRequestWithRetries')
-            ->willReturn(['{"object": "billing.meter_event_session"}', 200, []])
+            ->willReturn(['{"object": "v2.billing.meter_event_session"}', 200, []])
         ;
 
         $this->curlClientStub->expects(static::once())
@@ -446,7 +446,7 @@ public function testV2GetRequest()
     public function testV2PostRequest()
     {
         $this->curlClientStub->method('executeRequestWithRetries')
-            ->willReturn(['{"object": "billing.meter_event_session"}', 200, []])
+            ->willReturn(['{"object": "v2.billing.meter_event_session"}', 200, []])
         ;
 
         $this->curlClientStub->expects(static::once())
@@ -475,7 +475,7 @@ public function testV2PostRequest()
     public function testV2PostRequestWithEmptyParams()
     {
         $this->curlClientStub->method('executeRequestWithRetries')
-            ->willReturn(['{"object": "billing.meter_event_session"}', 200, []])
+            ->willReturn(['{"object": "v2.billing.meter_event_session"}', 200, []])
         ;
 
         $this->curlClientStub->expects(static::once())
@@ -777,7 +777,7 @@ public function testV2OverridesPreviewVersionIfPassedInRawRequestOptions()
     public function testV2OverridesPreviewVersionIfPassedInRequestOptions()
     {
         $this->curlClientStub->method('executeRequestWithRetries')
-            ->willReturn(['{"object": "billing.meter_event_session"}', 200, []])
+            ->willReturn(['{"object": "v2.billing.meter_event_session"}', 200, []])
         ;
 
         $this->curlClientStub->expects(static::once())
@@ -802,7 +802,7 @@ public function testV2OverridesPreviewVersionIfPassedInRequestOptions()
     public function testV1AndV2Request()
     {
         $this->curlClientStub->method('executeRequestWithRetries')
-            ->willReturnOnConsecutiveCalls(['{"object": "billing.meter_event_session"}', 200, []], ['{"object": "billing.meter_event"}', 200, []])
+            ->willReturnOnConsecutiveCalls(['{"object": "v2.billing.meter_event_session"}', 200, []], ['{"object": "billing.meter_event"}', 200, []])
         ;
 
         $this->curlClientStub
@@ -816,7 +816,8 @@ public function testV1AndV2Request()
                     $this->assertContains('Stripe-Version: ' . ApiVersion::CURRENT, $opts[\CURLOPT_HTTPHEADER]);
 
                     return true;
-                }), MOCK_URL . '/v1/billing/meter_event/bmes_123',
+                }),
+                MOCK_URL . '/v1/billing/meter_event/bmes_123',
             ])
         ;