From 3a681a3b2f2c0ebac227a3b86bb9057d0e6eb8f8 Mon Sep 17 00:00:00 2001
From: Jeremy Mikola <jmikola@gmail.com>
Date: Wed, 23 Nov 2022 12:45:35 +0800
Subject: [PATCH] Update composer.json and Evergreen matrices for 1.15.0
 (#1006)

* Bump PHPC versions in Evergreen matrix

* Bump latest-stable server version to MongoDB 6.0

* Bump extension requirement and branch alias in composer.json

The 1.14.x series is being skipped to restore version parity between the extension and library.
---
 .evergreen/config.yml | 20 +++++++-------------
 composer.json         |  4 ++--
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 8171e22d8..3ddd859c3 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -680,9 +680,9 @@ axes:
     display_name: MongoDB Version
     values:
       - id: "latest-stable"
-        display_name: "MongoDB 5.0"
+        display_name: "MongoDB 6.0"
         variables:
-          VERSION: "5.0"
+          VERSION: "6.0"
       - id: "oldest-supported"
         display_name: "MongoDB 3.6"
         variables:
@@ -691,22 +691,16 @@ axes:
   - id: driver-versions
     display_name: Driver Version
     values:
-      # TODO: Update to "1.15.0" once PHPC 1.15.0 is released
       - id: "oldest-supported"
-        # display_name: "1.15.0"
-        display_name: "PHPC 1.15-dev (master)"
+        display_name: "PHPC 1.15.0"
         variables:
-          # EXTENSION_VERSION: "1.15.0"
-          EXTENSION_BRANCH: "master"
-      # TODO: Update to "1.15.x"/"stable" once PHPC 1.15.0 is released
+          EXTENSION_VERSION: "1.15.0"
       - id: "latest-stable"
-        # display_name: "1.15.x"
-        display_name: "PHPC 1.15-dev (master)"
+        display_name: "PHPC (1.15.x)"
         variables:
-          # EXTENSION_VERSION: "stable"
-          EXTENSION_BRANCH: "master"
+          EXTENSION_VERSION: "stable"
       - id: "latest-dev"
-        display_name: "PHPC 1.15-dev (master)"
+        display_name: "PHPC (1.16-dev)"
         variables:
           EXTENSION_BRANCH: "master"
 
diff --git a/composer.json b/composer.json
index be1348928..8e55fabff 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "php": "^7.2 || ^8.0",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.14.0",
+        "ext-mongodb": "^1.15.0",
         "jean85/pretty-package-versions": "^1.2 || ^2.0.1",
         "symfony/polyfill-php80": "^1.19"
     },
@@ -32,7 +32,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.14.x-dev"
+            "dev-master": "1.15.x-dev"
         }
     },
     "config": {