Merge branch '5.x' into 5.5

Author: eddieace

CHANGELOG.md

@@ -2,11 +2,16 @@
 
 Starting with version 5, the Facebook PHP SDK follows [SemVer](http://semver.org/).
 
-
 ## 5.x
 
 Version 5 of the Facebook PHP SDK is a complete refactor of version 4. It comes loaded with lots of new features and a friendlier API.
 
+- 5.6.2 (2018-02-15)
+  - Strip 'code' param (#913)
+- 5.6.1 (2017-08-16)
+  - Fixed doc block syntax that interfered with Doctrine (#844)
+- 5.6.0 (2017-07-23)
+  - Bump Graph API version to v2.10 (#829)
 - 5.5.0 (2017-04-20)
   - Added support for batch options (#713)
   - Bump Graph API version to v2.9.
@@ -81,12 +86,10 @@ Version 5 of the Facebook PHP SDK is a complete refactor of version 4. It comes
     - Added `ext-mbstring` to composer require
     - Added this CHANGELOG. Hi! :)
 
-
 ## 4.1-dev
 
 Since the Facebook PHP SDK didn't follow SemVer in version 4.x, the master branch was going to be released as 4.1. However, the SDK switched to SemVer in v5.0. So any references on the internet to version 4.1 can be assumed to be an alias to version `5.0.0`
 
-
 ## 4.0.x
 
 Version 4.0 of the Facebook PHP SDK did not follow [SemVer](http://semver.org/). The versioning format used was as follows: `4.MAJOR.(MINOR|PATCH)`. The `MINOR` and `PATCH` versions were squashed together.

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.

CONTRIBUTING.md

@@ -3,8 +3,16 @@ Contributing
 
 Contributions are **welcome** and will be fully **credited**.
 
-We accept contributions via Pull Requests on [Github](https://github.com/facebook/facebook-php-sdk-v4).
+We accept contributions via Pull Requests on [Github](https://github.com/facebook/php-graph-sdk/pull/new).
 
+The current stable major version is v5. The v6 is under active development.
+
+This means any new feature MUST target v6 (`master` branch).
+
+The v5 (`5.x` branch) is maintained only for bug fixes, node/edge updates or documentation improvements.
+
+## Code of Conduct
+The code of conduct is described in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md)
 
 ## Pull Requests
 
@@ -29,14 +37,12 @@ We accept contributions via Pull Requests on [Github](https://github.com/faceboo
 
 - **Ensure no coding standards violations** - Please [run PHP Code Sniffer](#running-php-code-sniffer) using the PSR-2 standard before submitting your pull request. A violation will cause the build to fail, so please make sure there are no violations. We can't accept a patch if the build fails.
 
-
 ## Running Tests
 
 ``` bash
 $ ./vendor/bin/phpunit
 ```
 
-
 ## Running PHP Code Sniffer
 
 You can install [PHP Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer) globally with composer.

README.md

@@ -1,13 +1,11 @@
 # Facebook SDK for PHP (v5)
 
-[![Build Status](https://img.shields.io/travis/facebook/php-graph-sdk/5.5.svg)](https://travis-ci.org/facebook/php-graph-sdk)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/facebook/facebook-php-sdk-v4/badges/quality-score.png?b=5.5)](https://scrutinizer-ci.com/g/facebook/facebook-php-sdk-v4/?branch=5.5)
-[![Latest Stable Version](http://img.shields.io/badge/Latest%20Stable-5.5.0-blue.svg)](https://packagist.org/packages/facebook/graph-sdk)
-
+[![Build Status](https://img.shields.io/travis/facebook/php-graph-sdk/5.x.svg)](https://travis-ci.org/facebook/php-graph-sdk)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/facebook/facebook-php-sdk-v4/badges/quality-score.png?b=5.x)](https://scrutinizer-ci.com/g/facebook/facebook-php-sdk-v4/?branch=5.x)
+[![Latest Stable Version](http://img.shields.io/badge/Latest%20Stable-5.6.2-blue.svg)](https://packagist.org/packages/facebook/graph-sdk)
 
 This repository contains the open source PHP SDK that allows you to access the Facebook Platform from your PHP app.
 
-
 ## Installation
 
 The Facebook PHP SDK can be installed with [Composer](https://getcomposer.org/). Run this command:
@@ -16,24 +14,25 @@ The Facebook PHP SDK can be installed with [Composer](https://getcomposer.org/).
 composer require facebook/graph-sdk
 ```
 
-Please be aware, that there are issues when using the Facebook SDK together with [Guzzle](https://github.com/guzzle/guzzle) 6.x. php-graph-sdk v5.x only works with Guzzle 5.x out of the box. However, [there is a workaround to make it work with Guzzle 6.x](https://www.sammyk.me/how-to-inject-your-own-http-client-in-the-facebook-php-sdk-v5#writing-a-guzzle-6-http-client-implementation-from-scratch). 
+Please be aware, that there are issues when using the Facebook SDK together with [Guzzle](https://github.com/guzzle/guzzle) 6.x. php-graph-sdk v5.x only works with Guzzle 5.x out of the box. However, [there is a workaround to make it work with Guzzle 6.x](https://www.sammyk.me/how-to-inject-your-own-http-client-in-the-facebook-php-sdk-v5#writing-a-guzzle-6-http-client-implementation-from-scratch).
 
 ## Upgrading to v5.x
 
 Upgrading from v4.x? Facebook PHP SDK v5.x introduced breaking changes. Please [read the upgrade guide](https://www.sammyk.me/upgrading-the-facebook-php-sdk-from-v4-to-v5) before upgrading.
 
-
 ## Usage
 
 > **Note:** This version of the Facebook SDK for PHP requires PHP 5.4 or greater.
 
 Simple GET example of a user's profile.
 
 ```php
+require_once __DIR__ . '/vendor/autoload.php'; // change path as needed
+
 $fb = new \Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   //'default_access_token' => '{access-token}', // optional
 ]);
 
@@ -63,7 +62,6 @@ echo 'Logged in as ' . $me->getName();
 
 Complete documentation, installation instructions, and examples are available [here](docs/).
 
-
 ## Tests
 
 1. [Composer](https://getcomposer.org/) is a prerequisite for running the tests. Install composer globally, then run `composer install` to install required files.
@@ -80,17 +78,14 @@ By default the tests will send live HTTP requests to the Graph API. If you are w
 $ ./vendor/bin/phpunit --exclude-group integration
 ```
 
-
 ## Contributing
 
 For us to accept contributions you will have to first have signed the [Contributor License Agreement](https://developers.facebook.com/opensource/cla). Please see [CONTRIBUTING](https://github.com/facebook/php-graph-sdk/blob/master/CONTRIBUTING.md) for details.
 
-
 ## License
 
 Please see the [license file](https://github.com/facebook/php-graph-sdk/blob/master/LICENSE) for more information.
 
-
 ## Security Vulnerabilities
 
 If you have found a security issue, please contact the maintainers directly at [me@sammyk.me](mailto:me@sammyk.me).

docs/examples/access_token_from_canvas.md

@@ -10,7 +10,7 @@ A signed request will be sent to your app via the HTTP POST method within the co
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 $helper = $fb->getCanvasHelper();

docs/examples/access_token_from_javascript.md

@@ -29,7 +29,7 @@ In order to have the JavaScript SDK set a cookie containing a signed request (wh
     FB.init({
       appId: 'your-app-id',
       cookie: true, // This is important, it's not enabled by default
-      version: 'v2.9'
+      version: 'v2.10'
     });
   };
 
@@ -52,7 +52,7 @@ After the user successfully logs in, redirect the user (or make an AJAX request)
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 $helper = $fb->getJavaScriptHelper();

docs/examples/access_token_from_page_tab.md

@@ -10,7 +10,7 @@ Page tabs behave much like the app canvas. The PHP SDK provides a helper for pag
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 $helper = $fb->getPageTabHelper();

docs/examples/batch_request.md

@@ -11,7 +11,7 @@ The following example assumes we have the following permissions granted from the
 $fb = new Facebook\Facebook([
     'app_id' => '{app-id}',
     'app_secret' => '{app-secret}',
-    'default_graph_version' => 'v2.9',
+    'default_graph_version' => 'v2.10',
 ]);
 
 // Since all the requests will be sent on behalf of the same user,
@@ -109,7 +109,7 @@ The following example is a subset of the [first example](#example). We will only
 $fb = new Facebook\Facebook([
     'app_id' => '{app-id}',
     'app_secret' => '{app-secret}',
-    'default_graph_version' => 'v2.9',
+    'default_graph_version' => 'v2.10',
 ]);
 
 // Since all the requests will be sent on behalf of the same user,
@@ -176,7 +176,7 @@ Since we want the second request to be executed after the first one is completed
 $fb = new Facebook\Facebook([
     'app_id' => '{app-id}',
     'app_secret' => '{app-secret}',
-    'default_graph_version' => 'v2.9',
+    'default_graph_version' => 'v2.10',
 ]);
 
 // Since all the requests will be sent on behalf of the same user,
@@ -241,7 +241,7 @@ Since the requests sent in a batch are unrelated by default, we can make request
 $fb = new Facebook\Facebook([
     'app_id' => '{app-id}',
     'app_secret' => '{app-secret}',
-    'default_graph_version' => 'v2.9',
+    'default_graph_version' => 'v2.10',
 ]);
 
 $batch = [

docs/examples/batch_upload.md

@@ -12,7 +12,7 @@ The following example will upload two photos and one video.
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 // Since all the requests will be sent on behalf of the same user,

docs/examples/facebook_login.md

@@ -14,7 +14,7 @@ In this example, the PHP script that generates the login link is called `/login.
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 $helper = $fb->getRedirectLoginHelper();
@@ -31,7 +31,7 @@ echo '<a href="' . $loginUrl . '">Log in with Facebook!</a>';
 $fb = new Facebook\Facebook([
   'app_id' => '{app-id}',
   'app_secret' => '{app-secret}',
-  'default_graph_version' => 'v2.9',
+  'default_graph_version' => 'v2.10',
   ]);
 
 $helper = $fb->getRedirectLoginHelper();