Merge v2.1 into v2.x #1769
Merged
Merge v2.1 into v2.x #1769
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GromNaN
approved these changes
Aug 28, 2025
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| // The server requires an empty document for automatic credentials. | ||
| if (isset($options['kmsProviders']) && is_array($options['kmsProviders'])) { | ||
| foreach ($options['kmsProviders'] as $name => $provider) { | ||
| if ($provider === []) { |
Check notice
Code scanning / Psalm
MixedAssignment Note
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## v2.x #1769 +/- ##
=========================================
Coverage 87.72% 87.73%
- Complexity 3190 3194 +4
=========================================
Files 424 424
Lines 6348 6352 +4
=========================================
+ Hits 5569 5573 +4
Misses 779 779
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge new changes from v2.1 into v2.x.
Commits
ReflectionProperty::setAccessible(true)#1761): ebdb5c1
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.