summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json12
-rw-r--r--php-doctrine-dbal3.spec51
2 files changed, 52 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index 2374d79..6d5f584 100644
--- a/composer.json
+++ b/composer.json
@@ -33,21 +33,23 @@
"require": {
"php": "^7.3 || ^8.0",
"composer/package-versions-deprecated": "^1.11.99",
- "doctrine/cache": "^1.0|^2.0",
+ "doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3",
- "doctrine/event-manager": "^1.0"
+ "doctrine/event-manager": "^1.0",
+ "psr/cache": "^1|^2|^3",
+ "psr/log": "^1|^2|^3"
},
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
- "phpstan/phpstan": "1.1.1",
- "phpstan/phpstan-strict-rules": "^1",
+ "phpstan/phpstan": "1.2.0",
+ "phpstan/phpstan-strict-rules": "^1.1",
"phpunit/phpunit": "9.5.10",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.1",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0|^6.0",
- "vimeo/psalm": "4.12.0"
+ "vimeo/psalm": "4.13.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
diff --git a/php-doctrine-dbal3.spec b/php-doctrine-dbal3.spec
index bdcf782..3efb4dd 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.4
-%global github_commit 821b4f01a36ce63ed36c090ea74767b72db367e9
+%global github_version 3.2.0
+%global github_commit 5d54f63541d7bed1156cb5c9b79274ced61890e4
%global major 3
%global composer_vendor doctrine
@@ -22,7 +22,7 @@
# "php": "^7.3 || ^8"
%global php_min_ver 7.3
# "doctrine/cache": "^1.0|^2.0"
-%global doctrine_cache_min_ver 1.0
+%global doctrine_cache_min_ver 1.11
%global doctrine_cache_max_ver 3
# "doctrine/event-manager": "^1.0"
%global doctrine_event_min_ver 1.0
@@ -38,11 +38,23 @@
# allow v4
%global symfony_cache_min_ver 4.4
%global symfony_cache_max_ver 7
+# "psr/cache": "^1|^2|^3",
+%global psr_cache_min_ver 1
+%global psr_cache_max_ver 4
+# "psr/log": "^1|^2|^3"
+%global psr_log_min_ver 1
+%global psr_log_max_ver 4
+
%{!?phpdir: %global phpdir %{_datadir}/php}
# Build using "--without tests" to disable tests
+%if 0%{?rhel} == 7
+# sqlite is too old
+%bcond_with tests
+%else
%bcond_without tests
+%endif
Name: php-%{composer_vendor}-%{composer_project}%{major}
Version: %{github_version}
@@ -72,10 +84,12 @@ BuildRequires: php(language) >= %{php_min_ver}
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})
+BuildRequires:(php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver})
+BuildRequires:(php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_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:13
+# remirepo:17
%else
BuildRequires: php-doctrine-cache >= %{doctrine_cache_min_ver}
BuildRequires: php-doctrine-cache < %{doctrine_cache_max_ver}
@@ -88,6 +102,10 @@ 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}
+BuildRequires: php-psr-cache < %{psr_cache_max_ver}
+BuildRequires: php-psr-cache >= %{psr_cache_min_ver}
+BuildRequires: php-PsrLog < %{psr_log_max_ver}
+BuildRequires: php-PsrLog >= %{psr_log_min_ver}
%endif
## phpcompatinfo (computed from version 3.0)
BuildRequires: php-date
@@ -109,9 +127,11 @@ Requires: php(language) >= %{php_min_ver}
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})
+Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver})
+Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver})
# composer.json (optional)
Requires: (php-composer(symfony/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver})
-# remirepo:11
+# remirepo:15
%else
Requires: php-doctrine-cache < %{doctrine_cache_max_ver}
Requires: php-doctrine-cache >= %{doctrine_cache_min_ver}
@@ -119,6 +139,10 @@ 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}
+Requires: php-psr-cache < %{psr_cache_max_ver}
+Requires: php-psr-cache >= %{psr_cache_min_ver}
+Requires: php-PsrLog < %{psr_log_max_ver}
+Requires: php-PsrLog >= %{psr_log_min_ver}
# composer.json (optional)
Requires: php-symfony4-console >= %{symfony_console_min_ver}
Requires: php-symfony4-console < %{symfony_console_max_ver}
@@ -180,6 +204,16 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) {
'%{phpdir}/Doctrine/Common/Cache/autoload.php',
],
'%{phpdir}/Doctrine/Common/EventManager/autoload.php',
+ [
+ '%{phpdir}/Psr/Cache3/autoload.php',
+ '%{phpdir}/Psr/Cache2/autoload.php',
+ '%{phpdir}/Psr/Cache/autoload.php',
+ ],
+ [
+ '%{phpdir}/Psr/Log3/autoload.php',
+ '%{phpdir}/Psr/Log2/autoload.php',
+ '%{phpdir}/Psr/Log/autoload.php',
+ ]
]);
\Fedora\Autoloader\Dependencies::optional([
@@ -230,7 +264,7 @@ SKIP="--filter '^((?!(testFetchLongBlob)).)*$'"
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in php php73 php74 php80 php81; do
+for PHP_EXEC in php php74 php80 php81; do
rm -f /tmp/test_nesting.sqlite
if which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit9 \
@@ -256,6 +290,11 @@ exit $RETURN_CODE
%changelog
+* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- add dependency on psr/cache
+- add dependency on psr/log
+
* Tue Nov 16 2021 Remi Collet <remi@remirepo.net> - 3.1.4-1
- update to 3.1.4