Fix return statements #33130
Merged
Fix return statements #33130
Conversation
This file contains 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
nicolas-grekas
force-pushed
the
fix-ret
branch
from
016cf15
to
6a722df
Compare
yceruto
approved these changes
Aug 12, 2019
chalasr
approved these changes
Aug 12, 2019
| @@ -79,7 +79,7 @@ public function getUser() | |||
| } | |||
|
|
|||
| if (!$token = $tokenStorage->getToken()) { | |||
| return; | |||
| return null; | |||
There was a problem hiding this comment.
docblock should say @return object|null, could you fix it btw?
| @@ -446,12 +446,12 @@ protected function getUser() | |||
| } | |||
|
|
|||
| if (null === $token = $this->container->get('security.token_storage')->getToken()) { | |||
| return; | |||
| return null; | |||
nicolas-grekas
force-pushed
the
fix-ret
branch
from
6a722df
to
2bc05c8
Compare
nicolas-grekas
added a commit
that referenced
this pull request
Aug 13, 2019
This PR was merged into the 3.4 branch. Discussion ---------- Fix return statements | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Discovered while working on #30323 This will sync the code from 3.4 up to master, where adding return types will require these. Commits ------- 2bc05c8 Fix return statements
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.
Discovered while working on #30323
This will sync the code from 3.4 up to master, where adding return types will require these.