summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json24
-rw-r--r--php-doctrine-dbal.spec49
2 files changed, 43 insertions, 30 deletions
diff --git a/composer.json b/composer.json
index 2571ac4..662dbd8 100644
--- a/composer.json
+++ b/composer.json
@@ -32,39 +32,31 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
],
"require": {
- "php": "^7.3 || ^8",
+ "php": "^7.1 || ^8",
"ext-pdo": "*",
"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",
- "phpunit/phpunit": "^9.4",
- "psalm/plugin-phpunit": "^0.10.0",
+ "doctrine/coding-standard": "8.2.0",
+ "jetbrains/phpstorm-stubs": "2020.2",
+ "phpstan/phpstan": "0.12.81",
+ "phpunit/phpunit": "^7.5.20|^8.5|9.5.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."
},
"bin": ["bin/doctrine-dbal"],
"config": {
- "sort-packages": true,
- "platform": {
- "php": "7.3.0"
- }
+ "sort-packages": true
},
"autoload": {
"psr-4": { "Doctrine\\DBAL\\": "lib/Doctrine/DBAL" }
},
"autoload-dev": {
"psr-4": { "Doctrine\\Tests\\": "tests/Doctrine/Tests" }
- },
- "extra": {
- "branch-alias": {
- "dev-master": "4.0.x-dev"
- }
}
}
diff --git a/php-doctrine-dbal.spec b/php-doctrine-dbal.spec
index 3312da1..6d484b4 100644
--- a/php-doctrine-dbal.spec
+++ b/php-doctrine-dbal.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-doctrine-dbal
#
-# Copyright (c) 2013-2020 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2013-2021 Shawn Iwinski <shawn.iwinski@gmail.com>
# Adam Williamson <awilliam@redhat.com>
#
# License: MIT
@@ -11,34 +11,37 @@
# Please preserve changelog entries
#
+# Build using "--without tests" to disable tests
+%bcond_without tests
+
%global github_owner doctrine
%global github_name dbal
-%global github_version 2.12.1
-%global github_commit adce7a954a1c2f14f85e94aed90c8489af204086
+%global github_version 2.13.0
+%global github_commit 67d56d3203b33db29834e6b2fcdbfdc50535d796
%global composer_vendor doctrine
%global composer_project dbal
-# "php": "^7.3 || ^8"
-%global php_min_ver 7.3
+# "php": "^7.1 || ^8"
+%global php_min_ver 7.1
# "doctrine/cache": "^1.0"
%global doctrine_cache_min_ver 1.0
%global doctrine_cache_max_ver 2
# "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 1
# "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
%global symfony_console_min_ver 2.0.5
%global symfony_console_max_ver 5
%{!?phpdir: %global phpdir %{_datadir}/php}
-# Build using "--without tests" to disable tests
-%bcond_without tests
-
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 2%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: Doctrine Database Abstraction Layer (DBAL)
License: MIT
@@ -56,19 +59,22 @@ Patch0: %{name}-bin.patch
BuildArch: noarch
# Tests
%if %{with tests}
-BuildRequires: phpunit9 >= 9.4
+BuildRequires: phpunit9 >= 9.5.0
## 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/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/console) >= %{symfony_console_min_ver} with php-composer(symfony/console) < %{symfony_console_max_ver})
-# remirepo:9
+# remirepo:11
%else
BuildRequires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
BuildRequires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver}
+BuildRequires: php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver}
+BuildRequires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver}
BuildRequires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver}
BuildRequires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver}
## composer.json (optional)
@@ -92,15 +98,18 @@ Requires: php(language) >= %{php_min_ver}
# remirepo:1
%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/deprecations) >= %{doctrine_deprecations_min_ver} with php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver})
Requires: (php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver} with php-composer(doctrine/event-manager) < %{doctrine_cache_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-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
Requires: php-composer(doctrine/cache) < %{doctrine_cache_max_ver}
-Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver}
+Requires: php-composer(doctrine/cache) >= %{doctrine_cache_min_ver}
+Requires: php-composer(doctrine/deprecations) < %{doctrine_deprecations_max_ver}
+Requires: php-composer(doctrine/deprecations) >= %{doctrine_deprecations_min_ver}
Requires: php-composer(doctrine/event-manager) < %{doctrine_event_max_ver}
+Requires: php-composer(doctrine/event-manager) >= %{doctrine_event_min_ver}
# composer.json (optional)
Requires: php-composer(symfony/console) >= %{symfony_console_min_ver}
Requires: php-composer(symfony/console) < %{symfony_console_max_ver}
@@ -164,6 +173,7 @@ if (!class_exists('Doctrine\\DBAL\\Connection')) {
\Fedora\Autoloader\Dependencies::required(array(
'%{phpdir}/Doctrine/Common/Cache/autoload.php',
+ '%{phpdir}/Doctrine/Deprecations/autoload.php',
'%{phpdir}/Doctrine/Common/EventManager/autoload.php',
));
@@ -196,12 +206,17 @@ require_once '%{buildroot}/%{phpdir}/Doctrine/DBAL/autoload.php';
);
BOOTSTRAP
+%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
@@ -213,6 +228,7 @@ exit $RETURN_CODE
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -222,6 +238,11 @@ exit $RETURN_CODE
%changelog
+* Tue Mar 30 2021 Remi Collet <remi@remirepo.net> - 2.13.0-1
+- update to 2.13.0
+- lower dependency on PHP 7.1
+- add dependency on doctrine/deprecations
+
* Tue Dec 8 2020 Remi Collet <remi@remirepo.net> - 2.12.1-2
- don't register autoloader twice, e.g. by doctrine/dbal v3
generated by cgit (git 2.34.1) at 2024-05-15 02:55:47 +0000