Merge v2.2 into v2.x (#1978)

Author: mongodb-php-bot

tests/bson/bson-enum_error-003.phpt

@@ -15,5 +15,5 @@ enum MyEnum implements MongoDB\BSON\Persistable
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
-Fatal error: Enum class MyEnum cannot implement interface MongoDB\BSON\Persistable in %s on line %d
+--EXPECTREGEX--
+Fatal error: Enum class MyEnum cannot implement interface MongoDB\\BSON\\(Persistable|Unserializable) in .+ on line \d+

tests/bson/bson-enum_error-004.phpt

@@ -15,5 +15,5 @@ enum MyBackedEnum: int implements MongoDB\BSON\Persistable
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECTF--
-Fatal error: Enum class MyBackedEnum cannot implement interface MongoDB\BSON\Persistable in %s on line %d
+--EXPECTREGEX--
+Fatal error: Enum class MyBackedEnum cannot implement interface MongoDB\\BSON\\(Persistable|Unserializable) in .+ on line \d+