Merge pull request #523 from SammyK/batch-header-fix

Fix parsing of batch headers

Author: gfosco

src/Facebook/FacebookBatchResponse.php

@@ -102,7 +102,8 @@ public function addResponse($key, $response)
 
         $httpResponseBody = isset($response['body']) ? $response['body'] : null;
         $httpResponseCode = isset($response['code']) ? $response['code'] : null;
-        $httpResponseHeaders = isset($response['headers']) ? $response['headers'] : [];
+        // @TODO With PHP 5.5 support, this becomes array_column($response['headers'], 'value', 'name')
+        $httpResponseHeaders = isset($response['headers']) ? $this->normalizeBatchHeaders($response['headers']) : [];
 
         $this->responses[$originalRequestName] = new FacebookResponse(
             $originalRequest,
@@ -151,4 +152,23 @@ public function offsetGet($offset)
     {
         return isset($this->responses[$offset]) ? $this->responses[$offset] : null;
     }
+
+    /**
+     * Converts the batch header array into a standard format.
+     * @TODO replace with array_column() when PHP 5.5 is supported.
+     *
+     * @param array $batchHeaders
+     *
+     * @return array
+     */
+    private function normalizeBatchHeaders(array $batchHeaders)
+    {
+        $headers = [];
+
+        foreach ($batchHeaders as $header) {
+            $headers[$header['name']] = $header['value'];
+        }
+
+        return $headers;
+    }
 }

tests/FacebookBatchResponseTest.php

@@ -135,4 +135,30 @@ public function testTheOriginalRequestCanBeObtainedForEachRequest()
         $this->assertEquals('foo_token_two', $batchResponse[1]->getAccessToken());
         $this->assertEquals('foo_token_three', $batchResponse[2]->getAccessToken());
     }
+
+    public function testHeadersFromBatchRequestCanBeAccessed()
+    {
+        $graphResponseJson = '[';
+        $graphResponseJson .= '{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v2.0"},{"name":"ETag","value":"\"fooTag\""}],"body":"{\"foo\":\"bar\"}"}';
+        $graphResponseJson .= ',{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v2.5"},{"name":"ETag","value":"\"barTag\""}],"body":"{\"foo\":\"bar\"}"}';
+        $graphResponseJson .= ']';
+        $response = new FacebookResponse($this->request, $graphResponseJson, 200);
+
+        $requests = [
+            new FacebookRequest($this->app, 'foo_token_one', 'GET', '/me'),
+            new FacebookRequest($this->app, 'foo_token_two', 'GET', '/you'),
+        ];
+
+        $batchRequest = new FacebookBatchRequest($this->app, $requests);
+        $batchResponse = new FacebookBatchResponse($batchRequest, $response);
+
+        $this->assertEquals('v2.0', $batchResponse[0]->getGraphVersion());
+        $this->assertEquals('"fooTag"', $batchResponse[0]->getETag());
+        $this->assertEquals('v2.5', $batchResponse[1]->getGraphVersion());
+        $this->assertEquals('"barTag"', $batchResponse[1]->getETag());
+        $this->assertEquals([
+          'Facebook-API-Version' => 'v2.5',
+          'ETag' => '"barTag"',
+        ], $batchResponse[1]->getHeaders());
+    }
 }