summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json20
-rw-r--r--php-laminas-config3.spec54
2 files changed, 45 insertions, 29 deletions
diff --git a/composer.json b/composer.json
index adfc01d..27b4d40 100644
--- a/composer.json
+++ b/composer.json
@@ -16,21 +16,23 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
},
"require": {
- "php": "^7.3 || ~8.0.0",
+ "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"ext-json": "*",
- "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+ "laminas/laminas-stdlib": "^3.6",
"psr/container": "^1.0"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-filter": "^2.7.2",
- "laminas/laminas-i18n": "^2.10.3",
- "laminas/laminas-servicemanager": "^3.4.1",
- "malukenho/docheader": "^0.1.6",
- "phpunit/phpunit": "^8.5.8"
+ "laminas/laminas-coding-standard": "~2.4.0",
+ "laminas/laminas-filter": "~2.23.0",
+ "laminas/laminas-i18n": "~2.19.0",
+ "laminas/laminas-servicemanager": "~3.19.0",
+ "phpunit/phpunit": "~9.5.25"
},
"conflict": {
"container-interop/container-interop": "<1.2.0",
diff --git a/php-laminas-config3.spec b/php-laminas-config3.spec
index 75ffa78..5b860eb 100644
--- a/php-laminas-config3.spec
+++ b/php-laminas-config3.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-config3
#
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 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 2f2273a6bdf966a9adf6042f8950b6c33199a3b7
+%global gh_commit 46baad58d0b12cf98539e04334eff40a1fdfb9a0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-config
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}%{major}
-Version: 3.6.0
+Version: 3.8.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component v%{major}
@@ -34,7 +34,7 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 7.3
+BuildRequires: php(language) >= 8.0
BuildRequires: php-json
BuildRequires: php-libxml
BuildRequires: php-pcre
@@ -43,17 +43,17 @@ BuildRequires: php-xmlreader
BuildRequires: php-xmlwriter
# 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.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
# From composer, "require-dev": {
-# "laminas/laminas-filter": "^2.7.2",
-# "laminas/laminas-i18n": "^2.10.3",
-# "laminas/laminas-servicemanager": "^3.4.1",
-# "malukenho/docheader": "^0.1.6",
-# "phpunit/phpunit": "^8.5.8"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.7.2 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.10.3 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.4.1 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+# "laminas/laminas-coding-standard": "~2.4.0",
+# "laminas/laminas-filter": "~2.23.0",
+# "laminas/laminas-i18n": "~2.19.0",
+# "laminas/laminas-servicemanager": "~3.19.0",
+# "phpunit/phpunit": "~9.5.25"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-filter) >= 2.23.0 with php-autoloader(%{gh_owner}/laminas-filter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.19.0 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.19.0 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
# remirepo:7
%else
BuildRequires: php-laminas-stdlib
@@ -62,21 +62,21 @@ BuildRequires: php-laminas-filter
BuildRequires: php-laminas-i18n
BuildRequires: php-laminas-servicemanager
%endif
-BuildRequires: phpunit8 >= 8.5.8
+BuildRequires: phpunit9 >= 9.5.25
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
+# "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
# "ext-json": "*",
-# "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+# "laminas/laminas-stdlib": "^3.6",
# "psr/container": "^1.0"
-Requires: php(language) >= 7.3
+Requires: php(language) >= 8.0
Requires: php-json
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.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-composer(psr/container) >= 1.0 with php-composer(psr/container) < 2)
# From composer, "suggest": {
# "laminas/laminas-filter": "Laminas\\Filter component",
@@ -151,9 +151,11 @@ EOF
: upstream test suite
ret=0
-for cmd in php php73 php74 php80 php81; do
+for cmd in php php80 php81 php82; do
if which $cmd; then
- $cmd %{_bindir}/phpunit8 || ret=1
+ $cmd %{_bindir}/phpunit9 \
+ --filter '^((?!(testCloseWhenCallFromFileReaderGetInvalid|testCloseWhenCallFromStringReaderGetInvalid)).)*$' \
+ || ret=1
fi
done
exit $ret
@@ -172,6 +174,18 @@ exit $ret
%changelog
+* Mon Oct 17 2022 Remi Collet <remi@remirepo.net> - 3.8.0-1
+- update to 3.8.0
+- raise dependency on PHP 8.0
+
+* Fri Jan 28 2022 Remi Collet <remi@remirepo.net> - 3.7.0-2
+- ignore 2 failed tests, FTBFS #2046823
+
+* Mon Oct 4 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1
+- update to 3.7.0
+- raise dependency on laminas-stdlib 3.6
+- switch to phpunit9
+
* Wed Sep 8 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
- update to 3.6.0
- drop zendframework compatibility layer
generated by cgit (git 2.34.1) at 2024-05-09 01:21:48 +0000