Skip to content

[HttpKernel] [HttpCache] Fix deprecated error in HttpCache#getSurrogate #15306

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
m14t wants to merge 1 commit into from
Closed

[HttpKernel] [HttpCache] Fix deprecated error in HttpCache#getSurrogate #15306

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: 6 additions & 6 deletions src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@ public function getKernel()
*/
public function getSurrogate()
{
return $this->getEsi();
if (!$this->surrogate instanceof Esi) {
throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
}
Copy link
Contributor

@jakzal jakzal Jul 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be missing something, but does it really make sense to have this condition in getSurrogate() which is suppose to work with any surrogate?

Copy link
Member

@nicolas-grekas nicolas-grekas Jul 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you're right! would you open a PR?

Copy link
Member

@nicolas-grekas nicolas-grekas Jul 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hum, maybe not: previously, only ESI was allowed (by calling getEsi())
So allowing more surrogates would be a new feature.


return $this->surrogate;
}

/**
Expand All @@ -176,11 +180,7 @@ public function getEsi()
{
@trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0. Use the getSurrogate() method instead.', E_USER_DEPRECATED);

if (!$this->surrogate instanceof Esi) {
throw new \LogicException('This instance of HttpCache was not set up to use ESI as surrogate handler. You must overwrite and use createSurrogate');
}

return $this->surrogate;
return $this->getSurrogate();
}

/**
Expand Down