Minor fixes and CS

Author: Nyholm

composer.json

@@ -17,11 +17,12 @@
         "php-http/client-implementation": "^1.0",
         "php-http/httplug": "^1.0",
         "php-http/discovery": "^1.0",
-        "paragonie/random_compat": "^2.0"
+        "paragonie/random_compat": "^2.0",
+        "squizlabs/php_codesniffer": "^2.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "mockery/mockery": "~0.8",
+        "phpunit/phpunit": "^4.8 || ^5.6",
+        "mockery/mockery": "^0.9",
         "php-http/guzzle6-adapter": "^1.0",
         "php-http/message": "^1.0",
         "guzzlehttp/psr7": "^1.0"

docs/FacebookVideo.fbmd

@@ -28,6 +28,11 @@ $myVideoFileToUpload = $fb->videoToUpload('/path/to/video-file.mp4'),
 Partial file uploads are possible using the `$maxLength` and `$offset` parameters which provide the same functionality as the `$maxlen` and `$offset` parameters on the [`stream_get_contents()` PHP function](http://php.net/stream_get_contents).
 </card>
 
+%FB(devsite:markdown-wiki:info-card {
+  content: "Uploading videos may cause a timeout. Make sure to configure your HTTP client to increase timeout time before uploading videos.",
+  type: 'warning',
+})
+
 <card>
 ## Usage {#usage}
 

src/Facebook/FacebookClient.php

@@ -198,18 +198,24 @@ public function sendRequest(FacebookRequest $request)
 
         static::$requestCount++;
 
-        $returnResponse = new FacebookResponse(
+        // Prepare headers from associative array to a single string for each header.
+        $responseHeaders = [];
+        foreach ($psr7Response->getHeaders() as $name => $values) {
+            $responseHeaders[] = sprintf('%s: %s', $name, implode(", ", $values));
+        }
+
+        $facebookResponse = new FacebookResponse(
             $request,
             $psr7Response->getBody(),
             $psr7Response->getStatusCode(),
-            $psr7Response->getHeaders()
+            $responseHeaders
         );
 
-        if ($returnResponse->isError()) {
-            throw $returnResponse->getThrownException();
+        if ($facebookResponse->isError()) {
+            throw $facebookResponse->getThrownException();
         }
 
-        return $returnResponse;
+        return $facebookResponse;
     }
 
     /**

tests/FacebookClientTest.php

@@ -75,6 +75,14 @@ public function testACustomHttpClientCanBeInjected()
         $this->assertInstanceOf('Facebook\Tests\Fixtures\MyFooClientHandler', $httpHandler);
     }
 
+    public function testTheHttpClientWillFallbackToDefault()
+    {
+        $client = new FacebookClient();
+        $httpHandler = $client->getHttpClient();
+
+        $this->assertInstanceOf('Http\Client\HttpClient', $httpHandler);
+    }
+
     public function testBetaModeCanBeDisabledOrEnabledViaConstructor()
     {
         $client = new FacebookClient(null, false);

tests/Fixtures/FakeGraphApiForResumableUpload.php

@@ -19,7 +19,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
  */
 
 namespace Facebook\Tests\Fixtures;
@@ -59,23 +58,29 @@ public function sendRequest(RequestInterface $request)
     private function respondStart()
     {
         if ($this->respondWith == 'FAIL_ON_START') {
-            return new Response(500, ['Foo'=>'Bar'],
-                '{"error":{"message":"Error validating access token: Session has expired on Monday, ' .
-                '10-Aug-15 01:00:00 PDT. The current time is Monday, 10-Aug-15 01:14:23 PDT.",' .
+            return new Response(
+                500,
+                ['Foo' => 'Bar'],
+                '{"error":{"message":"Error validating access token: Session has expired on Monday, '.
+                '10-Aug-15 01:00:00 PDT. The current time is Monday, 10-Aug-15 01:14:23 PDT.",'.
                 '"type":"OAuthException","code":190,"error_subcode":463}}'
             );
         }
 
-        return new Response(200, ['Foo'=>'Bar'],
+        return new Response(
+            200,
+            ['Foo' => 'Bar'],
             '{"video_id":"1337","start_offset":"0","end_offset":"20","upload_session_id":"42"}'
         );
     }
 
     private function respondTransfer()
     {
         if ($this->respondWith == 'FAIL_ON_TRANSFER') {
-            return new Response(500, ['Foo'=>'Bar'],
-                '{"error":{"message":"There was a problem uploading your video. Please try uploading it again.",' .
+            return new Response(
+                500,
+                ['Foo' => 'Bar'],
+                '{"error":{"message":"There was a problem uploading your video. Please try uploading it again.",'.
                 '"type":"FacebookApiException","code":6000,"error_subcode":1363019}}'
             );
         }
@@ -94,11 +99,11 @@ private function respondTransfer()
 
         $this->transferCount++;
 
-        return new Response(200, ['Foo'=>'Bar'], json_encode($data));
+        return new Response(200, ['Foo' => 'Bar'], json_encode($data));
     }
 
     private function respondFinish()
     {
-        return new Response(500, ['Foo'=>'Bar'], '{"success":true}');
+        return new Response(500, ['Foo' => 'Bar'], '{"success":true}');
     }
 }

tests/Fixtures/FooClientInterface.php

@@ -31,7 +31,9 @@ class FooClientInterface implements HttpClient
 {
     public function sendRequest(RequestInterface $request)
     {
-        return new Response(1337, ['Date' => 'Mon, 19 May 2014 18:37:17 GMT'],
+        return new Response(
+            1337,
+            ['Date' => 'Mon, 19 May 2014 18:37:17 GMT'],
             '{"data":[{"id":"123","name":"Foo"},{"id":"1337","name":"Bar"}]}',
             '1.1',
             'OK'

tests/Fixtures/MyFooBatchClientHandler.php

@@ -31,7 +31,9 @@ class MyFooBatchClientHandler implements HttpClient
 {
     public function sendRequest(RequestInterface $request)
     {
-        return new Response(200, ['Date' => 'Mon, 19 May 2014 18:37:17 GMT'],
+        return new Response(
+            200,
+            ['Date' => 'Mon, 19 May 2014 18:37:17 GMT'],
             '[{"code":"123","body":"Foo"},{"code":"1337","body":"Bar"}]'
         );
     }

tests/Fixtures/MyFooClientHandler.php

@@ -31,7 +31,9 @@ class MyFooClientHandler implements HttpClient
 {
     public function sendRequest(RequestInterface $request)
     {
-        return new Response(200, ['Date'=>'Mon, 19 May 2014 18:37:17 GMT'],
+        return new Response(
+            200,
+            ['Date'=>'Mon, 19 May 2014 18:37:17 GMT'],
             '{"data":[{"id":"123","name":"Foo"},{"id":"1337","name":"Bar"}]}'
         );
     }