Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into beta #1556

Merged
merged 24 commits into from
Aug 18, 2023
Merged

Merge master into beta #1556

merged 24 commits into from
Aug 18, 2023

Conversation

pakrym-stripe
Copy link
Contributor

No description provided.

stripe-openapi bot and others added 23 commits August 10, 2023 17:05
Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
…elete

Remove deprecated enum value Invoice.STATUS_DELETED
* Update generated code for v461

* Update generated code for v465

* Update generated code for v466

* Update generated code for v466

---------

Co-authored-by: Stripe OpenAPI <105521251+stripe-openapi[bot]@users.noreply.github.com>
Co-authored-by: Richard Marmorstein <52928443+richardm-stripe@users.noreply.github.com>
# Conflicts:
#	CHANGELOG.md
#	VERSION
#	lib/ApiRequestor.php
#	lib/Stripe.php
#	lib/Util/ApiVersion.php
@@ -406,12 +408,6 @@ function ($key) use ($params) {
}
$defaultHeaders = $this->_defaultHeaders($myApiKey, $clientUAInfo);

if ('preview' === $apiMode && !isset($headers['Stripe-Version'])) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This logic moved to BaseStripeClient

@pakrym-stripe pakrym-stripe force-pushed the pakrym/merge-master-beta branch from 8f4e7d1 to 9335d0f Compare August 18, 2023 19:55
# Conflicts:
#	CHANGELOG.md
#	VERSION
#	lib/Stripe.php
#	tests/Stripe/BaseStripeClientTest.php
@pakrym-stripe pakrym-stripe force-pushed the pakrym/merge-master-beta branch from 9335d0f to ed8762f Compare August 18, 2023 20:01
@pakrym-stripe pakrym-stripe merged commit d66f376 into beta Aug 18, 2023
@remi-stripe remi-stripe deleted the pakrym/merge-master-beta branch September 28, 2023 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants