update to 3.1.0

add dependency on doctrine/deprecations

2 files changed, 35 insertions, 19 deletions

diff --git a/composer.json b/composer.json
index 0909566..b78e5bc 100644
--- a/composer.json
+++ b/composer.json
@@ -34,17 +34,19 @@
         "php": "^7.3 || ^8.0",
         "composer/package-versions-deprecated": "^1.11.99",
         "doctrine/cache": "^1.0",
+        "doctrine/deprecations": "^0.5.3",
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^8.1",
-        "jetbrains/phpstorm-stubs": "^2019.1",
-        "phpstan/phpstan": "^0.12.40",
+        "doctrine/coding-standard": "8.2.0",
+        "jetbrains/phpstorm-stubs": "2020.2",
+        "phpstan/phpstan": "0.12.81",
         "phpstan/phpstan-strict-rules": "^0.12.2",
-        "phpunit/phpunit": "^9.4",
-        "psalm/plugin-phpunit": "^0.10.0",
+        "phpunit/phpunit": "9.5.0",
+        "psalm/plugin-phpunit": "0.13.0",
+        "squizlabs/php_codesniffer": "3.6.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "vimeo/psalm": "^3.17.2"
+        "vimeo/psalm": "4.6.4"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -61,10 +63,5 @@
     },
     "autoload-dev": {
         "psr-4": { "Doctrine\\DBAL\\Tests\\": "tests" }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.0.x-dev"
-        }
     }
 }
diff --git a/php-doctrine-dbal3.spec b/php-doctrine-dbal3.spec
index c4fbc3a..a6c06bd 100644
--- a/php-doctrine-dbal3.spec
+++ b/php-doctrine-dbal3.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     doctrine
 %global github_name      dbal
-%global github_version   3.0.0
-%global github_commit    ee6d1260d5cc20ec506455a585945d7bdb98662c
+%global github_version   3.1.0
+%global github_commit    5ba62e7e40df119424866064faf2cef66cb5232a
 %global major            3
 
 %global composer_vendor  doctrine
@@ -27,6 +27,9 @@
 # "doctrine/event-manager": "^1.0"
 %global doctrine_event_min_ver 1.0
 %global doctrine_event_max_ver 2
+# "doctrine/deprecations": "^0.5.3",
+%global doctrine_deprecations_min_ver 0.5.3
+%global doctrine_deprecations_max_ver 2
 # "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
 # ignore v2
 %global symfony_console_min_ver 3.0
@@ -39,7 +42,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}%{major}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Doctrine Database Abstraction Layer (DBAL) version %{major}
 
 License:       MIT
@@ -57,21 +60,24 @@ Patch0:        %{name}-bin.patch
 BuildArch: noarch
 # Tests
 %if %{with tests}
-BuildRequires: phpunit9 >= 9.4
+BuildRequires: phpunit9 >= 9.5
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) <  %{doctrine_cache_max_ver})
 BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) <  %{doctrine_cache_max_ver})
+BuildRequires:(php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) <  %{doctrine_deprecations_max_ver})
 ## composer.json (optional)
 BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) <  %{symfony_console_max_ver})
-# remirepo:9
+# remirepo:11
 %else
 BuildRequires: php-doctrine-cache >= %{doctrine_cache_min_ver}
 BuildRequires: php-doctrine-cache <  %{doctrine_cache_max_ver}
 BuildRequires: php-doctrine-event-manager >= %{doctrine_event_min_ver}
 BuildRequires: php-doctrine-event-manager <  %{doctrine_event_max_ver}
+BuildRequires: php-doctrine-deprecations <  %{doctrine_deprecations_max_ver}
+BuildRequires: php-doctrine-deprecations >= %{doctrine_deprecations_min_ver}
 ## composer.json (optional)
 BuildRequires: php-symfony4-console >= %{symfony_console_min_ver}
 BuildRequires: php-symfony4-console <  %{symfony_console_max_ver}
@@ -95,14 +101,17 @@ Requires:      php(language) >= %{php_min_ver}
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:     (php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with php-composer(doctrine/cache) <  %{doctrine_cache_max_ver})
 Requires:     (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) <  %{doctrine_cache_max_ver})
+Requires:     (php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) <  %{doctrine_deprecations_max_ver})
 # composer.json (optional)
 Requires:     (php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) <  %{symfony_console_max_ver})
-# remirepo:9
+# remirepo:11
 %else
-Requires:      php-doctrine-cache >= %{doctrine_cache_min_ver}
 Requires:      php-doctrine-cache <  %{doctrine_cache_max_ver}
-Requires:      php-doctrine-event-manager >= %{doctrine_event_min_ver}
+Requires:      php-doctrine-cache >= %{doctrine_cache_min_ver}
 Requires:      php-doctrine-event-manager <  %{doctrine_event_max_ver}
+Requires:      php-doctrine-event-manager >= %{doctrine_event_min_ver}
+Requires:      php-doctrine-deprecations <  %{doctrine_deprecations_max_ver}
+Requires:      php-doctrine-deprecations >= %{doctrine_deprecations_min_ver}
 # composer.json (optional)
 Requires:      php-symfony4-console >= %{symfony_console_min_ver}
 Requires:      php-symfony4-console <  %{symfony_console_max_ver}
@@ -158,6 +167,7 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) {
     \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__);
 }
 \Fedora\Autoloader\Dependencies::required(array(
+    '%{phpdir}/Doctrine/Deprecations/autoload.php',
     '%{phpdir}/Doctrine/Common/Cache/autoload.php',
     '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
 ));
@@ -194,12 +204,17 @@ BOOTSTRAP
 : ignore test using PHPStan
 find tests -name \*php -exec grep -q PHPStan {} \; -print -delete
 
+%if 0%{?rhel} == 7
+SKIP="--filter '^((?!(testFetchAllKeyValueWithLimit)).)*$'"
+%endif
+
 : Upstream tests
 RETURN_CODE=0
 for PHP_EXEC in php php73 php74 php80; do
     rm -f /tmp/test_nesting.sqlite
     if which $PHP_EXEC; then
         $PHP_EXEC %{_bindir}/phpunit9 \
+            $SKIP \
             --bootstrap bs.php \
             --verbose || RETURN_CODE=1
     fi
@@ -220,6 +235,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 3.1.0-1
+- update to 3.1.0
+- add dependency on doctrine/deprecations
+
 * Tue Dec  8 2020 Remi Collet <remi@remirepo.net> - 3.0.0-2
 - don't register autoloader twice, e.g. by doctrine/dbal v3