Merge upstream and update generated code for v425

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 10.18.0 - 2023-07-20
+* [#1533](https://github.com/stripe/stripe-php/pull/1533) Update generated code
+  * Add support for new value `service_tax` on enum `TaxRate.tax_type`
+* [#1526](https://github.com/stripe/stripe-php/pull/1526) Add constants for payment intent cancellation reasons
+* [#1487](https://github.com/stripe/stripe-php/pull/1487) PHPDoc: use union of literals for $method parameter throughout
+
 ## 10.18.0-beta.1 - 2023-07-13
 * [#1527](https://github.com/stripe/stripe-php/pull/1527) Update generated code for beta
   Release specs are identical.
@@ -9,7 +15,7 @@
   * Add support for `payment_method_configuration_details` on `PaymentIntent`
   * Rename `Tax.SettingService` -> `Tax.SettingsService` (parity with main release)
 * [#1519](https://github.com/stripe/stripe-php/pull/1519) Update generated code for beta
-  * Rename `Tax.SettingsService` -> `Tax.SettingService`
+  * Rename `Tax.SettingsService` -> `Tax.SettingService`
 
 ## 10.17.0 - 2023-07-13
 * [#1525](https://github.com/stripe/stripe-php/pull/1525) Update generated code