update to 3.1.1

allow symfony/console version 6
allow doctrine/cache version 2

2 files changed, 40 insertions, 16 deletions

diff --git a/composer.json b/composer.json
index b78e5bc..6dda8c7 100644
--- a/composer.json
+++ b/composer.json
@@ -33,19 +33,20 @@
     "require": {
         "php": "^7.3 || ^8.0",
         "composer/package-versions-deprecated": "^1.11.99",
-        "doctrine/cache": "^1.0",
+        "doctrine/cache": "^1.0|^2.0",
         "doctrine/deprecations": "^0.5.3",
         "doctrine/event-manager": "^1.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "8.2.0",
+        "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2020.2",
         "phpstan/phpstan": "0.12.81",
         "phpstan/phpstan-strict-rules": "^0.12.2",
-        "phpunit/phpunit": "9.5.0",
+        "phpunit/phpunit": "9.5.5",
         "psalm/plugin-phpunit": "0.13.0",
         "squizlabs/php_codesniffer": "3.6.0",
-        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
+        "symfony/cache": "^5.2|^6.0",
+        "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
         "vimeo/psalm": "4.6.4"
     },
     "suggest": {
diff --git a/php-doctrine-dbal3.spec b/php-doctrine-dbal3.spec
index a6c06bd..3010933 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.1.0
-%global github_commit    5ba62e7e40df119424866064faf2cef66cb5232a
+%global github_version   3.1.1
+%global github_commit    8e0fde2b90e3f61361013d1e928621beeea07bc0
 %global major            3
 
 %global composer_vendor  doctrine
@@ -21,19 +21,23 @@
 
 # "php": "^7.3 || ^8"
 %global php_min_ver 7.3
-# "doctrine/cache": "^1.0"
+# "doctrine/cache": "^1.0|^2.0"
 %global doctrine_cache_min_ver 1.0
-%global doctrine_cache_max_ver 2
+%global doctrine_cache_max_ver 3
 # "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"
+# "symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0"
 # ignore v2
 %global symfony_console_min_ver 3.0
-%global symfony_console_max_ver 6
+%global symfony_console_max_ver 7
+# "symfony/cache": "^5.2|^6.0"
+# allow v4
+%global symfony_cache_min_ver 4.4
+%global symfony_cache_max_ver 5
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
@@ -60,7 +64,7 @@ Patch0:        %{name}-bin.patch
 BuildArch: noarch
 # Tests
 %if %{with tests}
-BuildRequires: phpunit9 >= 9.5
+BuildRequires: phpunit9 >= 9.5.5
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 # remirepo:1
@@ -69,8 +73,9 @@ BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with ph
 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/cache) >= %{symfony_cache_min_ver} with php-composer(symfony/cache) <  %{symfony_cache_max_ver})
 BuildRequires:(php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) <  %{symfony_console_max_ver})
-# remirepo:11
+# remirepo:13
 %else
 BuildRequires: php-doctrine-cache >= %{doctrine_cache_min_ver}
 BuildRequires: php-doctrine-cache <  %{doctrine_cache_max_ver}
@@ -79,6 +84,8 @@ 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-composer(symfony/cache) <  %{symfony_cache_max_ver}
+BuildRequires: php-composer(symfony/cache) >= %{symfony_cache_min_ver}
 BuildRequires: php-symfony4-console >= %{symfony_console_min_ver}
 BuildRequires: php-symfony4-console <  %{symfony_console_max_ver}
 %endif
@@ -166,15 +173,19 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 if (!class_exists('Doctrine\\DBAL\\Connection')) {
     \Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__);
 }
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/Doctrine/Deprecations/autoload.php',
-    '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+    [
+        '%{phpdir}/Doctrine/Common/Cache2/autoload.php',
+        '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+    ],
     '%{phpdir}/Doctrine/Common/EventManager/autoload.php',
-));
+]);
 
 \Fedora\Autoloader\Dependencies::optional([
     [
-        (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony5') . '/Component/Console/autoload.php',
+        (getenv('RPM_SYMFONY_TREE')?:'%{phpdir}/Symfony6') . '/Component/Console/autoload.php',
+        '%{phpdir}/Symfony5/Component/Console/autoload.php',
         '%{phpdir}/Symfony4/Component/Console/autoload.php',
         '%{phpdir}/Symfony3/Component/Console/autoload.php',
     ],
@@ -195,6 +206,13 @@ install -pm 0755 bin/doctrine-dbal.php %{buildroot}/%{_bindir}/doctrine-dbal%{ma
 cat > bs.php <<'BOOTSTRAP'
 <?php
 require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL%{major}/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+    [
+        '%{phpdir}/Symfony6/Component/Cache/autoload.php',
+        '%{phpdir}/Symfony5/Component/Cache/autoload.php',
+        '%{phpdir}/Symfony4/Component/Cache/autoload.php',
+    ],
+]);
 \Fedora\Autoloader\Autoload::addPsr4(
     'Doctrine\\DBAL\\Tests\\',
     __DIR__ . '/tests'
@@ -235,6 +253,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 3.1.1-1
+- update to 3.1.1
+- allow symfony/console version 6
+- allow doctrine/cache version 2
+
 * Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 3.1.0-1
 - update to 3.1.0
 - add dependency on doctrine/deprecations