Merge v1.21 changes that were merged into master into v2.0

.github/workflows/coding-standards.yml

@@ -8,9 +8,7 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
-  # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/mongo-php-driver@master"
+  DRIVER_VERSION: "stable"
 
 jobs:
   phpcs:

.github/workflows/static-analysis.yml

@@ -14,9 +14,7 @@ on:
 
 env:
   PHP_VERSION: "8.2"
-  # TODO: change to "stable" once 1.20.0 is released
-  # DRIVER_VERSION: "stable"
-  DRIVER_VERSION: "mongodb/mongo-php-driver@master"
+  DRIVER_VERSION: "stable"
 
 jobs:
   psalm:

.github/workflows/vale-tdbx.yml

@@ -18,20 +18,20 @@ jobs:
       - id: files
         uses: masesgroup/retrieve-changed-files@v2
         with:
-          format: 'csv'
+          format: "csv"
 
       - name: checkout-latest-rules
         uses: actions/checkout@v4
         with:
           repository: mongodb/mongodb-vale-action
-          path: './tdbx-vale-rules'
+          path: "./tdbx-vale-rules"
           token: ${{secrets.GITHUB_TOKEN}}
 
       - name: move-files-for-vale-action
         run: |
-            cp tdbx-vale-rules/.vale.ini .vale.ini
-            mkdir -p .github/styles/
-            cp -rf tdbx-vale-rules/.github/styles/ .github/
+          cp tdbx-vale-rules/.vale.ini .vale.ini
+          mkdir -p .github/styles/
+          cp -rf tdbx-vale-rules/.github/styles/ .github/
 
       - name: run-vale
         uses: errata-ai/vale-action@reviewdog

config/redirects

@@ -1,12 +1,17 @@
 define: base https://www.mongodb.com/docs/php-library
 define: prefix docs/php-library
 raw: ${prefix}/ -> ${base}/current
-define: versions v1.16 v1.17 v1.18 v1.19 v1.20 master
+define: versions v1.16 v1.17 v1.18 v1.19 v1.20 v1.21 master
 symlink: upcoming -> master
-symlink: current -> v1.20
+symlink: current -> v1.21
 
+# general redirects
 [v1.17-v1.19]: ${prefix}/${version}/tutorial/client-side-encryption/ -> ${base}/${version}/tutorial/encryption/
 [v1.16]: ${prefix}/${version}/tutorial/encryption/ -> ${base}/${version}/
+[v1.20-*]: ${prefix}/${version}/get-started/connect-to-mongodb -> ${base}/${version}/get-started/run-sample-query/
+[*-v1.20]: ${prefix}/${version}/aggregation/atlas-search -> ${base}/${version}/aggregation/
+[*-v1.20]: ${prefix}/${version}/aggregation/vector-search -> ${base}/${version}/aggregation/
+[*-v1.20]: ${prefix}/${version}/builders -> ${base}/${version}/
 
 # standardization redirects
 
@@ -25,9 +30,9 @@ symlink: current -> v1.20
 [v1.20-*]: ${prefix}/${version}/tutorial/indexes/ -> ${base}/${version}/indexes/
 [v1.20-*]: ${prefix}/${version}/tutorial/tailable-cursor/ -> ${base}/${version}/read/cursor/
 [v1.20-*]: ${prefix}/${version}/tutorial/example-data/ -> ${base}/${version}/
-[v1.20-*]: ${prefix}/${version}/tutorial/aws-lambda/ -> ${base}/${version}/
 [v1.20-*]: ${prefix}/${version}/tutorial/modeling-bson-data/ -> ${base}/${version}/data-formats/modeling-bson-data/
 [v1.20-*]: ${prefix}/${version}/tutorial/stable-api/ -> ${base}/${version}/stable-api/
+[v1.20-*]: ${prefix}/${version}/tutorial/aws-lambda/ -> ${base}/${version}/aws-lambda/
 
 # redirects in old docs
 # note: this mapping does not account for all of the new pages
@@ -46,3 +51,5 @@ symlink: current -> v1.20
 [*-v1.19]: ${prefix}/${version}/data-formats/modeling-bson-data/ -> ${base}/${version}/tutorial/modeling-bson-data/
 [*-v1.19]: ${prefix}/${version}/stable-api/ -> ${base}/${version}/tutorial/stable-api/
 [*-v1.19]: ${prefix}/${version}/whats-new/ -> ${base}/${version}/
+[*-v1.19]: ${prefix}/${version}/aws-lambda/ -> ${base}/${version}/tutorial/aws-lambda/
+

snooty.toml

@@ -29,6 +29,7 @@ toc_landing_pages = [
     "/security",
     "/data-formats",
     "/upgrade",
+    "/aggregation",
 ]
 
 sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
@@ -38,15 +39,15 @@ php-library = "MongoDB PHP Library"
 
 [constants]
 php-library = "MongoDB PHP Library"
-version = "1.20"
+version = "1.21"
+source-gh-branch = "v1.x"
 full-version = "{+version+}.0"
 extension-short = "PHP extension"
 mdb-server = "MongoDB Server"
 stable-api = "Stable API"
 library-short = "PHP library"
 driver-short = "{+library-short+}"
 api = "https://www.mongodb.com/docs/php-library/current/reference"
-php-manual = "https://www.php.net/manual/en"
 string-data-type = "``string``"
 bool-data-type = "``bool``"
 int-data-type = "``int``"