From 7f3d63775639ae313ee613a9ff8a907b15b57208 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Wed, 18 Nov 2015 15:46:53 +0100 Subject: [PATCH] Updated to reflect changes in PHP-HTTP --- README.md | 7 ++++--- composer.json | 5 ++--- src/Mailgun/Mailgun.php | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 57ff6c8..caf282d 100644 --- a/README.md +++ b/README.md @@ -25,12 +25,13 @@ curl -sS https://getcomposer.org/installer | php php composer.phar require mailgun/mailgun-php:~1.7.2 ``` -You do also need to choose what library to use when you are sending messages. Consult the +You do also need to choose what library to use when you are sending http messages. Consult the [php-http/adapter-implementation](https://packagist.org/providers/php-http/adapter-implementation) virtual package to -find adapters to use. Example: +find adapters to use. For more information about virtual packages please refer to +[Httplug](http://docs.httplug.io/en/latest/virtual-package/). Example: ```bash -php composer.phar require php-http/guzzle6-adapter:^0.1.0 +php composer.phar require php-http/guzzle6-adapter:dev-master ``` **For shared hosts without SSH access, check out our [Shared Host Instructions](SharedHostInstall.md).** diff --git a/composer.json b/composer.json index 21ea5d9..41399c0 100644 --- a/composer.json +++ b/composer.json @@ -5,13 +5,12 @@ "php": ">=5.4.0", "guzzlehttp/psr7": "~1.2", "php-http/client-implementation": "@dev", - "php-http/discovery": "dev-master" + "php-http/discovery": "~0.2" }, "require-dev": { "phpunit/phpunit": "~4.6", "php-http/guzzle6-adapter": "dev-master", - "php-http/httplug": "dev-master", - "php-http/message-factory": "dev-master" + "php-http/httplug": "dev-master" }, "autoload": { "psr-0": { diff --git a/src/Mailgun/Mailgun.php b/src/Mailgun/Mailgun.php index 6f3d572..cee46db 100644 --- a/src/Mailgun/Mailgun.php +++ b/src/Mailgun/Mailgun.php @@ -2,7 +2,6 @@ namespace Mailgun; -use Http\Adapter\HttpAdapter; use Http\Client\HttpClient; use Mailgun\Constants\ExceptionMessages; use Mailgun\Messages\Exceptions; @@ -34,7 +33,7 @@ class Mailgun{ * @param string $apiEndpoint * @param string $apiVersion * @param bool $ssl - * @param HttpAdapter $httpClient + * @param HttpClient $httpClient */ public function __construct( $apiKey = null,