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

A few fixes to support phpseclib 2 #72

Merged
merged 1 commit into from
Jan 13, 2016
Merged

A few fixes to support phpseclib 2 #72

merged 1 commit into from
Jan 13, 2016

Conversation

kasparasg
Copy link
Contributor

@cirpo Wondered if this dependency could be upgraded? I feel like I fixed the broken bits and the tests pass :shipit: 😉

Thanks.

@cirpo
Copy link
Contributor

cirpo commented Jan 10, 2016

@foreachlt thanks, I'll give it a look this week. I'm a little bit worried and we should triple check because probably there are some cases not covered by tests (we already tried once).

@kasparasg
Copy link
Contributor Author

@cirpo thank you for taking a look at this 👍

@tristanbes
Copy link

we're really looking towards this merge/fix (too) because without this, we can't use google api client in version 2 because it requires phpseclib2 which conflicts with your library. Thanks for fixing it @foreachlt

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@foreachlt could you please rebase this PR with the latest master? We've just released version 6.0.4.
thanks

@kasparasg
Copy link
Contributor Author

@cirpo will do 😉

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@foreachlt if you could use php-cs-fixer with --level=symfony --fixers=ordered_use it would be awesome :)

@kasparasg
Copy link
Contributor Author

@cirpo it should be all done 👍

@kasparasg
Copy link
Contributor Author

@cirpo ohh, will apply php fixer stuff too, just a sec

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@foreachlt @tristanbes I will try to make it by the end of this week, thanks a lot guys!

@kasparasg
Copy link
Contributor Author

@cirpo php-cs-fixer hasn't found any violations in src/ dir 😉

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@foreachlt 👍

@tristanbes
Copy link

@cirpo what prevents this PR to be merged and tag a release right now if all the tests pass? I'm curious.

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@tristanbes last time the tests where passing but someone experienced some issues. We need to check the coverage. I can't do it right now as I'm a bit busy and I would avoid the same mistake we did last time.
If you desperately need it you can point your composer.json to https://github.com/foreachlt/jose
It's just a matter of precaution and time :)
I'll try to do it as soon as possible, I promise :)

@tristanbes
Copy link

ok thanks for your answser :)

@cirpo
Copy link
Contributor

cirpo commented Jan 12, 2016

@foreachlt I created a new branch phpseclib-2 https://github.com/namshi/jose/tree/phpseclib-2. Could you please open the PR against that branch? I will be easy for everyone to test it, wdyt?

@kasparasg kasparasg closed this Jan 12, 2016
@cirpo cirpo reopened this Jan 13, 2016
@cirpo
Copy link
Contributor

cirpo commented Jan 13, 2016

@foreachlt @tristanbes everything seems working fine on our side.

@foreachlt you get phpseclib ~2.0 the 2.0-dev version, what if we specify the 2.0.0? what are your thoughts about it?

@kasparasg
Copy link
Contributor Author

@cirpo sure, I agree with you. I didn't realize it would get 2.0-dev. What do you think about 2.0.* in order to accept minor patches by default? Provided that semver is used correctly by phpseclib-2.

@tristanbes
Copy link

👍 for 2.0.*

@cirpo
Copy link
Contributor

cirpo commented Jan 13, 2016

@foreachlt if you want you can do the modification :)
I will merge it and create the 6.1.0 tag

@kasparasg
Copy link
Contributor Author

@cirpo changed the version. Rebased, tests still pass locally. All good to :shipit: I think 😉

@cirpo
Copy link
Contributor

cirpo commented Jan 13, 2016

yalla, lets merge!

cirpo added a commit that referenced this pull request Jan 13, 2016
A few fixes to support phpseclib 2
@cirpo cirpo merged commit b333390 into namshi:master Jan 13, 2016
@cirpo
Copy link
Contributor

cirpo commented Jan 13, 2016

@foreachlt @tristanbes enjoy the 6.1.0 release

thanks a lot folks!

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