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.

Sign up for GitHub

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

Jump to bottom

PHP: use php7_wrapper to reduce duplicated codes on v1.0.x branch(second part) #7533

Merged
merged 2 commits into from
Jul 27, 2016
Merged

PHP: use php7_wrapper to reduce duplicated codes on v1.0.x branch(second part) #7533

merged 2 commits into from
Jul 27, 2016
+307 −488

Conversation

thinkerou
Copy link
Contributor

No description provided.

@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok to test.

1 similar comment
@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok to test.

@thinkerou thinkerou changed the title PHP: use php7_wrapper to reduce duplicated codes(second part) PHP: use php7_wrapper to reduce duplicated codes on v1.0.x branch(second part) Jul 26, 2016
@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok to test.

1 similar comment
@grpc-kokoro
Copy link

Thanks for your pull request. The automated tests will run as soon as one of the admins verifies this change is ok to test.

@stanley-cheung stanley-cheung self-assigned this Jul 26, 2016
@stanley-cheung
Copy link
Contributor

Thanks for the contribution. Looks like by doing this, we cut down the number of occurance of if PHP_MAJOR_VERSION < 7 from 55 to 45. Nice work!

@stanley-cheung
Copy link
Contributor

@thinkerou Can you rebase your branch on the latest of v1.0.x? It will pick up the latest change that will test this PR properly on Jenkins. Thanks.

@thinkerou
Copy link
Contributor Author

We need to support >= PHP4.5 ?

I commit the PR to v1.0.x branch before, I have run the command git fetch upstream, git merge upstream/v1.0.x and git push origin wrap_php7_on_v1_branch_second.

Basic tests on PHP7 errors, this is because code merge error?

@stanley-cheung
Copy link
Contributor

Can you try doing what you did again?

@stanley-cheung
Copy link
Contributor

Please try doing these again. git fetch upstream, git merge upstream/v1.0.x and git push origin wrap_php7_on_v1_branch_second. It should pick up some latest change on the v1.0.x branch so that Jenkins can test this PR properly. Thanks,

@stanley-cheung
Copy link
Contributor

Oh, nevermind. The change I was thinking wasn't on the v1.0.x branch.

@stanley-cheung
Copy link
Contributor

LGTM. This is ready to merge.

@stanley-cheung stanley-cheung merged commit ee70fa7 into grpc:v1.0.x Jul 27, 2016
@thinkerou
Copy link
Contributor Author

OK

@lock lock bot locked as resolved and limited conversation to collaborators Jan 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@stanley-cheung stanley-cheung

Labels
cla: yes disposition/ready to merge lang/php
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thinkerou @grpc-kokoro @stanley-cheung @googlebot