Merge v2.3 into v2.x (#2023)

Author: mongodb-drivers-pr-bot[bot]

.evergreen/config.yml

@@ -37,6 +37,9 @@ github_pr_aliases: &github_pr_aliases
   # Run PR tasks for all PR variants (only MongoDB 7.0)
   - variant_tags: ["pr"]
     task_tags: ["pr 7.0"]
+  # Run PECL package test
+  - variant_tags: ["pr pecl"]
+    task_tags: ["pr pecl"]
 
 commit_queue_aliases: *github_pr_aliases
 

.evergreen/config/build-task-groups.yml

@@ -19,6 +19,15 @@ task_groups:
     tasks:
       - ".build"
 
+  - name: "build-pecl-test"
+    max_hosts: 1
+    setup_task: *build_setup
+    setup_task_can_fail_task: true
+    setup_task_timeout_secs: 1800
+    teardown_task: *build_teardown
+    tasks:
+      - "test-pecl-package"
+
   - name: "build-php-libmongoc"
     # Keep this in sync with the actual number of libmongoc builds (typically 3) defined in _template-build-libmongoc.yml
     max_hosts: 2

.evergreen/config/build-variants.yml

@@ -17,6 +17,16 @@ buildvariants:
     tasks:
       - name: "build-all-php"
 
+  # PECL package test - RHEL 8 does not provide zstd, catching stale config header issues
+  - name: test-pecl-rhel8
+    display_name: "Test: PECL package (RHEL 8)"
+    tags: ["pecl", "x64", "pr", "tag"]
+    run_on: rhel80-small
+    expansions:
+      PHP_VERSION: "8.3"
+    tasks:
+      - name: "build-pecl-test"
+
   # RHEL
   - name: build-rhel90
     display_name: "Build: RHEL 9.0"

.evergreen/config/test-tasks.yml

@@ -1,4 +1,38 @@
 tasks:
+  - name: "test-pecl-package"
+    tags: ["pecl", "nodb", "pr", "tag"]
+    commands:
+      - command: shell.exec
+        type: test
+        params:
+          working_dir: "src"
+          add_expansions_to_env: true
+          script: |
+            set -o errexit
+
+            PHP_PATH=$(find /opt/php/ -maxdepth 1 -type d -name "${PHP_VERSION}*-64bit" -print | sort -V -r | head -n 1)/bin
+            export PATH="$PHP_PATH:$PATH"
+            echo "PHP: $(php --version | head -n 1)"
+
+            # Compile the extension: required to generate the Makefile and to
+            # make MONGODB_VERSION available for `make package.xml`
+            phpize
+            ./configure --enable-mongodb-developer-flags
+            make all
+
+            echo "Testing" > changelog
+            make package.xml RELEASE_NOTES_FILE=$(pwd)/changelog
+            make package
+
+            PACKAGE_VERSION=$(./bin/update-release-version.php get-version)
+            PACKAGE_FILE="mongodb-$PACKAGE_VERSION.tgz"
+
+            # Install via PECL (fresh configure + build in a temp directory, same as a real user install)
+            # Redirect stdin from /dev/null to prevent PECL from reading the rest of the script when
+            # prompting for configure options (it would use the next script line as the first answer).
+            pecl install "$PACKAGE_FILE" < /dev/null
+            php -d extension="$(php-config --extension-dir)/mongodb.so" --ri mongodb
+
   - name: "test-atlas-connectivity"
     tags: ["atlas", "nodb", "pr", "tag"]
     commands:

bin/prep-release.php

@@ -97,6 +97,20 @@ function get_files() {
             }
         }
     }
+
+    // Exclude headers generated by configure (AC_CONFIG_FILES in config.m4).
+    // These are produced on the build machine and must not be shipped in the
+    // PECL package. Their .h.in templates are included above and configure
+    // regenerates the correct output in the build directory on the target machine.
+    unset($files['src/libmongoc/src/common/src/common-config.h']);
+    unset($files['src/libmongoc/src/libbson/src/bson/config.h']);
+    unset($files['src/libmongoc/src/libbson/src/bson/version.h']);
+    unset($files['src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h']);
+    unset($files['src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h']);
+    unset($files['src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h']);
+    unset($files['src/libmongoc/src/zlib-1.3.1/zconf.h']);
+    unset($files['src/libmongocrypt/src/mongocrypt-config.h']);
+
     ksort($files);
     return $files;
 }