Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/base_facebook.php

Author: moisadoru

.gitignore

@@ -1 +1,4 @@
 /coverage/
+vendor/
+composer.lock
+composer.phar

.travis.yml

@@ -2,4 +2,5 @@ language: php
 php:
   - 5.3
   - 5.4
+  - 5.5
 script: phpunit --stderr --bootstrap tests/bootstrap.php tests/tests.php

composer.json

@@ -16,6 +16,9 @@
         "ext-curl": "*",
         "ext-json": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
     "autoload": {
         "classmap": ["src"]
     }

examples/example.php

@@ -46,6 +46,7 @@
 if ($user) {
   $logoutUrl = $facebook->getLogoutUrl();
 } else {
+  $statusUrl = $facebook->getLoginStatusUrl();
   $loginUrl = $facebook->getLoginUrl();
 }
 
@@ -76,6 +77,10 @@
     <?php if ($user): ?>
       <a href="<?php echo $logoutUrl; ?>">Logout</a>
     <?php else: ?>
+      <div>
+        Check the login status using OAuth 2.0 handled by the PHP SDK:
+        <a href="<?php echo $statusUrl; ?>">Check the login status</a>
+      </div>
       <div>
         Login using OAuth 2.0 handled by the PHP SDK:
         <a href="<?php echo $loginUrl; ?>">Login with Facebook</a>

readme.md

@@ -1,5 +1,4 @@
-Facebook PHP SDK (v.3.2.0)
-==========================
+Facebook PHP SDK (v.3.2.2)
 
 The [Facebook Platform](http://developers.facebook.com/) is
 a set of APIs that make your app more social.
@@ -15,41 +14,63 @@ Usage
 
 The [examples][examples] are a good place to start. The minimal you'll need to
 have is:
+```php
+require 'facebook-php-sdk/src/facebook.php';
 
-    require 'facebook-php-sdk/src/facebook.php';
+$facebook = new Facebook(array(
+  'appId'  => 'YOUR_APP_ID',
+  'secret' => 'YOUR_APP_SECRET',
+));
 
-    $facebook = new Facebook(array(
-      'appId'  => 'YOUR_APP_ID',
-      'secret' => 'YOUR_APP_SECRET',
-    ));
-
-    // Get User ID
-    $user = $facebook->getUser();
+// Get User ID
+$user = $facebook->getUser();
+```
 
 To make [API][API] calls:
-
-    if ($user) {
-      try {
-        // Proceed knowing you have a logged in user who's authenticated.
-        $user_profile = $facebook->api('/me');
-      } catch (FacebookApiException $e) {
-        error_log($e);
-        $user = null;
-      }
-    }
+```php
+if ($user) {
+  try {
+    // Proceed knowing you have a logged in user who's authenticated.
+    $user_profile = $facebook->api('/me');
+  } catch (FacebookApiException $e) {
+    error_log($e);
+    $user = null;
+  }
+}
+```
 
 Login or logout url will be needed depending on current user state.
-
-    if ($user) {
-      $logoutUrl = $facebook->getLogoutUrl();
-    } else {
-      $loginUrl = $facebook->getLoginUrl();
-    }
-
-[examples]: http://github.com/facebook/facebook-php-sdk/blob/master/examples/example.php
+```php
+if ($user) {
+  $logoutUrl = $facebook->getLogoutUrl();
+} else {
+  $loginUrl = $facebook->getLoginUrl();
+}
+```
+
+With Composer:
+
+- Add the `"facebook/php-sdk": "@stable"` into the `require` section of your `composer.json`.
+- Run `composer install`.
+- The example will look like
+
+```php
+if (($loader = require_once __DIR__ . '/vendor/autoload.php') == null)  {
+  die('Vendor directory not found, Please run composer install.');
+}
+
+$facebook = new Facebook(array(
+  'appId'  => 'YOUR_APP_ID',
+  'secret' => 'YOUR_APP_SECRET',
+));
+
+// Get User ID
+$user = $facebook->getUser();
+```
+
+[examples]: /examples/example.php
 [API]: http://developers.facebook.com/docs/api
 
-
 Tests
 -----