8000 [HttpKernel] render_esi should behave in dev as it does in prod by bpaulin · Pull Request #15056 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[HttpKernel] render_esi should behave in dev as it does in prod #15056

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

Closed
wants to merge 2 commits into from
Closed

[HttpKernel] render_esi should behave in dev as it does in prod #15056

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
971e1d6
render_esi behaviour when fallback
bpaulin Jun 21, 2015
15900ee
code style
bpaulin Sep 3, 2015
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
Prev Previous commit
code style
  • Loading branch information
@bpaulin
bpaulin committed Sep 3, 2015
commit 15900ee50f9ffbe0a0266b27ad363f9008f436af
3 changes: 1 addition & 2 deletions src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ public function render($uri, Request $request, array $options = array())
// want that as we want to preserve objects (so we manually set Request attributes
// below instead)
$attributes = $reference->attributes;
if (isset($options['is_fallback']) && $options['is_fallback'] )
{
if (isset($options['is_fallback']) && $options['is_fallback']) {
$this->checkNonScalar($attributes);
unset($options['is_fallback']);
}
Expand Down
6 changes: 2 additions & 4 deletions src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,10 @@ private function getInlineStrategy($called = false, $options = false)
$inline = $this->getMockBuilder('Symfony\Component\HttpKernel\Fragment\InlineFragmentRenderer')->disableOriginalConstructor()->getMock();

if ($called) {
if ($options)
{
if ($options) {
$inline->expects($this->once())->method('render')->with($this->anything(), $this->anything(), $options);
}
else
{
else {
$inline->expects($this->once())->method('render');
}
}
Expand Down
0