Skip to content

Commit 45e5bae

Browse files
committed
Fix @var annotation for Response::$statusCode and @return annotation for Response::getStatusCode()
1 parent 3e8bc25 commit 45e5bae

3 files changed

Lines changed: 15 additions & 33 deletions

File tree

phpstan-baseline.neon

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -660,12 +660,6 @@ parameters:
660660
count: 1
661661
path: src/Response.php
662662

663-
-
664-
message: '#^Method yii\\httpclient\\Response\:\:getStatusCode\(\) should return string but returns string\|null\.$#'
665-
identifier: return.type
666-
count: 1
667-
path: src/Response.php
668-
669663
-
670664
message: '#^Method yii\\httpclient\\StreamTransport\:\:composeContextOptions\(\) has parameter \$options with no value type specified in iterable type array\.$#'
671665
identifier: missingType.iterableValue
@@ -1056,12 +1050,6 @@ parameters:
10561050
count: 1
10571051
path: tests/ResponseTest.php
10581052

1059-
-
1060-
message: '#^Method yiiunit\\extensions\\httpclient\\ResponseTest\:\:dataProviderIsOk\(\) return type has no value type specified in iterable type array\.$#'
1061-
identifier: missingType.iterableValue
1062-
count: 1
1063-
path: tests/ResponseTest.php
1064-
10651053
-
10661054
message: '#^Method yiiunit\\extensions\\httpclient\\ResponseTest\:\:dataProviderParseBody\(\) return type has no value type specified in iterable type array\.$#'
10671055
identifier: missingType.iterableValue

src/Response.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Response represents HTTP request response.
1616
*
1717
* @property-read bool $isOk Whether response is OK.
18-
* @property-read string $statusCode Status code.
18+
* @property-read string|null $statusCode Status code.
1919
*
2020
* @author Paul Klimov <klimov.paul@gmail.com>
2121
* @since 2.0
@@ -56,7 +56,7 @@ public function getCookies()
5656
/**
5757
* Returns status code.
5858
* @throws Exception on failure.
59-
* @return string status code.
59+
* @return string|null status code.
6060
*/
6161
public function getStatusCode()
6262
{

tests/ResponseTest.php

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,13 @@ public function testGetStatusCode(): void
171171
{
172172
$response = new Response();
173173

174-
$statusCode = 123;
174+
$statusCode = '123';
175175
$response->setHeaders(['http-code' => $statusCode]);
176-
$this->assertEquals($statusCode, $response->getStatusCode());
176+
$this->assertSame($statusCode, $response->getStatusCode());
177177

178-
$statusCode = 123;
179-
$response->setHeaders(['http-code' => [
180-
$statusCode + 10,
181-
$statusCode,
182-
]]);
183-
$this->assertEquals($statusCode, $response->getStatusCode());
178+
$statusCode = '123';
179+
$response->setHeaders(['http-code' => ['133', $statusCode]]);
180+
$this->assertSame($statusCode, $response->getStatusCode());
184181
}
185182

186183
public function testUnableToGetStatusCode(): void
@@ -194,31 +191,28 @@ public function testUnableToGetStatusCode(): void
194191

195192
/**
196193
* Data provider for [[testIsOk()]]
197-
* @return array test data.
194+
* @return list<array{string, bool}> test data.
198195
*/
199196
public function dataProviderIsOk(): array
200197
{
201198
return [
202-
[100, false],
203-
[200, true],
204-
[201, true],
205-
[226, true],
206-
[400, false],
199+
['100', false],
200+
['200', true],
201+
['201', true],
202+
['226', true],
203+
['400', false],
207204
];
208205
}
209206

210207
/**
211208
* @dataProvider dataProviderIsOk
212209
* @depends testGetStatusCode
213-
*
214-
* @param int $statusCode
215-
* @param bool $isOk
216210
*/
217-
public function testIsOk($statusCode, $isOk): void
211+
public function testIsOk(string $statusCode, bool $isOk): void
218212
{
219213
$response = new Response();
220214
$response->setHeaders(['http-code' => $statusCode]);
221-
$this->assertEquals($isOk, $response->getIsOk());
215+
$this->assertSame($isOk, $response->getIsOk());
222216
}
223217

224218
public function testParseCookieHeader(): void

0 commit comments

Comments
 (0)