merge fix

Author: Nyholm

docs/reference/CanvasHelper.md

@@ -3,7 +3,7 @@
 The `FacebookCanvasHelper` is used to obtain an access token or signed request when working within the context of an [app canvas](https://developers.facebook.com/docs/games/canvas).
 
 ```php
-Facebook\Helper\CanvasHelper( Facebook\Application $facebookApp )
+Facebook\Helper\CanvasHelper( Facebook\Application $application )
 ```
 
 ## Usage

docs/reference/Facebook.md

@@ -329,14 +329,14 @@ $batchResponse = $fb->sendBatchRequest($requests);
 
 ## newBatchRequest()
 ```php
-public Facebook\FacebookBatchRequest newBatchRequest(
+public Facebook\BatchRequest newBatchRequest(
     string|AccessToken|null $accessToken,
     string|null $graphVersion
 )
 ```
 
-Instantiates an empty `Facebook\FacebookBatchRequest`.
-To populate it use the [`Facebook\FacebookBatchRequest::add()`](FacebookBatchRequest.md#add) method.
+Instantiates an empty `Facebook\BatchRequest`.
+To populate it use the [`Facebook\BatchRequest::add()`](BatchRequest.md#add) method.
 
 The `$accessToken` and `$graphVersion` arguments are the same as `get()` above.
 If any of the requests contained in the batch request does not have either the `$accessToken` or the `$graphVersion` set,

src/Authentication/OAuth2Client.php

@@ -121,11 +121,11 @@ public function debugToken($accessToken)
     /**
      * Generates an authorization URL to begin the process of authenticating a user.
      *
-     * @param string $redirectUrl The callback URL to redirect to.
-     * @param string $state       The CSPRNG-generated CSRF value.
-     * @param array  $scope       An array of permissions to request.
-     * @param array  $params      An array of parameters to generate URL.
-     * @param string $separator   The separator to use in http_build_query().
+     * @param string $redirectUrl the callback URL to redirect to
+     * @param string $state       the CSPRNG-generated CSRF value
+     * @param array  $scope       an array of permissions to request
+     * @param array  $params      an array of parameters to generate URL
+     * @param string $separator   the separator to use in http_build_query()
      *
      * @return string
      */

src/BatchRequest.php

@@ -61,15 +61,14 @@ public function __construct(Application $app = null, array $requests = [], $acce
     /**
      * Adds a new request to the array.
      *
-     * @param Request|array     $request
-     * @param string|null|array $options Array of batch request options e.g. 'name', 'omit_response_on_success'.
+     * @param array|Request     $request
+     * @param null|array|string $options Array of batch request options e.g. 'name', 'omit_response_on_success'.
      *                                   If a string is given, it is the value of the 'name' option.
      *
-     * @return BatchRequest
-     *
      * @throws \InvalidArgumentException
      *
      * @return BatchRequest
+     * @return BatchRequest
      */
     public function add($request, $options = null)
     {
@@ -233,10 +232,10 @@ public function validateBatchRequestCount()
     /**
      * Converts a Request entity into an array that is batch-friendly.
      *
-     * @param Request   $request         The request entity to convert.
-     * @param string|null|array $options Array of batch request options e.g. 'name', 'omit_response_on_success'.
-     *                                   If a string is given, it is the value of the 'name' option.
-     * @param string|null       $attachedFiles Names of files associated with the request.
+     * @param Request           $request       the request entity to convert
+     * @param null|array|string $options       Array of batch request options e.g. 'name', 'omit_response_on_success'.
+     *                                         If a string is given, it is the value of the 'name' option.
+     * @param null|string       $attachedFiles names of files associated with the request
      *
      * @return array
      */

src/Facebook.php

@@ -482,9 +482,10 @@ public function sendBatchRequest(array $requests, $accessToken = null, $graphVer
     /**
      * Instantiates an empty FacebookBatchRequest entity.
      *
-     * @param  AccessToken|string|null $accessToken  The top-level access token. Requests with no access token
-     *                                               will fallback to this.
-     * @param  string|null             $graphVersion The Graph API version to use.
+     * @param null|AccessToken|string $accessToken  The top-level access token. Requests with no access token
+     *                                              will fallback to this.
+     * @param null|string             $graphVersion the Graph API version to use
+     *
      * @return FacebookBatchRequest
      */
     public function newBatchRequest($accessToken = null, $graphVersion = null)