update to 2.0.0

rename to php-pecl-mongodb2 for new API
always use bundled libraries

3 files changed, 186 insertions, 837 deletions

diff --git a/PHPINFO b/PHPINFO
index 06456a3..e09d990 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,12 +2,10 @@
 mongodb
 
 MongoDB support => enabled
-MongoDB extension version => 1.21.0
+MongoDB extension version => 2.0.0
 MongoDB extension stability => stable
-libbson headers version => 1.30.1
-libbson library version => 1.30.1
-libmongoc headers version => 1.30.1
-libmongoc library version => 1.30.1
+libbson bundled version => 1.30.3
+libmongoc bundled version => 1.30.3
 libmongoc SSL => enabled
 libmongoc SSL library => OpenSSL
 libmongoc crypto => enabled
@@ -19,8 +17,7 @@ libmongoc compression => enabled
 libmongoc compression snappy => enabled
 libmongoc compression zlib => enabled
 libmongoc compression zstd => enabled
-libmongocrypt headers version => 1.13.0
-libmongocrypt library version => 1.13.0
+libmongocrypt bundled version => 1.12.0
 libmongocrypt crypto => enabled
 libmongocrypt crypto library => libcrypto
 crypt_shared library version => unknown
diff --git a/REFLECTION b/REFLECTION
index d604cf4..eb3d34e 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
+Extension [ <persistent> extension #131 mongodb version 2.0.0 ] {
 
   - Dependencies {
     Dependency [ date (Required) ]
@@ -14,54 +14,11 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
   }
 
   - Constants [2] {
-    Constant [ string MONGODB_VERSION ] { 1.21.0 }
+    Constant [ string MONGODB_VERSION ] { 2.0.0 }
     Constant [ string MONGODB_STABILITY ] { stable }
   }
 
   - Functions {
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\fromJSON ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> string $json ]
-      }
-      - Return [ string ]
-    }
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\fromPHP ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> object|array $value ]
-      }
-      - Return [ string ]
-    }
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\toCanonicalExtendedJSON ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> string $bson ]
-      }
-      - Return [ string ]
-    }
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\toJSON ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> string $bson ]
-      }
-      - Return [ string ]
-    }
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\toPHP ] {
-
-      - Parameters [2] {
-        Parameter #0 [ <required> string $bson ]
-        Parameter #1 [ <optional> ?array $typemap = null ]
-      }
-      - Return [ object|array ]
-    }
-    Function [ <internal, deprecated:mongodb> function MongoDB\BSON\toRelaxedExtendedJSON ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> string $bson ]
-      }
-      - Return [ string ]
-    }
     Function [ <internal:mongodb> function MongoDB\Driver\Monitoring\addSubscriber ] {
 
       - Parameters [1] {
@@ -87,7 +44,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
     }
   }
 
-  - Classes [79] {
+  - Classes [76] {
     Interface [ <internal:mongodb> interface MongoDB\BSON\Type ] {
 
       - Constants [0] {
@@ -125,7 +82,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ stdClass|MongoDB\BSON\Document|MongoDB\BSON\PackedArray|array ]
+          - Return [ stdClass|MongoDB\BSON\Document|MongoDB\BSON\PackedArray|array ]
         }
       }
     }
@@ -150,7 +107,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> array $data ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
       }
     }
@@ -174,14 +131,14 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
 
         Method [ <internal:mongodb> abstract public method getType ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
@@ -212,7 +169,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -236,21 +193,21 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
 
         Method [ <internal:mongodb> abstract public method getScope ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ ?object ]
+          - Return [ ?object ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -310,14 +267,14 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -341,21 +298,21 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
 
         Method [ <internal:mongodb> abstract public method getFlags ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -379,21 +336,21 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> abstract public method getIncrement ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -412,19 +369,26 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [2] {
+      - Methods [3] {
         Method [ <internal:mongodb> abstract public method toDateTime ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ DateTime ]
+          - Return [ DateTime ]
+        }
+
+        Method [ <internal:mongodb> abstract public method toDateTimeImmutable ] {
+
+          - Parameters [0] {
+          }
+          - Return [ DateTimeImmutable ]
         }
 
         Method [ <internal:mongodb> abstract public method __toString ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ string ]
+          - Return [ string ]
         }
       }
     }
@@ -487,7 +451,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> <iterateable> final class MongoDB\BSON\PackedArray implements Stringable, IteratorAggregate, Traversable, Serializable, ArrayAccess, MongoDB\BSON\Type ] {
+    Class [ <internal:mongodb> <iterateable> final class MongoDB\BSON\PackedArray implements Stringable, IteratorAggregate, Traversable, ArrayAccess, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -524,7 +488,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [16] {
+      - Methods [14] {
         Method [ <internal:mongodb, ctor> private method __construct ] {
 
           - Parameters [0] {
@@ -616,21 +580,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -648,7 +597,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> <iterateable> final class MongoDB\BSON\Document implements Stringable, IteratorAggregate, Traversable, Serializable, ArrayAccess, MongoDB\BSON\Type ] {
+    Class [ <internal:mongodb> <iterateable> final class MongoDB\BSON\Document implements Stringable, IteratorAggregate, Traversable, ArrayAccess, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -693,7 +642,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [16] {
+      - Methods [14] {
         Method [ <internal:mongodb, ctor> private method __construct ] {
 
           - Parameters [0] {
@@ -785,21 +734,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -817,7 +751,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Binary implements Stringable, MongoDB\BSON\BinaryInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Binary implements Stringable, MongoDB\BSON\BinaryInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [10] {
         Constant [ public int TYPE_GENERIC ] { 0 }
@@ -848,7 +782,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -878,21 +812,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -917,7 +836,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\DBPointer implements Stringable, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\DBPointer implements Stringable, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -938,7 +857,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [5] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -952,21 +871,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -991,7 +895,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Decimal128 implements Stringable, MongoDB\BSON\Decimal128Interface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Decimal128 implements Stringable, MongoDB\BSON\Decimal128Interface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1012,7 +916,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [5] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -1027,21 +931,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1066,7 +955,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Int64 implements Stringable, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Int64 implements Stringable, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1087,7 +976,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [5] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -1102,21 +991,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1141,7 +1015,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Javascript implements Stringable, MongoDB\BSON\JavascriptInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Javascript implements Stringable, MongoDB\BSON\JavascriptInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1162,7 +1036,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -1192,21 +1066,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1231,7 +1090,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\MaxKey implements MongoDB\BSON\MaxKeyInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\MaxKey implements MongoDB\BSON\MaxKeyInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1252,22 +1111,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
+      - Methods [3] {
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1292,7 +1136,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\MinKey implements MongoDB\BSON\MinKeyInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\MinKey implements MongoDB\BSON\MinKeyInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1313,22 +1157,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
+      - Methods [3] {
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1353,7 +1182,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\ObjectId implements Stringable, MongoDB\BSON\ObjectIdInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\ObjectId implements Stringable, MongoDB\BSON\ObjectIdInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1374,7 +1203,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [8] {
+      - Methods [6] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -1396,21 +1225,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1454,7 +1268,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ stdClass|MongoDB\BSON\Document|array ]
+          - Return [ stdClass|MongoDB\BSON\Document|array ]
         }
 
         Method [ <internal:mongodb, inherits MongoDB\BSON\Unserializable> abstract public method bsonUnserialize ] {
@@ -1462,12 +1276,12 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> array $data ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Regex implements Stringable, MongoDB\BSON\RegexInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Regex implements Stringable, MongoDB\BSON\RegexInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1488,7 +1302,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -1518,21 +1332,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1557,7 +1356,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Symbol implements Stringable, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Symbol implements Stringable, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1578,7 +1377,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [5] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -1592,21 +1391,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1631,7 +1415,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Timestamp implements Stringable, MongoDB\BSON\TimestampInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Timestamp implements Stringable, MongoDB\BSON\TimestampInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1652,7 +1436,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -1682,21 +1466,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1721,7 +1490,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\Undefined implements Stringable, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\Undefined implements Stringable, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1742,7 +1511,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [5] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -1756,21 +1525,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1795,7 +1549,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\BSON\UTCDateTime implements Stringable, MongoDB\BSON\UTCDateTimeInterface, JsonSerializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\BSON\UTCDateTime implements Stringable, MongoDB\BSON\UTCDateTimeInterface, JsonSerializable, MongoDB\BSON\Type ] {
 
       - Constants [0] {
       }
@@ -1816,11 +1570,11 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> DateTimeInterface|MongoDB\BSON\Int64|string|int|float|null $milliseconds = null ]
+            Parameter #0 [ <optional> DateTimeInterface|MongoDB\BSON\Int64|int|null $milliseconds = null ]
           }
         }
 
@@ -1831,7 +1585,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ DateTime ]
         }
 
-        Method [ <internal:mongodb> final public method toDateTimeImmutable ] {
+        Method [ <internal:mongodb, prototype MongoDB\BSON\UTCDateTimeInterface> final public method toDateTimeImmutable ] {
 
           - Parameters [0] {
           }
@@ -1845,21 +1599,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -1884,7 +1623,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Interface [ <internal:mongodb> interface MongoDB\Driver\CursorInterface extends Traversable ] {
+    Interface [ <internal:mongodb> interface MongoDB\Driver\CursorInterface extends Iterator, Traversable ] {
 
       - Constants [0] {
       }
@@ -1898,26 +1637,40 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [10] {
+        Method [ <internal:mongodb> abstract public method current ] {
+
+          - Parameters [0] {
+          }
+          - Return [ object|array|null ]
+        }
+
         Method [ <internal:mongodb> abstract public method getId ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ MongoDB\Driver\CursorId|MongoDB\BSON\Int64 ]
+          - Return [ MongoDB\BSON\Int64 ]
         }
 
         Method [ <internal:mongodb> abstract public method getServer ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ MongoDB\Driver\Server ]
+          - Return [ MongoDB\Driver\Server ]
         }
 
         Method [ <internal:mongodb> abstract public method isDead ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ bool ]
+          - Return [ bool ]
+        }
+
+        Method [ <internal:mongodb> abstract public method key ] {
+
+          - Parameters [0] {
+          }
+          - Return [ ?int ]
         }
 
         Method [ <internal:mongodb> abstract public method setTypeMap ] {
@@ -1925,14 +1678,35 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> array $typemap ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method toArray ] {
 
           - Parameters [0] {
           }
-          - Tentative return [ array ]
+          - Return [ array ]
+        }
+
+        Method [ <internal:Core, inherits Iterator> abstract public method next ] {
+
+          - Parameters [0] {
+          }
+          - Tentative return [ void ]
+        }
+
+        Method [ <internal:Core, inherits Iterator> abstract public method valid ] {
+
+          - Parameters [0] {
+          }
+          - Tentative return [ bool ]
+        }
+
+        Method [ <internal:Core, inherits Iterator> abstract public method rewind ] {
+
+          - Parameters [0] {
+          }
+          - Tentative return [ void ]
         }
       }
     }
@@ -1997,16 +1771,14 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
     Class [ <internal:mongodb> final class MongoDB\Driver\ClientEncryption ] {
 
-      - Constants [9] {
+      - Constants [7] {
         Constant [ public string AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC ] { AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic }
         Constant [ public string AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM ] { AEAD_AES_256_CBC_HMAC_SHA_512-Random }
         Constant [ public string ALGORITHM_INDEXED ] { Indexed }
         Constant [ public string ALGORITHM_UNINDEXED ] { Unindexed }
         Constant [ public string ALGORITHM_RANGE ] { Range }
-        Constant [ public string ALGORITHM_RANGE_PREVIEW ] { RangePreview }
         Constant [ public string QUERY_TYPE_EQUALITY ] { equality }
         Constant [ public string QUERY_TYPE_RANGE ] { range }
-        Constant [ public string QUERY_TYPE_RANGE_PREVIEW ] { rangePreview }
       }
 
       - Static properties [0] {
@@ -2146,7 +1918,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> <iterateable> final class MongoDB\Driver\Cursor implements Iterator, Traversable, MongoDB\Driver\CursorInterface ] {
+    Class [ <internal:mongodb> <iterateable> final class MongoDB\Driver\Cursor implements MongoDB\Driver\CursorInterface, Traversable, Iterator ] {
 
       - Constants [0] {
       }
@@ -2167,7 +1939,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           }
         }
 
-        Method [ <internal:mongodb, prototype Iterator> public method current ] {
+        Method [ <internal:mongodb, prototype MongoDB\Driver\CursorInterface> public method current ] {
 
           - Parameters [0] {
           }
@@ -2176,10 +1948,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
         Method [ <internal:mongodb, prototype MongoDB\Driver\CursorInterface> final public method getId ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> bool $asInt64 = false ]
+          - Parameters [0] {
           }
-          - Tentative return [ MongoDB\Driver\CursorId|MongoDB\BSON\Int64 ]
+          - Return [ MongoDB\BSON\Int64 ]
         }
 
         Method [ <internal:mongodb, prototype MongoDB\Driver\CursorInterface> final public method getServer ] {
@@ -2196,7 +1967,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ bool ]
         }
 
-        Method [ <internal:mongodb, prototype Iterator> public method key ] {
+        Method [ <internal:mongodb, prototype MongoDB\Driver\CursorInterface> public method key ] {
 
           - Parameters [0] {
           }
@@ -2241,73 +2012,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\CursorId implements Stringable, Serializable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [1] {
-        Method [ <internal:mongodb> final static public method __set_state ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> array $properties ]
-          }
-          - Return [ MongoDB\Driver\CursorId ]
-        }
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [6] {
-        Method [ <internal:mongodb, ctor> final private method __construct ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:mongodb, prototype Stringable> final public method __toString ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
-        Method [ <internal:mongodb> final public method __unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> array $data ]
-          }
-          - Return [ void ]
-        }
-
-        Method [ <internal:mongodb> final public method __serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-      }
-    }
-
     Class [ <internal:mongodb> final class MongoDB\Driver\Manager ] {
 
       - Constants [0] {
@@ -2353,7 +2057,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $namespace ]
             Parameter #1 [ <required> MongoDB\Driver\BulkWrite $bulk ]
-            Parameter #2 [ <optional> MongoDB\Driver\WriteConcern|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ MongoDB\Driver\WriteResult ]
         }
@@ -2363,9 +2067,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $db ]
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
-            Parameter #2 [ <optional> MongoDB\Driver\ReadPreference|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeQuery ] {
@@ -2373,9 +2077,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $namespace ]
             Parameter #1 [ <required> MongoDB\Driver\Query $query ]
-            Parameter #2 [ <optional> MongoDB\Driver\ReadPreference|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeReadCommand ] {
@@ -2385,7 +2089,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeReadWriteCommand ] {
@@ -2395,7 +2099,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeWriteCommand ] {
@@ -2405,7 +2109,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method getEncryptedFieldsMap ] {
@@ -2494,7 +2198,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\ReadConcern implements MongoDB\BSON\Serializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\ReadConcern implements MongoDB\BSON\Serializable, MongoDB\BSON\Type ] {
 
       - Constants [5] {
         Constant [ public string LINEARIZABLE ] { linearizable }
@@ -2520,7 +2224,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [8] {
+      - Methods [6] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -2549,21 +2253,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ stdClass ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -2581,14 +2270,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\ReadPreference implements MongoDB\BSON\Serializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\ReadPreference implements MongoDB\BSON\Serializable, MongoDB\BSON\Type ] {
 
-      - Constants [12] {
-        Constant [ public int RP_PRIMARY ] { 1 }
-        Constant [ public int RP_PRIMARY_PREFERRED ] { 5 }
-        Constant [ public int RP_SECONDARY ] { 2 }
-        Constant [ public int RP_SECONDARY_PREFERRED ] { 6 }
-        Constant [ public int RP_NEAREST ] { 10 }
+      - Constants [7] {
         Constant [ public string PRIMARY ] { primary }
         Constant [ public string PRIMARY_PREFERRED ] { primaryPreferred }
         Constant [ public string SECONDARY ] { secondary }
@@ -2614,11 +2298,11 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [11] {
+      - Methods [8] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> string|int $mode ]
+            Parameter #0 [ <required> string $mode ]
             Parameter #1 [ <optional> ?array $tagSets = null ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
@@ -2638,13 +2322,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ int ]
         }
 
-        Method [ <internal, deprecated:mongodb> final public method getMode ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
         Method [ <internal:mongodb> final public method getModeString ] {
 
           - Parameters [0] {
@@ -2666,21 +2343,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ stdClass ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -2734,7 +2396,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $namespace ]
             Parameter #1 [ <required> MongoDB\Driver\BulkWrite $bulkWrite ]
-            Parameter #2 [ <optional> MongoDB\Driver\WriteConcern|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
           - Return [ MongoDB\Driver\WriteResult ]
         }
@@ -2744,9 +2406,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $db ]
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
-            Parameter #2 [ <optional> MongoDB\Driver\ReadPreference|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeQuery ] {
@@ -2754,9 +2416,9 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [3] {
             Parameter #0 [ <required> string $namespace ]
             Parameter #1 [ <required> MongoDB\Driver\Query $query ]
-            Parameter #2 [ <optional> MongoDB\Driver\ReadPreference|array|null $options = null ]
+            Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeReadCommand ] {
@@ -2766,7 +2428,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeReadWriteCommand ] {
@@ -2776,7 +2438,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method executeWriteCommand ] {
@@ -2786,7 +2448,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
             Parameter #1 [ <required> MongoDB\Driver\Command $command ]
             Parameter #2 [ <optional> ?array $options = null ]
           }
-          - Return [ MongoDB\Driver\Cursor ]
+          - Return [ MongoDB\Driver\CursorInterface ]
         }
 
         Method [ <internal:mongodb> final public method getHost ] {
@@ -2875,7 +2537,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\ServerApi implements MongoDB\BSON\Serializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\ServerApi implements MongoDB\BSON\Serializable, MongoDB\BSON\Type ] {
 
       - Constants [1] {
         Constant [ public string V1 ] { 1 }
@@ -2897,7 +2559,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [6] {
+      - Methods [4] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
@@ -2914,21 +2576,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ stdClass ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -3208,7 +2855,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\WriteConcern implements MongoDB\BSON\Serializable, MongoDB\BSON\Type, Serializable ] {
+    Class [ <internal:mongodb> final class MongoDB\Driver\WriteConcern implements MongoDB\BSON\Serializable, MongoDB\BSON\Type ] {
 
       - Constants [1] {
         Constant [ public string MAJORITY ] { majority }
@@ -3230,7 +2877,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [10] {
+      - Methods [8] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
@@ -3275,21 +2922,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ stdClass ]
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $data ]
-          }
-          - Return [ void ]
-        }
-
         Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
@@ -3427,35 +3059,35 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
 
           - Parameters [0] {
           }
-          - Return [ ?int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> final public method getMatchedCount ] {
 
           - Parameters [0] {
           }
-          - Return [ ?int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> final public method getModifiedCount ] {
 
           - Parameters [0] {
           }
-          - Return [ ?int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> final public method getDeletedCount ] {
 
           - Parameters [0] {
           }
-          - Return [ ?int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> final public method getUpsertedCount ] {
 
           - Parameters [0] {
           }
-          - Return [ ?int ]
+          - Return [ int ]
         }
 
         Method [ <internal:mongodb> final public method getServer ] {
@@ -3877,115 +3509,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> abstract class MongoDB\Driver\Exception\WriteException extends MongoDB\Driver\Exception\ServerException implements Stringable, Throwable, MongoDB\Driver\Exception\Exception ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [6] {
-        Property [ protected $message = '' ]
-        Property [ protected $code = 0 ]
-        Property [ protected string $file = '' ]
-        Property [ protected int $line = 0 ]
-        Property [ protected $errorLabels = NULL ]
-        Property [ protected $writeResult = NULL ]
-      }
-
-      - Methods [12] {
-        Method [ <internal:mongodb> final public method getWriteResult ] {
-
-          - Parameters [0] {
-          }
-          - Return [ MongoDB\Driver\WriteResult ]
-        }
-
-        Method [ <internal:mongodb, inherits MongoDB\Driver\Exception\RuntimeException> final public method hasErrorLabel ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $errorLabel ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> string $message = "" ]
-            Parameter #1 [ <optional> int $code = 0 ]
-            Parameter #2 [ <optional> ?Throwable $previous = null ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-
-          - Parameters [0] {
-          }
-          - Return [ ?Throwable ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Stringable> public method __toString ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-      }
-    }
-
     Class [ <internal:mongodb> class MongoDB\Driver\Exception\AuthenticationException extends MongoDB\Driver\Exception\ConnectionException implements Stringable, Throwable, MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
@@ -4087,7 +3610,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> class MongoDB\Driver\Exception\BulkWriteException extends MongoDB\Driver\Exception\WriteException implements MongoDB\Driver\Exception\Exception, Throwable, Stringable ] {
+    Class [ <internal:mongodb> class MongoDB\Driver\Exception\BulkWriteException extends MongoDB\Driver\Exception\ServerException implements Stringable, Throwable, MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
       }
@@ -4108,7 +3631,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
 
       - Methods [12] {
-        Method [ <internal:mongodb, inherits MongoDB\Driver\Exception\WriteException> final public method getWriteResult ] {
+        Method [ <internal:mongodb> final public method getWriteResult ] {
 
           - Parameters [0] {
           }
@@ -4792,107 +4315,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       }
     }
 
-    Class [ <internal:mongodb> final class MongoDB\Driver\Exception\SSLConnectionException extends MongoDB\Driver\Exception\ConnectionException implements Stringable, Throwable, MongoDB\Driver\Exception\Exception ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [5] {
-        Property [ protected $message = '' ]
-        Property [ protected $code = 0 ]
-        Property [ protected string $file = '' ]
-        Property [ protected int $line = 0 ]
-        Property [ protected $errorLabels = NULL ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:mongodb, inherits MongoDB\Driver\Exception\RuntimeException> final public method hasErrorLabel ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> string $errorLabel ]
-          }
-          - Return [ bool ]
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> string $message = "" ]
-            Parameter #1 [ <optional> int $code = 0 ]
-            Parameter #2 [ <optional> ?Throwable $previous = null ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-
-          - Parameters [0] {
-          }
-          - Tentative return [ void ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-
-          - Parameters [0] {
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-
-          - Parameters [0] {
-          }
-          - Return [ int ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-
-          - Parameters [0] {
-          }
-          - Return [ array ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-
-          - Parameters [0] {
-          }
-          - Return [ ?Throwable ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Stringable> public method __toString ] {
-
-          - Parameters [0] {
-          }
-          - Return [ string ]
-        }
-      }
-    }
-
     Class [ <internal:mongodb> class MongoDB\Driver\Exception\UnexpectedValueException extends UnexpectedValueException implements Throwable, Stringable, MongoDB\Driver\Exception\Exception ] {
 
       - Constants [0] {
@@ -5023,7 +4445,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\CommandStartedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method commandSucceeded ] {
@@ -5031,7 +4453,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\CommandSucceededEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method commandFailed ] {
@@ -5039,7 +4461,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\CommandFailedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
       }
     }
@@ -5058,7 +4480,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [13] {
+      - Methods [12] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -5128,13 +4550,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal, deprecated:mongodb> final public method getServer ] {
-
-          - Parameters [0] {
-          }
-          - Return [ MongoDB\Driver\Server ]
-        }
-
         Method [ <internal:mongodb> final public method getServiceId ] {
 
           - Parameters [0] {
@@ -5165,7 +4580,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [11] {
+      - Methods [10] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -5221,13 +4636,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal, deprecated:mongodb> final public method getServer ] {
-
-          - Parameters [0] {
-          }
-          - Return [ MongoDB\Driver\Server ]
-        }
-
         Method [ <internal:mongodb> final public method getServiceId ] {
 
           - Parameters [0] {
@@ -5258,7 +4666,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
       - Properties [0] {
       }
 
-      - Methods [12] {
+      - Methods [11] {
         Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
@@ -5321,13 +4729,6 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Return [ string ]
         }
 
-        Method [ <internal, deprecated:mongodb> final public method getServer ] {
-
-          - Parameters [0] {
-          }
-          - Return [ MongoDB\Driver\Server ]
-        }
-
         Method [ <internal:mongodb> final public method getServiceId ] {
 
           - Parameters [0] {
@@ -5397,7 +4798,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerChangedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method serverClosed ] {
@@ -5405,7 +4806,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerClosedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method serverOpening ] {
@@ -5413,7 +4814,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerOpeningEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method serverHeartbeatFailed ] {
@@ -5421,7 +4822,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerHeartbeatFailedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method serverHeartbeatStarted ] {
@@ -5429,7 +4830,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerHeartbeatStartedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method serverHeartbeatSucceeded ] {
@@ -5437,7 +4838,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\ServerHeartbeatSucceededEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method topologyChanged ] {
@@ -5445,7 +4846,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\TopologyChangedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method topologyClosed ] {
@@ -5453,7 +4854,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\TopologyClosedEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
 
         Method [ <internal:mongodb> abstract public method topologyOpening ] {
@@ -5461,7 +4862,7 @@ Extension [ <persistent> extension #128 mongodb version 1.21.0 ] {
           - Parameters [1] {
             Parameter #0 [ <required> MongoDB\Driver\Monitoring\TopologyOpeningEvent $event ]
           }
-          - Tentative return [ void ]
+          - Return [ void ]
         }
       }
     }
diff --git a/php-pecl-mongodb2.spec b/php-pecl-mongodb2.spec
index 894d8a2..87d4eb0 100644
--- a/php-pecl-mongodb2.spec
+++ b/php-pecl-mongodb2.spec
@@ -1,4 +1,4 @@
-# remirepo spec file for php-pecl-mongodb
+# remirepo spec file for php-pecl-mongodb2
 #
 # SPDX-FileCopyrightText:  Copyright 2015-2025 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
@@ -7,11 +7,7 @@
 # Please, preserve the changelog entries
 #
 
-%if 0%{?scl:1}
-%scl_package       php-pecl-mongodb
-%else
-%global _root_prefix %{_prefix}
-%endif
+%{?scl:%scl_package php-pecl-mongodb2}
 
 %global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pie_vend   mongodb
@@ -20,21 +16,14 @@
 # After 40-smbclient.ini, see https://jira.mongodb.org/browse/PHPC-658
 %global ini_name   50-%{pecl_name}.ini
 
-# test suite requires a MongoDB server
-%bcond_with tests
-
-# temp for EL until available in EPEL
-%if 0%{?fedora} >= 37 || 0%{?rhel} >= 8
-%bcond_without      syslib
-%else
-%bcond_with         syslib
-%endif
+# use bundled libraries by default because of upcoming v2
+%bcond_with        syslib
 
 # Bundled versions
-%global bundled_libmongo  1.30.1
+%global bundled_libmongo  1.30.3
 %global bundled_libcrypt  1.12.0
 # Required versions (in config.m4)
-%global minimal_libmongo  1.30.1
+%global minimal_libmongo  1.30.3
 %global minimal_libcrypt  1.12.0
 
 %if %{with syslib}
@@ -46,9 +35,9 @@
 %global runtime_libcrypt  %(pkg-config --silence-errors --modversion libmongocrypt 2>/dev/null || echo %{system_libcrypt})
 %endif
 
-Summary:        MongoDB driver for PHP
-Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-%global upstream_version 1.21.0
+Summary:        MongoDB driver for PHP version 2
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}2
+%global upstream_version 2.0.0
 #global upstream_prever  beta1
 #global upstream_lower   ~beta1
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
@@ -91,9 +80,6 @@ Provides:       bundled(libbson)           = %{bundled_libmongo}
 Provides:       bundled(mongo-c-driver)    = %{bundled_libmongo}
 Provides:       bundled(libmongocrypt)     = %{bundled_libcrypt}
 %endif
-%if %{with tests}
-BuildRequires:  mongodb-server
-%endif
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
@@ -105,6 +91,15 @@ Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa}   = %{version}
 Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
 Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj}      = %{version}
 
+%if 0%{?fedora} >= 43 || 0%{?rhel} >= 11 || "%{php_version}" > "8.5"
+Obsoletes:     %{?scl_prefix}php-pecl-%{pecl_name}          < 2
+Provides:      %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
+Provides:      %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+%else
+# A single version can be installed
+Conflicts:     %{?scl_prefix}php-pecl-%{pecl_name}  < 2
+%endif
+
 %description
 The purpose of this driver is to provide exceptionally thin glue between
 MongoDB and PHP, implementing only fundemental and performance-critical
@@ -245,55 +240,6 @@ OPT="-n"
     --modules | grep %{pecl_name}
 %endif
 
-%if %{with tests}
-ret=0
-
-%global mongo_version  %(mongod --version | sed -n '/db version/{s/.*v//;p}' 2>/dev/null)
-#global mongo_version 4
-
-: Run a mongodb server version %{mongo_version}
-mkdir dbtest
-mongod \
-  --journal \
-  --bind_ip     127.0.0.1 \
-  --unixSocketPrefix /tmp \
-  --logpath     $PWD/server.log \
-  --pidfilepath $PWD/server.pid \
-  --dbpath      $PWD/dbtest \
-  --fork   || : skip test as server cant start
-
-if [ -s server.pid ] ; then
-  : Drop known to fail tests
-%if "%{mongo_version}" < "3.4"
-    ### With mongodb 3.2
-%endif
-
-  : Run the test suite
-  echo '{"STANDALONE": "mongodb://127.0.0.1:27017"}' | tee /tmp/PHONGO-SERVERS.json
-
-  pushd %{sources}
-    TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
-    REPORT_EXIT_STATUS=1 \
-    %{__php} -n run-tests.php -q -P --show-diff || ret=1
-  popd
-
-%if %{with_zts}
-  pushd ZTS
-    TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
-    REPORT_EXIT_STATUS=1 \
-    %{__ztsphp} -n run-tests.php -q -P --show-diff || ret=1
-  popd
-%endif
-
-  : Cleanup
-  kill $(cat server.pid)
-fi
-
-exit $ret
-%else
-: check disabled, missing '--with tests' option
-%endif
-
 
 %files
 %license %{sources}/LICENSE
@@ -310,6 +256,11 @@ exit $ret
 
 
 %changelog
+* Thu Apr 10 2025 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- rename to php-pecl-mongodb2 for new API
+- always use bundled libraries
+
 * Fri Feb 28 2025 Remi Collet <remi@remirepo.net> - 1.21.0-1
 - update to 1.21.0
 - raise dependency on PHP 8.1