[WebProfilerBundle] fixed getSession when no session has been set deprecation warnings #27458
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
javiereguiluz
approved these changes
Jun 1, 2018
nicolas-grekas
approved these changes
Jun 1, 2018
| @@ -180,7 +180,7 @@ public function searchBarAction(Request $request) | |||
| $this->cspHandler->disableCsp(); | |||
| } | |||
|
|
|||
| if (null === $session = $request->getSession()) { | |||
| if (!$request->hasSession() || null === ($session = $request->getSession())) { | |||
There was a problem hiding this comment.
I'd suggest to use if (!$request->hasSession() || !$session = $request->getSession()) {
| @@ -289,7 +289,7 @@ public function searchAction(Request $request) | |||
| $limit = $request->query->get('limit'); | |||
| $token = $request->query->get('token'); | |||
|
|
|||
| if (null !== $session = $request->getSession()) { | |||
| if ($request->hasSession() && ($session = $request->getSession())) { | |||
There was a problem hiding this comment.
if ($request->hasSession() && $session = $request->getSession()) {
alcalyn
reviewed
Jun 1, 2018
| @@ -1,7 +1,7 @@ | |||
| {% extends '@WebProfiler/Profiler/layout.html.twig' %} | |||
|
|
|||
| {% macro profile_search_filter(request, result, property) %} | |||
| {%- if request.session is not null -%} | |||
| {%- if request.hasSession and request.session is not null -%} | |||
There was a problem hiding this comment.
Why not only {%- if request.hasSession -%} ?
xabbuh
reviewed
Jun 2, 2018
| @@ -180,7 +180,7 @@ public function searchBarAction(Request $request) | |||
| $this->cspHandler->disableCsp(); | |||
| } | |||
|
|
|||
| if (null === $session = $request->getSession()) { | |||
| if (!$request->hasSession() || !$session = $request->getSession()) { | |||
There was a problem hiding this comment.
if (!$request->hasSession()) is enough
There was a problem hiding this comment.
Are you sure? I think we need $session in the else part.
We could move $session = $request->getSession() into the else though.
There was a problem hiding this comment.
moving it to the else seems reasonable to me
xabbuh
approved these changes
Jun 2, 2018
alcalyn
approved these changes
Jun 4, 2018
…recation warnings
|
Thank you @GregOriol. |
nicolas-grekas
added a commit
that referenced
this pull request
Jun 4, 2018
…een set deprecation warnings (GregOriol) This PR was submitted for the master branch but it was squashed and merged into the 4.1 branch instead (closes #27458). Discussion ---------- [WebProfilerBundle] fixed getSession when no session has been set deprecation warnings | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | none but see comment | License | MIT Symfony 4.1 adds deprecation warnings when getSession is called and a session has not been set. Some code in the WebProfiler was not up-to-date to use hasSession before. (this actually caused [Silex-WebProfiler](https://github.com/silexphp/Silex-WebProfiler)'s tests to fail) Commits ------- 0f3ba5a [WebProfilerBundle] fixed getSession when no session has been set deprecation warnings
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Symfony 4.1 adds deprecation warnings when getSession is called and a session has not been set.
Some code in the WebProfiler was not up-to-date to use hasSession before.
(this actually caused Silex-WebProfiler's tests to fail)