update to 1.11.0alpha1

with libbson and libmongoc 1.19.0
drop patch merged upstream

3 files changed, 277 insertions, 47 deletions

diff --git a/PHPINFO b/PHPINFO
index 698bac3..57dad3a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,12 +2,12 @@
 mongodb
 
 MongoDB support => enabled
-MongoDB extension version => 1.10.0
-MongoDB extension stability => stable
-libbson headers version => 1.18.0
-libbson library version => 1.18.0
-libmongoc headers version => 1.18.0
-libmongoc library version => 1.18.0
+MongoDB extension version => 1.11.0alpha1
+MongoDB extension stability => alpha
+libbson headers version => 1.19.0
+libbson library version => 1.19.0
+libmongoc headers version => 1.19.0
+libmongoc library version => 1.19.0
 libmongoc SSL => enabled
 libmongoc SSL library => OpenSSL
 libmongoc crypto => enabled
@@ -19,8 +19,8 @@ libmongoc compression => enabled
 libmongoc compression snappy => enabled
 libmongoc compression zlib => enabled
 libmongoc compression zstd => enabled
-libmongocrypt headers version => 1.2.1
-libmongocrypt library version => 1.2.1
+libmongocrypt headers version => 1.2.2
+libmongocrypt library version => 1.2.2
 libmongocrypt crypto => enabled
 libmongocrypt crypto library => libcrypto
 
diff --git a/REFLECTION b/REFLECTION
index 9d3b74b..424e54c 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
+Extension [ <persistent> extension #119 mongodb version 1.11.0alpha1 ] {
 
   - Dependencies {
     Dependency [ date (Required) ]
@@ -14,8 +14,8 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
   }
 
   - Constants [2] {
-    Constant [ string MONGODB_VERSION ] { 1.10.0 }
-    Constant [ string MONGODB_STABILITY ] { stable }
+    Constant [ string MONGODB_VERSION ] { 1.11.0alpha1 }
+    Constant [ string MONGODB_STABILITY ] { alpha }
   }
 
   - Functions {
@@ -421,7 +421,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [9] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -430,12 +430,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\BinaryInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -483,13 +496,26 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [7] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -537,7 +563,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [7] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -545,12 +571,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\Decimal128Interface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -586,13 +625,26 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [7] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -640,7 +692,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [9] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -649,12 +701,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\JavascriptInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -708,7 +773,20 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [3] {
+      - Methods [5] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -750,7 +828,20 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [3] {
+      - Methods [5] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -792,7 +883,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [6] {
+      - Methods [8] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -806,12 +897,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\ObjectIdInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -883,7 +987,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [9] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -892,12 +996,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\RegexInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -945,13 +1062,26 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [7] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -999,7 +1129,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [7] {
+      - Methods [9] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [2] {
@@ -1008,12 +1138,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\TimestampInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -1061,13 +1204,26 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
+      - Methods [7] {
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -1115,7 +1271,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [6] {
+      - Methods [8] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -1123,12 +1279,25 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\UTCDateTimeInterface> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype JsonSerializable> final public method jsonSerialize ] {
 
           - Parameters [0] {
@@ -1459,33 +1628,40 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [5] {
-        Method [ <internal:mongodb> final public method __toString ] {
+      - Methods [6] {
+        Method [ <internal:mongodb> final public method __serialize ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
+        Method [ <internal:mongodb> final public method __toString ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
+        Method [ <internal:mongodb> final public method __unserialize ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $serialized ]
+            Parameter #0 [ <required> array $data ]
           }
         }
 
-        Method [ <internal:mongodb, ctor> final private method __construct ] {
+        Method [ <internal:mongodb, prototype Serializable> final public method serialize ] {
 
           - Parameters [0] {
           }
         }
 
-        Method [ <internal:mongodb> final public method __wakeup ] {
+        Method [ <internal:mongodb, prototype Serializable> final public method unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> $serialized ]
+          }
+        }
+
+        Method [ <internal:mongodb, ctor> final private method __construct ] {
 
           - Parameters [0] {
           }
@@ -1671,11 +1847,12 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
 
     Class [ <internal:mongodb> final class MongoDB\Driver\ReadConcern implements MongoDB\BSON\Serializable, MongoDB\BSON\Type, Serializable ] {
 
-      - Constants [4] {
+      - Constants [5] {
         Constant [ public string LOCAL ] { local }
         Constant [ public string MAJORITY ] { majority }
         Constant [ public string LINEARIZABLE ] { linearizable }
         Constant [ public string AVAILABLE ] { available }
+        Constant [ public string SNAPSHOT ] { snapshot }
       }
 
       - Static properties [0] {
@@ -1693,7 +1870,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [6] {
+      - Methods [8] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [1] {
@@ -1701,6 +1878,19 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb> final public method getLevel ] {
 
           - Parameters [0] {
@@ -1766,7 +1956,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [9] {
+      - Methods [11] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
@@ -1776,6 +1966,19 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb> final public method getHedge ] {
 
           - Parameters [0] {
@@ -2006,7 +2209,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [4] {
+      - Methods [6] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
@@ -2016,6 +2219,19 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb, prototype MongoDB\BSON\Serializable> final public method bsonSerialize ] {
 
           - Parameters [0] {
@@ -2173,7 +2389,7 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
       - Properties [0] {
       }
 
-      - Methods [8] {
+      - Methods [10] {
         Method [ <internal:mongodb, ctor> final public method __construct ] {
 
           - Parameters [3] {
@@ -2183,6 +2399,19 @@ Extension [ <persistent> extension #117 mongodb version 1.10.0 ] {
           }
         }
 
+        Method [ <internal:mongodb> final public method __serialize ] {
+
+          - Parameters [0] {
+          }
+        }
+
+        Method [ <internal:mongodb> final public method __unserialize ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> array $data ]
+          }
+        }
+
         Method [ <internal:mongodb> final public method getW ] {
 
           - Parameters [0] {
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 43a00ec..c082271 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -33,29 +33,27 @@
 %endif
 
 %if %{with syslib}
-%global libmongo    1.18.0
+%global libmongo    1.19.0
 #global libmongover #{libmongo}
 %global libmongover %(pkg-config --silence-errors --modversion libmongoc-1.0 2>/dev/null || echo %{libmongo})
 %global libcrypt    1.2.1
 %global libcryptver %(pkg-config --silence-errors --modversion libmongocrypt 2>/dev/null || echo %{libcrypt})
 %else
-%global libmongo    1.18.0
+%global libmongo    1.19.0
 %global libcrypt    1.2.1
 %endif
 
 Summary:        MongoDB driver for PHP
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-%global upstream_version 1.10.0
-#global upstream_prever  alpha1
-#global upstream_lower   ~alpha1
+%global upstream_version 1.11.0
+%global upstream_prever  alpha1
+%global upstream_lower   ~alpha1
 Version:        %{upstream_version}%{?upstream_lower}
-Release:        4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        ASL 2.0
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Patch0:         %{pecl_name}-php81.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 7.1
@@ -148,11 +146,9 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .php81
-
 %if 0%{?rhel} == 8
 # temporary: lower minimal required version
-sed -e 's/1.16.2/1.16.1/;s/1.0.3/1.0.1/' -i config.m4
+# sed -e 's/1.16.2/1.16.1/;s/1.0.3/1.0.1/' -i config.m4
 %endif
 
 # Sanity check, really often broken
@@ -342,6 +338,11 @@ exit $ret
 
 
 %changelog
+* Tue Sep 14 2021 Remi Collet <remi@remirepo.net> - 1.11.0~alpha1-1
+- update to 1.11.0alpha1
+- with libbson and libmongoc 1.19.0
+- drop patch merged upstream
+
 * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.10.0-4
 - rebuild for 8.1.0RC1