-
Notifications
You must be signed in to change notification settings - Fork 53
Allow HTTPlug 2.0 #114
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
Allow HTTPlug 2.0 #114
Changes from 15 commits
c66e081
35720b0
d7116bf
5dd4d9f
d99e7aa
af093a3
36d79a7
a8e1cb5
fae2083
8fc310c
a131600
22c3573
9272148
e54ceb7
8f65a3c
6e5c694
6ff43de
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
language: php | ||
|
||
sudo: false | ||
|
||
dist: trusty | ||
|
||
cache: | ||
directories: | ||
- $HOME/.composer/cache/files | ||
|
@@ -19,17 +16,15 @@ branches: | |
matrix: | ||
fast_finish: true | ||
include: | ||
- php: 7.1 | ||
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" DEPENDENCIES="doctrine/instantiator:^1.1" | ||
- php: 7.0 | ||
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" | ||
|
||
# Test the latest stable release | ||
- php: 5.4 | ||
- php: 5.5 | ||
- php: 5.6 | ||
- php: 7.0 | ||
- php: 7.1 | ||
- php: 7.2 | ||
env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="henrikbjorn/phpspec-code-coverage:^1.0" | ||
- php: 7.2 | ||
env: COVERAGE=true TEST_COMMAND="composer test-ci" DEPENDENCIES="leanphp/phpspec-code-coverage" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a maintained fork of the previous package, which is now abandoned. |
||
|
||
# Test LTS versions | ||
- php: 7.1 | ||
|
@@ -44,9 +39,10 @@ matrix: | |
env: STABILITY="dev" | ||
|
||
allow_failures: | ||
# Latest dev is allowed to fail. | ||
- php: 7.3 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is not working for now, but the issue is on Travis' side. Will work as soon as they fix it. |
||
sudo: required | ||
- env: STABILITY="dev" | ||
|
||
before_install: | ||
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi | ||
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi; | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,16 +11,21 @@ | |
} | ||
], | ||
"require": { | ||
"php": "^5.4 || ^7.0", | ||
"php-http/httplug": "^1.1", | ||
"php": "^7.0", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why not go directly to 7.1? afaik 7.0 is EOL already. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because it's the same of PSR-18 and HTTPlug 2. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Im fine with 7.1. For psr18 it did not really matter. It was not using any php7.1 features. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. as long as we agree that dropping 7.0 support is a minor change and we "just do it" if 7.0 becomes a pain for some reason, i am fine with allowing it for now ;-) |
||
"php-http/httplug": "^2.0", | ||
"php-http/message-factory": "^1.0", | ||
"php-http/message": "^1.6", | ||
"symfony/options-resolver": "^2.6 || ^3.0 || ^4.0" | ||
}, | ||
"require-dev": { | ||
"phpspec/phpspec": "^2.5 || ^3.4 || ^4.2", | ||
"phpspec/phpspec": "^3.4 || ^4.2", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dropping 2.x which was needed only to run under PHP 5.x |
||
"phpspec/prophecy": "^1.8", | ||
"guzzlehttp/psr7": "^1.4" | ||
}, | ||
"conflict": { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Those are lower bounds to avoid issues in CI builds. Should not affect There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. --prefer-lowest will respect the conflict section. as will other packages, as discussed below. do we use the doctrine/instantiator or sebastian/comparator in our actual code, or only for tests? all things thests should be solved in require-dev rather than here, or we prevent installing this on some systems that are fine with those versions. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Both packages are needed by the test suite through PHPSpec/Prophecy; the dev deps tree should not have packages in common with the non-dev deps, so it should be fine. I preferred to use conflicts instead of requiring them explicitly because they are both indirect dependencies that could go away at any time. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the problem is that conflicts are also respected by applications using this package. meaning that if my project uses an older version of one of the libraries we mark as conflicting here will not be able to install this package because of the conflict. conflict should only be used to mark versions of packages that may not be run together with this package. they should not be used to control what is installed for development. if this is all only about --prefer-lowest, i think we either need them in require-dev, or if you want to be more explicit, put them in the DEPENDENCIES of .travis.yml only for the lowest version build - that would be the most explicit way of doing it, imho. |
||
"doctrine/instantiator": "<1.0.5", | ||
"sebastian/comparator": "<2" | ||
}, | ||
"suggest": { | ||
"php-http/logger-plugin": "PSR-3 Logger plugin", | ||
"php-http/cache-plugin": "PSR-6 Cache plugin", | ||
|
@@ -37,6 +42,7 @@ | |
}, | ||
"extra": { | ||
"branch-alias": { | ||
"dev-2.x": "2.x-dev", | ||
"dev-master": "1.8-dev" | ||
} | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was previously on PHP 7.1 due to doctrine/istantiator 1.1, which is no longer required. I've added a conflict rule below.