rebuild for PHP 8.0.0RC1

add patch from https://github.com/improved-php-library/http-message/pull/4

2 files changed, 340 insertions, 1 deletions

diff --git a/4.patch b/4.patch
new file mode 100644
index 0000000..72d3a92
--- /dev/null
+++ b/4.patch
@@ -0,0 +1,330 @@
+From 26c91577076827570ccfdb35fd88f06aa123dd09 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Sep 2020 10:41:06 +0200
+Subject: [PATCH] relax test for 8.0.0RC1
+
+---
+ tests/Factory/createServerRequest_err01.phpt | 4 ++--
+ tests/Message/body_err01.phpt                | 2 +-
+ tests/Message/headers_err01.phpt             | 2 +-
+ tests/Message/headers_err02.phpt             | 2 +-
+ tests/Message/headers_err03.phpt             | 2 +-
+ tests/Message/headers_err04.phpt             | 2 +-
+ tests/Message/headers_err05.phpt             | 2 +-
+ tests/Message/protocolVersion_err01.phpt     | 2 +-
+ tests/Request/method_err01.phpt              | 2 +-
+ tests/Request/requestTarget_err01.phpt       | 2 +-
+ tests/Request/uri_err01.phpt                 | 2 +-
+ tests/Response/status_err01.phpt             | 2 +-
+ tests/ServerRequest/attributes_err01.phpt    | 2 +-
+ tests/ServerRequest/cookieParams_err01.phpt  | 2 +-
+ tests/ServerRequest/parsedBody_err01.phpt    | 2 +-
+ tests/ServerRequest/queryParams_err01.phpt   | 2 +-
+ tests/Stream/read_err01.phpt                 | 4 ++--
+ tests/Stream/seek_err01.phpt                 | 4 ++--
+ tests/Stream/write_err01.phpt                | 4 ++--
+ tests/Uri/fragment_err02.phpt                | 4 ++--
+ tests/Uri/host_error.phpt                    | 2 +-
+ tests/Uri/path_err02.phpt                    | 4 ++--
+ tests/Uri/port_err02.phpt                    | 4 ++--
+ tests/Uri/query_err02.phpt                   | 4 ++--
+ tests/Uri/scheme_err02.phpt                  | 4 ++--
+ tests/Uri/userInfo_err02.phpt                | 4 ++--
+ 26 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/tests/Factory/createServerRequest_err01.phpt b/tests/Factory/createServerRequest_err01.phpt
+index f30c26b..004abc4 100644
+--- a/tests/Factory/createServerRequest_err01.phpt
++++ b/tests/Factory/createServerRequest_err01.phpt
+@@ -30,7 +30,7 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\Factory::createServerRequest() expects at least 2 parameters, 0 given
+-HttpMessage\Factory::createServerRequest() expects at least 2 parameters, 1 given
++HttpMessage\Factory::createServerRequest() expects at least 2 %s, 0 given
++HttpMessage\Factory::createServerRequest() expects at least 2 %s, 1 given
+ HttpMessage\Factory::createServerRequest() expects parameter 1 to be a string or object that implements Psr\Http\Message\UriInterface, array given
+ %sttpMessage\Factory::createServerRequest()%sarray, string given
+diff --git a/tests/Message/body_err01.phpt b/tests/Message/body_err01.phpt
+index 571fb38..720ff6a 100644
+--- a/tests/Message/body_err01.phpt
++++ b/tests/Message/body_err01.phpt
+@@ -20,4 +20,4 @@ try {
+ ?>
+ --EXPECTF--
+ %sttpMessage\Message::withBody()%s Psr\Http\Message\StreamInterface, resource given
+-HttpMessage\Message::withBody() expects exactly 1 parameter, 0 given
++HttpMessage\Message::withBody() expects exactly 1 %s, 0 given
+diff --git a/tests/Message/headers_err01.phpt b/tests/Message/headers_err01.phpt
+index 84332bc..797aff0 100644
+--- a/tests/Message/headers_err01.phpt
++++ b/tests/Message/headers_err01.phpt
+@@ -25,5 +25,5 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Message::withHeader()%sstring, array given
+-HttpMessage\Message::withHeader() expects exactly 2 parameters, 1 given
++HttpMessage\Message::withHeader() expects exactly 2 %s, 1 given
+ HttpMessage\Message::withHeader()%sstring, array given
+diff --git a/tests/Message/headers_err02.phpt b/tests/Message/headers_err02.phpt
+index 607fa13..a9e5c9c 100644
+--- a/tests/Message/headers_err02.phpt
++++ b/tests/Message/headers_err02.phpt
+@@ -25,5 +25,5 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Message::withAddedHeader()%sstring, array given
+-HttpMessage\Message::withAddedHeader() expects exactly 2 parameters, 1 given
++HttpMessage\Message::withAddedHeader() expects exactly 2 %s, 1 given
+ HttpMessage\Message::withAddedHeader()%sstring, array given
+diff --git a/tests/Message/headers_err03.phpt b/tests/Message/headers_err03.phpt
+index ed65c5a..5888ab3 100644
+--- a/tests/Message/headers_err03.phpt
++++ b/tests/Message/headers_err03.phpt
+@@ -19,4 +19,4 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Message::withoutHeader()%sstring, array given
+-HttpMessage\Message::withoutHeader() expects exactly 1 parameter, 0 given
++HttpMessage\Message::withoutHeader() expects exactly 1 %s, 0 given
+diff --git a/tests/Message/headers_err04.phpt b/tests/Message/headers_err04.phpt
+index 2be1ac0..b6a6762 100644
+--- a/tests/Message/headers_err04.phpt
++++ b/tests/Message/headers_err04.phpt
+@@ -19,4 +19,4 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Message::getHeader()%sstring, array given
+-HttpMessage\Message::getHeader() expects exactly 1 parameter, 0 given
++HttpMessage\Message::getHeader() expects exactly 1 %s, 0 given
+diff --git a/tests/Message/headers_err05.phpt b/tests/Message/headers_err05.phpt
+index ab2b43f..c2f2a58 100644
+--- a/tests/Message/headers_err05.phpt
++++ b/tests/Message/headers_err05.phpt
+@@ -19,4 +19,4 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Message::getHeaderLine()%sstring, array given
+-HttpMessage\Message::getHeaderLine() expects exactly 1 parameter, 0 given
++HttpMessage\Message::getHeaderLine() expects exactly 1 %s, 0 given
+diff --git a/tests/Message/protocolVersion_err01.phpt b/tests/Message/protocolVersion_err01.phpt
+index 6401d49..0f40115 100644
+--- a/tests/Message/protocolVersion_err01.phpt
++++ b/tests/Message/protocolVersion_err01.phpt
+@@ -17,5 +17,5 @@ try {
+ }
+ ?>
+ --EXPECTF--
+-HttpMessage\Message::withProtocolVersion() expects exactly 1 parameter, 0 given
++HttpMessage\Message::withProtocolVersion() expects exactly 1 %s, 0 given
+ HttpMessage\Message::withProtocolVersion()%sstring, array given
+diff --git a/tests/Request/method_err01.phpt b/tests/Request/method_err01.phpt
+index 4396100..95c155f 100644
+--- a/tests/Request/method_err01.phpt
++++ b/tests/Request/method_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\Request::withMethod() expects exactly 1 parameter, 0 given
++HttpMessage\Request::withMethod() expects exactly 1 %s, 0 given
+ HttpMessage\Request::withMethod()%sstring, array given
+diff --git a/tests/Request/requestTarget_err01.phpt b/tests/Request/requestTarget_err01.phpt
+index 2d93d63..97f976e 100644
+--- a/tests/Request/requestTarget_err01.phpt
++++ b/tests/Request/requestTarget_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\Request::withRequestTarget() expects exactly 1 parameter, 0 given
++HttpMessage\Request::withRequestTarget() expects exactly 1 %s, 0 given
+ HttpMessage\Request::withRequestTarget()%sstring, array given
+diff --git a/tests/Request/uri_err01.phpt b/tests/Request/uri_err01.phpt
+index 697e754..8803d73 100644
+--- a/tests/Request/uri_err01.phpt
++++ b/tests/Request/uri_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\Request::withUri() expects exactly 1 parameter, 0 given
++HttpMessage\Request::withUri() expects exactly 1 %s, 0 given
+ %sttpMessage\Request::withUri()%sPsr\Http\Message\UriInterface, string given
+diff --git a/tests/Response/status_err01.phpt b/tests/Response/status_err01.phpt
+index 5111e7d..75c6a82 100644
+--- a/tests/Response/status_err01.phpt
++++ b/tests/Response/status_err01.phpt
+@@ -24,6 +24,6 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\Response::withStatus() expects at least 1 parameter, 0 given
++HttpMessage\Response::withStatus() expects at least 1 %s, 0 given
+ HttpMessage\Response::withStatus()%sint, string given
+ HttpMessage\Response::withStatus()%sstring, array given
+diff --git a/tests/ServerRequest/attributes_err01.phpt b/tests/ServerRequest/attributes_err01.phpt
+index b679674..c66373b 100644
+--- a/tests/ServerRequest/attributes_err01.phpt
++++ b/tests/ServerRequest/attributes_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\ServerRequest::withAttribute() expects exactly 2 parameters, 1 given
++HttpMessage\ServerRequest::withAttribute() expects exactly 2 %s, 1 given
+ HttpMessage\ServerRequest::withAttribute()%s string, array given
+diff --git a/tests/ServerRequest/cookieParams_err01.phpt b/tests/ServerRequest/cookieParams_err01.phpt
+index f1d4071..1dbe3e6 100644
+--- a/tests/ServerRequest/cookieParams_err01.phpt
++++ b/tests/ServerRequest/cookieParams_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\ServerRequest::withCookieParams() expects exactly 1 parameter, 0 given
++HttpMessage\ServerRequest::withCookieParams() expects exactly 1 %s, 0 given
+ %sttpMessage\ServerRequest::withCookieParams()%s array, string given
+diff --git a/tests/ServerRequest/parsedBody_err01.phpt b/tests/ServerRequest/parsedBody_err01.phpt
+index ec2a019..9f5b980 100644
+--- a/tests/ServerRequest/parsedBody_err01.phpt
++++ b/tests/ServerRequest/parsedBody_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\ServerRequest::withQueryParams() expects exactly 1 parameter, 0 given
++HttpMessage\ServerRequest::withQueryParams() expects exactly 1 %s, 0 given
+ HttpMessage\ServerRequest::withParsedBody()%sarray, string given
+diff --git a/tests/ServerRequest/queryParams_err01.phpt b/tests/ServerRequest/queryParams_err01.phpt
+index 593bdf7..a7dd760 100644
+--- a/tests/ServerRequest/queryParams_err01.phpt
++++ b/tests/ServerRequest/queryParams_err01.phpt
+@@ -18,5 +18,5 @@ try {
+ 
+ ?>
+ --EXPECTF--
+-HttpMessage\ServerRequest::withQueryParams() expects exactly 1 parameter, 0 given
++HttpMessage\ServerRequest::withQueryParams() expects exactly 1 %s, 0 given
+ %sttpMessage\ServerRequest::withQueryParams()%s array, string given
+diff --git a/tests/Stream/read_err01.phpt b/tests/Stream/read_err01.phpt
+index e774f51..d2076ff 100644
+--- a/tests/Stream/read_err01.phpt
++++ b/tests/Stream/read_err01.phpt
+@@ -11,5 +11,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Stream::read() expects exactly 1 parameter, 0 given
+\ No newline at end of file
++--EXPECTF--
++HttpMessage\Stream::read() expects exactly 1 %s, 0 given
+diff --git a/tests/Stream/seek_err01.phpt b/tests/Stream/seek_err01.phpt
+index 098e9bb..724eac5 100644
+--- a/tests/Stream/seek_err01.phpt
++++ b/tests/Stream/seek_err01.phpt
+@@ -11,5 +11,5 @@ try {
+     echo $e->getMessage();
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Stream::seek() expects at least 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Stream::seek() expects at least 1 %s, 0 given
+diff --git a/tests/Stream/write_err01.phpt b/tests/Stream/write_err01.phpt
+index c6f9d10..4a3a775 100644
+--- a/tests/Stream/write_err01.phpt
++++ b/tests/Stream/write_err01.phpt
+@@ -11,5 +11,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Stream::write() expects exactly 1 parameter, 0 given
+\ No newline at end of file
++--EXPECTF--
++HttpMessage\Stream::write() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/fragment_err02.phpt b/tests/Uri/fragment_err02.phpt
+index 8e52621..b706a6a 100644
+--- a/tests/Uri/fragment_err02.phpt
++++ b/tests/Uri/fragment_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withFragment() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withFragment() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/host_error.phpt b/tests/Uri/host_error.phpt
+index d0e1ceb..5f00ee0 100644
+--- a/tests/Uri/host_error.phpt
++++ b/tests/Uri/host_error.phpt
+@@ -16,4 +16,4 @@ try {
+ ?>
+ --EXPECTF--
+ HttpMessage\Uri::withHost()%s, array given
+-HttpMessage\Uri::withHost() expects exactly 1 parameter, 0 given
++HttpMessage\Uri::withHost() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/path_err02.phpt b/tests/Uri/path_err02.phpt
+index c588d02..35d6fdc 100644
+--- a/tests/Uri/path_err02.phpt
++++ b/tests/Uri/path_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withPath() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withPath() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/port_err02.phpt b/tests/Uri/port_err02.phpt
+index f50945c..a24b02c 100644
+--- a/tests/Uri/port_err02.phpt
++++ b/tests/Uri/port_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withPort() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withPort() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/query_err02.phpt b/tests/Uri/query_err02.phpt
+index c0fb791..220c2bc 100644
+--- a/tests/Uri/query_err02.phpt
++++ b/tests/Uri/query_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withQuery() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withQuery() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/scheme_err02.phpt b/tests/Uri/scheme_err02.phpt
+index 71f1c24..82ccc21 100644
+--- a/tests/Uri/scheme_err02.phpt
++++ b/tests/Uri/scheme_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withScheme() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withScheme() expects exactly 1 %s, 0 given
+diff --git a/tests/Uri/userInfo_err02.phpt b/tests/Uri/userInfo_err02.phpt
+index 93409dd..c637e0e 100644
+--- a/tests/Uri/userInfo_err02.phpt
++++ b/tests/Uri/userInfo_err02.phpt
+@@ -8,5 +8,5 @@ try {
+     echo $e->getMessage(), "\n";
+ }
+ ?>
+---EXPECT--
+-HttpMessage\Uri::withUserInfo() expects exactly 1 parameter, 0 given
++--EXPECTF--
++HttpMessage\Uri::withUserInfo() expects exactly 1 %s, 0 given
diff --git a/php-pecl-http-message.spec b/php-pecl-http-message.spec
index 0647ac2..e5d0473 100644
--- a/php-pecl-http-message.spec
+++ b/php-pecl-http-message.spec
@@ -21,12 +21,13 @@
 Summary:        PSR-7 HTTP Message implementation
 Name:           %{?sub_prefix}php-pecl-http-message
 Version:        0.2.2
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
 Patch0:         https://patch-diff.githubusercontent.com/raw/improved-php-library/http-message/pull/3.patch
+Patch1:         https://patch-diff.githubusercontent.com/raw/improved-php-library/http-message/pull/4.patch
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel > 7.2
@@ -93,6 +94,7 @@ mv %{pecl_name}-%{version}%{?prever} NTS
 
 cd NTS
 %patch0 -p1 -b .pr3
+%patch1 -p1 -b .pr4
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_HTTP_MESSAGE_VERSION/{s/.* "//;s/".*$//;p}' php_http_message.h)
@@ -241,6 +243,13 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 0.2.2-4
+- rebuild for PHP 8.0.0RC1
+- add patch from https://github.com/improved-php-library/http-message/pull/4
+
+* Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 0.2.2-3
+- rebuild for PHP 8.0.0beta3
+
 * Tue Sep  1 2020 Remi Collet <remi@remirepo.net> - 0.2.2-2
 - add patch for PHP 8 from
   https://github.com/improved-php-library/http-message/pull/3