From 266f4c8604c19634d14f8b84dc9e12b3d647ec25 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 28 Mar 2024 07:35:43 +0100
Subject: update to 1.18.0

raise dependency on mongodb extension version 1.18
---
 composer.json         |  6 +++---
 php-mongodb-rpm.patch | 16 ++++++++--------
 php-mongodb.spec      | 18 +++++++++++-------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 9366f11..e11990c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
         "php": "^7.4 || ^8.0",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.17.0",
-        "jean85/pretty-package-versions": "^2.0.1",
+        "ext-mongodb": "^1.18.0",
+        "composer-runtime-api": "^2.0",
         "psr/log": "^1.1.4|^2|^3",
         "symfony/polyfill-php80": "^1.27",
         "symfony/polyfill-php81": "^1.27"
@@ -53,7 +53,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.17.x-dev"
+            "dev-master": "1.18.x-dev"
         }
     },
     "config": {
diff --git a/php-mongodb-rpm.patch b/php-mongodb-rpm.patch
index ad9d349..b706e73 100644
--- a/php-mongodb-rpm.patch
+++ b/php-mongodb-rpm.patch
@@ -1,22 +1,22 @@
 diff -up ./src/Client.php.rpm ./src/Client.php
---- ./src/Client.php.rpm	2021-07-13 22:03:24.000000000 +0200
-+++ ./src/Client.php	2021-07-14 16:11:34.362284353 +0200
-@@ -18,7 +18,6 @@
+--- ./src/Client.php.rpm	2024-03-28 07:31:35.800951756 +0100
++++ ./src/Client.php	2024-03-28 07:33:06.605444491 +0100
+@@ -17,7 +17,6 @@
+ 
  namespace MongoDB;
  
+-use Composer\InstalledVersions;
  use Iterator;
--use Jean85\PrettyVersions;
  use MongoDB\Driver\ClientEncryption;
  use MongoDB\Driver\Exception\InvalidArgumentException as DriverInvalidArgumentException;
- use MongoDB\Driver\Exception\RuntimeException as DriverRuntimeException;
-@@ -388,11 +387,7 @@ class Client
+@@ -395,11 +394,7 @@ class Client
      private static function getVersion(): string
      {
          if (self::$version === null) {
 -            try {
--                self::$version = PrettyVersions::getVersion('mongodb/mongodb')->getPrettyVersion();
+-                self::$version = InstalledVersions::getPrettyVersion('mongodb/mongodb') ?? 'unknown';
 -            } catch (Throwable $t) {
--                return 'unknown';
+-                self::$version = 'error';
 -            }
 +            self::$version = '@VERSION@';
          }
diff --git a/php-mongodb.spec b/php-mongodb.spec
index 85347b9..7a99be6 100644
--- a/php-mongodb.spec
+++ b/php-mongodb.spec
@@ -9,17 +9,17 @@
 # disabled for https://fedoraproject.org/wiki/Changes/MongoDB_Removal
 %bcond_with          tests
 
-%global gh_commit    01d0840bf0678f519e72dc71b69c8a50a0856c2d
+%global gh_commit    d421c418ef56a96f3dfa6b2828f936df6848ccf9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     mongodb
 %global gh_project   mongo-php-library
 %global psr0         MongoDB
 
-%global upstream_version 1.17.1
+%global upstream_version 1.18.0
 #global upstream_prever  alpha1
 #global upstream_lower   alpha1
 
-%global ext_version      1.17.0
+%global ext_version      1.18.0
 
 Name:           php-%{gh_owner}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
@@ -32,7 +32,7 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-# Get rid of jean85/pretty-package-versions
+# Get rid of composer-runtime-api
 Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
@@ -74,8 +74,8 @@ BuildRequires:  php-composer(fedora/autoloader)
 #        "php": "^7.4 || ^8.0"
 #        "ext-hash": "*",
 #        "ext-json": "*",
-#        "ext-mongodb": "^1.17.0",
-#        "jean85/pretty-package-versions": "^2.0.1",
+#        "ext-mongodb": "^1.18.0",
+#        "composer-runtime-api": "^2.0",
 #        "symfony/polyfill-php73": "^1.27",
 #        "psr/log": "^1.1.4|^2|^3",
 #        "symfony/polyfill-php80": "^1.27",
@@ -217,12 +217,16 @@ exit $ret
 
 
 %changelog
+* Thu Mar 28 2024 Remi Collet <remi@remirepo.net> - 1.18.0-1
+- update to 1.18.0
+- raise dependency on mongodb extension version 1.18
+
 * Tue Mar 19 2024 Remi Collet <remi@remirepo.net> - 1.17.1-1
 - update to 1.17.1
 
 * Wed Nov 15 2023 Remi Collet <remi@remirepo.net> - 1.17.0-1
 - update to 1.17.0
-- raise dependency on PHP 7.2
+- raise dependency on PHP 7.4
 - raise dependency on mongodb extension version 1.17
 - add dependency on psr/log
 
-- 
cgit