summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json22
-rw-r--r--php-laminas-db.spec61
2 files changed, 44 insertions, 39 deletions
diff --git a/composer.json b/composer.json
index 4b41311..02a0de6 100644
--- a/composer.json
+++ b/composer.json
@@ -19,30 +19,27 @@
"sort-packages": true
},
"extra": {
- "branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
- },
"laminas": {
"component": "Laminas\\Db",
"config-provider": "Laminas\\Db\\ConfigProvider"
}
},
"require": {
- "php": "^5.6 || ^7.0",
- "laminas/laminas-stdlib": "^2.7 || ^3.0",
+ "php": "^7.3 || ~8.0.0",
+ "laminas/laminas-stdlib": "^3.3",
"laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
- "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
- "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
- "phpunit/phpunit": "^5.7.27 || ^6.5.14"
+ "laminas/laminas-eventmanager": "^3.3",
+ "laminas/laminas-hydrator": "^3.2 || ^4.0",
+ "laminas/laminas-servicemanager": "^3.3",
+ "phpspec/prophecy-phpunit": "^2.0",
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"laminas/laminas-eventmanager": "Laminas\\EventManager component",
- "laminas/laminas-hydrator": "Laminas\\Hydrator component for using HydratingResultSets",
+ "laminas/laminas-hydrator": "(^3.2 || ^4.0) Laminas\\Hydrator component for using HydratingResultSets",
"laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
},
"autoload": {
@@ -51,9 +48,6 @@
}
},
"autoload-dev": {
- "files": [
- "test/autoload.php"
- ],
"psr-4": {
"LaminasTest\\Db\\": "test/unit/",
"LaminasIntegrationTest\\Db\\": "test/integration/"
diff --git a/php-laminas-db.spec b/php-laminas-db.spec
index bd0ef8f..3747a0d 100644
--- a/php-laminas-db.spec
+++ b/php-laminas-db.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-db
#
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 6c4238918b9204db1eb8cafae2c1940d40f4c007
+%global gh_commit 80cbba4e749f9eb7d8036172acb9ad41e8b6923f
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-db
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.11.3
+Version: 2.12.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -34,47 +34,50 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.6
+BuildRequires: php(language) >= 7.3
BuildRequires: php-date
BuildRequires: php-pcre
BuildRequires: php-pdo
BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
# "laminas/laminas-coding-standard": "~1.0.0",
-# "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-# "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
-# "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-# "phpunit/phpunit": "^5.7.27 || ^6.5.14"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 2.1 with php-autoloader(%{gh_owner}/laminas-hydrator) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-# remirepo:7
+# "laminas/laminas-eventmanager": "^3.3",
+# "laminas/laminas-hydrator": "^3.2 || ^4.0",
+# "laminas/laminas-servicemanager": "^3.3",
+# "phpspec/prophecy-phpunit": "^2.0",
+# "phpunit/phpunit": "^9.3"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-hydrator) >= 3.2 with php-autoloader(%{gh_owner}/laminas-hydrator) < 5)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3)
+# remirepo:8
%else
BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-zendframework-bridge
BuildRequires: php-laminas-eventmanager
-BuildRequires: php-laminas-hydrator
+BuildRequires: php-laminas-hydrator3
BuildRequires: php-laminas-servicemanager
+BuildRequires: php-phpspec-prophecy-phpunit
%endif
-%global phpunit %{_bindir}/phpunit6
-BuildRequires: phpunit6 >= 6.5.14
+%global phpunit %{_bindir}/phpunit9
+BuildRequires: phpunit9 >= 9.3
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^5.6 || ^7.0",
-# "laminas/laminas-stdlib": "^2.7 || ^3.0",
+# "php": "^7.3 || ~8.0.0",
+# "laminas/laminas-stdlib": "^3.3",
# "laminas/laminas-zendframework-bridge": "^1.0"
-Requires: php(language) >= 5.6
+Requires: php(language) >= 7.3
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-eventmanager": "Laminas\\EventManager component",
@@ -134,8 +137,8 @@ cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/EventManager/autoload.php',
[
+ '%{php_home}/%{namespace}/Hydrator4/autoload.php',
'%{php_home}/%{namespace}/Hydrator3/autoload.php',
- '%{php_home}/%{namespace}/Hydrator/autoload.php',
],
'%{php_home}/%{namespace}/ServiceManager/autoload.php',
]);
@@ -166,11 +169,12 @@ cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
-# comptibility layer before PSR-0 autoloader
-require_once dirname(__DIR__) . '/test/autoload.php';
require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test/unit');
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}IntegrationTest\\%{library}\\', dirname(__DIR__) . '/test/integration');
+\Fedora\Autoloader\Dependencies::required([
+ '%{php_home}/Prophecy/PhpUnit/autoload.php',
+]);
EOF
: check compat autoloader
@@ -181,10 +185,10 @@ exit (class_exists("\\Zend\\%{library}\\ConfigProvider") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php73 php74 php80; do
if which $cmdarg; then
set $cmdarg
- $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+ $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
fi
done
exit $ret
@@ -204,6 +208,13 @@ exit $ret
%changelog
+* Wed Feb 24 2021 Remi Collet <remi@remirepo.net> - 2.12.0-1
+- update to 2.12.0
+- raise dependency on PHP 7.3
+- raise dependency on laminas-stdlib 3.3
+- allow laminas-hydrator v3 and v4
+- switch to phpunit9
+
* Mon Mar 30 2020 Remi Collet <remi@remirepo.net> - 2.11.3-1
- update to 2.11.3 (no change)