finalize gedcomx-php integration

Author: justincy

README.md

@@ -142,4 +142,5 @@ When a response body is present, it will be deserialized as either an
 or a [FamilySearchPlatform](http://familysearch.github.io/gedcomx-php/class-Gedcomx.Extensions.FamilySearch.FamilySearchPlatform.html)
 object.
 
-gedcomx-php must be installed and included separately.
+gedcomx-php must be installed and included separately. gedcomx-php version 3.1.2
+or later is required.

composer.json

@@ -7,7 +7,7 @@
         }
     ],
     "require-dev": {
-        "gedcomx/gedcomx-php": "^3.0",
+        "gedcomx/gedcomx-php": "^3.1.2",
         "php-vcr/php-vcr": "^1.2",
         "phpunit/phpunit": "^4.8",
         "php-vcr/phpunit-testlistener-vcr": "^1.1"

composer.lock

@@ -463,13 +463,13 @@ private function request($url, $options = array())
                     if ($response->data && $this->objects){
 
                         // Atom Feed
-                        if (isset($response->data->entries)){
+                        if (isset($response->data['entries'])){
                             $response->gedcomx = new \Gedcomx\Atom\Feed($response->data);
                         } 
 
                         // OAuth token success response
-                        else if (isset($response->data['access_token'])) {
-                            // TODO
+                        else if (isset($response->data['access_token']) || isset($response->data['error'])) {
+                            $response->gedcomx = new \Gedcomx\Extensions\FamilySearch\OAuth2($response->data);
                         } 
 
                         // GedcomX

src/FamilySearch.php

@@ -25,8 +25,8 @@ public function testAuthenticate()
         $response = $this->login();
         $this->assertResponseOK($response);
         $this->assertResponseData($response);
-        $this->assertArrayHasKey('token', $response->data);
-        $this->assertNotHasGedcomxObject($response);
+        $this->assertArrayHasKey('access_token', $response->data);
+        $this->assertHasGedcomxObject($response);
     }
 
     /**