Skip to content

ext/standard/info.c: Various refactoring #15366

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
merged 2 commits into from
Aug 13, 2024
Merged

Conversation

Girgias
Copy link
Member

@Girgias Girgias commented Aug 12, 2024

No description provided.

@Girgias Girgias force-pushed the filter-refactor branch 2 times, most recently from 3cc121c to 55050a1 Compare August 12, 2024 22:55
@Girgias Girgias marked this pull request as ready for review August 13, 2024 00:17
@Girgias Girgias requested a review from bukka as a code owner August 13, 2024 00:17
@Girgias
Copy link
Member Author

Girgias commented Aug 13, 2024

@cmb69 could you maybe double-check the Windows changes?

Copy link
Member

@cmb69 cmb69 left a comment

Choose a reason for hiding this comment

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

I've left a couple of remarks. The changes to info.c look generally good to me.

It's amazing to see 350 LOC just to get the name of the Windows version. We could drop a few, since we're no longer supporting Vista and 7 and the respective server versions, but that shouldn't be done in this refactoring PR.

@Girgias Girgias changed the title ext/standard: Various refactoring ext/standard/info.c: Various refactoring Aug 13, 2024
@Girgias
Copy link
Member Author

Girgias commented Aug 13, 2024

I merged some changes, split the mail.c ones to another PR, and amended the fixes into the respective commits.

Copy link
Member

@cmb69 cmb69 left a comment

Choose a reason for hiding this comment

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

Thank you, this is fine! Maybe address the nit below, or feel free to merge without.

@@ -602,9 +602,10 @@ static char* php_get_windows_name()
}
}
} else {
return NULL;
ZEND_UNREACHABLE();
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I think this is fine given that this PR targets master.

@Girgias Girgias merged commit d63caf0 into php:master Aug 13, 2024
8 of 9 checks passed
@Girgias Girgias deleted the filter-refactor branch August 13, 2024 14:57
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.

2 participants