Skip to content

Remove duplicated SKIP checks to improve performance #7858

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 1 commit into from
Jan 2, 2022

Conversation

kamil-tekiela
Copy link
Member

I thought this would speed up some tests, but it doesn't seem to improve it that much. It improves formatting and will prevent confusion in future tests in terms of which file should be included.

@cmb69
Copy link
Member

cmb69 commented Dec 30, 2021

Thanks for this! And also thanks for the improvements to gh7837.phpt. I'll do a review of this PR tomorrow.

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 like the cleanup of the inclusions of the helpers here.

I'm not sure about the changes in indentation; this still looks somewhat inconsistent, and it might be more reasonable to agree on a CS for PHPTs, and to enforce that with some automated script (scripts/dev/tidy.php might be extended).

Other than that, this looks good to me. Thank you!

@@ -4,13 +4,15 @@ mysqli_ssl_set() - test is a stub!
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
die("skip test is a stub!");
Copy link
Member

Choose a reason for hiding this comment

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

Not sure what to do with this test. It is apparently "a stub" since its introduction to the code base 234 years ago.

@kamil-tekiela
Copy link
Member Author

I'm not sure about the changes in indentation; this still looks somewhat inconsistent, and it might be more reasonable to agree on a CS for PHPTs, and to enforce that with some automated script (scripts/dev/tidy.php might be extended).

The changes in the indentation are only where I was changing something else already. I decided not to change formatting of the whole file as that would be too disruptive. I only changed it in sections that I was modifying anyway. As there's no one standard at the moment, it doesn't make much difference. The indentation is already all over the place. I'm not sure if it makes sense to employ coding standard, but it's not the topic of this PR.

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 think this is good to be merged, then.

@kamil-tekiela kamil-tekiela merged commit 05ed3b7 into php:master Jan 2, 2022
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.

2 participants