update to 1.17.0

raise dependency on PHP 7.2
raise dependency on mongodb extension version 1.17
add dependency on psr/log

2 files changed, 56 insertions, 24 deletions

diff --git a/composer.json b/composer.json
index fe9698d..cda6313 100644
--- a/composer.json
+++ b/composer.json
@@ -6,36 +6,54 @@
     "license": "Apache-2.0",
     "authors": [
         { "name": "Andreas Braun", "email": "andreas.braun@mongodb.com" },
-        { "name": "Jeremy Mikola", "email": "jmikola@gmail.com" }
+        { "name": "Jeremy Mikola", "email": "jmikola@gmail.com" },
+        { "name": "Jérôme Tamarelle", "email": "jerome.tamarelle@mongodb.com" }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-hash": "*",
         "ext-json": "*",
-        "ext-mongodb": "^1.16.0",
+        "ext-mongodb": "^1.17.0",
         "jean85/pretty-package-versions": "^2.0.1",
-        "symfony/polyfill-php73": "^1.27",
+        "psr/log": "^1.1.4|^2|^3",
         "symfony/polyfill-php80": "^1.27",
         "symfony/polyfill-php81": "^1.27"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^11.1",
-        "rector/rector": "^0.16.0",
+        "doctrine/coding-standard": "^12.0",
+        "rector/rector": "^0.18",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/phpunit-bridge": "^5.2",
-        "vimeo/psalm": "^4.28"
+        "vimeo/psalm": "^5.13"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },
         "files": [ "src/functions.php" ]
     },
     "autoload-dev": {
-        "psr-4": { "MongoDB\\Tests\\": "tests/" },
+        "psr-4": {
+            "MongoDB\\Tests\\": "tests/"
+        },
         "files": [ "tests/PHPUnit/Functions.php" ]
     },
+    "scripts": {
+        "bench": "cd benchmark && composer update && vendor/bin/phpbench run --report=aggregate",
+        "checks": [
+            "@check:cs",
+            "@check:psalm",
+            "@check:rector"
+        ],
+        "check:cs": "phpcs",
+        "check:psalm": "psalm",
+        "check:rector": "rector --ansi --dry-run",
+        "fix:cs": "phpcbf",
+        "fix:psalm:baseline": "psalm --set-baseline=psalm-baseline.xml",
+        "fix:rector": "rector process --ansi",
+        "test": "simple-phpunit"
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.16.x-dev"
+            "dev-master": "1.17.x-dev"
         }
     },
     "config": {
diff --git a/php-mongodb.spec b/php-mongodb.spec
index 258cbd4..629de2c 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    72d80889eb7567c0da4e7d4ddbdcf66dfea90ac3
+%global gh_commit    9d9c917cf7ff275ed6bd63c596efeb6e49fd0e53
 %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.16.1
+%global upstream_version 1.17.0
 #global upstream_prever  alpha1
 #global upstream_lower   alpha1
 
-%global ext_version      1.16.0
+%global ext_version      1.17.0
 
 Name:           php-%{gh_owner}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_lower}}
@@ -36,7 +36,7 @@ Source1:        makesrc.sh
 Patch0:         %{name}-rpm.patch
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.2
+BuildRequires:  php(language) >= 7.4
 BuildRequires:  php-cli
 BuildRequires:  php-reflection
 BuildRequires:  php-date
@@ -46,11 +46,12 @@ BuildRequires:  php-json
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(symfony/polyfill-php73) >= 1.27 with php-composer(symfony/polyfill-php73) < 2)
-BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.27 with php-composer(symfony/polyfill-php80) < 2)
-BuildRequires: (php-composer(symfony/polyfill-php81) >= 1.27 with php-composer(symfony/polyfill-php81) < 2)
-# remirepo:4
+BuildRequires: (php-composer(psr/log)                >= 1.1.4 with php-composer(psr/log)                < 4)
+BuildRequires: (php-composer(symfony/polyfill-php80) >= 1.27  with php-composer(symfony/polyfill-php80) < 2)
+BuildRequires: (php-composer(symfony/polyfill-php81) >= 1.27  with php-composer(symfony/polyfill-php81) < 2)
+# remirepo:5
 %else
+BuildRequires:  php-PsrLog                           >= 1.1.4
 BuildRequires:  php-symfony-polyfill                 <  2
 BuildRequires:  php-symfony-polyfill                 >= 1.27
 %endif
@@ -69,25 +70,27 @@ BuildRequires:  %{phpunit}
 BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
-#        "php": "^7.2 || ^8.0"
+#        "php": "^7.4 || ^8.0"
 #        "ext-hash": "*",
 #        "ext-json": "*",
-#        "ext-mongodb": "^1.16.0",
+#        "ext-mongodb": "^1.17.0",
 #        "jean85/pretty-package-versions": "^2.0.1",
 #        "symfony/polyfill-php73": "^1.27",
+#        "psr/log": "^1.1.4|^2|^3",
 #        "symfony/polyfill-php80": "^1.27",
 #        "symfony/polyfill-php81": "^1.27"
-Requires:       php(language) >= 7.2
+Requires:       php(language) >= 7.4
 Requires:       php-hash
 Requires:       php-json
 Requires:       php-pecl(mongodb) >= %{ext_version}
 # remirepo:1
 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
-Requires:      (php-composer(symfony/polyfill-php73) >= 1.27 with php-composer(symfony/polyfill-php73) < 2)
-Requires:      (php-composer(symfony/polyfill-php80) >= 1.27 with php-composer(symfony/polyfill-php80) < 2)
-Requires:      (php-composer(symfony/polyfill-php81) >= 1.27 with php-composer(symfony/polyfill-php81) < 2)
-# remirepo:4
+Requires:      (php-composer(psr/log)                >= 1.1.4 with php-composer(psr/log)                < 4)
+Requires:      (php-composer(symfony/polyfill-php80) >= 1.27  with php-composer(symfony/polyfill-php80) < 2)
+Requires:      (php-composer(symfony/polyfill-php81) >= 1.27  with php-composer(symfony/polyfill-php81) < 2)
+# remirepo:5
 %else
+Requires:       php-PsrLog                           >= 1.1.4
 Requires:       php-symfony-polyfill                 <  2
 Requires:       php-symfony-polyfill                 >= 1.27
 %endif
@@ -126,6 +129,11 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('MongoDB\\', __DIR__);
 require_once __DIR__. '/functions.php';
 \Fedora\Autoloader\Dependencies::required([
+    [
+        '%{_datadir}/php/Psr/Log3/autoload.php',
+        '%{_datadir}/php/Psr/Log2/autoload.php',
+        '%{_datadir}/php/Psr/Log/autoload.php',
+    ],
     '%{_datadir}/php/Symfony/Polyfill/autoload.php',
 ]);
 EOF
@@ -208,6 +216,12 @@ exit $ret
 
 
 %changelog
+* 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 mongodb extension version 1.17
+- add dependency on psr/log
+
 * Thu Sep 28 2023 Remi Collet <remi@remirepo.net> - 1.16.1-1
 - update to 1.16.1