summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-12-07 15:41:15 +0100
committerRemi Collet <remi@php.net>2021-12-07 15:41:15 +0100
commit46b8aa989848d7e0f45113e6d969685b5c5b8e13 (patch)
tree1d2614654eb51bf57ceef9e935bc1183bfce887b
parent27439e4eaa66abc73772573eb3e40388ab4aa835 (diff)
update to 1.6.0 (no change)
keep compatibility using laminas-zendframework-bridge as this is only used using compat autolader
-rw-r--r--composer.json7
-rw-r--r--php-laminas-psr7bridge.spec12
2 files changed, 10 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index 2a916d7..11d4c8b 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,6 @@
"php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-diactoros": "^1.7 || ^2.0",
"laminas/laminas-http": "^2.15",
- "laminas/laminas-zendframework-bridge": "^1.0",
"psr/http-message": "^1.0"
},
"require-dev": {
@@ -36,7 +35,8 @@
"vimeo/psalm": "^4.11"
},
"conflict": {
- "laminas/laminas-stdlib": "< 3.2.1"
+ "laminas/laminas-stdlib": "< 3.2.1",
+ "zendframework/zend-psr7bridge": "*"
},
"autoload": {
"psr-4": {
@@ -58,8 +58,5 @@
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"static-analysis": "psalm --shepherd --stats"
- },
- "replace": {
- "zendframework/zend-psr7bridge": "^1.2.0"
}
}
diff --git a/php-laminas-psr7bridge.spec b/php-laminas-psr7bridge.spec
index 3194c4f..a121880 100644
--- a/php-laminas-psr7bridge.spec
+++ b/php-laminas-psr7bridge.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit a560f42d66fc11b0b05e7d2103e69e434365e7c1
+%global gh_commit c151fe1bff398309f95f20c16f48398ee194ee62
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-psr7bridge
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 1.5.0
+Version: 1.6.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -66,7 +66,6 @@ BuildRequires: php-fedora-autoloader-devel
# "php": "^7.3 || ~8.0.0 || ~8.1.0",
# "laminas/laminas-diactoros": "^1.7 || ^2.0",
# "laminas/laminas-http": "^2.15",
-# "laminas/laminas-zendframework-bridge": "^1.0",
# "psr/http-message": "^1.0"
Requires: php(language) >= 7.3
# remirepo:1
@@ -160,7 +159,7 @@ exit (class_exists("\\Zend\\%{library}\\Psr7Response") ? 0 : 1);
: upstream test suite
ret=0
-for cmd in php php73 php74 php80 php81; do
+for cmd in php php74 php80 php81; do
if which $cmd; then
$cmd %{_bindir}/phpunit9 || ret=1
fi
@@ -182,6 +181,11 @@ exit $ret
%changelog
+* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0 (no change)
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
* Fri Oct 29 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1
- update to 1.5.0 (no change)