Skip to content

2.x to become the new master #134

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 41 commits into from
Jan 3, 2019
Merged

2.x to become the new master #134

merged 41 commits into from
Jan 3, 2019

Conversation

Nyholm
Copy link
Member

@Nyholm Nyholm commented Dec 28, 2018

This is a PR to show that we have a 2.x branch.

It should be merged after we release 1.9.

Jean85 and others added 24 commits November 6, 2018 11:36
* Adjust client signatures
* Lock lower bounds for test dependencies
* Use leanphp/phpspec-code-coverage as a maintained fork
Remove deprecated plugin option 'debug_plugins'
Complete removal of debug_plugins
* Add types where possible

* Add spec to autoload-dev

* Fix signatures

* Use ::class anywhere

* Add `: Promise` return type to Plugin::handleRequest
We add interfaces for final classes so that they can be mocked in testing.
We chose to use the Interface suffix here to avoid name clashes, rather than renaming the existing PHP classes.
The interfaces are only relevant for unit testing, we do not expect people to provide their own implementations.

HttpClientPoolItem is purely internal and we therefore don't want an interface for it.
It is marked with @Final and explained to not be meant to extend.
mark classes as final and methods and properties as private
Remove php-cs-fixer from dependencies
@sagikazarmark sagikazarmark self-assigned this Dec 28, 2018
dbu and others added 5 commits December 29, 2018 09:23
Typecheck for PSR-18 ClientInterface instead of Httplug Client interface. Our interface extends the PSR-18 ClientInterface and therefore is still accepted.

No changes for the async client as there is no PSR for that (yet)
@dbu dbu added this to the v2.0.0 milestone Jan 3, 2019
@Nyholm
Copy link
Member Author

Nyholm commented Jan 3, 2019

I suggest merging this to master now.

I've created a 1.x branch

@dbu
Copy link
Contributor

dbu commented Jan 3, 2019

agreed. i'll try to solve the merge conflicts.

Copy link
Contributor

@dbu dbu left a comment

Choose a reason for hiding this comment

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

lets merge this, i'd say!

@dbu dbu changed the title WIP: 2.x 2.x to become the new master Jan 3, 2019
@Nyholm
Copy link
Member Author

Nyholm commented Jan 3, 2019

Thank you for fixing the merge conflicts.
Im happy with merging now.

@GrahamCampbell
Copy link
Contributor

What about dropping PHP 7.0?

@Nyholm
Copy link
Member Author

Nyholm commented Jan 3, 2019

I just suggest to merge to master. Not to tag 2.0.

About PHP 7.0: #148

@dbu dbu merged commit 43c7910 into master Jan 3, 2019
@dbu dbu deleted the 2.x branch January 3, 2019 13:55
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.

6 participants