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

Merged PHP7 and PHP5 code #31

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Conversation

IonBazan
Copy link
Contributor

@IonBazan IonBazan commented Nov 6, 2017

This is the first step to merge the PHP5 and PHP7 code to ease the maintaining. I've tested it locally on 5.6 and 7.1.
The next step is to separate some of version-specific functions back to different files to make it more readable.

@IonBazan IonBazan changed the title Merged PHP7 and PHP7 code Merged PHP7 and PHP5 code Nov 6, 2017
@IonBazan
Copy link
Contributor Author

IonBazan commented Nov 7, 2017

This still needs some fixes for PHP 5. I will review the changes and fix this.
@hnw from what I see, Travis CI marked my build as passed even when all tests were skipped.

@IonBazan
Copy link
Contributor Author

IonBazan commented Nov 8, 2017

This should also fix #30 - test added

zend_long sec, usec;
#else
long sec, usec;
#endif
Copy link
Owner

Choose a reason for hiding this comment

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

zend_long always means 64bit integer on 64bit system, however long has 32bit length on 64bit-Windows system. This fix causes backward-compatibility problem.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@IonBazan IonBazan force-pushed the merge-php-code branch 3 times, most recently from 1f4b733 to ef2ddad Compare November 26, 2017 19:56
@IonBazan
Copy link
Contributor Author

IonBazan commented Dec 4, 2017

@hnw Can you review this again?

@havvg
Copy link

havvg commented Feb 2, 2018

Ping @hnw :)

@IonBazan
Copy link
Contributor Author

@hnw ping

cs278 pushed a commit to kiddivouchers/php-timecop that referenced this pull request Jun 19, 2018
cs278 pushed a commit to kiddivouchers/php-timecop that referenced this pull request Jun 19, 2018
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.

3 participants