[FrameworkBundle] Added GlobalVariables::getToken() #20773
Merged
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
Simperfit
approved these changes
Dec 6, 2016
|
While I agree that this is nice for consistency, I do not agree with it being a bug fix. So I would vote for merging this into the |
| /** | ||
| * Returns the current user. | ||
| * | ||
| * @return mixed |
There was a problem hiding this comment.
If it were to be removed, shouldn't this be removed in 2.7 instead?
There was a problem hiding this comment.
No, it's just that we don't add such annotations anymore. Old code should be kept as is.
|
Should be merged in master. |
69857e5 to
543ebd4
Compare
543ebd4 to
099b848
Compare
|
Fixed and rebased on master. |
xabbuh
reviewed
Dec 9, 2016
|
|
||
| if (!$token = $tokenStorage->getToken()) { | ||
| /** | ||
| * Returns the current user. |
There was a problem hiding this comment.
If you removed the return type, you could IMO remove the whole docblock.
|
Thank you @HeahDude. |
fabpot
added a commit
that referenced
this pull request
Dec 13, 2016
…eahDude) This PR was merged into the 3.3-dev branch. Discussion ---------- [FrameworkBundle] Added GlobalVariables::getToken() | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/symfony-docs#7191 comments | License | MIT | Doc PR | symfony/symfony-docs#7191 I propose this feature as bug fix in 3.2, since I don't use the PHP templating I forgot to add the method in the `FrameworkBundle`, to keep it align with the `TwigBridge` in #19991. Is this acceptable or should it go in master? Commits ------- 099b848 Added GlobalVariables::getToken()
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.
I propose this feature as bug fix in 3.2, since I don't use the PHP templating I forgot to add the method in the
FrameworkBundle, to keep it align with theTwigBridgein #19991.Is this acceptable or should it go in master?