Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit a8cccc7

Browse files
Merge pull request #88 from CoverGenius/feature/support-guzzle-7-master
[V4] Support guzzle 7 - #73
2 parents 24278ab + 8675e55 commit a8cccc7

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
language: php
22
php:
3-
- '5.6'
4-
- '7.0'
53
- '7.3'
6-
- hhvm-3.24
4+
- '7.4'
75
cache:
86
directories:
97
- $HOME/.composer/cache

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
],
2222
"require": {
2323
"php": ">=5.5.9",
24-
"guzzlehttp/guzzle": "^6.2.1",
24+
"guzzlehttp/guzzle": "^6.2.1 || ^7.0.1",
25+
"guzzlehttp/uri-template": "^0",
2526
"phpseclib/phpseclib": "^2.0.11",
2627
"gree/jose": "^2.2.1"
2728
},

src/Hyperwallet/Util/ApiClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use GuzzleHttp\Client;
44
use GuzzleHttp\Exception\BadResponseException;
55
use GuzzleHttp\Exception\ConnectException;
6-
use GuzzleHttp\UriTemplate;
6+
use GuzzleHttp\UriTemplate\UriTemplate;
77
use Hyperwallet\Exception\HyperwalletApiException;
88
use Hyperwallet\Exception\HyperwalletException;
99
use Hyperwallet\Model\BaseModel;

src/Hyperwallet/Util/HyperwalletEncryption.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use GuzzleHttp\Client;
44
use GuzzleHttp\Exception\BadResponseException;
55
use GuzzleHttp\Exception\ConnectException;
6-
use GuzzleHttp\UriTemplate;
6+
use GuzzleHttp\UriTemplate\UriTemplate;
77
use Hyperwallet\Exception\HyperwalletApiException;
88
use Hyperwallet\Exception\HyperwalletException;
99
use Hyperwallet\Model\BaseModel;

src/Hyperwallet/Util/HyperwalletUUID.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use GuzzleHttp\Client;
44
use GuzzleHttp\Exception\BadResponseException;
55
use GuzzleHttp\Exception\ConnectException;
6-
use GuzzleHttp\UriTemplate;
6+
use GuzzleHttp\UriTemplate\UriTemplate;
77
use Hyperwallet\Exception\HyperwalletApiException;
88
use Hyperwallet\Exception\HyperwalletException;
99
use Hyperwallet\Model\BaseModel;

0 commit comments

Comments
 (0)