Skip to content
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.

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

Fix return statements #33130

Merged
merged 1 commit into from Aug 13, 2019

Conversation

@nicolas-grekas
Copy link
Member

commented Aug 12, 2019

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.

@nicolas-grekas nicolas-grekas added this to the 3.4 milestone Aug 12, 2019

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:fix-ret branch from 016cf15 to 6a722df Aug 12, 2019

@@ -79,7 +79,7 @@ public function getUser()
}
if (!$token = $tokenStorage->getToken()) {
return;
return null;

This comment has been minimized.

Copy link
@chalasr

chalasr Aug 12, 2019

Member

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;

This comment has been minimized.

Copy link
@chalasr

chalasr Aug 12, 2019

Member

same for the docblock

@nicolas-grekas nicolas-grekas force-pushed the nicolas-grekas:fix-ret branch from 6a722df to 2bc05c8 Aug 13, 2019

@nicolas-grekas nicolas-grekas merged commit 2bc05c8 into symfony:3.4 Aug 13, 2019

0 of 3 checks passed

fabbot.io Some changes should be done to comply with our standards.
Details
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

nicolas-grekas added a commit that referenced this pull request Aug 13, 2019

minor #33130 Fix return statements (nicolas-grekas)
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
Projects
None yet
4 participants
You can’t perform that action at this time.