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

Turned return type annotations of private methods into php return types #32993

Merged

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Aug 6, 2019

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.

@derrabus derrabus changed the title Turned return type annotations of private methods into php return types. Turned return type annotations of private methods into php return types Aug 6, 2019
@nicolas-grekas nicolas-grekas added this to the next milestone Aug 6, 2019
@derrabus derrabus force-pushed the improvement/private-return-types branch from 3872e44 to 7ef2637 Compare August 6, 2019 15:18
@derrabus
Copy link
Member Author

derrabus commented Aug 6, 2019

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.

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.
@nicolas-grekas
Copy link
Member

can be rebased

@derrabus
Copy link
Member Author

derrabus commented Aug 7, 2019

@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.
@derrabus derrabus force-pushed the improvement/private-return-types branch 2 times, most recently from b6c3786 to 150d81b Compare August 7, 2019 12:58
@derrabus
Copy link
Member Author

derrabus commented Aug 7, 2019

Done.

@nicolas-grekas
Copy link
Member

(tests fail)

@derrabus derrabus force-pushed the improvement/private-return-types branch from 150d81b to f54ca00 Compare August 7, 2019 14:20
@derrabus
Copy link
Member Author

derrabus commented Aug 7, 2019

Fixed.

@nicolas-grekas
Copy link
Member

Thank you @derrabus.

@nicolas-grekas nicolas-grekas merged commit f54ca00 into symfony:4.4 Aug 8, 2019
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.
@derrabus derrabus deleted the improvement/private-return-types branch August 8, 2019 08:51
@nicolas-grekas nicolas-grekas modified the milestones: next, 4.4 Oct 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants