Skip to content

Commit f92ada6

Browse files
xabbuhnicolas-grekas
authored andcommitted
stop using assertObjectHasAttribute()/assertObjectHasNotAttribute()
1 parent ba0cd9a commit f92ada6

File tree

3 files changed

+5
-28
lines changed

3 files changed

+5
-28
lines changed

Tests/RequestTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,10 +1668,7 @@ public function testGetSession()
16681668
$request->setSession(new Session(new MockArraySessionStorage()));
16691669
$this->assertTrue($request->hasSession());
16701670

1671-
$session = $request->getSession();
1672-
$this->assertObjectHasAttribute('storage', $session);
1673-
$this->assertObjectHasAttribute('flashName', $session);
1674-
$this->assertObjectHasAttribute('attributeName', $session);
1671+
$this->assertInstanceOf(Session::class, $request->getSession());
16751672
}
16761673

16771674
public function testHasPreviousSession()

Tests/ResponseTest.php

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,14 @@ public function testSendHeaders()
5151
{
5252
$response = new Response();
5353
$headers = $response->sendHeaders();
54-
$this->assertObjectHasAttribute('headers', $headers);
55-
$this->assertObjectHasAttribute('content', $headers);
56-
$this->assertObjectHasAttribute('version', $headers);
57-
$this->assertObjectHasAttribute('statusCode', $headers);
58-
$this->assertObjectHasAttribute('statusText', $headers);
59-
$this->assertObjectHasAttribute('charset', $headers);
54+
$this->assertSame($response, $headers);
6055
}
6156

6257
public function testSend()
6358
{
6459
$response = new Response();
6560
$responseSend = $response->send();
66-
$this->assertObjectHasAttribute('headers', $responseSend);
67-
$this->assertObjectHasAttribute('content', $responseSend);
68-
$this->assertObjectHasAttribute('version', $responseSend);
69-
$this->assertObjectHasAttribute('statusCode', $responseSend);
70-
$this->assertObjectHasAttribute('statusText', $responseSend);
71-
$this->assertObjectHasAttribute('charset', $responseSend);
61+
$this->assertSame($response, $responseSend);
7262
}
7363

7464
public function testGetCharset()
@@ -132,12 +122,7 @@ public function testSetNotModified()
132122
{
133123
$response = new Response('foo');
134124
$modified = $response->setNotModified();
135-
$this->assertObjectHasAttribute('headers', $modified);
136-
$this->assertObjectHasAttribute('content', $modified);
137-
$this->assertObjectHasAttribute('version', $modified);
138-
$this->assertObjectHasAttribute('statusCode', $modified);
139-
$this->assertObjectHasAttribute('statusText', $modified);
140-
$this->assertObjectHasAttribute('charset', $modified);
125+
$this->assertSame($response, $modified);
141126
$this->assertEquals(304, $modified->getStatusCode());
142127

143128
ob_start();

Tests/StreamedResponseTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,7 @@ public function testSetNotModified()
127127
{
128128
$response = new StreamedResponse(function () { echo 'foo'; });
129129
$modified = $response->setNotModified();
130-
$this->assertObjectHasAttribute('headers', $modified);
131-
$this->assertObjectHasAttribute('content', $modified);
132-
$this->assertObjectHasAttribute('version', $modified);
133-
$this->assertObjectHasAttribute('statusCode', $modified);
134-
$this->assertObjectHasAttribute('statusText', $modified);
135-
$this->assertObjectHasAttribute('charset', $modified);
130+
$this->assertSame($response, $modified);
136131
$this->assertEquals(304, $modified->getStatusCode());
137132

138133
ob_start();

0 commit comments

Comments
 (0)