use integration instead of sandbox

FamilySearch · Oct 31, 2016 · 1830312 · 1830312
1 parent 1a8a97f
commit 1830312
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 131 deletions.
diff --git a/src/FamilySearch.php b/src/FamilySearch.php
@@ -8,11 +8,11 @@ class FamilySearch
 
     /**
      * The FamilySearch reference or environment to target. Valid values are
-     * 'sandbox', 'beta', and 'production'.
+     * 'integration', 'beta', and 'production'.
      * 
      * @var string
      */
-    private $environment = 'sandbox';
+    private $environment = 'integration';
 
     /**
      * The application key assigned when your application was registered.
@@ -65,7 +65,7 @@ class FamilySearch
      */
     public function __construct($options = array())
     {
-        if (isset($options['environment']) && in_array($options['environment'], ['production','beta','sandbox'])) {
+        if (isset($options['environment']) && in_array($options['environment'], ['production','beta','integration'])) {
             $this->environment = $options['environment'];
         }
 
@@ -487,7 +487,7 @@ private function identHost()
             case 'beta':
                 return 'https://identbeta.familysearch.org';
             default:
-                return 'https://identint.familysearch.org';
+                return 'https://integration.familysearch.org';
         }
     }
 
@@ -504,7 +504,7 @@ private function platformHost()
             case 'beta':
                 return 'https://beta.familysearch.org';
             default:
-                return 'https://sandbox.familysearch.org';
+                return 'https://integration.familysearch.org';
         }
     }
 

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -70,8 +70,8 @@ public function testRedirect()
         $this->assertResponseOK($this->login());
         $response = $this->client->get('/platform/tree/current-person');
         $this->assertTrue($response->redirected);
-        $this->assertEquals('https://sandbox.familysearch.org/platform/tree/current-person', $response->originalUrl);
-        $this->assertEquals('https://sandbox.familysearch.org/platform/tree/persons/KW7G-28J', $response->effectiveUrl);
+        $this->assertEquals('https://integration.familysearch.org/platform/tree/current-person', $response->originalUrl);
+        $this->assertEquals('https://integration.familysearch.org/platform/tree/persons/KW7G-28J', $response->effectiveUrl);
     }
 
 }
diff --git a/test/fixtures/testAuthenticate.json b/test/fixtures/testAuthenticate.json
@@ -1,9 +1,9 @@
 [{
     "request": {
         "method": "POST",
-        "url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
+        "url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
         "headers": {
-            "Host": "identint.familysearch.org",
+            "Host": "integration.familysearch.org",
             "Content-Type": "application\/x-www-form-urlencoded"
         },
         "body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,15 +17,15 @@
         "headers": {
             "Server": "Apache-Coyote\/1.1",
             "Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
-            "Last-Modified": "Thu Aug 11 16:20:04 GMT+00:00 2016",
+            "Last-Modified": "Mon Oct 31 18:26:33 GMT+00:00 2016",
             "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
             "Pragma": "no-cache",
             "Content-Type": "application\/json;charset=ISO-8859-1",
             "Content-Language": "en-US",
             "Content-Length": "185",
-            "Date": "Thu, 11 Aug 2016 16:20:03 GMT",
+            "Date": "Mon, 31 Oct 2016 18:26:32 GMT",
             "Connection": "close"
         },
-        "body": "{\"token\":\"USYS89652A8E4F0B964668A7FB0AB06FE18F_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS89652A8E4F0B964668A7FB0AB06FE18F_idses-int01.a.fsglobal.net\"}"
+        "body": "{\"token\":\"USYSFCFCB55D6A92B6AAF6E522920825C1C2_idses-int02.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSFCFCB55D6A92B6AAF6E522920825C1C2_idses-int02.a.fsglobal.net\"}"
     }
 }]
diff --git a/test/fixtures/testDelete.json b/test/fixtures/testDelete.json
diff --git a/test/fixtures/testGet.json b/test/fixtures/testGet.json
diff --git a/test/fixtures/testHead.json b/test/fixtures/testHead.json
@@ -1,9 +1,9 @@
 [{
     "request": {
         "method": "POST",
-        "url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
+        "url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
         "headers": {
-            "Host": "identint.familysearch.org",
+            "Host": "integration.familysearch.org",
             "Content-Type": "application\/x-www-form-urlencoded"
         },
         "body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,24 +17,24 @@
         "headers": {
             "Server": "Apache-Coyote\/1.1",
             "Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
-            "Last-Modified": "Thu Aug 11 17:08:41 GMT+00:00 2016",
+            "Last-Modified": "Mon Oct 31 18:26:43 GMT+00:00 2016",
             "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
             "Pragma": "no-cache",
             "Content-Type": "application\/json;charset=ISO-8859-1",
             "Content-Language": "en-US",
             "Content-Length": "185",
-            "Date": "Thu, 11 Aug 2016 17:08:40 GMT",
+            "Date": "Mon, 31 Oct 2016 18:26:43 GMT",
             "Connection": "close"
         },
-        "body": "{\"token\":\"USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net\"}"
+        "body": "{\"token\":\"USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net\"}"
     }
 },{
     "request": {
         "method": "POST",
-        "url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons",
+        "url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons",
         "headers": {
-            "Host": "sandbox.familysearch.org",
-            "Authorization": "Bearer USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net",
+            "Host": "integration.familysearch.org",
+            "Authorization": "Bearer USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net",
             "Accept": "application\/x-fs-v1+json",
             "Content-Type": "application\/x-fs-v1+json"
         },
@@ -49,16 +49,16 @@
         "headers": {
             "Cache-Control": "no-cache, no-store, no-transform, must-revalidate, max-age=0",
             "Content-Type": "application\/x-fs-v1+json",
-            "Date": "Thu, 11 Aug 2016 17:08:42 GMT",
-            "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\"",
-            "Location": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T",
+            "Date": "Mon, 31 Oct 2016 18:25:49 GMT",
+            "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\"",
+            "Location": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3",
             "Server": "Apache-Coyote\/1.1",
             "Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
             "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.\"",
-            "X-ENTITY-ID": "L5ZV-K5T",
-            "X-PROCESSING-TIME": "414",
-            "X-THROTTLE-MILLIS-LEFT": "1799206",
-            "X-THROTTLE-MILLIS-USED": "794",
+            "X-ENTITY-ID": "L58X-4X3",
+            "X-PROCESSING-TIME": "399",
+            "X-THROTTLE-MILLIS-LEFT": "1797215",
+            "X-THROTTLE-MILLIS-USED": "2785",
             "X-THROTTLE-WINDOW-SIZE": "1800000",
             "Content-Length": "0",
             "Connection": "Close"
@@ -67,10 +67,10 @@
 },{
     "request": {
         "method": "GET",
-        "url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-K5T",
+        "url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4X3",
         "headers": {
-            "Host": "sandbox.familysearch.org",
-            "Authorization": "Bearer USYSAC23135F011A1E8FD2D93D3C14ACC083_idses-int01.a.fsglobal.net",
+            "Host": "integration.familysearch.org",
+            "Authorization": "Bearer USYS4F60C1CB790B03897C4E91B38E56605D_idses-int01.a.fsglobal.net",
             "Accept": "application\/x-fs-v1+json"
         }
     },
@@ -83,16 +83,16 @@
         "headers": {
             "Allow": "OPTIONS, HEAD, GET, POST, DELETE",
             "Cache-Control": "no-transform, must-revalidate, max-age=0",
-            "Content-Location": "\/tree\/persons\/L5ZV-K5T",
+            "Content-Location": "\/tree\/persons\/L58X-4X3",
             "Content-Type": "application\/x-fs-v1+json",
-            "Date": "Thu, 11 Aug 2016 17:08:42 GMT",
-            "ETag": "\"136902281221260000\"",
-            "Last-Modified": "Thu, 11 Aug 2016 17:08:42 GMT",
+            "Date": "Mon, 31 Oct 2016 18:25:49 GMT",
+            "ETag": "\"136972311497060000\"",
+            "Last-Modified": "Mon, 31 Oct 2016 18:25:49 GMT",
             "Server": "Apache-Coyote\/1.1",
             "Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
-            "X-PROCESSING-TIME": "164",
-            "X-THROTTLE-MILLIS-LEFT": "1799046",
-            "X-THROTTLE-MILLIS-USED": "954",
+            "X-PROCESSING-TIME": "150",
+            "X-THROTTLE-MILLIS-LEFT": "1797068",
+            "X-THROTTLE-MILLIS-USED": "2932",
             "X-THROTTLE-WINDOW-SIZE": "1800000",
             "transfer-encoding": "chunked",
             "Connection": "Close"

diff --git a/test/fixtures/testPost.json b/test/fixtures/testPost.json
@@ -1,9 +1,9 @@
 [{
     "request": {
         "method": "POST",
-        "url": "https:\/\/identint.familysearch.org\/cis-web\/oauth2\/v3\/token",
+        "url": "https:\/\/integration.familysearch.org\/cis-web\/oauth2\/v3\/token",
         "headers": {
-            "Host": "identint.familysearch.org",
+            "Host": "integration.familysearch.org",
             "Content-Type": "application\/x-www-form-urlencoded"
         },
         "body": "grant_type=password&client_id=a02j000000CBv4gAAD&username=sdktester&password=1234sdkpass"
@@ -17,24 +17,24 @@
         "headers": {
             "Server": "Apache-Coyote\/1.1",
             "Expires": "Tue, 03 Jul 2001 06:00:00 GMT",
-            "Last-Modified": "Thu Aug 11 16:44:53 GMT+00:00 2016",
+            "Last-Modified": "Mon Oct 31 18:26:39 GMT+00:00 2016",
             "Cache-Control": "no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0",
             "Pragma": "no-cache",
             "Content-Type": "application\/json;charset=ISO-8859-1",
             "Content-Language": "en-US",
             "Content-Length": "185",
-            "Date": "Thu, 11 Aug 2016 16:44:52 GMT",
+            "Date": "Mon, 31 Oct 2016 18:26:39 GMT",
             "Connection": "close"
         },
-        "body": "{\"token\":\"USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net\"}"
+        "body": "{\"token\":\"USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net\",\"token_type\":\"family_search\",\"access_token\":\"USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net\"}"
     }
 },{
     "request": {
         "method": "POST",
-        "url": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons",
+        "url": "https:\/\/integration.familysearch.org\/platform\/tree\/persons",
         "headers": {
-            "Host": "sandbox.familysearch.org",
-            "Authorization": "Bearer USYSF8744BC94797917DF2610BBACE0179BA_idses-int01.a.fsglobal.net",
+            "Host": "integration.familysearch.org",
+            "Authorization": "Bearer USYS5D0E3B763A8914DDB7DF9086D1055B4A_idses-int02.a.fsglobal.net",
             "Accept": "application\/x-fs-v1+json",
             "Content-Type": "application\/x-fs-v1+json"
         },
@@ -49,16 +49,16 @@
         "headers": {
             "Cache-Control": "no-cache, no-store, no-transform, must-revalidate, max-age=0",
             "Content-Type": "application\/x-fs-v1+json",
-            "Date": "Thu, 11 Aug 2016 16:44:53 GMT",
-            "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\"",
-            "Location": "https:\/\/sandbox.familysearch.org\/platform\/tree\/persons\/L5ZV-KVR",
+            "Date": "Mon, 31 Oct 2016 18:25:46 GMT",
+            "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\"",
+            "Location": "https:\/\/integration.familysearch.org\/platform\/tree\/persons\/L58X-4XS",
             "Server": "Apache-Coyote\/1.1",
             "Vary": "Accept, Accept-Language, Accept-Encoding, Expect, Accept-Encoding",
             "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.\"",
-            "X-ENTITY-ID": "L5ZV-KVR",
-            "X-PROCESSING-TIME": "437",
-            "X-THROTTLE-MILLIS-LEFT": "1795856",
-            "X-THROTTLE-MILLIS-USED": "4144",
+            "X-ENTITY-ID": "L58X-4XS",
+            "X-PROCESSING-TIME": "1144",
+            "X-THROTTLE-MILLIS-LEFT": "1798861",
+            "X-THROTTLE-MILLIS-USED": "1139",
             "X-THROTTLE-WINDOW-SIZE": "1800000",
             "Content-Length": "0",
             "Connection": "Close"