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

Author: mongodb-php-bot

phongo_version.h

@@ -22,9 +22,9 @@
  * publishing a release. */
 
 /* clang-format off */
-#define PHP_MONGODB_VERSION "1.20.0dev"
+#define PHP_MONGODB_VERSION "1.21.0dev"
 #define PHP_MONGODB_STABILITY "devel"
-#define PHP_MONGODB_VERSION_DESC 1,20,0,0
+#define PHP_MONGODB_VERSION_DESC 1,21,0,0
 /* clang-format on */
 
 #endif /* PHONGO_VERSION_H */

tests/utils/tools.php

@@ -602,7 +602,7 @@ function severityToString(int $severity): string {
         'E_USER_ERROR' => E_USER_ERROR,
         'E_USER_WARNING' => E_USER_WARNING,
         'E_USER_NOTICE' => E_USER_NOTICE,
-        'E_STRICT' => E_STRICT,
+        'E_STRICT' => 2048, // E_STRICT was deprecated in PHP 8.4
         'E_RECOVERABLE_ERROR' => E_RECOVERABLE_ERROR,
         'E_DEPRECATED' => E_DEPRECATED,
         'E_USER_DEPRECATED' => E_USER_DEPRECATED,