added option to enable fileUpload using curl @ syntax

Author: daaku

examples/example.php

@@ -2,10 +2,10 @@
 
 require '../src/facebook.php';
 
-// Create our Application instance.
+// Create our Application instance (replace this with your appId and secret).
 $facebook = new Facebook(array(
-  'appId'  => '254752073152',
-  'secret' => '904270b68a2cc3d54485323652da4d14',
+  'appId'  => '117743971608120',
+  'secret' => '943716006e74d9b9283d4d5d8ab93204',
   'cookie' => true,
 ));
 

src/facebook.php

@@ -79,7 +79,7 @@ class Facebook
   /**
    * Version.
    */
-  const VERSION = '2.0.6';
+  const VERSION = '2.1.1';
 
   /**
    * Default options for curl.
@@ -145,6 +145,11 @@ class Facebook
    */
   protected $baseDomain = '';
 
+  /**
+   * Indicates if the CURL based @ syntax for file uploads is enabled.
+   */
+  protected $fileUploadSupport = false;
+
   /**
    * Initialize a Facebook Application.
    *
@@ -153,6 +158,7 @@ class Facebook
    * - secret: the application secret
    * - cookie: (optional) boolean true to enable cookie support
    * - domain: (optional) domain for the cookie
+   * - fileUpload: (optional) boolean indicating if file uploads are enabled
    *
    * @param Array $config the application configuration
    */
@@ -165,6 +171,9 @@ public function __construct($config) {
     if (isset($config['domain'])) {
       $this->setBaseDomain($config['domain']);
     }
+    if (isset($config['fileUpload'])) {
+      $this->setFileUploadSupport($config['fileUpload']);
+    }
   }
 
   /**
@@ -243,6 +252,25 @@ public function getBaseDomain() {
     return $this->baseDomain;
   }
 
+  /**
+   * Set the file upload support status.
+   *
+   * @param String $domain the base domain
+   */
+  public function setFileUploadSupport($fileUploadSupport) {
+    $this->fileUploadSupport = $fileUploadSupport;
+    return $this;
+  }
+
+  /**
+   * Get the file upload support status.
+   *
+   * @return String the base domain
+   */
+  public function useFileUploadSupport() {
+    return $this->fileUploadSupport;
+  }
+
   /**
    * Get the data from a signed_request token
    *
@@ -538,7 +566,11 @@ protected function makeRequest($url, $params, $ch=null) {
     }
 
     $opts = self::$CURL_OPTS;
-    $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
+    if ($this->useFileUploadSupport()) {
+      $opts[CURLOPT_POSTFIELDS] = $params;
+    } else {
+      $opts[CURLOPT_POSTFIELDS] = http_build_query($params, null, '&');
+    }
     $opts[CURLOPT_URL] = $url;
 
     // disable the 'Expect: 100-continue' behaviour. This causes CURL to wait

tests/tests.php

@@ -7,20 +7,20 @@
 
 class FacebookTest extends PHPUnit_Framework_TestCase
 {
-  const APP_ID = '254752073152';
-  const SECRET = '904270b68a2cc3d54485323652da4d14';
+  const APP_ID = '117743971608120';
+  const SECRET = '943716006e74d9b9283d4d5d8ab93204';
 
   private static $VALID_EXPIRED_SESSION = array(
-    'access_token' => '254752073152|2.I_eTFkcTKSzX5no3jI4r1Q__.3600.1273359600-1677846385|uI7GwrmBUed8seZZ05JbdzGFUpk.',
-    'expires'      => '1273359600',
-    'secret'       => '0d9F7pxWjM_QakY_51VZqw__',
-    'session_key'  => '2.I_eTFkcTKSzX5no3jI4r1Q__.3600.1273359600-1677846385',
-    'sig'          => '9f6ae89510b30dddb3f864f3caf32fb3',
+    'access_token' => '117743971608120|2.vdCKd4ZIEJlHwwtrkilgKQ__.86400.1281049200-1677846385|NF_2DDNxFBznj2CuwiwabHhTAHc.',
+    'expires'      => '1281049200',
+    'secret'       => 'u0QiRGAwaPCyQ7JE_hiz1w__',
+    'session_key'  => '2.vdCKd4ZIEJlHwwtrkilgKQ__.86400.1281049200-1677846385',
+    'sig'          => '7a9b063de0bef334637832166948dcad',
     'uid'          => '1677846385',
   );
 
-  private static $VALID_SIGNED_REQUEST = 'ZcZocIFknCpcTLhwsRwwH5nL6oq7OmKWJx41xRTi59E.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImV4cGlyZXMiOiIxMjczMzU5NjAwIiwib2F1dGhfdG9rZW4iOiIyNTQ3NTIwNzMxNTJ8Mi5JX2VURmtjVEtTelg1bm8zakk0cjFRX18uMzYwMC4xMjczMzU5NjAwLTE2Nzc4NDYzODV8dUk3R3dybUJVZWQ4c2VaWjA1SmJkekdGVXBrLiIsInNlc3Npb25fa2V5IjoiMi5JX2VURmtjVEtTelg1bm8zakk0cjFRX18uMzYwMC4xMjczMzU5NjAwLTE2Nzc4NDYzODUiLCJ1c2VyX2lkIjoiMTY3Nzg0NjM4NSJ9';
-  private static $NON_TOSSED_SIGNED_REQUEST = 'laEjO-az9kzgFOUldy1G7EyaP6tMQEsbFIDrB1RUamE.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiJ9';
+  private static $VALID_SIGNED_REQUEST = '1sxR88U4SW9m6QnSxwCEw_CObqsllXhnpP5j2pxD97c.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImV4cGlyZXMiOjEyODEwNTI4MDAsIm9hdXRoX3Rva2VuIjoiMTE3NzQzOTcxNjA4MTIwfDIuVlNUUWpub3hYVVNYd1RzcDB1U2g5d19fLjg2NDAwLjEyODEwNTI4MDAtMTY3Nzg0NjM4NXx4NURORHBtcy1nMUM0dUJHQVYzSVdRX2pYV0kuIiwidXNlcl9pZCI6IjE2Nzc4NDYzODUifQ';
+  private static $NON_TOSSED_SIGNED_REQUEST = 'c0Ih6vYvauDwncv0n0pndr0hP0mvZaJPQDPt6Z43O0k.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiJ9';
 
   public function testConstructor() {
     $facebook = new Facebook(array(
@@ -49,6 +49,20 @@ public function testConstructorWithCookie() {
                       'Expect Cookie support to be on.');
   }
 
+  public function testConstructorWithFileUpload() {
+    $facebook = new Facebook(array(
+      'appId'      => self::APP_ID,
+      'secret'     => self::SECRET,
+      'fileUpload' => true,
+    ));
+    $this->assertEquals($facebook->getAppId(), self::APP_ID,
+                        'Expect the App ID to be set.');
+    $this->assertEquals($facebook->getApiSecret(), self::SECRET,
+                        'Expect the API secret to be set.');
+    $this->assertTrue($facebook->useFileUploadSupport(),
+                      'Expect file upload support to be on.');
+  }
+
   public function testSetAppId() {
     $facebook = new Facebook(array(
       'appId'  => self::APP_ID,
@@ -104,6 +118,18 @@ public function testIgnoreDeleteSetCookie() {
                        'Expect Cookie to not exist.');
   }
 
+  public function testSetFileUploadSupport() {
+    $facebook = new Facebook(array(
+      'appId'  => self::APP_ID,
+      'secret' => self::SECRET,
+    ));
+    $this->assertFalse($facebook->useFileUploadSupport(),
+                       'Expect file upload support to be off.');
+    $facebook->setFileUploadSupport(true);
+    $this->assertTrue($facebook->useFileUploadSupport(),
+                      'Expect file upload support to be on.');
+  }
+
   public function testSetNullSession() {
     $facebook = new Facebook(array(
       'appId'  => self::APP_ID,
@@ -345,7 +371,8 @@ public function testGraphAPIWithOnlyParams() {
       'secret' => self::SECRET,
     ));
 
-    $response = $facebook->api('/platform/feed', array('limit' => 1));
+    $response = $facebook->api('/platform/feed',
+      array('limit' => 1, 'access_token' => ''));
     $this->assertEquals(1, count($response['data']), 'should get one entry');
     $this->assertTrue(
       strstr($response['paging']['next'], 'limit=1') !== false,
@@ -613,15 +640,23 @@ public function testSignedToken() {
     $payload = $facebook->publicParseSignedRequest(self::$VALID_SIGNED_REQUEST);
     $this->assertNotNull($payload, 'Expected token to parse');
     $session = $facebook->publicCreateSessionFromSignedRequest($payload);
-    foreach (array('uid', 'access_token') as $key) {
-      $this->assertEquals($session[$key], self::$VALID_EXPIRED_SESSION[$key]);
-    }
+    $this->assertEquals($session['uid'], self::$VALID_EXPIRED_SESSION['uid']);
     $this->assertEquals($facebook->getSignedRequest(), null);
     $_REQUEST['signed_request'] = self::$VALID_SIGNED_REQUEST;
     $this->assertEquals($facebook->getSignedRequest(), $payload);
     unset($_REQUEST['signed_request']);
   }
 
+  public function testSignedTokenInQuery() {
+    $facebook = new Facebook(array(
+      'appId'  => self::APP_ID,
+      'secret' => self::SECRET,
+    ));
+    $_REQUEST['signed_request'] = self::$VALID_SIGNED_REQUEST;
+    $this->assertNotNull($facebook->getSession());
+    unset($_REQUEST['signed_request']);
+  }
+
   public function testNonTossedSignedtoken() {
     $facebook = new FBPublic(array(
       'appId'  => self::APP_ID,