Skip to content

Commit 09777ea

Browse files
committed
Merge branch 'v2.x' into merge-v1.x-into-v2.x-1740741263182
* v2.x: Add return type hint for Encoder::encode() implementation Reverse pipeline init from an array (#1596) PHPLIB-1617 Accept a Pipeline instance in aggregate and watch methods (#1580) Fix CS Require latest python version (#1564) (#1565) Update src/Operation/Find.php Ignore `disableMD5` option as `md5` field is removed from the spec (#1502) Remove obsolete baseline entries 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)
2 parents d216a5b + abc36b1 commit 09777ea

File tree

154 files changed

+1086
-3779
lines changed

Some content is hidden

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

154 files changed

+1086
-3779
lines changed

.evergreen/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,3 @@ include:
7171
- filename: .evergreen/config/generated/test/require-api-version.yml
7272
- filename: .evergreen/config/generated/test/csfle.yml
7373
- filename: .evergreen/config/generated/test-variant/modern-php-full.yml
74-
- filename: .evergreen/config/generated/test-variant/phpc.yml
75-
- filename: .evergreen/config/generated/test-variant/lowest.yml

.evergreen/config/generate-config.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858

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

6465
echo "Generated config. Use the following list to import files:\n";
6566
echo implode("\n", array_map('getImportConfig', $allFiles)) . "\n";

.evergreen/config/generated/build/build-extension.yml

+140-124
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

-16
This file was deleted.

.evergreen/config/generated/test-variant/phpc.yml

-42
This file was deleted.

0 commit comments

Comments
 (0)