-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Turned return type annotations of private methods into php return types #32993
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
Merged
nicolas-grekas
merged 1 commit into
symfony:4.4
from
derrabus:improvement/private-return-types
Aug 8, 2019
Merged
Turned return type annotations of private methods into php return types #32993
nicolas-grekas
merged 1 commit into
symfony:4.4
from
derrabus:improvement/private-return-types
Aug 8, 2019
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
derrabus
commented
Aug 6, 2019
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
Outdated
Show resolved
Hide resolved
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
Outdated
Show resolved
Hide resolved
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
Outdated
Show resolved
Hide resolved
derrabus
commented
Aug 6, 2019
3872e44
to
7ef2637
Compare
I'll fix broken PHPDocs and inconsistent returns that I've found while working on this PR with separate PRs on lower branches, probably tomorrow. |
Tobion
reviewed
Aug 6, 2019
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
Outdated
Show resolved
Hide resolved
Tobion
reviewed
Aug 6, 2019
Tobion
reviewed
Aug 6, 2019
Tobion
reviewed
Aug 6, 2019
Tobion
reviewed
Aug 6, 2019
This was referenced Aug 7, 2019
nicolas-grekas
added a commit
that referenced
this pull request
Aug 7, 2019
This PR was merged into the 3.4 branch. Discussion ---------- Fix inconsistent return points | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17201 (partly) | License | MIT | Doc PR | N/A This PR fixes some inconsistent return points I've discovered while working on #32993. Adding return types made fixing these inconsistencies necessary, see also [this comment](#17201 (comment)). Commits ------- 1a83f9b Fix inconsistent return points.
can be rebased |
@nicolas-grekas The PR will probably conflict again once #33007 is merged, so I'll wait for that. |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 7, 2019
This PR was merged into the 3.4 branch. Discussion ---------- Fix some return type annotations | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A This PR fixed some incorrect return type declarations I discovered while working on #32993. Commits ------- 0a78dc0 Fix some return type annotations.
b6c3786
to
150d81b
Compare
Done. |
(tests fail) |
150d81b
to
f54ca00
Compare
Fixed. |
Thank you @derrabus. |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 8, 2019
…hp return types (derrabus) This PR was merged into the 4.4 branch. Discussion ---------- Turned return type annotations of private methods into php return types | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A As discussed with @nicolas-grekas in #30323 (comment), this PR attempts to turn `@return` annotations on private methods into return type declarations. Commits ------- f54ca00 Turned return type annotations of private methods into php return types.
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.
As discussed with @nicolas-grekas in #30323 (comment), this PR attempts to turn
@return
annotations on private methods into return type declarations.