summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json25
-rw-r--r--php-laminas-feed.spec47
2 files changed, 38 insertions, 34 deletions
diff --git a/composer.json b/composer.json
index 736a7d2..b534713 100644
--- a/composer.json
+++ b/composer.json
@@ -21,27 +21,27 @@
"extra": {
},
"require": {
- "php": "^7.3 || ~8.0.0",
+ "php": "^7.3 || ~8.0.0 || ~8.1.0",
"ext-dom": "*",
"ext-libxml": "*",
- "laminas/laminas-escaper": "^2.5.2",
- "laminas/laminas-stdlib": "^3.2.1",
- "laminas/laminas-zendframework-bridge": "^1.0"
+ "laminas/laminas-escaper": "^2.9",
+ "laminas/laminas-stdlib": "^3.6"
},
"require-dev": {
"laminas/laminas-cache": "^2.7.2",
- "laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-db": "^2.8.2",
- "laminas/laminas-http": "^2.7",
- "laminas/laminas-servicemanager": "^3.3",
- "laminas/laminas-validator": "^2.10.1",
- "phpunit/phpunit": "^9.3",
+ "laminas/laminas-coding-standard": "~2.2.1",
+ "laminas/laminas-db": "^2.13.3",
+ "laminas/laminas-http": "^2.15",
+ "laminas/laminas-servicemanager": "^3.7",
+ "laminas/laminas-validator": "^2.15",
+ "phpunit/phpunit": "^9.5.5",
"psalm/plugin-phpunit": "^0.13.0",
"psr/http-message": "^1.0.1",
"vimeo/psalm": "^4.1"
},
"conflict": {
- "laminas/laminas-servicemanager": "<3.3"
+ "laminas/laminas-servicemanager": "<3.3",
+ "zendframework/zend-feed": "*"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
@@ -71,8 +71,5 @@
"static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
- },
- "replace": {
- "zendframework/zend-feed": "^2.12.0"
}
}
diff --git a/php-laminas-feed.spec b/php-laminas-feed.spec
index 134485d..8005f79 100644
--- a/php-laminas-feed.spec
+++ b/php-laminas-feed.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 463fdae515fba30633906098c258d3b2c733c15c
+%global gh_commit 3ef837a12833c74b438d2c3780023c4244e0abae
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-feed
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.14.1
+Version: 2.15.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -45,28 +45,28 @@ BuildRequires: php-spl
BuildRequires: php-tidy
# From composer, "require-dev": {
# "laminas/laminas-cache": "^2.7.2",
-# "laminas/laminas-coding-standard": "~1.0.0",
-# "laminas/laminas-db": "^2.8.2",
-# "laminas/laminas-http": "^2.7",
-# "laminas/laminas-servicemanager": "^3.3",
-# "laminas/laminas-validator": "^2.10.1",
-# "phpunit/phpunit": "^9.3",
+# "laminas/laminas-coding-standard": "~2.2.1",
+# "laminas/laminas-db": "^2.13.3",
+# "laminas/laminas-http": "^2.15",
+# "laminas/laminas-servicemanager": "^3.7",
+# "laminas/laminas-validator": "^2.15",
+# "phpunit/phpunit": "^9.5.5",
# "psalm/plugin-phpunit": "^0.13.0",
# "psr/http-message": "^1.0.1",
# "vimeo/psalm": "^4.1"
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3
+BuildRequires: phpunit9 >= 9.5.5
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(psr/http-message) >= 1.0.1 with php-composer(psr/http-message) < 2)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
+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 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.7.2 with php-autoloader(%{gh_owner}/laminas-cache) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.8.2 with php-autoloader(%{gh_owner}/laminas-db) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.7 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.10.1 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.3 with php-autoloader(%{gh_owner}/laminas-db) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.7 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
# remirepo:11
%else
BuildRequires: php-psr-http-message
@@ -84,10 +84,10 @@ BuildRequires: php-laminas-validator
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
+# "php": "^7.3 || ~8.0.0 || ~8.1.0",
# "ext-dom": "*",
# "ext-libxml": "*",
-# "laminas/laminas-escaper": "^2.5.2",
+# "laminas/laminas-escaper": "^2.9",
# "laminas/laminas-stdlib": "^3.2.1",
# "laminas/laminas-zendframework-bridge": "^1.0"
Requires: php(language) >= 7.3
@@ -97,8 +97,8 @@ Requires: php-libxml
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(psr/http-message) >= 1.0.1 with php-composer(psr/http-message) < 2)
-Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.5.2 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.2.1 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-escaper) >= 2.9 with php-autoloader(%{gh_owner}/laminas-escaper) < 3)
+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 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "suggest": {
# "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
@@ -213,7 +213,7 @@ exit (class_exists("\\Zend\\%{library}\\Uri") ? 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 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -236,6 +236,13 @@ exit $ret
%changelog
+* Fri Sep 24 2021 Remi Collet <remi@remirepo.net> - 2.15.0-1
+- update to 2.15.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+- raise dependency on laminas-escaper 2.9
+- raise dependency on laminas-stdlib 3.6
+
* Tue Apr 6 2021 Remi Collet <remi@remirepo.net> - 2.14.1-1
- update to 2.14.1