10000 [HttpFoundation] reset callback on StreamedResponse when setNotModified() is called by rubencm · Pull Request #27937 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpFoundation] reset callback on StreamedResponse when setNotModified() is called #27937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2018
Merged

[HttpFoundation] reset callback on StreamedResponse when setNotModified() is called #27937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Symfony/Component/HttpFoundation/StreamedResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,16 @@ public function getContent()
{
return false;
}

/**
* {@inheritdoc}
*
* @return $this
*/
public function setNotModified()
{
$this->setCallback(function () {});

return parent::setNotModified();
}
}
7 changes: 6 additions & 1 deletion src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ public function testMustRevalidateWithProxyRevalidateCacheControlHeader()

public function testSetNotModified()
{
$response = new Response();
$response = new Response('foo');
$modified = $response->setNotModified();
$this->assertObjectHasAttribute('headers', $modified);
$this->assertObjectHasAttribute('content', $modified);
Expand All @@ -135,6 +135,11 @@ public function testSetNotModified()
$this->assertObjectHasAttribute('statusText', $modified);
$this->assertObjectHasAttribute('charset', $modified);
$this->assertEquals(304, $modified->getStatusCode());

ob_start();
$modified->sendContent();
$string = ob_get_clean();
$this->assertEmpty($string);
}

public function testIsSuccessful()
Expand Down
18 changes: 18 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,22 @@ public function testReturnThis()
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
}

public function testSetNotModified()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$modified = $response->setNotModified();
$this->assertObjectHasAttribute('headers', $modified);
$this->assertObjectHasAttribute('content', $modified);
$this->assertObjectHasAttribute('version', $modified);
$this->assertObjectHasAttribute('statusCode', $modified);
$this->assertObjectHasAttribute('statusText', $modified);
$this->assertObjectHasAttribute('charset', $modified);
$this->assertEquals(304, $modified->getStatusCode());

ob_start();
$modified->sendContent();
$string = ob_get_clean();
$this->assertEmpty($string);
}
}
0