summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json7
-rw-r--r--php-doctrine-dbal.spec34
2 files changed, 29 insertions, 12 deletions
diff --git a/composer.json b/composer.json
index fff4319..a1bf3f6 100644
--- a/composer.json
+++ b/composer.json
@@ -34,16 +34,17 @@
"require": {
"php": "^7.1 || ^8",
"ext-pdo": "*",
- "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",
- "phpunit/phpunit": "^7.5.20|^8.5|9.5.0",
+ "phpunit/phpunit": "^7.5.20|^8.5|9.5.5",
"squizlabs/php_codesniffer": "3.6.0",
+ "symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.6.4"
},
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
index fc4ee61..a782f43 100644
--- a/php-doctrine-dbal.spec
+++ b/php-doctrine-dbal.spec
@@ -16,17 +16,17 @@
%global github_owner doctrine
%global github_name dbal
-%global github_version 2.13.1
-%global github_commit c800380457948e65bbd30ba92cc17cda108bf8c9
+%global github_version 2.13.2
+%global github_commit 8dd39d2ead4409ce652fd4f02621060f009ea5e4
%global composer_vendor doctrine
%global composer_project dbal
# "php": "^7.1 || ^8"
%global php_min_ver 7.1
-# "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
@@ -36,6 +36,9 @@
# "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
%global symfony_console_min_ver 2.0.5
%global symfony_console_max_ver 6
+# "symfony/cache": "^4.4"
+%global symfony_cache_min_ver 4.4
+%global symfony_cache_max_ver 5
%{!?phpdir: %global phpdir %{_datadir}/php}
@@ -59,7 +62,7 @@ Patch0: %{name}-bin.patch
BuildArch: noarch
# Tests
%if %{with tests}
-BuildRequires: phpunit9 >= 9.5.0
+BuildRequires: phpunit9 >= 9.5.5
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
# remirepo:1
@@ -68,8 +71,9 @@ BuildRequires:(php-composer(doctrine/cache) >= %{doctrine_cache_min_ver} with ph
BuildRequires:(php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver})
BuildRequires:(php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_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-composer(doctrine/cache) < %{doctrine_cache_max_ver}
BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
@@ -78,6 +82,8 @@ BuildRequires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_mi
BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver}
BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_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-composer(symfony/console) < %{symfony_console_max_ver}
BuildRequires: php-composer(symfony/console) >= %{symfony_console_min_ver}
%endif
@@ -171,11 +177,14 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) {
\Fedora\Autoloader\Autoload::addPsr4('Doctrine\\DBAL\\', __DIR__);
}
-\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+\Fedora\Autoloader\Dependencies::required([
+ [
+ '%{phpdir}/Doctrine/Common/Cache2/autoload.php',
+ '%{phpdir}/Doctrine/Common/Cache/autoload.php',
+ ],
'%{phpdir}/Doctrine/Deprecations/autoload.php',
'%{phpdir}/Doctrine/Common/EventManager/autoload.php',
-));
+]);
\Fedora\Autoloader\Dependencies::optional([
[
@@ -201,6 +210,9 @@ install -pm 0755 bin/doctrine-dbal.php %{buildroot}/%{_bindir}/doctrine-dbal
cat > bs.php <<'BOOTSTRAP'
<?php
require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL/autoload.php';
+\Fedora\Autoloader\Dependencies::required([
+ '%{phpdir}/Symfony4/Component/Cache/autoload.php',
+]);
\Fedora\Autoloader\Autoload::addPsr4(
'Doctrine\\Tests\\',
__DIR__ . '/tests/Doctrine/Tests'
@@ -239,6 +251,10 @@ exit $RETURN_CODE
%changelog
+* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 2.13.2-1
+- update to 2.13.2
+- allow doctrine/cache version 2
+
* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 2.13.1-1
- update to 2.13.1