Skip to content

Commit 6f60cec

Browse files
committed
Merge branch 'master' into 1.17-merge-master
* master: PHPLIB-1323 Implement `unlink` for GridFS stream wrapper (#1206) PHPLIB-1330: Sync tests for failCommand errorLabels reqs (#1214) PHPLIB-1246: Test PHP 8.3 on Evergreen (#1213) PHPLIB-1324 Implement `rename` for GridFS stream wrapper (#1207) PHPLIB-1248 Add examples on GridFS (#1196) Deprecate setting GridFS disableMD5 to false explicitly (#1205) PHPLIB-1326: Use more permissive top-level runOnRequirements (#1210) PHPLIB-1206 Add bucket alises for context resolver using GridFS StreamWrapper (#1138) Bump actions/upload-artifact from 3 to 4 (#1208) PHPLIB-1275: Replace apiargs usage in docs with extracts (#1203) Fix title formatting in Client::removeSubscriber() docs (#1204) PHPLIB-1304: Pull mongohouse image from ECR repo (#1202) Fix evergreen failures (#1200) Enable workflows to run for GitHub Merge Queue (#1199) PHPLIB-1313 Ensure the GridFS stream is saved when the script ends (#1197) PHPLIB-1309 Add addSubscriber/removeSubscriber to Client class to ease configuration (#1195) Master is now 1.18-dev
2 parents 4467433 + b700b10 commit 6f60cec

File tree

315 files changed

+12343
-11024
lines changed

Some content is hidden

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

315 files changed

+12343
-11024
lines changed

.evergreen/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ include:
4848
- filename: .evergreen/config/test-variants.yml
4949

5050
# Automatically generated files
51+
- filename: .evergreen/config/generated/build/build-php-8.3.yml
5152
- filename: .evergreen/config/generated/build/build-php-8.2.yml
5253
- filename: .evergreen/config/generated/build/build-php-8.1.yml
5354
- filename: .evergreen/config/generated/build/build-php-8.0.yml
@@ -78,3 +79,9 @@ include:
7879
- filename: .evergreen/config/generated/test/csfle-5.0.yml
7980
- filename: .evergreen/config/generated/test/csfle-4.4.yml
8081
- filename: .evergreen/config/generated/test/csfle-4.2.yml
82+
- filename: .evergreen/config/generated/test-variant/latest-php-8.3.yml
83+
- filename: .evergreen/config/generated/test-variant/replicaset-php-8.2.yml
84+
- filename: .evergreen/config/generated/test-variant/replicaset-php-8.1.yml
85+
- filename: .evergreen/config/generated/test-variant/replicaset-php-8.0.yml
86+
- filename: .evergreen/config/generated/test-variant/replicaset-php-7.4.yml
87+
- filename: .evergreen/config/generated/test-variant/lowest-php-7.4.yml

.evergreen/config/generate-config.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
// Supported PHP versions. Add new versions to the beginning of the list
55
$supportedPhpVersions = [
6+
'8.3',
67
'8.2',
78
'8.1',
89
'8.0',
910
'7.4'
1011
];
1112

13+
$latestPhpVersion = max($supportedPhpVersions);
14+
$lowestPhpVersion = min($supportedPhpVersions);
15+
1216
// Supported MongoDB versions. Add new versions after "rapid"
1317
$supportedMongoDBVersions = [
1418
'latest',
@@ -51,6 +55,11 @@
5155
$allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);
5256
$allFiles[] = generateConfigs('test', 'mongodbVersion', 'csfle.yml', 'csfle-%s', $csfleServerVersions);
5357

58+
// Test variants
59+
$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'latest.yml', 'latest-php-%s', [$latestPhpVersion]);
60+
$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'replicaset-only.yml', 'replicaset-php-%s', array_diff($supportedPhpVersions, [$latestPhpVersion]));
61+
$allFiles[] = generateConfigs('test-variant', 'phpVersion', 'lowest.yml', 'lowest-php-%s', [$lowestPhpVersion]);
62+
5463
echo "Generated config. Use the following list to import files:\n";
5564
echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n";
5665

.evergreen/config/generated/build/build-php-8.3.yml

Lines changed: 40 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/latest-php-8.3.yml

Lines changed: 85 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/lowest-php-7.4.yml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/replicaset-php-7.4.yml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/replicaset-php-8.0.yml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/replicaset-php-8.1.yml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test-variant/replicaset-php-8.2.yml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-5.0.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-6.0.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-7.0.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-latest.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.evergreen/config/generated/test/require-api-version-rapid.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)