Skip to content

PHPC-2441: Remove deprecated Manager constructor options #1719

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 6 commits into from
Oct 16, 2024
Merged

PHPC-2441: Remove deprecated Manager constructor options #1719

merged 6 commits into from
Oct 16, 2024

Conversation

jmikola
Copy link
Member

@jmikola jmikola commented Oct 11, 2024

alcaeus
alcaeus reviewed Oct 14, 2024
View reviewed changes
Copy link
Member

@alcaeus alcaeus left a comment

Choose a reason for hiding this comment

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

Looks good with a minor change to the upgrade document. Thank you for doing some cleanup along the way!

src/phongo_client.c
@@ -938,10 +819,6 @@ static zval* php_phongo_manager_prepare_manager_for_hash(zval* driverOptions, bo
ADD_ASSOC_ZVAL_EX(driverOptionsClone, "autoEncryption", autoEncryptionOptsClone);

return driverOptionsClone;

ref:
Z_ADDREF_P(driverOptions);
Copy link
Member

Choose a reason for hiding this comment

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

Noted this was moved to php_phongo_manager_make_client_hash, where it makes more sense.

@jmikola @alcaeus
Update UPGRADE-2.0.md
ca4396b 
Co-authored-by: Andreas Braun <git@alcaeus.org>
@jmikola jmikola marked this pull request as ready for review October 14, 2024 15:04
alcaeus
alcaeus reviewed Oct 15, 2024
View reviewed changes
tests/manager/bug0940-001.phpt Outdated
@@ -6,13 +6,12 @@ PHPC-940: php_phongo_free_ssl_opt() attempts to free interned strings
--FILE--
<?php

var_dump(new MongoDB\Driver\Manager(null, [], ['ca_file' => false]));
var_dump(new MongoDB\Driver\Manager(null, ['tlsCAFile' => false]));
Copy link
Member

Choose a reason for hiding this comment

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

This causes a test failure as a string is expected.

Copy link
Member Author

Choose a reason for hiding this comment

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

This required a more involved fix, as I had to preserve use of a driver option to ensure that php_phongo_make_ssl_opt() actually does something. The original patch for PHPC-940 may no longer apply since php_phongo_fetch_string() always returns an allocated string, but there's no harm in continuing to test this with an interned string.

@jmikola jmikola requested a review from alcaeus October 16, 2024 00:15
@jmikola jmikola merged commit 693b675 into mongodb:v2.x Oct 16, 2024
59 checks passed
@jmikola jmikola deleted the 2.x-phpc-2441 branch October 16, 2024 13:55
alcaeus added a commit that referenced this pull request Oct 29, 2024
@alcaeus
Merge branch 'v2.x' into merge-v1.x-into-v2.x-1730215826947
fc308fa 
* v2.x: (22 commits)
  PHPC-2441: Remove deprecated Manager constructor options (#1719)
  PHPC-990: Strict type validation for boolean URI options (#1713)
  PHPC-2440: Remove deprecated Query constructor options (#1707)
  PHPC-2459: Remove support for float arg in UTCDateTime ctor (#1709)
  Remove obsolete test
  PHPC-2344 Remove SSLConnectionException (#1696)
  PHPC-2144 Throw a LogicException when getting info from unacknowledged write result (#1687)
  PHPC-2454: Remove --enable-system-ciphers configure option (#1681)
  PHPC-2348 Remove `WriteException` and move `getWriteResult` to `BulkWriteException` (#1685)
  PHPC-2417 Add UTCDateTimeInterface::toDateTimeImmutable() (#1684)
  PHPC-2309: Remove --with-openssl-dir configure option (#1676)
  PHPC-2444: Remove support for string arguments in UTCDateTime constructor (#1662)
  PHPC-2248: Remove Serializable implementations (#1663)
  Update version for 2.x branch (#1672)
  PHPC-1021: Remove support for ReadPreference integer modes (#1666)
  PHPC-2342: Remove --with-libbson and --with-libmongoc configure options (#1667)
  PHPC-2351: Remove CursorId class (#1664)
  PHPC-2140: Make tentative return types definitive (#1658)
  PHPC-2402: Remove range_preview constants (#1665)
  PHPC-2346: Remove deprecated BSON functions (#1653)
  ...
alcaeus added a commit that referenced this pull request Jun 12, 2025
@alcaeus
Resolve conflicts
750a5e1 
* v2.1: (37 commits)
  Back to -dev
  Package 2.1.0
  PHPC-2555: Stop testing with MongoDB 4.0 (#1827)
  PHPC-2510 Install evergreen tools using git submodule (#1797)
  Bump to libmongoc 1.30.4 (#1822)
  Feature: Client Bulk Write (#1818)
  Mention Serializable/Unserializable types in upgrade guide (#1805)
  Back to -dev
  Package 2.0.0
  Master is now 2.1-dev
  PHPC-2536: Remove run-ocsp-responder.sh (#1802)
  PHPC-2536: Migrate to common OCSP responder script (#1800)
  1.x is now 1.22.0dev
  PHPC-2485: Remove WriteConcern and ReadPreference from execute method arginfo (#1783)
  PHPC-2497: BulkWriteException stub should inherit ServerException (#1784)
  PHPC-2441: Remove deprecated Manager constructor options (#1719)
  PHPC-990: Strict type validation for boolean URI options (#1713)
  PHPC-2440: Remove deprecated Query constructor options (#1707)
  PHPC-2459: Remove support for float arg in UTCDateTime ctor (#1709)
  Remove obsolete test
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alcaeus alcaeus alcaeus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jmikola @alcaeus