Resolve conflicts

* 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
  ...

Author: alcaeus

.evergreen/README.md

@@ -12,5 +12,5 @@ hosts.
 
 [mongodb-labs/drivers-evergreen-tools](https://github.com/mongodb-labs/drivers-evergreen-tools)
 consists of common scripts used by many drivers (e.g. starting
-[mongo-orchestration](https://github.com/10gen/mongo-orchestration)). The PHP
-driver clones this during the build process.
+[mongo-orchestration](https://github.com/10gen/mongo-orchestration)). This package is installed as a Git submodule
+in the `tests` directory.

.evergreen/config.yml

@@ -23,6 +23,7 @@ post:
   - func: "upload test results"
   - func: "stop mongo-orchestration"
   - func: "stop load balancer"
+  - func: "stop OCSP responder"
   - func: "cleanup"
 
 # These aliases define the default variant/tasks to test for pull requests and merge queue

.evergreen/config/functions.yml

@@ -4,7 +4,7 @@ functions:
     - command: git.get_project
       params:
         directory: "src"
-    # Fetch the libmongoc submodule
+    # Fetch the submodules
     - command: shell.exec
       params:
         working_dir: "src"
@@ -22,7 +22,7 @@ functions:
              CURRENT_VERSION=latest
           fi
           
-          export DRIVERS_TOOLS="$(pwd)/../drivers-tools"
+          export DRIVERS_TOOLS="$(pwd)/tests/drivers-evergreen-tools"
           export PROJECT_DIRECTORY="$(pwd)"
           
           # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
@@ -72,15 +72,9 @@ functions:
   "prepare resources":
     - command: shell.exec
       params:
+        working_dir: src
         script: |
           ${PREPARE_SHELL}
-          rm -rf $DRIVERS_TOOLS
-          if [ "${project}" = "drivers-tools" ]; then
-            # If this was a patch build, doing a fresh clone would not actually test the patch
-            cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
-          else
-            git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
-          fi
           echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
 
 
@@ -132,6 +126,9 @@ functions:
         script: |
           ${PREPARE_SHELL}
           perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" Makefile
+          for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do
+            perl -p -i -e "s|/data/mci/[0-9a-z]+/src|${PROJECT_DIRECTORY}|g" $filename
+          done
 
   "compile driver" :
     - command: shell.exec
@@ -192,17 +189,23 @@ functions:
           ${PREPARE_SHELL}
           bash ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
 
-  "run OCSP responder":
-    - command: shell.exec
+  "start OCSP responder":
+    - command: subprocess.exec
       params:
+        binary: bash
+        background: true
         include_expansions_in_env:
-          - TEST_COLUMN
-          - CERT_TYPE
-          - USE_DELEGATE
-        shell: bash
+          - SERVER_TYPE
+          - OCSP_ALGORITHM
+        args:
+          - ${DRIVERS_TOOLS}/.evergreen/ocsp/setup.sh
+
+  "stop OCSP responder":
+    - command: shell.exec
+      params:
         script: |
           ${PREPARE_SHELL}
-          bash ${PROJECT_DIRECTORY}/.evergreen/run-ocsp-responder.sh
+          bash ${DRIVERS_TOOLS}/.evergreen/ocsp/teardown.sh
 
   "run tests":
     - command: shell.exec

.evergreen/config/generate-config.php

@@ -19,7 +19,6 @@
     '5.0',
     '4.4',
     '4.2',
-    '4.0',
 ];
 
 // TODO: Change when PHP 8.4 is stable