Skip to content

Fix travis PHP 5.4 and 5.5 #590

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
Sep 23, 2019
Merged

Fix travis PHP 5.4 and 5.5 #590

merged 1 commit into from
Sep 23, 2019

Conversation

sanmai
Copy link

@sanmai sanmai commented Sep 23, 2019

Like #583

@erayd erayd merged commit 0fb947d into jsonrainbow:5.x.x Sep 23, 2019
@erayd
Copy link
Contributor

erayd commented Sep 23, 2019

Have just reversed the merge for this sorry - it modifies the 5.x.x branch, and I didn't initially notice this. Excepting very rare situations where a patch affects only the 5.x.x branch, we don't allow that - patches must apply in the master branch first, and are then backported via another PR (helps keep everything very consistent).

I will roll a backport release for you this week which includes #583.

@erayd erayd self-assigned this Sep 23, 2019
@sanmai sanmai deleted the patch-2 branch September 23, 2019 08:39
@sanmai
Copy link
Author

sanmai commented Sep 23, 2019

No questions about this PR. I'm more concerned with #589 if you can have a look at it.

@erayd
Copy link
Contributor

erayd commented Sep 23, 2019

@sanmai I have merged that one - thank you for catching that; _autoload() has been deprecated for a while!

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