Minor fixes

Author: Nyholm

CHANGELOG.md

@@ -5,7 +5,6 @@ Starting with version 5, the Facebook PHP SDK follows [SemVer](http://semver.org
 
 ## 6.x
 
-
 - 6.0 (201?-??-??)
   - We use an HTTP client abstraction called HTTPlug to give the user more control over *how* to send PSR7 messages. See updated installation instructions. 
   - Removed option `http_client_handler`

src/Facebook/Facebook.php

@@ -39,6 +39,7 @@
 use Facebook\Helpers\FacebookPageTabHelper;
 use Facebook\Helpers\FacebookRedirectLoginHelper;
 use Facebook\Exceptions\FacebookSDKException;
+use Http\Client\HttpClient;
 
 /**
  * Class Facebook
@@ -132,6 +133,9 @@ public function __construct(array $config = [])
         if (!$config['app_secret']) {
             throw new FacebookSDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "' . static::APP_SECRET_ENV_NAME . '"');
         }
+        if ($config['http_client'] !== null && !$config['http_client'] instanceof HttpClient) {
+            throw new \InvalidArgumentException('Required "http_client" key to be null or an instance of \Http\Client\HttpClient');
+        }
 
         $this->app = new FacebookApp($config['app_id'], $config['app_secret']);
         $this->client = new FacebookClient(

src/Facebook/FacebookClient.php

@@ -193,8 +193,6 @@ public function sendRequest(FacebookRequest $request)
 
         list($url, $method, $headers, $body) = $this->prepareRequestMessage($request);
 
-        // Should throw `FacebookSDKException` exception on HTTP client error.
-        // Don't catch to allow it to bubble up.
         $psr7Request = MessageFactoryDiscovery::find()->createRequest($method, $url, $headers, $body);
         $psr7Response = $this->httpClient->sendRequest($psr7Request);
 

tests/FacebookTest.php

@@ -68,7 +68,7 @@ public function testInstantiatingWithoutAppSecretThrows()
     }
 
     /**
-     * @expectedException \Throwable
+     * @expectedException \InvalidArgumentException
      */
     public function testSettingAnInvalidHttpClientTypeThrows()
     {
@@ -79,7 +79,7 @@ public function testSettingAnInvalidHttpClientTypeThrows()
     }
 
     /**
-     * @expectedException \Throwable
+     * @expectedException \InvalidArgumentException
      */
     public function testSettingAnInvalidHttpClientClassThrows()
     {