Merge pull request #42 from vredeling/master

Update oauth2 client to v2.3 & replace PEST with Guzzle.

Author: basvandorst

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
-  - 5.5
+  - 5.6
 install:
   - composer --no-interaction install
 script: phpunit --configuration phpunit.xml --coverage-clover=coverage.clover

README.md

@@ -78,7 +78,7 @@ use Strava\API\Exception;
 use Strava\API\Service\REST;
 
 try {
-    $adapter = new Pest('https://www.strava.com/api/v3');
+    $adapter = new \GuzzleHttp\Client(['base_uri' => 'https://www.strava.com/api/v3']);
     $service = new REST($token, $adapter);  // Define your user token here.
     $client = new Client($service);
 
@@ -146,8 +146,8 @@ $oauth->getAccessToken($grant = 'authorization_code', $params = []);
 ### Strava\API\Client
 #### Usage
 ```php
-// REST adapter (We use `Pest` in this project)
-$adapter = new Pest('https://www.strava.com/api/v3');
+// REST adapter (We use `Guzzle` in this project)
+$adapter = new \GuzzleHttp\Client(['base_uri' => 'https://www.strava.com/api/v3']);
 // Service to use (Service\Stub is also available for test purposes)
 $service = new Service\REST('RECEIVED-TOKEN', $adapter);
 
@@ -207,7 +207,7 @@ $client->getStreamsRoute($id);
 ### Used libraries
 - [Strava API](https://strava.github.io/api/)
 - [thephpleague/oauth2-client](https://github.com/thephpleague/oauth2-client/)
-- [educoder/pest](https://github.com/educoder/pest)
+- [guzzlehttp/guzzle](https://github.com/guzzle/guzzle)
 
 ### Development
 The StravaPHP library was created by Bas van Dorst, [software engineer](https://www.linkedin.com/in/basvandorst) and cyclist enthusiast.

composer.json

@@ -9,12 +9,12 @@
     "StravaPHP"
   ],
   "require": {
-    "php": ">=5.5.0",
-    "educoder/pest": "~1.0",
-    "league/oauth2-client": "~1.0"
+    "php": ">=5.6",
+    "league/oauth2-client": "~2.3",
+    "guzzlehttp/guzzle": "~6.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0"
+    "phpunit/phpunit": "^5"
   },
   "license": "MIT",
   "authors": [

src/Strava/API/Factory.php

@@ -1,8 +1,6 @@
 <?php
 namespace Strava\API;
 
-use Pest;
-
 /**
  * Factory class
  *
@@ -45,7 +43,7 @@ public function getOAuthClient($client_id, $client_secret, $redirect_uri)
      */
     public function getAPIClient($token)
     {
-        $adapter = new Pest(self::$endpoint);
+        $adapter = new \GuzzleHttp\Client(['base_uri' => self::$endpoint]);
         $service = new Service\REST($token, $adapter);
 
         $APIClient = new Client($service);