Merge v2.1 into v2.x

[mongodb-php-bot]

Merge new changes from v2.1 into v2.x.

Commits

• Merge v1.21 into v2.1 (Merge v1.21 into v2.1 #1832): a2815a4
• Skip large encryption tests on mongocryptd (Skip large encryption tests on mongocryptd #1831): 722523c

Resolving conflicts

To resolve any conflicts, check out the temporary branch and run the following command:

git merge v2.x

Ignoring changes

To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:

git reset --hard v2.x
git merge --strategy=ours v2.1

Then, push the temporary branch to upate the pull request.

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 87.79%. Comparing base (869ff4b) to head (e7aa2db).
⚠️ Report is 4 commits behind head on v2.x.
✅ All tests successful. No failed tests found.

Additional details and impacted files

@@             Coverage Diff              @@
##               v2.x    #1833      +/-   ##
============================================
+ Coverage     82.65%   87.79%   +5.14%     
  Complexity     3208     3208              
============================================
  Files           428      428              
  Lines          6400     6400              
============================================
+ Hits           5290     5619     +329     
+ Misses         1110      781     -329     

Flag	Coverage Δ
6.0-replica_set	86.59% <ø> (?)
6.0-server	82.65% <ø> (ø)
6.0-sharded_cluster	86.37% <ø> (?)
8.0-replica_set	87.65% <ø> (?)
8.0-server	83.42% <ø> (?)
8.0-sharded_cluster	87.48% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.