summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json21
-rw-r--r--php-laminas-paginator.spec47
2 files changed, 37 insertions, 31 deletions
diff --git a/composer.json b/composer.json
index 968ec58..b4e292d 100644
--- a/composer.json
+++ b/composer.json
@@ -25,21 +25,20 @@
}
},
"require": {
- "php": "^7.3 || ~8.0.0",
+ "php": "^7.3 || ~8.0.0 || ~8.1.0",
"ext-json": "*",
- "laminas/laminas-stdlib": "^3.2.1",
- "laminas/laminas-zendframework-bridge": "^1.0.4"
+ "laminas/laminas-stdlib": "^3.6.0"
},
"require-dev": {
- "laminas/laminas-cache": "^2.9.0",
+ "laminas/laminas-cache": "^2.13.0",
"laminas/laminas-coding-standard": "~2.1.4",
"laminas/laminas-config": "^2.6.0",
- "laminas/laminas-filter": "^2.9.4",
- "laminas/laminas-servicemanager": "^3.4.1",
- "laminas/laminas-view": "^2.11.4",
- "phpunit/phpunit": "^9.3",
+ "laminas/laminas-filter": "^2.11.1",
+ "laminas/laminas-servicemanager": "^3.7.0",
+ "laminas/laminas-view": "^2.14.1",
+ "phpunit/phpunit": "^9.5.10",
"psalm/plugin-phpunit": "^0.15.1",
- "vimeo/psalm": "^4.6"
+ "vimeo/psalm": "^4.10.0"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component to support cache features",
@@ -69,7 +68,7 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
- "replace": {
- "zendframework/zend-paginator": "^2.8.2"
+ "conflict": {
+ "zendframework/zend-paginator": "*"
}
}
diff --git a/php-laminas-paginator.spec b/php-laminas-paginator.spec
index 52cd4d5..7aab3c0 100644
--- a/php-laminas-paginator.spec
+++ b/php-laminas-paginator.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 14ce4a397e6329954389cc40aa635caa9573f695
+%global gh_commit 7f00d5fdecd1b4f67c8e84e6f6d57bbabda4b7d8
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-paginator
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.10.0
+Version: 2.11.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -39,50 +39,51 @@ BuildRequires: php-json
BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0.4 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
-# "laminas/laminas-cache": "^2.9.0",
+# "laminas/laminas-cache": "^2.13.0",
# "laminas/laminas-coding-standard": "~2.1.4",
# "laminas/laminas-config": "^2.6.0",
-# "laminas/laminas-filter": "^2.9.4",
-# "laminas/laminas-servicemanager": "^3.4.1",
-# "laminas/laminas-view": "^2.11.4",
-# "phpunit/phpunit": "^9.3",
+# "laminas/laminas-filter": "^2.11.1",
+# "laminas/laminas-servicemanager": "^3.7.0",
+# "laminas/laminas-view": "^2.14.1",
+# "phpunit/phpunit": "^9.5.5",
# "psalm/plugin-phpunit": "^0.15.1",
-# "vimeo/psalm": "^4.6"
+# "vimeo/psalm": "^4.10.0"
+# ignore cache min version for now
BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.9.0 with php-autoloader(%{gh_owner}/laminas-cache) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-config) >= 2.6.0 with php-autoloader(%{gh_owner}/laminas-config) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.9.4 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.11.4 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.11.1 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.14.1 with php-autoloader(%{gh_owner}/laminas-view) < 3)
# remirepo:11
%else
-BuildRequires: php-laminas-stdlib >= 3.2.1
+BuildRequires: php-laminas-stdlib >= 3.6
BuildRequires: php-laminas-zendframework-bridge >= 1.0.4
BuildRequires: php-laminas-cache >= 2.9.0
BuildRequires: php-laminas-config >= 2.6.0
-BuildRequires: php-laminas-filter >= 2.9.4
-BuildRequires: php-laminas-servicemanager >= 3.4.1
+BuildRequires: php-laminas-filter >= 2.11.1
+BuildRequires: php-laminas-servicemanager >= 3.7
BuildRequires: php-laminas-view >= 2.11.4
%endif
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.5
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
+# "php": "^7.3 || ~8.0.0 || ~8.1.0",
# "ext-json": "*",
-# "laminas/laminas-stdlib": "^3.2.1",
+# "laminas/laminas-stdlib": "^3.6.0",
# "laminas/laminas-zendframework-bridge": "^1.0.4"
Requires: php(language) >= 7.3
Requires: php-json
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0.4 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
@@ -186,7 +187,7 @@ exit (class_exists("\\Zend\\%{library}\\Factory") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -209,6 +210,12 @@ exit $ret
%changelog
+* Fri Oct 15 2021 Remi Collet <remi@remirepo.net> - 2.11.0-1
+- update to 2.11.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+- raise dependency to laminas-stdlib 3.6
+
* Fri Feb 26 2021 Remi Collet <remi@remirepo.net> - 2.10.0-1
- update to 2.10.0
- switch to phpunit9