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

Reduce redundant else-branching (after throws), add missing @throws annotations #138

Closed
wants to merge 2 commits into from

Conversation

glensc
Copy link
Contributor

@glensc glensc commented Oct 11, 2022

kay.stenschke and others added 2 commits October 11, 2022 19:12
@glensc
Copy link
Contributor Author

glensc commented Oct 11, 2022

php 8.0 job needs retry. i don't have permission to do so myself. some temporary error setting up container.

@falkenhawk
Copy link
Member

falkenhawk commented Oct 12, 2022

@glensc @throws tags are useful indeed.

But do we really need all the code beautifying? let the zf1 be the ugly beast, only taming it to make it work without errors on newer php versions. I don't want to follow the path of others trying to make the codebase look cleaner or more modern :)

@falkenhawk
Copy link
Member

or is it a matter of a IDE complaining there, for redundant else after return, when using zf1 in a project?

@glensc
Copy link
Contributor Author

glensc commented Oct 12, 2022

that's the thing, we don't need, but doing so makes it easier to pull changes from the other repo if the codebase is not that diverged. i reviewed the diffs here many times, these seem to do what they describe. no extra code, no side effects.

@glensc
Copy link
Contributor Author

glensc commented Oct 12, 2022

I already excluded whitespace and formatting changes (if you open the original pull request), which makes merging the codebase more difficult again, but at least diff -w might help (haven't tested)

@glensc
Copy link
Contributor Author

glensc commented Oct 12, 2022

Extracted annotations:

so you can decide about the other changes here later.

@falkenhawk
Copy link
Member

Oh that's lovely, thanks @glensc . I will look into it

@falkenhawk
Copy link
Member

decided to go with #140 instead

@falkenhawk falkenhawk closed this Nov 7, 2022
@glensc glensc mentioned this pull request Jan 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants