Skip to content

Commit acbdfe1

Browse files
rustagirjordan-smith721elyse-mdblindseymoorejmikola
authored
Merge v1.21 changes that were merged into master into v2.0 (#216)
* use sharedincludes in compat page * add source constants for versions * delete files for old build system (cherry picked from commit 55daa82) * adds more info to v1.20 whats new (cherry picked from commit 302bcd5) * Fix compatibility table (cherry picked from commit 4fba22f) * (DOCSP-44298) Removed EOL'd v1.16 and earlier. (#165) (#166) * DOCSP-44903 Shorten TOC Labels (#176) * DOCSP-44903 Shorten TOC Labels * rest of pages * angle brackets * fixes * internal review * updates based on Mike's PR * review comments and consistency (cherry picked from commit b9fda16) * PHPLIB-1278: FAQ entry on connection persistence * Address vale lint checks on word usage * Docs edits * Merge pull request #181 from mcmorisi/DRIVERS-2658-hint DOCSP-45139: Add Hint option for Distinct operation * (DOCSP-45749) Denests last phase 1 nested components (#182) * (DOCSP-45749) Denests last phase 1 nested components * Update build * DOCSP-45100: Delete and rename by name (#187) * DOCSP-45100: Delete and rename by name * edits * JM feedback (cherry picked from commit 343f339) * bring master changes into v1.21 * DOCSP-44644: db/coll accessor methods * fix spacing * vale action dependency * vale action dependency * DOCSP-45100: GridFS methods api docs (#196) * DOCSP-45100: GridFS methods api docs * edits * RR feedback * JT feedback * DOCSP-45100: GridFS methods api docs (#196) * DOCSP-45100: GridFS methods api docs * edits * RR feedback * JT feedback (cherry picked from commit 1442347) * DOCSP-43365: type specification for createSearchIndex(es) * indentation fix * indentation fix * add whats new entry * indentation fix * SA PR fixes 1 * DOCSP-43365: type specification for createSearchIndex(es) (cherry picked from commit e09b124) * indentation fix (cherry picked from commit cd6a586) * indentation fix (cherry picked from commit 3b3ec37) * add whats new entry (cherry picked from commit f821030) * SA PR fixes 1 (cherry picked from commit 7d9bfe8) * DOCSP-43457: builderEncoder option (#200) * DOCSP-43457: builderEncoder option * fix * fix type * go back * codec * JT feedback * DOCSP-43457: builderEncoder option (#200) * DOCSP-43457: builderEncoder option * fix * fix type * go back * codec * JT feedback (cherry picked from commit e1ed056) * DOCSP-44237 flags Option deprecation on v2.21 (#201) * DOCSP-44237 flags Option deprecation on v2.21 * add what's new note * Rea review comments * DOCSP-45770: atlas search queries (#197) * DOCSP-45770: atlas search queries * fix indentation * fix indentation * fix indentation * fix indentation * snooty landing page * snooty landing page * indentation fix * netlify trigger * whats new * RM PR fixes 1 * comments * small fix * JT tech review 1 * indentation fix * fix * small fixes * small fixes * remov Pipeline type * DOCSP-45878: Transactions parallelism note (#204) * DOCSP-45878: Transactions parallelism note (#204) (cherry picked from commit ba91a37) * DOCSP-43919: aggregation builder (#203) * DOCSP-43919: aggregation builder * indentation fix * remov Pipeline type * LM PR fixes 1 * fp fixes * todo fixes * small fixes * JM tech review 1 * DOCSP-46127: Update manual link (#205) * DOCSP-46127: Update manual link * MW feedback * DOCSP-46127: Update manual link (#205) * DOCSP-46127: Update manual link * MW feedback (cherry picked from commit bf6ac8a) * DOCSP-47690: aws lambda tutorial (#207) * DOCSP-47690: aws lambda tutorial * fixes * fixes * fixes * MM PR fixes 1 * remove section * RB small fix * DOCSP-47690: aws lambda tutorial (#207) * DOCSP-47690: aws lambda tutorial * fixes * fixes * fixes * MM PR fixes 1 * remove section * RB small fix (cherry picked from commit 8ed8dde) * add redirect for aws lambda page * change title to avoid duplicate * change toc * change url and add redirects * add back old ref based on rea's feedback * change redirect * fix merge issues * use regular includes on master * DOCSP-47970: v1.21 release (#212) * DOCSP-47970: v1.21 release * JM combine v's * JT small fix (#209) * DOCSP-43464: operations with builders (#206) * DOCSP-43464: operations with builders * fix desc * shared include fix? * shared include fix? * revert * netlify trigger * small fix * LM PR fixes 1 * LM PR fixes 2 * link fix * reformat comments * JT tech review 2 * fix code example * JT tech review comments --------- Co-authored-by: Jordan Smith <jordan.smith@mongodb.com> Co-authored-by: Elyse Foreman <elyse.foreman@mongodb.com> Co-authored-by: lindseymoore <71525840+lindseymoore@users.noreply.github.com> Co-authored-by: Jeremy Mikola <jmikola@gmail.com> Co-authored-by: Michael Morisi <michael.morisi@mongodb.com> Co-authored-by: Sarah Simpers <82042374+sarahsimpers@users.noreply.github.com> Co-authored-by: Nora Reidy <nora.reidy@mongodb.com> Co-authored-by: Angela <angelashu103@gmail.com> Co-authored-by: shuangela <angela.shu@mongodb.com>
1 parent 00e91a9 commit acbdfe1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2032
-330
lines changed

‎.github/workflows/coding-standards.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88

99
env:
1010
PHP_VERSION: "8.2"
11-
# TODO: change to "stable" once 1.20.0 is released
12-
# DRIVER_VERSION: "stable"
13-
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
11+
DRIVER_VERSION: "stable"
1412

1513
jobs:
1614
phpcs:

‎.github/workflows/static-analysis.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ on:
1414

1515
env:
1616
PHP_VERSION: "8.2"
17-
# TODO: change to "stable" once 1.20.0 is released
18-
# DRIVER_VERSION: "stable"
19-
DRIVER_VERSION: "mongodb/mongo-php-driver@master"
17+
DRIVER_VERSION: "stable"
2018

2119
jobs:
2220
psalm:

‎.github/workflows/vale-tdbx.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ jobs:
1818
- id: files
1919
uses: masesgroup/retrieve-changed-files@v2
2020
with:
21-
format: 'csv'
21+
format: "csv"
2222

2323
- name: checkout-latest-rules
2424
uses: actions/checkout@v4
2525
with:
2626
repository: mongodb/mongodb-vale-action
27-
path: './tdbx-vale-rules'
27+
path: "./tdbx-vale-rules"
2828
token: ${{secrets.GITHUB_TOKEN}}
2929

3030
- name: move-files-for-vale-action
3131
run: |
32-
cp tdbx-vale-rules/.vale.ini .vale.ini
33-
mkdir -p .github/styles/
34-
cp -rf tdbx-vale-rules/.github/styles/ .github/
32+
cp tdbx-vale-rules/.vale.ini .vale.ini
33+
mkdir -p .github/styles/
34+
cp -rf tdbx-vale-rules/.github/styles/ .github/
3535
3636
- name: run-vale
3737
uses: errata-ai/vale-action@reviewdog

‎config/redirects‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
define: base https://www.mongodb.com/docs/php-library
22
define: prefix docs/php-library
33
raw: ${prefix}/ -> ${base}/current
4-
define: versions v1.16 v1.17 v1.18 v1.19 v1.20 master
4+
define: versions v1.16 v1.17 v1.18 v1.19 v1.20 v1.21 master
55
symlink: upcoming -> master
6-
symlink: current -> v1.20
6+
symlink: current -> v1.21
77

8+
# general redirects
89
[v1.17-v1.19]: ${prefix}/${version}/tutorial/client-side-encryption/ -> ${base}/${version}/tutorial/encryption/
910
[v1.16]: ${prefix}/${version}/tutorial/encryption/ -> ${base}/${version}/
11+
[v1.20-*]: ${prefix}/${version}/get-started/connect-to-mongodb -> ${base}/${version}/get-started/run-sample-query/
12+
[*-v1.20]: ${prefix}/${version}/aggregation/atlas-search -> ${base}/${version}/aggregation/
13+
[*-v1.20]: ${prefix}/${version}/aggregation/vector-search -> ${base}/${version}/aggregation/
14+
[*-v1.20]: ${prefix}/${version}/builders -> ${base}/${version}/
1015

1116
# standardization redirects
1217

@@ -25,9 +30,9 @@ symlink: current -> v1.20
2530
[v1.20-*]: ${prefix}/${version}/tutorial/indexes/ -> ${base}/${version}/indexes/
2631
[v1.20-*]: ${prefix}/${version}/tutorial/tailable-cursor/ -> ${base}/${version}/read/cursor/
2732
[v1.20-*]: ${prefix}/${version}/tutorial/example-data/ -> ${base}/${version}/
28-
[v1.20-*]: ${prefix}/${version}/tutorial/aws-lambda/ -> ${base}/${version}/
2933
[v1.20-*]: ${prefix}/${version}/tutorial/modeling-bson-data/ -> ${base}/${version}/data-formats/modeling-bson-data/
3034
[v1.20-*]: ${prefix}/${version}/tutorial/stable-api/ -> ${base}/${version}/stable-api/
35+
[v1.20-*]: ${prefix}/${version}/tutorial/aws-lambda/ -> ${base}/${version}/aws-lambda/
3136

3237
# redirects in old docs
3338
# note: this mapping does not account for all of the new pages
@@ -46,3 +51,5 @@ symlink: current -> v1.20
4651
[*-v1.19]: ${prefix}/${version}/data-formats/modeling-bson-data/ -> ${base}/${version}/tutorial/modeling-bson-data/
4752
[*-v1.19]: ${prefix}/${version}/stable-api/ -> ${base}/${version}/tutorial/stable-api/
4853
[*-v1.19]: ${prefix}/${version}/whats-new/ -> ${base}/${version}/
54+
[*-v1.19]: ${prefix}/${version}/aws-lambda/ -> ${base}/${version}/tutorial/aws-lambda/
55+

‎snooty.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ toc_landing_pages = [
2929
"/security",
3030
"/data-formats",
3131
"/upgrade",
32+
"/aggregation",
3233
]
3334

3435
sharedinclude_root = "https://raw.githubusercontent.com/10gen/docs-shared/main/"
@@ -38,15 +39,15 @@ php-library = "MongoDB PHP Library"
3839

3940
[constants]
4041
php-library = "MongoDB PHP Library"
41-
version = "1.20"
42+
version = "1.21"
43+
source-gh-branch = "v1.x"
4244
full-version = "{+version+}.0"
4345
extension-short = "PHP extension"
4446
mdb-server = "MongoDB Server"
4547
stable-api = "Stable API"
4648
library-short = "PHP library"
4749
driver-short = "{+library-short+}"
4850
api = "https://www.mongodb.com/docs/php-library/current/reference"
49-
php-manual = "https://www.php.net/manual/en"
5051
string-data-type = "``string``"
5152
bool-data-type = "``bool``"
5253
int-data-type = "``int``"

0 commit comments

Comments
 (0)