Skip to content

Commit

Permalink
Feature/upgrade fxmlrpc httpplug (#172)
Browse files Browse the repository at this point in the history
* Upgraded fxmlrpc to the latest version which requires httpplug instead of Ivory

* fix php 7 failing build
  • Loading branch information
mfairch authored Mar 7, 2018
1 parent ecb3f50 commit a3034be
Show file tree
Hide file tree
Showing 6 changed files with 668 additions and 273 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ language: php
sudo: false

php:
- 5.5
- 5.6
- hhvm
- 7
- 7.1
- 7.2

before_script:
- composer self-update
Expand All @@ -17,7 +15,5 @@ script: phpunit

matrix:
allow_failures:
- php: hhvm
- php: 7
- php: 7.1
fast_finish: true
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

This version implements RESTful endpoints, a new version of Guzzle, and a restructured request handler.

As of version 1.4, PHP 7+ is required.

### Breaking Change

If you use the `Contacts`, `Orders` or `Products` services, there are now two different classes handling each service - one for REST, one for XML-RPC. *This version of the SDK will load the REST class by default.* If you still need the XML-RPC class, pass `'xml'` as an argument when requesting the object: `$infusionsoft->orders('xml')'`
Expand All @@ -28,7 +30,7 @@ Or manually add it to your composer.json:
``` json
{
"require": {
"infusionsoft/php-sdk": "1.3.*"
"infusionsoft/php-sdk": "1.4.*"
}
}
```
Expand Down
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@
"php": ">=5.5",
"ext-curl": "*",
"guzzlehttp/guzzle": "~6.1",
"lstrojny/fxmlrpc": "0.11",
"egeloen/http-adapter": "~0.6",
"psr/log": "~1.0"
"lstrojny/fxmlrpc": "^0.14.0",
"psr/log": "~1.0",
"php-http/guzzle6-adapter": "^1.1",
"zendframework/zend-diactoros": "^1.7",
"php-http/message": "^1.6",
"php-http/curl-client": "^1.7"
},
"require-dev": {
"mockery/mockery": "^0.9",
"phpunit/phpunit": "~4",
"doctrine/instantiator": "1.0.5",
"squizlabs/php_codesniffer": "1.*"
},
"autoload": {
Expand Down
Loading

0 comments on commit a3034be

Please sign in to comment.