Skip to content

Commit 1830312

Browse files
justincyjustincy
committed
use integration instead of sandbox
1 parent 1a8a97f commit 1830312

File tree

8 files changed

+131
-131
lines changed

8 files changed

+131
-131
lines changed

‎src/FamilySearch.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ class FamilySearch
88

99
/**
1010
* The FamilySearch reference or environment to target. Valid values are
11-
* 'sandbox', 'beta', and 'production'.
11+
* 'integration', 'beta', and 'production'.
1212
*
1313
* @var string
1414
*/
15-
private $environment = 'sandbox';
15+
private $environment = 'integration';
1616

1717
/**
1818
* The application key assigned when your application was registered.
@@ -65,7 +65,7 @@ class FamilySearch
6565
*/
6666
public function __construct($options = array())
6767
{
68-
if (isset($options['environment']) && in_array($options['environment'], ['production','beta','sandbox'])) {
68+
if (isset($options['environment']) && in_array($options['environment'], ['production','beta','integration'])) {
6969
$this->environment = $options['environment'];
7070
}
7171

@@ -487,7 +487,7 @@ private function identHost()
487487
case 'beta':
488488
return 'https://identbeta.familysearch.org';
489489
default:
490-
return 'https://identint.familysearch.org';
490+
return 'https://integration.familysearch.org';
491491
}
492492
}
493493

@@ -504,7 +504,7 @@ private function platformHost()
504504
case 'beta':
505505
return 'https://beta.familysearch.org';
506506
default:
507-
return 'https://sandbox.familysearch.org';
507+
return 'https://integration.familysearch.org';
508508
}
509509
}
510510

‎test/ClientTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public function testRedirect()
7070
$this->assertResponseOK($this->login());
7171
$response = $this->client->get('/platform/tree/current-person');
7272
$this->assertTrue($response->redirected);
73-
$this->assertEquals('https://sandbox.familysearch.org/platform/tree/current-person', $response->originalUrl);
74-
$this->assertEquals('https://sandbox.familysearch.org/platform/tree/persons/KW7G-28J', $response->effectiveUrl);
73+
$this->assertEquals('https://integration.familysearch.org/platform/tree/current-person', $response->originalUrl);
74+
$this->assertEquals('https://integration.familysearch.org/platform/tree/persons/KW7G-28J', $response->effectiveUrl);
7575
}
7676

7777
}

‎test/fixtures/testAuthenticate.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"request": {
33
"method": "POST",
4-
"url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
4+
"url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
55
"headers": {
6-
"Host": "identint.familysearch.org",
6+
"Host": "integration.familysearch.org",
77
"Content-Type": "application\/x-www-form-urlencoded"
88
},
99
"body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,15 +17,15 @@
1717
"headers": {
1818
"Server": "Apache-Coyote\/1.1",
1919
"Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
20-
"Last-Modified": "Thu Aug 11 16:20:04 GMT+00:00 2016",
20+
"Last-Modified": "Mon Oct 31 18:26:33 GMT+00:00 2016",
2121
"Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
2222
"Pragma": "no-cache",
2323
"Content-Type": "application\/json;charset=ISO-8859-1",
2424
"Content-Language": "en-US",
2525
"Content-Length": "185",
26-
"Date": "Thu, 11 Aug 2016 16:20:03 GMT",
26+
"Date": "Mon, 31 Oct 2016 18:26:32 GMT",
2727
"Connection": "close"
2828
},
29-
"body": "{\"token\":\"USYS89652A8E4F0B964668A7FB0AB06FE18F_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS89652A8E4F0B964668A7FB0AB06FE18F_idses-int01.a.fsglobal.net\"}"
29+
"body": "{\"token\":\"USYSFCFCB55D6A92B6AAF6E522920825C1C2_idses-int02.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSFCFCB55D6A92B6AAF6E522920825C1C2_idses-int02.a.fsglobal.net\"}"
3030
}
3131
}]

‎test/fixtures/testDelete.json‎

Lines changed: 33 additions & 33 deletions
Large diffs are not rendered by default.

‎test/fixtures/testGet.json‎

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

‎test/fixtures/testHead.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"request": {
33
"method": "POST",
4-
"url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
4+
"url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
55
"headers": {
6-
"Host": "identint.familysearch.org",
6+
"Host": "integration.familysearch.org",
77
"Content-Type": "application\/x-www-form-urlencoded"
88
},
99
"body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,24 +17,24 @@
1717
"headers": {
1818
"Server": "Apache-Coyote\/1.1",
1919
"Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
20-
"Last-Modified": "Thu Aug 11 17:08:41 GMT+00:00 2016",
20+
"Last-Modified": "Mon Oct 31 18:26:43 GMT+00:00 2016",
2121
"Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
2222
"Pragma": "no-cache",
2323
"Content-Type": "application\/json;charset=ISO-8859-1",
2424
"Content-Language": "en-US",
2525
"Content-Length": "185",
26-
"Date": "Thu, 11 Aug 2016 17:08:40 GMT",
26+
"Date": "Mon, 31 Oct 2016 18:26:43 GMT",
2727
"Connection": "close"
2828
},
29-
"body": "{\"token\":\"USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net\"}"
29+
"body": "{\"token\":\"USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net\"}"
3030
}
3131
},{
3232
"request": {
3333
"method": "POST",
34-
"url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons",
34+
"url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons",
3535
"headers": {
36-
"Host": "sandbox.familysearch.org",
37-
"Authorization": "Bearer USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net",
36+
"Host": "integration.familysearch.org",
37+
"Authorization": "Bearer USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net",
3838
"Accept": "application\/x-fs-v1+json",
3939
"Content-Type": "application\/x-fs-v1+json"
4040
},
@@ -49,16 +49,16 @@
4949
"headers": {
5050
"Cache-Control": "no-cache, no-store, no-transform, must-revalidate, max-age=0",
5151
"Content-Type": "application\/x-fs-v1+json",
52-
"Date": "Thu, 11 Aug 2016 17:08:42 GMT",
53-
"Link": "<https:\/\/sandbox.familysearch.org\/platform\/tree\/ancestry?person=L5ZV-K5T>; rel=\"ancestry\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/child-relationships>; rel=\"child-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/descendancy?person=L5ZV-K5T>; rel=\"descendancy\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/discussion-references>; rel=\"discussion-references\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/matches>; rel=\"matches\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/notes>; rel=\"notes\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/parent-relationships>; rel=\"parent-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons-with-relationships?person=L5ZV-K5T>; rel=\"person-with-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/source-references>; rel=\"source-references\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T\/spouse-relationships>; rel=\"spouse-relationships\"",
54-
"Location": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T",
52+
"Date": "Mon, 31 Oct 2016 18:25:49 GMT",
53+
"Link": "<https:\/\/integration.familysearch.org\/platform\/tree\/ancestry?person=L58X-4X3>; rel=\"ancestry\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/child-relationships>; rel=\"child-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/descendancy?person=L58X-4X3>; rel=\"descendancy\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/discussion-references>; rel=\"discussion-references\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/matches>; rel=\"matches\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/notes>; rel=\"notes\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/parent-relationships>; rel=\"parent-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons-with-relationships?person=L58X-4X3>; rel=\"person-with-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons>; rel=\"persons\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/source-references>; rel=\"source-references\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3\/spouse-relationships>; rel=\"spouse-relationships\"",
54+
"Location": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3",
5555
"Server": "Apache-Coyote\/1.1",
5656
"Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
5757
"Warning": "400 FamilySearch \"A locale was specified for normalized date 29 November 1651 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 1721 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 1721 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 29 November 1651 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\"",
58-
"X-ENTITY-ID": "L5ZV-K5T",
59-
"X-PROCESSING-TIME": "414",
60-
"X-THROTTLE-MILLIS-LEFT": "1799206",
61-
"X-THROTTLE-MILLIS-USED": "794",
58+
"X-ENTITY-ID": "L58X-4X3",
59+
"X-PROCESSING-TIME": "399",
60+
"X-THROTTLE-MILLIS-LEFT": "1797215",
61+
"X-THROTTLE-MILLIS-USED": "2785",
6262
"X-THROTTLE-WINDOW-SIZE": "1800000",
6363
"Content-Length": "0",
6464
"Connection": "Close"
@@ -67,10 +67,10 @@
6767
},{
6868
"request": {
6969
"method": "GET",
70-
"url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T",
70+
"url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3",
7171
"headers": {
72-
"Host": "sandbox.familysearch.org",
73-
"Authorization": "Bearer USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net",
72+
"Host": "integration.familysearch.org",
73+
"Authorization": "Bearer USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net",
7474
"Accept": "application\/x-fs-v1+json"
7575
}
7676
},
@@ -83,16 +83,16 @@
8383
"headers": {
8484
"Allow": "OPTIONS, HEAD, GET, POST, DELETE",
8585
"Cache-Control": "no-transform, must-revalidate, max-age=0",
86-
"Content-Location": "\/tree\/persons\/L5ZV-K5T",
86+
"Content-Location": "\/tree\/persons\/L58X-4X3",
8787
"Content-Type": "application\/x-fs-v1+json",
88-
"Date": "Thu, 11 Aug 2016 17:08:42 GMT",
89-
"ETag": "\"136902281221260000\"",
90-
"Last-Modified": "Thu, 11 Aug 2016 17:08:42 GMT",
88+
"Date": "Mon, 31 Oct 2016 18:25:49 GMT",
89+
"ETag": "\"136972311497060000\"",
90+
"Last-Modified": "Mon, 31 Oct 2016 18:25:49 GMT",
9191
"Server": "Apache-Coyote\/1.1",
9292
"Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
93-
"X-PROCESSING-TIME": "164",
94-
"X-THROTTLE-MILLIS-LEFT": "1799046",
95-
"X-THROTTLE-MILLIS-USED": "954",
93+
"X-PROCESSING-TIME": "150",
94+
"X-THROTTLE-MILLIS-LEFT": "1797068",
95+
"X-THROTTLE-MILLIS-USED": "2932",
9696
"X-THROTTLE-WINDOW-SIZE": "1800000",
9797
"transfer-encoding": "chunked",
9898
"Connection": "Close"

‎test/fixtures/testPost.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[{
22
"request": {
33
"method": "POST",
4-
"url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
4+
"url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
55
"headers": {
6-
"Host": "identint.familysearch.org",
6+
"Host": "integration.familysearch.org",
77
"Content-Type": "application\/x-www-form-urlencoded"
88
},
99
"body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,24 +17,24 @@
1717
"headers": {
1818
"Server": "Apache-Coyote\/1.1",
1919
"Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
20-
"Last-Modified": "Thu Aug 11 16:44:53 GMT+00:00 2016",
20+
"Last-Modified": "Mon Oct 31 18:26:39 GMT+00:00 2016",
2121
"Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
2222
"Pragma": "no-cache",
2323
"Content-Type": "application\/json;charset=ISO-8859-1",
2424
"Content-Language": "en-US",
2525
"Content-Length": "185",
26-
"Date": "Thu, 11 Aug 2016 16:44:52 GMT",
26+
"Date": "Mon, 31 Oct 2016 18:26:39 GMT",
2727
"Connection": "close"
2828
},
29-
"body": "{\"token\":\"USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net\"}"
29+
"body": "{\"token\":\"USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net\"}"
3030
}
3131
},{
3232
"request": {
3333
"method": "POST",
34-
"url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons",
34+
"url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons",
3535
"headers": {
36-
"Host": "sandbox.familysearch.org",
37-
"Authorization": "Bearer USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net",
36+
"Host": "integration.familysearch.org",
37+
"Authorization": "Bearer USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net",
3838
"Accept": "application\/x-fs-v1+json",
3939
"Content-Type": "application\/x-fs-v1+json"
4040
},
@@ -49,16 +49,16 @@
4949
"headers": {
5050
"Cache-Control": "no-cache, no-store, no-transform, must-revalidate, max-age=0",
5151
"Content-Type": "application\/x-fs-v1+json",
52-
"Date": "Thu, 11 Aug 2016 16:44:53 GMT",
53-
"Link": "<https:\/\/sandbox.familysearch.org\/platform\/tree\/ancestry?person=L5ZV-KVR>; rel=\"ancestry\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/child-relationships>; rel=\"child-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/descendancy?person=L5ZV-KVR>; rel=\"descendancy\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/discussion-references>; rel=\"discussion-references\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/matches>; rel=\"matches\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/notes>; rel=\"notes\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/parent-relationships>; rel=\"parent-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons-with-relationships?person=L5ZV-KVR>; rel=\"person-with-relationships\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/source-references>; rel=\"source-references\", <https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR\/spouse-relationships>; rel=\"spouse-relationships\"",
54-
"Location": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR",
52+
"Date": "Mon, 31 Oct 2016 18:25:46 GMT",
53+
"Link": "<https:\/\/integration.familysearch.org\/platform\/tree\/ancestry?person=L58X-4XS>; rel=\"ancestry\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/child-relationships>; rel=\"child-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/descendancy?person=L58X-4XS>; rel=\"descendancy\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/discussion-references>; rel=\"discussion-references\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/matches>; rel=\"matches\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/notes>; rel=\"notes\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/parent-relationships>; rel=\"parent-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons-with-relationships?person=L58X-4XS>; rel=\"person-with-relationships\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons>; rel=\"persons\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/source-references>; rel=\"source-references\", <https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS\/spouse-relationships>; rel=\"spouse-relationships\"",
54+
"Location": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS",
5555
"Server": "Apache-Coyote\/1.1",
5656
"Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
5757
"Warning": "400 FamilySearch \"A locale was specified for normalized date 29 November 1651 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 1721 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 1721 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\", 400 FamilySearch \"A locale was specified for normalized date 29 November 1651 but it will be ignored.\", 400 FamilySearch \"Multiple normalized date values were provided. Only the first will be accepted.\"",
58-
"X-ENTITY-ID": "L5ZV-KVR",
59-
"X-PROCESSING-TIME": "437",
60-
"X-THROTTLE-MILLIS-LEFT": "1795856",
61-
"X-THROTTLE-MILLIS-USED": "4144",
58+
"X-ENTITY-ID": "L58X-4XS",
59+
"X-PROCESSING-TIME": "1144",
60+
"X-THROTTLE-MILLIS-LEFT": "1798861",
61+
"X-THROTTLE-MILLIS-USED": "1139",
6262
"X-THROTTLE-WINDOW-SIZE": "1800000",
6363
"Content-Length": "0",
6464
"Connection": "Close"

0 commit comments

Comments
 (0)