Merge pull request #18 from DraperStudio/master

Require PHP 5.5 and Guzzle 6

.travis.yml

@@ -3,11 +3,9 @@ sudo: false
 language: php
 
 php:
-- 5.4
 - 5.5
 - 5.6
 - hhvm
-- hhvm-nightly
 
 cache:
   directories:

composer.json

@@ -1,26 +1,25 @@
 {
-  "name": "socialiteproviders/manager",
-  "description": "Easily add new or override built-in providers in Laravel Socialite.",
-  "require": {
-    "php": ">=5.4.0",
-    "laravel/framework": "~5.0",
-    "laravel/socialite": "~2.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "4.5.*",
-    "mockery/mockery": "0.9.*"
-  },
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Andy Wendt",
-      "email": "andy@awendt.com"
-    }
-  ],
-  "minimum-stability": "stable",
-  "autoload": {
-    "psr-4": {
-      "SocialiteProviders\\Manager\\": "src/"
-    }
-  }
+    "name": "socialiteproviders/manager",
+    "description": "Easily add new or override built-in providers in Laravel Socialite.",
+    "license": "MIT",
+    "authors": [{
+        "name": "Andy Wendt",
+        "email": "andy@awendt.com"
+    }],
+    "require": {
+        "php": ">=5.5.0",
+        "laravel/framework": "~5.0",
+        "laravel/socialite": "~2.0",
+        "guzzlehttp/guzzle": "~6.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.5.*",
+        "mockery/mockery": "0.9.*"
+    },
+    "autoload": {
+        "psr-4": {
+            "SocialiteProviders\\Manager\\": "src/"
+        }
+    },
+    "minimum-stability": "stable"
 }

src/SocialiteWasCalled.php

@@ -44,8 +44,8 @@ function () use ($provider) {
     /**
      * @param SocialiteManager $socialite
      * @param $providerName
-     * @param string           $providerClass
-     * @param null|string      $oauth1Server
+     * @param string      $providerClass
+     * @param null|string $oauth1Server
      *
      * @return \Laravel\Socialite\One\AbstractProvider|\Laravel\Socialite\Two\AbstractProvider
      */

tests/ManagerTestTrait.php

@@ -17,9 +17,9 @@ protected function expectManagerInvalidArgumentException()
     protected function config()
     {
         return [
-            'client_id'     => 'test',
+            'client_id' => 'test',
             'client_secret' => 'test',
-            'redirect'      => 'test',
+            'redirect' => 'test',
         ];
     }
 
@@ -31,8 +31,8 @@ protected function config()
     protected function oauth1FormattedConfig(array $config)
     {
         return [
-            'identifier'   => $config['client_id'],
-            'secret'       => $config['client_secret'],
+            'identifier' => $config['client_id'],
+            'secret' => $config['client_secret'],
             'callback_uri' => $config['redirect'],
         ];
     }