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 non php7 code from ext/php7 folder #1162

Merged
merged 5 commits into from
Mar 2, 2021
Merged

Conversation

labbati
Copy link
Member

@labbati labbati commented Mar 1, 2021

Description

Get rid of all non php7 code in ext/php7

Readiness checklist

  • [ ] (only for Members) Changelog has been added to the release document.
  • [ ] Tests added for this feature/bug.

Reviewer checklist

  • Appropriate labels assigned.
  • Milestone is set.
  • Changelog has been added to the release document. For community contributors the reviewer is in charge of this task.

@labbati labbati requested a review from SammyK March 1, 2021 14:37
@labbati labbati added this to the 0.56.0 milestone Mar 1, 2021
@labbati labbati added the c-extension Apply this label to issues and prs related to the C-extension label Mar 1, 2021
SammyK
SammyK previously approved these changes Mar 1, 2021
Copy link
Contributor

@SammyK SammyK left a comment

Choose a reason for hiding this comment

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

👍 LTGM! Thanks for all the deletions @labbati! 🥇

ext/php7/compatibility.h Outdated Show resolved Hide resolved
Comment on lines 8 to 9
TSRMLS_FETCH();
php_log_err((char *)message TSRMLS_CC);
Copy link
Contributor

Choose a reason for hiding this comment

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

In another followup PR, we could remove the TSRMLS_* references for PHP 7 and PHP 8. Then this would become:

Suggested change
TSRMLS_FETCH();
php_log_err((char *)message TSRMLS_CC);
php_log_err((char *)message);

Copy link
Member Author

Choose a reason for hiding this comment

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

I am leaving this for a separate PR as I want to discuss this further.

Copy link
Contributor

@SammyK SammyK left a comment

Choose a reason for hiding this comment

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

Even better. Thanks @labbati! 👍

@labbati labbati merged commit f09dd36 into master Mar 2, 2021
@labbati labbati deleted the labbati/no-if-phpversion7 branch March 2, 2021 21:53
@labbati labbati changed the title remove non php7 code from ext/php7 folder Remove non php7 code from ext/php7 folder Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c-extension Apply this label to issues and prs related to the C-extension
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants