Merge v1.x into v2.x (#1487)

mongodb · Oct 16, 2024 · e7a5982 · e7a5982
2 parents dc098ce + 3a62df1
commit e7a5982
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 4 deletions.
diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml
@@ -325,9 +325,9 @@ functions:
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
-          file="${PROJECT_DIRECTORY}/.evergreen/install-composer.sh"
-          # Don't use ${file} syntax here because evergreen treats it as an empty expansion.
-          [ -f "$file" ] && DEPENDENCIES=${DEPENDENCIES} bash $file || echo "$file not available, skipping"
+          DEPENDENCIES=${DEPENDENCIES} \
+          PHP_VERSION=${PHP_VERSION} \
+          bash ${PROJECT_DIRECTORY}/.evergreen/install-composer.sh
 
   "start load balancer":
     - command: shell.exec

diff --git a/.evergreen/config/generate-config.php b/.evergreen/config/generate-config.php
@@ -3,12 +3,15 @@
 
 // Supported PHP versions. Add new versions to the beginning of the list
 $supportedPhpVersions = [
+    '8.4',
     '8.3',
     '8.2',
     '8.1',
 ];
 
-$latestPhpVersion = max($supportedPhpVersions);
+// TODO: use max() once PHP 8.4 is stable
+//$latestPhpVersion = max($supportedPhpVersions);
+$latestPhpVersion = '8.3';
 $lowestPhpVersion = min($supportedPhpVersions);
 
 // Supported MongoDB versions. Add new versions after "rapid"

diff --git a/.evergreen/config/generated/build/build-extension.yml b/.evergreen/config/generated/build/build-extension.yml
diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml
diff --git a/.evergreen/install-composer.sh b/.evergreen/install-composer.sh
@@ -38,4 +38,9 @@ php --ri mongodb
 
 install_composer
 
+# Remove psalm as it's not compatible with PHP 8.4: https://github.com/vimeo/psalm/pull/10928
+if [ "$PHP_VERSION" == "8.4" ]; then
+  php composer.phar remove --no-update --dev vimeo/psalm
+fi
+
 php composer.phar update $COMPOSER_FLAGS
diff --git a/tests/GridFS/BucketFunctionalTest.php b/tests/GridFS/BucketFunctionalTest.php
@@ -842,6 +842,9 @@ public function testDanglingOpenWritableStream(): void
 
         $code = <<<'PHP'
             require '%s';
+            // Don't report deprecations - if the issue exists this code will
+            // result in a fatal error
+            error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
             $client = MongoDB\Tests\FunctionalTestCase::createTestClient();
             $database = $client->selectDatabase(getenv('MONGODB_DATABASE') ?: 'phplib_test');
             $gridfs = $database->selectGridFSBucket();
@@ -882,6 +885,9 @@ public function testDanglingOpenWritableStreamWithGlobalStreamWrapperAlias(): vo
 
         $code = <<<'PHP'
             require '%s';
+            // Don't report deprecations - if the issue exists this code will
+            // result in a fatal error
+            error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
             $client = MongoDB\Tests\FunctionalTestCase::createTestClient();
             $database = $client->selectDatabase(getenv('MONGODB_DATABASE') ?: 'phplib_test');
             $database->selectGridFSBucket()->registerGlobalStreamWrapperAlias('alias');