Merge pull request #90 from SammyK/http-client-implementation-guzzle-and-stream

Http client implementations for stream wrapper & Guzzle with stream fallback

Author: Fosco Marotto

composer.json

@@ -16,7 +16,11 @@
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "mockery/mockery": "dev-master"
+        "mockery/mockery": "dev-master",
+        "guzzlehttp/guzzle": "~4.0"
+    },
+    "suggest": {
+        "guzzlehttp/guzzle": "Allows for implementation of the Guzzle HTTP client"
     },
     "autoload": {
         "psr-4": {

src/Facebook/FacebookRequest.php

@@ -23,6 +23,10 @@
  */
 namespace Facebook;
 
+use Facebook\HttpClients\FacebookHttpable;
+use Facebook\HttpClients\FacebookCurlHttpClient;
+use Facebook\HttpClients\FacebookStreamHttpClient;
+
 /**
  * Class FacebookRequest
  * @package Facebook
@@ -136,7 +140,7 @@ public function getETag()
    * setHttpClientHandler - Returns an instance of the HTTP client
    * handler
    *
-   * @param FacebookHttpable
+   * @param \Facebook\HttpClients\FacebookHttpable
    */
   public static function setHttpClientHandler(FacebookHttpable $handler)
   {
@@ -151,7 +155,10 @@ public static function setHttpClientHandler(FacebookHttpable $handler)
    */
   public static function getHttpClientHandler()
   {
-    return static::$httpClientHandler ?: static::$httpClientHandler = new FacebookCurlHttpClient();
+    if (static::$httpClientHandler) {
+      return static::$httpClientHandler;
+    }
+    return function_exists('curl_init') ? new FacebookCurlHttpClient() : new FacebookStreamHttpClient();
   }
 
   /**
@@ -168,7 +175,8 @@ public static function getHttpClientHandler()
    */
   public function __construct(
     $session, $method, $path, $parameters = null, $version = null, $etag = null
-  ) {
+  )
+  {
     $this->session = $session;
     $this->method = $method;
     $this->path = $path;
@@ -198,7 +206,8 @@ public function __construct(
    *
    * @return string
    */
-  protected function getRequestURL() {
+  protected function getRequestURL()
+  {
     return static::BASE_GRAPH_URL . '/' . $this->version . $this->path;
   }
 
@@ -210,7 +219,8 @@ protected function getRequestURL() {
    * @throws FacebookSDKException
    * @throws FacebookRequestException
    */
-  public function execute() {
+  public function execute()
+  {
     $url = $this->getRequestURL();
     $params = $this->getParameters();
 
@@ -228,13 +238,10 @@ public function execute() {
       $connection->addRequestHeader('If-None-Match', $this->etag);
     }
 
+    // Should throw `FacebookSDKException` exception on HTTP client error.
+    // Don't catch to allow it to bubble up.
     $result = $connection->send($url, $this->method, $params);
 
-    // Client error
-    if ($result === false) {
-      throw new FacebookSDKException($connection->getErrorMessage(), $connection->getErrorCode());
-    }
-
     $etagHit = 304 == $connection->getResponseHttpStatusCode();
 
     $headers = $connection->getResponseHeaders();
@@ -257,7 +264,6 @@ public function execute() {
     return new FacebookResponse($this, $decodedResult, $result, $etagHit, $etagReceived);
   }
 
-
   /**
    * Generate and return the appsecret_proof value for an access_token
    *

src/Facebook/FacebookCurl.php renamed to src/Facebook/HttpClients/FacebookCurl.php

@@ -21,11 +21,11 @@
  * DEALINGS IN THE SOFTWARE.
  *
  */
-namespace Facebook;
+namespace Facebook\HttpClients;
 
 /**
  * Class FacebookCurl
- * Abstraction for the procedural curl elements so that curl can me mocked
+ * Abstraction for the procedural curl elements so that curl can be mocked
  * and the implementation can be tested.
  * @package Facebook
  */
@@ -40,7 +40,8 @@ class FacebookCurl
   /**
    * Make a new curl reference instance
    */
-  public function init() {
+  public function init()
+  {
     $this->curl = curl_init();
   }
 
@@ -50,7 +51,8 @@ public function init() {
    * @param $key
    * @param $value
    */
-  public function setopt($key, $value) {
+  public function setopt($key, $value)
+  {
     curl_setopt($this->curl, $key, $value);
   }
 
@@ -59,7 +61,8 @@ public function setopt($key, $value) {
    *
    * @param array $options
    */
-  public function setopt_array(array $options) {
+  public function setopt_array(array $options)
+  {
     curl_setopt_array($this->curl, $options);
   }
 
@@ -68,7 +71,8 @@ public function setopt_array(array $options) {
    *
    * @return mixed
    */
-  public function exec() {
+  public function exec()
+  {
     return curl_exec($this->curl);
   }
 
@@ -77,7 +81,8 @@ public function exec() {
    *
    * @return int
    */
-  public function errno() {
+  public function errno()
+  {
     return curl_errno($this->curl);
   }
 
@@ -86,7 +91,8 @@ public function errno() {
    *
    * @return string
    */
-  public function error() {
+  public function error()
+  {
     return curl_error($this->curl);
   }
 
@@ -97,7 +103,8 @@ public function error() {
    *
    * @return mixed
    */
-  public function getinfo($type) {
+  public function getinfo($type)
+  {
     return curl_getinfo($this->curl, $type);
   }
 
@@ -106,14 +113,16 @@ public function getinfo($type) {
    *
    * @return array
    */
-  public function version() {
+  public function version()
+  {
     return curl_version();
   }
 
   /**
    * Close the resource connection to curl
    */
-  public function close() {
+  public function close()
+  {
     curl_close($this->curl);
   }