Skip to content

Using latest version of discovery #21

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

Merged
merged 7 commits into from
Jul 22, 2016
Merged

Using latest version of discovery #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b1fd59
Using latest version of discovery
Nyholm Jun 25, 2016
066972f
Bump to php 5.5
Nyholm Jun 26, 2016
94fdaf7
regenerating ssl certs
Nyholm Jun 27, 2016
5b2eca5
Using discovery 1.0
Nyholm Jul 18, 2016
684989e
Updated certs
Nyholm Jul 18, 2016
72475b4
Update integration tests
Nyholm Jul 18, 2016
e69c8f7
using new Client integration tests
Nyholm Jul 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Bump to php 5.5
  • Loading branch information
@Nyholm
Nyholm committed Jun 26, 2016
commit 066972fbcac6fd0fd71326441b988bc970369354
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ cache:
- $HOME/.composer/cache

php:
- 5.4
- 5.5
- 5.6
- 7.0
Expand All @@ -26,7 +25,7 @@ matrix:
- php: hhvm
fast_finish: true
include:
- php: 5.4
- php: 5.5
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"

before_install:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}
],
"require": {
"php": ">=5.4",
"php": "^5.5|^7.0",
Copy link
Member

@sagikazarmark sagikazarmark Jun 26, 2016

Choose a reason for hiding this comment

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

Khm....why?

Copy link
Member Author

@Nyholm Nyholm Jun 26, 2016

Choose a reason for hiding this comment

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

I updated to 5.5 because we have a hard dependency on discovery 0.9 which is requiring 5.5.

I did change the syntax because we can't garuantee that this library will work with php 8

Copy link
Member

@sagikazarmark sagikazarmark Jun 26, 2016

Choose a reason for hiding this comment

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

I don't see why 5.5 is required: https://github.com/php-http/discovery/blob/master/composer.json#L14

Copy link
Member Author

@Nyholm Nyholm Jun 27, 2016

Choose a reason for hiding this comment

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

Sorry, my bad. This was missing:
php-http/discovery#60

Copy link
Member

@sagikazarmark sagikazarmark Jul 16, 2016

Choose a reason for hiding this comment

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

Double pipes pls

"symfony/options-resolver": "^2.6|^3.0",
"php-http/httplug": "^1.0",
"php-http/message-factory": "^1.0.2",
Expand Down