Commit 6f60cec

committed

Merge branch 'master' into 1.17-merge-master

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

2 parents 4467433 + b700b10 commit 6f60cecCopy full SHA for 6f60cec

File tree

315 files changed

+12343

-11024

lines changed

.evergreen
- config.yml
- config
  - generate-config.php
  - generated
  - templates
    - test-variant
    - test
      - require-api-version.yml
  - test-variants.yml
.github/workflows
CHANGELOG.md
composer.json
docs
examples
psalm-baseline.xml
src
- Client.php
- GridFS
tests

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 number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ include:`
`48`	`48`	`- filename: .evergreen/config/test-variants.yml`
`49`	`49`
`50`	`50`	`# Automatically generated files`
	`51`	`+ - filename: .evergreen/config/generated/build/build-php-8.3.yml`
`51`	`52`	`- filename: .evergreen/config/generated/build/build-php-8.2.yml`
`52`	`53`	`- filename: .evergreen/config/generated/build/build-php-8.1.yml`
`53`	`54`	`- filename: .evergreen/config/generated/build/build-php-8.0.yml`
`@@ -78,3 +79,9 @@ include:`
`78`	`79`	`- filename: .evergreen/config/generated/test/csfle-5.0.yml`
`79`	`80`	`- filename: .evergreen/config/generated/test/csfle-4.4.yml`
`80`	`81`	`- 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 number	Diff line number	Diff line change
`@@ -3,12 +3,16 @@`
`3`	`3`
`4`	`4`	`// Supported PHP versions. Add new versions to the beginning of the list`
`5`	`5`	`$supportedPhpVersions = [`
	`6`	`+ '8.3',`
`6`	`7`	`'8.2',`
`7`	`8`	`'8.1',`
`8`	`9`	`'8.0',`
`9`	`10`	`'7.4'`
`10`	`11`	`];`
`11`	`12`
	`13`	`+$latestPhpVersion = max($supportedPhpVersions);`
	`14`	`+$lowestPhpVersion = min($supportedPhpVersions);`
	`15`	`+`
`12`	`16`	`// Supported MongoDB versions. Add new versions after "rapid"`
`13`	`17`	`$supportedMongoDBVersions = [`
`14`	`18`	`'latest',`
`@@ -51,6 +55,11 @@`
`51`	`55`	`$allFiles[] = generateConfigs('test', 'mongodbVersion', 'require-api-version.yml', 'require-api-version-%s', $requireApiServerVersions);`
`52`	`56`	`$allFiles[] = generateConfigs('test', 'mongodbVersion', 'csfle.yml', 'csfle-%s', $csfleServerVersions);`
`53`	`57`
	`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`	`+`
`54`	`63`	`echo "Generated config. Use the following list to import files:\n";`
`55`	`64`	`echo implode("\n", array_map('getImportConfig', array_merge(...$allFiles))) . "\n";`
`56`	`65`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 6f60cec

File tree

315 files changed

Some content is hidden

315 files changed

`‎.evergreen/config.yml‎`

`‎.evergreen/config/generate-config.php‎`

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

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

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

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

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

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

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

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

0 commit comments