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

Remove ReturnTypeWillChange #42378

Merged
merged 1 commit into from
Aug 10, 2021

Conversation

derrabus
Copy link
Member

@derrabus derrabus commented Aug 4, 2021

Q A
Branch? 6.0
Bug fix? no
New feature? no
Deprecations? no
Tickets N/A
License MIT
Doc PR N/A

This PR removed the ReturnTypeWillChange attribute everywhere by adding actual return types.

@derrabus
Copy link
Member Author

derrabus commented Aug 4, 2021

We should probably wait until #42379 has been merged up as well.

@derrabus derrabus changed the title Remove ReturnTypeWillChange Remove ReturnTypeWillChange Aug 4, 2021
@Tobion
Copy link
Member

Tobion commented Aug 5, 2021

#42379 has been merged. Please include the relevant changes here as well.

@derrabus derrabus force-pushed the remove/return-type-will-change branch from b5ea60c to 8b2363b Compare August 5, 2021 00:09
@derrabus
Copy link
Member Author

derrabus commented Aug 5, 2021

Done.

@@ -601,12 +601,11 @@ public function in(string|array $dirs)
*
* This method implements the IteratorAggregate interface.
*
* @return \Iterator|SplFileInfo[] An iterator
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we might want to fix those phpdocs in lower branches?

@derrabus
Copy link
Member Author

derrabus commented Aug 5, 2021

The failing test is fixed and backported as #42384. I'll take care of the Psalm failures later.

Tobion added a commit that referenced this pull request Aug 5, 2021
This PR was merged into the 4.4 branch.

Discussion
----------

[HttpFoundation] Fix broken mock

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | N/A
| License       | MIT
| Doc PR        | N/A

Backport from #42378.

This PR fixes a couple of mocked methods that currently return `null` although a real implementation would never do that.

Commits
-------

af37c64 Fix broken mock
@derrabus derrabus force-pushed the remove/return-type-will-change branch 2 times, most recently from e76842e to ef2ab70 Compare August 10, 2021 17:56
@derrabus
Copy link
Member Author

PR is ready again.

Signed-off-by: Alexander M. Turek <me@derrabus.de>
@derrabus derrabus force-pushed the remove/return-type-will-change branch from ef2ab70 to 2d3e1ed Compare August 10, 2021 18:37
@Tobion
Copy link
Member

Tobion commented Aug 10, 2021

Thank you @derrabus.

@Tobion Tobion merged commit 08b0176 into symfony:6.0 Aug 10, 2021
@derrabus derrabus deleted the remove/return-type-will-change branch August 10, 2021 19:08
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