Skip to content

Commit

Permalink
Merge branch 'v2.x' into merge-v1.x-into-v2.x-1730397444425
Browse files Browse the repository at this point in the history
* v2.x:
  Regenerate evergreen configuration (#1503)
  PHPLIB-1546 and PHPLIB-1159: Remove CreateCollection flags and autoIndexId options (#1478)
  PHPLIB-1227 Use void return types for operations without meaningful result document (#1468)
  Remove deprecated functionality (#1439)
  PHPLIB-1518 `WriteResult::get*Count()` always return an int on acknowledged result (#1454)
  PHPLIB-954: Add return types to all methods (#1391)
  PHPLIB-797: Remove unused methods in UnsupportedException (#1436)
  Revert "Add final annotations to non-internal Operation classes (#1410)"
  PHPLIB-953 Make internal classes and Operation classes final (#1392)
  PHPLIB-1218 Remove deprecated fields from GridFS files (#1398)
  • Loading branch information
alcaeus committed Nov 4, 2024
2 parents 7781e75 + 99ded15 commit 0870eaf
Show file tree
Hide file tree
Showing 152 changed files with 1,033 additions and 3,740 deletions.
2 changes: 0 additions & 2 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,3 @@ include:
- filename: .evergreen/config/generated/test/require-api-version.yml
- filename: .evergreen/config/generated/test/csfle.yml
- filename: .evergreen/config/generated/test-variant/modern-php-full.yml
- filename: .evergreen/config/generated/test-variant/phpc.yml
- filename: .evergreen/config/generated/test-variant/lowest.yml
5 changes: 3 additions & 2 deletions .evergreen/config/generate-config.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,9 @@

// Test variants
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'modern-php-full.yml', $supportedPhpVersions);
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
$allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);
// TODO: Re-enable when 2.0.0 is released
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'phpc.yml', [$latestPhpVersion]);
// $allFiles[] = generateConfigs('buildvariants', 'test-variant', 'phpVersion', 'lowest.yml', [$lowestPhpVersion]);

echo "Generated config. Use the following list to import files:\n";
echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";
Expand Down
264 changes: 140 additions & 124 deletions .evergreen/config/generated/build/build-extension.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 0 additions & 16 deletions .evergreen/config/generated/test-variant/lowest.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .evergreen/config/generated/test-variant/phpc.yml

This file was deleted.

Loading

0 comments on commit 0870eaf

Please sign in to comment.