summaryrefslogtreecommitdiffstats
path: root/4.patch
blob: 72d3a92b99a2980fd0fbe10d16680f5ab1b40819 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
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