Skip to content

Commit 15efa77

Browse files
committed
Fix message factory params order + User agent
1 parent 400e0c2 commit 15efa77

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

src/HttpAdapterTest.php

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public function testOptions($uri, array $headers = [], array $data = [], array $
168168
public function testSendRequest($uri, $method, array $headers = [], array $data = [])
169169
{
170170
$request = $this->httpAdapter->getConfiguration()->getMessageFactory()->createRequest(
171-
$uri,
172171
$method,
172+
$uri,
173173
RequestInterface::PROTOCOL_VERSION_1_1,
174174
$headers,
175175
http_build_query($data, null, '&')
@@ -190,8 +190,8 @@ public function testSendRequest($uri, $method, array $headers = [], array $data
190190
public function testSendInternalRequest($uri, $method, array $headers = [], array $data = [], array $files = [])
191191
{
192192
$request = $this->httpAdapter->getConfiguration()->getMessageFactory()->createInternalRequest(
193-
$uri,
194193
$method,
194+
$uri,
195195
RequestInterface::PROTOCOL_VERSION_1_1,
196196
$headers,
197197
$data,
@@ -219,7 +219,8 @@ public function testSendRequests()
219219
*/
220220
public function testSendErroredRequests()
221221
{
222-
list($requests, $erroredRequests) = $this->erroredRequestsProvider();
222+
$requests = $this->requestsProvider();
223+
$erroredRequests = $this->erroredRequestsProvider();
223224

224225
try {
225226
$this->httpAdapter->sendRequests(array_merge($requests, $erroredRequests));
@@ -259,7 +260,7 @@ public function testSendWithProtocolVersion10()
259260
);
260261

261262
$this->assertResponse(
262-
$this->httpAdapter->send($this->getUri(), $method = RequestInterface::METHOD_GET),
263+
$this->httpAdapter->send($method = RequestInterface::METHOD_GET, $this->getUri()),
263264
['protocol_version' => $protocolVersion]
264265
);
265266

@@ -273,7 +274,7 @@ public function testSendWithUserAgent()
273274
{
274275
$this->httpAdapter->getConfiguration()->setUserAgent($userAgent = 'foo');
275276

276-
$this->assertResponse($this->httpAdapter->send($this->getUri(), $method = RequestInterface::METHOD_GET));
277+
$this->assertResponse($this->httpAdapter->send($method = RequestInterface::METHOD_GET, $this->getUri()));
277278
$this->assertRequest($method, ['User-Agent' => $userAgent]);
278279
}
279280

@@ -283,7 +284,7 @@ public function testSendWithUserAgent()
283284
public function testSendWithClientError()
284285
{
285286
$this->assertResponse(
286-
$this->httpAdapter->send($uri = $this->getClientErrorUri(), $method = RequestInterface::METHOD_GET),
287+
$this->httpAdapter->send($method = RequestInterface::METHOD_GET, $uri = $this->getClientErrorUri()),
287288
[
288289
'status_code' => 400,
289290
'reason_phrase' => 'Bad Request',
@@ -299,7 +300,7 @@ public function testSendWithClientError()
299300
public function testSendWithServerError()
300301
{
301302
$this->assertResponse(
302-
$this->httpAdapter->send($uri = $this->getServerErrorUri(), $method = RequestInterface::METHOD_GET),
303+
$this->httpAdapter->send($method = RequestInterface::METHOD_GET, $uri = $this->getServerErrorUri()),
303304
[
304305
'status_code' => 500,
305306
'reason_phrase' => 'Internal Server Error',
@@ -315,7 +316,7 @@ public function testSendWithServerError()
315316
public function testSendWithRedirect()
316317
{
317318
$this->assertResponse(
318-
$this->httpAdapter->send($uri = $this->getRedirectUri(), $method = RequestInterface::METHOD_GET),
319+
$this->httpAdapter->send($method = RequestInterface::METHOD_GET, $uri = $this->getRedirectUri()),
319320
[
320321
'status_code' => 302,
321322
'reason_phrase' => 'Found',
@@ -332,7 +333,7 @@ public function testSendWithRedirect()
332333
*/
333334
public function testSendWithInvalidUri()
334335
{
335-
$this->httpAdapter->send($this->getInvalidUri(), RequestInterface::METHOD_GET);
336+
$this->httpAdapter->send(RequestInterface::METHOD_GET, $this->getInvalidUri());
336337
}
337338

338339
/**
@@ -343,7 +344,7 @@ public function testSendWithInvalidUri()
343344
public function testSendWithTimeoutExceeded($timeout)
344345
{
345346
$this->httpAdapter->getConfiguration()->setTimeout($timeout);
346-
$this->httpAdapter->send($this->getDelayUri($timeout), RequestInterface::METHOD_GET);
347+
$this->httpAdapter->send(RequestInterface::METHOD_GET, $this->getDelayUri($timeout));
347348
}
348349

349350
/**
@@ -457,12 +458,12 @@ public function internalRequestProvider()
457458
*/
458459
public function requestsProvider()
459460
{
460-
$requests = [$this->getUri()];
461+
$requests = [[RequestInterface::METHOD_GET, $this->getUri()]];
461462

462463
foreach ($this->requestProvider() as $request) {
463464
$requests[] = [
464-
$request[0],
465465
$request[1],
466+
$request[0],
466467
RequestInterface::PROTOCOL_VERSION_1_1,
467468
isset($request[2]) ? $request[2] : [],
468469
isset($request[3]) ? $request[3] : [],
@@ -472,8 +473,8 @@ public function requestsProvider()
472473

473474
foreach ($this->requestProvider() as $request) {
474475
$requests[] = $this->httpAdapter->getConfiguration()->getMessageFactory()->createRequest(
475-
$request[0],
476476
$request[1],
477+
$request[0],
477478
RequestInterface::PROTOCOL_VERSION_1_1,
478479
isset($request[2]) ? $request[2] : [],
479480
http_build_query(isset($request[3]) ? $request[3] : [], null, '&')
@@ -482,8 +483,8 @@ public function requestsProvider()
482483

483484
foreach ($this->requestProvider() as $request) {
484485
$requests[] = $this->httpAdapter->getConfiguration()->getMessageFactory()->createInternalRequest(
485-
$request[0],
486486
$request[1],
487+
$request[0],
487488
RequestInterface::PROTOCOL_VERSION_1_1,
488489
isset($request[2]) ? $request[2] : [],
489490
isset($request[3]) ? $request[3] : [],
@@ -499,10 +500,7 @@ public function requestsProvider()
499500
*/
500501
public function erroredRequestsProvider()
501502
{
502-
return [
503-
$this->requestsProvider(),
504-
[$this->getInvalidUri()],
505-
];
503+
return [[RequestInterface::METHOD_GET, $this->getInvalidUri()]];
506504
}
507505

508506
/**
@@ -581,7 +579,7 @@ protected function assertRequest(
581579

582580
$defaultHeaders = [
583581
'Connection' => 'close',
584-
'User-Agent' => 'Php Http Adapter',
582+
'User-Agent' => 'PHP Http Adapter',
585583
];
586584

587585
$headers = array_merge($defaultHeaders, $headers);

0 commit comments

Comments
 (0)