Skip to content

Commit 722a0e2

Browse files
author
Martin de Keijzer
committed
Bump Graph API to supported 10.x version
1 parent ec00565 commit 722a0e2

19 files changed

+35
-34
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# CHANGELOG
22

33
## 7.x
4-
4+
- 7.0.2
5+
- Bump default Graph API version to v10.0
56
- 7.0.1
67
- Fix a bug with required Composer packages
78
- 7.0.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require_once __DIR__ . '/vendor/autoload.php'; // change path as needed
2525
$fb = new \Facebook\Facebook([
2626
'app_id' => '{app-id}',
2727
'app_secret' => '{app-secret}',
28-
'default_graph_version' => 'v2.10',
28+
'default_graph_version' => 'v10.0',
2929
//'default_access_token' => '{access-token}', // optional
3030
]);
3131

docs/examples/access_token_from_canvas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A signed request will be sent to your app via the HTTP POST method within the co
1010
$fb = new Facebook\Facebook([
1111
'app_id' => '{app-id}',
1212
'app_secret' => '{app-secret}',
13-
'default_graph_version' => 'v2.10',
13+
'default_graph_version' => 'v10.0',
1414
]);
1515

1616
$helper = $fb->getCanvasHelper();

docs/examples/access_token_from_javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In order to have the JavaScript SDK set a cookie containing a signed request (wh
2929
FB.init({
3030
appId: 'your-app-id',
3131
cookie: true, // This is important, it's not enabled by default
32-
version: 'v2.10'
32+
version: 'v10.0'
3333
});
3434
};
3535
@@ -52,7 +52,7 @@ After the user successfully logs in, redirect the user (or make an AJAX request)
5252
$fb = new Facebook\Facebook([
5353
'app_id' => '{app-id}',
5454
'app_secret' => '{app-secret}',
55-
'default_graph_version' => 'v2.10',
55+
'default_graph_version' => 'v10.0',
5656
]);
5757

5858
$helper = $fb->getJavaScriptHelper();

docs/examples/access_token_from_page_tab.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Page tabs behave much like the app canvas. The PHP SDK provides a helper for pag
1010
$fb = new Facebook\Facebook([
1111
'app_id' => '{app-id}',
1212
'app_secret' => '{app-secret}',
13-
'default_graph_version' => 'v2.10',
13+
'default_graph_version' => 'v10.0',
1414
]);
1515

1616
$helper = $fb->getPageTabHelper();

docs/examples/batch_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The following example assumes we have the following permissions granted from the
1010
$fb = new Facebook\Facebook([
1111
'app_id' => '{app-id}',
1212
'app_secret' => '{app-secret}',
13-
'default_graph_version' => 'v2.10',
13+
'default_graph_version' => 'v10.0',
1414
]);
1515

1616
// Since all the requests will be sent on behalf of the same user,
@@ -106,7 +106,7 @@ Since the requests sent in a batch are unrelated by default, we can make request
106106
$fb = new Facebook\Facebook([
107107
'app_id' => '{app-id}',
108108
'app_secret' => '{app-secret}',
109-
'default_graph_version' => 'v2.10',
109+
'default_graph_version' => 'v10.0',
110110
]);
111111

112112
$batch = [

docs/examples/batch_upload.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following example will upload two photos and one video.
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
// Since all the requests will be sent on behalf of the same user,

docs/examples/facebook_login.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In this example, the PHP script that generates the login link is called `/login.
1414
$fb = new Facebook\Facebook([
1515
'app_id' => '{app-id}',
1616
'app_secret' => '{app-secret}',
17-
'default_graph_version' => 'v2.10',
17+
'default_graph_version' => 'v10.0',
1818
]);
1919

2020
$helper = $fb->getRedirectLoginHelper();
@@ -31,7 +31,7 @@ echo '<a href="' . $loginUrl . '">Log in with Facebook!</a>';
3131
$fb = new Facebook\Facebook([
3232
'app_id' => '{app-id}',
3333
'app_secret' => '{app-secret}',
34-
'default_graph_version' => 'v2.10',
34+
'default_graph_version' => 'v10.0',
3535
]);
3636

3737
$helper = $fb->getRedirectLoginHelper();

docs/examples/pagination_basic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In this example we'll pull five entries from a user's feed (assuming the user ap
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
try {

docs/examples/post_links.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For more information, see the documentation for [`Facebook\Facebook`](../referen
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
$linkData = [

docs/examples/retrieve_user_profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For more information, see the documentation for [`Facebook\Facebook`](../referen
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
try {

docs/examples/upload_photo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ For more information, see the documentation for [`Facebook\Facebook`](../referen
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
$data = [

docs/examples/upload_video.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following example will upload a video in chunks using the [resumable upload]
1212
$fb = new Facebook\Facebook([
1313
'app_id' => '{app-id}',
1414
'app_secret' => '{app-secret}',
15-
'default_graph_version' => 'v2.10',
15+
'default_graph_version' => 'v10.0',
1616
]);
1717

1818
$data = [

docs/getting_started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Before we can send requests to the Graph API, we need to load our app configurat
3636
$fb = new Facebook\Facebook([
3737
'app_id' => '{app-id}',
3838
'app_secret' => '{app-secret}',
39-
'default_graph_version' => 'v2.10',
39+
'default_graph_version' => 'v10.0',
4040
]);
4141
```
4242

docs/reference/Facebook.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To instantiate a new `Facebook\Facebook` service, pass an array of configuration
1010
$fb = new Facebook\Facebook([
1111
'app_id' => '{app-id}',
1212
'app_secret' => '{app-secret}',
13-
'default_graph_version' => 'v2.10',
13+
'default_graph_version' => 'v10.0',
1414
// . . .
1515
]);
1616
```
@@ -48,7 +48,7 @@ $fb = new Facebook\Facebook([
4848
'app_secret' => '{app-secret}',
4949
'default_access_token' => '{access-token}',
5050
'enable_beta_mode' => true,
51-
'default_graph_version' => 'v2.10',
51+
'default_graph_version' => 'v10.0',
5252
'http_client_handler' => 'guzzle',
5353
'persistent_data_handler' => 'memory',
5454
'url_detection_handler' => new MyUrlDetectionHandler(),
@@ -123,7 +123,7 @@ To take advantage of this feature, simply set an environment variable named `FAC
123123

124124
```php
125125
$fb = new Facebook\Facebook([
126-
'default_graph_version' => 'v2.10',
126+
'default_graph_version' => 'v10.0',
127127
]);
128128
```
129129

@@ -295,7 +295,7 @@ public Facebook\Response sendRequest(
295295
Sends a request to the Graph API.
296296

297297
```php
298-
$response = $fb->sendRequest('GET', '/me', [], '{access-token}', 'eTag', 'v2.10');
298+
$response = $fb->sendRequest('GET', '/me', [], '{access-token}', 'eTag', 'v10.0');
299299
```
300300

301301
## sendBatchRequest()

docs/reference/Request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,5 @@ $fb = new Facebook\Facebook(/* . . . */);
176176
$request = $fb->request('GET', '/me', ['fields' => 'id,name']);
177177

178178
$url = $request->getUrl();
179-
// /v2.10/me?fields=id,name&access_token=token&appsecret_proof=proof
179+
// /v10.0/me?fields=id,name&access_token=token&appsecret_proof=proof
180180
```

tests/BatchResponseTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ public function testASuccessfulJsonBatchResponseWillBeDecoded(): void
6060
{
6161
$graphResponseJson = '[';
6262
// Single Graph object.
63-
$graphResponseJson .= '{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Last-Modified","value":"2013-12-24T00:34:20+0000"},{"name":"Facebook-API-Version","value":"v2.0"},{"name":"ETag","value":"\"fooTag\""},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Pragma","value":"no-cache"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"}],"body":"{\"id\":\"123\",\"name\":\"Foo McBar\",\"updated_time\":\"2013-12-24T00:34:20+0000\",\"verified\":true}"}';
63+
$graphResponseJson .= '{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Last-Modified","value":"2013-12-24T00:34:20+0000"},{"name":"Facebook-API-Version","value":"v10.0"},{"name":"ETag","value":"\"fooTag\""},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Pragma","value":"no-cache"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"}],"body":"{\"id\":\"123\",\"name\":\"Foo McBar\",\"updated_time\":\"2013-12-24T00:34:20+0000\",\"verified\":true}"}';
6464
// Paginated list of Graph objects.
6565
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Facebook-API-Version","value":"v1.0"},{"name":"ETag","value":"\"barTag\""},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Pragma","value":"no-cache"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"}],"body":"{\"data\":[{\"id\":\"1337\",\"story\":\"Foo story.\"},{\"id\":\"1338\",\"story\":\"Bar story.\"}],\"paging\":{\"previous\":\"previous_url\",\"next\":\"next_url\"}}"}';
6666
// After POST operation.
67-
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Pragma","value":"no-cache"},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Facebook-API-Version","value":"v2.0"}],"body":"{\"id\":\"123_1337\"}"}';
67+
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Pragma","value":"no-cache"},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Facebook-API-Version","value":"v10.0"}],"body":"{\"id\":\"123_1337\"}"}';
6868
// After DELETE operation.
69-
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Pragma","value":"no-cache"},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Facebook-API-Version","value":"v2.0"}],"body":"true"}';
69+
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Connection","value":"close"},{"name":"Expires","value":"Sat, 01 Jan 2000 00:00:00 GMT"},{"name":"Cache-Control","value":"private, no-cache, no-store, must-revalidate"},{"name":"Access-Control-Allow-Origin","value":"*"},{"name":"Pragma","value":"no-cache"},{"name":"Content-Type","value":"text\/javascript; charset=UTF-8"},{"name":"Facebook-API-Version","value":"v10.0"}],"body":"true"}';
7070
$graphResponseJson .= ']';
7171
$response = new Response($this->request, $graphResponseJson, 200);
7272
$batchRequest = new BatchRequest($this->app, [
@@ -140,8 +140,8 @@ public function testTheOriginalRequestCanBeObtainedForEachRequest(): void
140140
public function testHeadersFromBatchRequestCanBeAccessed(): void
141141
{
142142
$graphResponseJson = '[';
143-
$graphResponseJson .= '{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v2.0"},{"name":"ETag","value":"\"fooTag\""}],"body":"{\"foo\":\"bar\"}"}';
144-
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v2.5"},{"name":"ETag","value":"\"barTag\""}],"body":"{\"foo\":\"bar\"}"}';
143+
$graphResponseJson .= '{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v10.0"},{"name":"ETag","value":"\"fooTag\""}],"body":"{\"foo\":\"bar\"}"}';
144+
$graphResponseJson .= ',{"code":200,"headers":[{"name":"Facebook-API-Version","value":"v10.4"},{"name":"ETag","value":"\"barTag\""}],"body":"{\"foo\":\"bar\"}"}';
145145
$graphResponseJson .= ']';
146146
$response = new Response($this->request, $graphResponseJson, 200);
147147

@@ -153,12 +153,12 @@ public function testHeadersFromBatchRequestCanBeAccessed(): void
153153
$batchRequest = new BatchRequest($this->app, $requests);
154154
$batchResponse = new BatchResponse($batchRequest, $response);
155155

156-
$this->assertEquals('v2.0', $batchResponse[0]->getGraphVersion());
156+
$this->assertEquals('v10.0', $batchResponse[0]->getGraphVersion());
157157
$this->assertEquals('"fooTag"', $batchResponse[0]->getETag());
158-
$this->assertEquals('v2.5', $batchResponse[1]->getGraphVersion());
158+
$this->assertEquals('v10.4', $batchResponse[1]->getGraphVersion());
159159
$this->assertEquals('"barTag"', $batchResponse[1]->getETag());
160160
$this->assertEquals([
161-
'Facebook-API-Version' => 'v2.5',
161+
'Facebook-API-Version' => 'v10.4',
162162
'ETag' => '"barTag"',
163163
], $batchResponse[1]->getHeaders());
164164
}

tests/FileUpload/ResumableUploaderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function setUp(): void
6363

6464
public function testResumableUploadCanStartTransferAndFinish(): void
6565
{
66-
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v2.4');
66+
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v10.0');
6767
$endpoint = '/me/videos';
6868
$chunk = $uploader->start($endpoint, $this->file);
6969
$this->assertInstanceOf(TransferChunk::class, $chunk);
@@ -82,15 +82,15 @@ public function testStartWillLetErrorResponsesThrow(): void
8282
{
8383
$this->expectException(\Facebook\Exception\ResponseException::class);
8484
$this->graphApi->failOnStart();
85-
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v2.4');
85+
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v10.0');
8686

8787
$uploader->start('/me/videos', $this->file);
8888
}
8989

9090
public function testFailedResumableTransferWillNotThrowAndReturnSameChunk(): void
9191
{
9292
$this->graphApi->failOnTransfer();
93-
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v2.4');
93+
$uploader = new ResumableUploader($this->fbApp, $this->client, 'access_token', 'v10.0');
9494

9595
$chunk = new TransferChunk($this->file, '1', '2', '3', '4');
9696
$newChunk = $uploader->transfer('/me/videos', $chunk);

tests/Url/UrlManipulatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function testGraphUrlsCanBeTrimmed(): void
213213
$baseGraphUrl = UrlManipulator::baseGraphUrlEndpoint($fullGraphUrl);
214214
$this->assertEquals('/me', $baseGraphUrl);
215215

216-
$fullGraphUrl = 'https://whatever-they-want.facebook.com/v2.1/me';
216+
$fullGraphUrl = 'https://whatever-they-want.facebook.com/v10.0/me';
217217
$baseGraphUrl = UrlManipulator::baseGraphUrlEndpoint($fullGraphUrl);
218218
$this->assertEquals('/me', $baseGraphUrl);
219219

0 commit comments

Comments
 (0)