Merge updates from stripe-php master to beta

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 16.0.0 - 2024-10-01
+* [#1756](https://github.com/stripe/stripe-php/pull/1756) Support for APIs in the new API version 2024-09-30.acacia
+
+  This release changes the pinned API version to `2024-09-30.acacia`. Please read the [API Upgrade Guide](https://stripe.com/docs/upgrades#2024-09-30.acacia) and carefully review the API changes before upgrading.
+
+  ### ⚠️ Breaking changes
+
+  * Rename `usage_threshold_config` to `usage_threshold` on `Billing.Alert`
+  * Remove support for `filter` on `Billing.Alert`. Use the filters on the `usage_threshold` instead
+
+
+  ### Additions
+
+  * Add support for new value `international_transaction` on enum `Treasury.ReceivedCredit.failure_code`
+  * Add support for new Usage Billing APIs `Billing.MeterEvent`, `Billing.MeterEventAdjustments`, `Billing.MeterEventSession`, `Billing.MeterEventStream` and the new Events API `Core.Events` under the [v2 namespace ](https://docs.corp.stripe.com/api-v2-overview)
+  * Add new method `parseThinEvent()` on the `StripeClient` class to parse [thin events](https://docs.corp.stripe.com/event-destinations#events-overview).
+  * Add a new method [rawRequest()](https://github.com/stripe/stripe-node/tree/master?tab=readme-ov-file#custom-requests) on the `StripeClient` class that takes a HTTP method type, url and relevant parameters to make requests to the Stripe API that are not yet supported in the SDK.
+
 ## 15.11.0-beta.1 - 2024-09-18
 * [#1748](https://github.com/stripe/stripe-php/pull/1748) Update generated code for beta
   * Remove support for resource `QuotePhase`
@@ -39,8 +57,8 @@
 
 ## 15.8.0 - 2024-08-29
 * [#1742](https://github.com/stripe/stripe-php/pull/1742) Generate SDK for OpenAPI spec version 1230
-  * Add support for new value `issuing_regulatory_reporting` on enum `File.purpose`
-  * Add support for new value `hr_oib` on enum `TaxId.type`
+  * Add support for new value `issuing_regulatory_reporting` on enum `File.purpose`
+  * Add support for new value `hr_oib` on enum `TaxId.type`
   * Add support for `status_details` on `TestHelpers.TestClock`
 
 ## 15.8.0-beta.1 - 2024-08-15

OPENAPI_VERSION

@@ -1 +1 @@
-v1267
+v1268

examples/README.md

@@ -0,0 +1,11 @@
+## Running an example
+
+From the examples folder, run:
+`php your_example.php`
+
+## Adding a new example
+
+1. Clone new_example.php
+2. Implement your example
+3. Run it (as per above)
+4. 👍

examples/meter_event_stream.php

@@ -0,0 +1,53 @@
+<?php
+
+require 'vendor/autoload.php'; // Make sure to include Composer's autoload file
+
+class MeterEventManager
+{
+    private $apiKey;
+    private $meterEventSession;
+
+    public function __construct($apiKey)
+    {
+        $this->apiKey = $apiKey;
+        $this->meterEventSession = null;
+    }
+
+    private function refreshMeterEventSession()
+    {
+        // Check if session is null or expired
+        if (
+            null === $this->meterEventSession
+            || $this->meterEventSession->expires_at <= time()
+        ) {
+            // Create a new meter event session in case the existing session expired
+            $client = new \Stripe\StripeClient($this->apiKey);
+            $this->meterEventSession = $client->v2->billing->meterEventSession->create();
+        }
+    }
+
+    public function sendMeterEvent($meterEvent)
+    {
+        // Refresh the meter event session, if necessary
+        $this->refreshMeterEventSession();
+
+        // Create a meter event with the current session's authentication token
+        $client = new \Stripe\StripeClient($this->meterEventSession->authentication_token);
+        $client->v2->billing->meterEventStream->create([
+            'events' => [$meterEvent],
+        ]);
+    }
+}
+
+// Usage
+$apiKey = '{{API_KEY}}';
+$customerId = '{{CUSTOMER_ID}}';
+
+$manager = new MeterEventManager($apiKey);
+$manager->sendMeterEvent([
+    'event_name' => 'alpaca_ai_tokens',
+    'payload' => [
+        'stripe_customer_id' => $customerId,
+        'value' => '26',
+    ],
+]);

examples/new_example.php

@@ -0,0 +1,26 @@
+<?php
+
+require 'vendor/autoload.php'; // Make sure to include Composer's autoload file
+//require '../init.php';
+
+class NewExample
+{
+    private $apiKey;
+
+    public function __construct($apiKey)
+    {
+        $this->apiKey = $apiKey;
+    }
+
+    public function doSomethingGreat()
+    {
+        echo "Hello World\n";
+        // $client = new \Stripe\StripeClient($this->apiKey);
+    }
+}
+
+// Usage
+$apiKey = '{{API_KEY}}';
+
+$example = new NewExample($apiKey);
+$example->doSomethingGreat();

examples/stripe_webhook_handler.php

@@ -0,0 +1,34 @@
+<?php
+
+require 'vendor/autoload.php';
+
+$api_key = getenv('STRIPE_API_KEY');
+$webhook_secret = getenv('WEBHOOK_SECRET');
+
+$app = new \Slim\App();
+$client = new \Stripe\StripeClient($api_key);
+
+$app->post('/webhook', function ($request, $response) use ($client, $webhook_secret) {
+    $webhook_body = $request->getBody()->getContents();
+    $sig_header = $request->getHeaderLine('Stripe-Signature');
+
+    try {
+        $thin_event = $client->parseThinEvent($webhook_body, $sig_header, $webhook_secret);
+
+        // Fetch the event data to understand the failure
+        $event = $client->v2->core->events->retrieve($thin_event->id);
+        if ($event instanceof \Stripe\Events\V1BillingMeterErrorReportTriggeredEvent) {
+            $meter = $event->fetchRelatedObject();
+            $meter_id = $meter->id;
+
+            // Record the failures and alert your team
+            // Add your logic here
+        }
+
+        return $response->withStatus(200);
+    } catch (\Exception $e) {
+        return $response->withStatus(400)->withJson(['error' => $e->getMessage()]);
+    }
+});
+
+$app->run();

init.php

@@ -13,6 +13,7 @@
 require __DIR__ . '/lib/Util/RequestOptions.php';
 require __DIR__ . '/lib/Util/Set.php';
 require __DIR__ . '/lib/Util/Util.php';
+require __DIR__ . '/lib/Util/EventTypes.php';
 require __DIR__ . '/lib/Util/ObjectTypes.php';
 
 // HttpClient
@@ -65,11 +66,15 @@
 require __DIR__ . '/lib/ApiRequestor.php';
 require __DIR__ . '/lib/ApiResource.php';
 require __DIR__ . '/lib/SingletonApiResource.php';
+require __DIR__ . '/lib/Service/ServiceNavigatorTrait.php';
 require __DIR__ . '/lib/Service/AbstractService.php';
 require __DIR__ . '/lib/Service/AbstractServiceFactory.php';
-require __DIR__ . '/lib/Preview.php';
-
+require __DIR__ . '/lib/V2/Event.php';
+require __DIR__ . '/lib/ThinEvent.php';
+require __DIR__ . '/lib/Reason.php';
+require __DIR__ . '/lib/RelatedObject.php';
 require __DIR__ . '/lib/Collection.php';
+require __DIR__ . '/lib/V2/Collection.php';
 require __DIR__ . '/lib/SearchResult.php';
 require __DIR__ . '/lib/ErrorObject.php';
 require __DIR__ . '/lib/Issuing/CardDetails.php';
@@ -96,6 +101,9 @@
 require __DIR__ . '/lib/BankAccount.php';
 require __DIR__ . '/lib/Billing/Alert.php';
 require __DIR__ . '/lib/Billing/AlertTriggered.php';
+require __DIR__ . '/lib/Billing/CreditBalanceSummary.php';
+require __DIR__ . '/lib/Billing/CreditBalanceTransaction.php';
+require __DIR__ . '/lib/Billing/CreditGrant.php';
 require __DIR__ . '/lib/Billing/Meter.php';
 require __DIR__ . '/lib/Billing/MeterErrorReport.php';
 require __DIR__ . '/lib/Billing/MeterEvent.php';
@@ -131,6 +139,11 @@
 require __DIR__ . '/lib/Entitlements/Feature.php';
 require __DIR__ . '/lib/EphemeralKey.php';
 require __DIR__ . '/lib/Event.php';
+require __DIR__ . '/lib/EventData/V1BillingMeterErrorReportTriggeredEventData.php';
+require __DIR__ . '/lib/EventData/V1BillingMeterNoMeterFoundEventData.php';
+require __DIR__ . '/lib/Events/V1BillingMeterErrorReportTriggeredEvent.php';
+require __DIR__ . '/lib/Events/V1BillingMeterNoMeterFoundEvent.php';
+require __DIR__ . '/lib/Exception/TemporarySessionExpiredException.php';
 require __DIR__ . '/lib/ExchangeRate.php';
 require __DIR__ . '/lib/File.php';
 require __DIR__ . '/lib/FileLink.php';
@@ -204,6 +217,9 @@
 require __DIR__ . '/lib/Service/BalanceTransactionService.php';
 require __DIR__ . '/lib/Service/Billing/AlertService.php';
 require __DIR__ . '/lib/Service/Billing/BillingServiceFactory.php';
+require __DIR__ . '/lib/Service/Billing/CreditBalanceSummaryService.php';
+require __DIR__ . '/lib/Service/Billing/CreditBalanceTransactionService.php';
+require __DIR__ . '/lib/Service/Billing/CreditGrantService.php';
 require __DIR__ . '/lib/Service/Billing/MeterEventAdjustmentService.php';
 require __DIR__ . '/lib/Service/Billing/MeterEventService.php';
 require __DIR__ . '/lib/Service/Billing/MeterService.php';
@@ -344,6 +360,14 @@
 require __DIR__ . '/lib/Service/Treasury/TransactionEntryService.php';
 require __DIR__ . '/lib/Service/Treasury/TransactionService.php';
 require __DIR__ . '/lib/Service/Treasury/TreasuryServiceFactory.php';
+require __DIR__ . '/lib/Service/V2/Billing/BillingServiceFactory.php';
+require __DIR__ . '/lib/Service/V2/Billing/MeterEventAdjustmentService.php';
+require __DIR__ . '/lib/Service/V2/Billing/MeterEventService.php';
+require __DIR__ . '/lib/Service/V2/Billing/MeterEventSessionService.php';
+require __DIR__ . '/lib/Service/V2/Billing/MeterEventStreamService.php';
+require __DIR__ . '/lib/Service/V2/Core/CoreServiceFactory.php';
+require __DIR__ . '/lib/Service/V2/Core/EventService.php';
+require __DIR__ . '/lib/Service/V2/V2ServiceFactory.php';
 require __DIR__ . '/lib/Service/WebhookEndpointService.php';
 require __DIR__ . '/lib/SetupAttempt.php';
 require __DIR__ . '/lib/SetupIntent.php';
@@ -390,6 +414,9 @@
 require __DIR__ . '/lib/Treasury/TransactionEntry.php';
 require __DIR__ . '/lib/UsageRecord.php';
 require __DIR__ . '/lib/UsageRecordSummary.php';
+require __DIR__ . '/lib/V2/Billing/MeterEvent.php';
+require __DIR__ . '/lib/V2/Billing/MeterEventAdjustment.php';
+require __DIR__ . '/lib/V2/Billing/MeterEventSession.php';
 require __DIR__ . '/lib/WebhookEndpoint.php';
 
 // The end of the section generated from our OpenAPI spec

lib/ApiOperations/Request.php

@@ -32,15 +32,16 @@ protected static function _validateParams($params = null)
      * @param array $params list of parameters for the request
      * @param null|array|string $options
      * @param string[] $usage names of tracked behaviors associated with this request
+     * @param 'v1'|'v2' $apiMode
      *
      * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return array tuple containing (the JSON response, $options)
      */
-    protected function _request($method, $url, $params = [], $options = null, $usage = [])
+    protected function _request($method, $url, $params = [], $options = null, $usage = [], $apiMode = 'v1')
     {
         $opts = $this->_opts->merge($options);
-        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts, $usage);
+        list($resp, $options) = static::_staticRequest($method, $url, $params, $opts, $usage, $apiMode);
         $this->setLastResponse($resp);
 
         return [$resp->json, $options];
@@ -96,17 +97,18 @@ protected function _requestStream($method, $url, $readBodyChunk, $params = [], $
      * @param array $params list of parameters for the request
      * @param null|array|string $options
      * @param string[] $usage names of tracked behaviors associated with this request
+     * @param 'v1'|'v2' $apiMode
      *
      * @throws \Stripe\Exception\ApiErrorException if the request fails
      *
      * @return array tuple containing (the JSON response, $options)
      */
-    protected static function _staticRequest($method, $url, $params, $options, $usage = [])
+    protected static function _staticRequest($method, $url, $params, $options, $usage = [], $apiMode = 'v1')
     {
         $opts = \Stripe\Util\RequestOptions::parse($options);
         $baseUrl = isset($opts->apiBase) ? $opts->apiBase : static::baseUrl();
         $requestor = new \Stripe\ApiRequestor($opts->apiKey, $baseUrl);
-        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers, 'standard', $usage);
+        list($response, $opts->apiKey) = $requestor->request($method, $url, $params, $opts->headers, $apiMode, $usage);
         $opts->discardNonPersistentHeaders();
 
         return [$response, $opts];