Merge pull request #1034 from foaly-nr1/id

Conserve id when next to data key, resolves #700

Author: yguedidi

CHANGELOG.md

@@ -12,6 +12,7 @@ Version 5 of the Facebook PHP SDK is a complete refactor of version 4. It comes
   - Fixed HTTP/2 support (#1079)
   - Fixed resumable upload error (#1001)
   - Strip 'enforce_https' param (#1084)
+  - Conserve id when next to data key, resolves #700 (#1034)
 - 5.6.3 (2018-07-01)
   - Add fix for countable error in PHP 7.2 (originally #969 by @andreybolonin)
 - 5.6.2 (2018-02-15)

src/Facebook/GraphNodes/GraphNodeFactory.php

@@ -304,7 +304,9 @@ public function castAsGraphNodeOrGraphEdge(array $data, $subclassName = null, $p
                 return $this->safelyMakeGraphEdge($data, $subclassName, $parentKey, $parentNodeId);
             }
             // Sometimes Graph is a weirdo and returns a GraphNode under the "data" key
-            $data = $data['data'];
+            $outerData = $data;
+            unset($outerData['data']);
+            $data = $data['data'] + $outerData;
         }
 
         // Create GraphNode

tests/GraphNodes/GraphNodeFactoryTest.php

@@ -247,6 +247,33 @@ public function testAGraphNodeWithARootDataKeyWillBeCastAsAGraphNode()
         ], $graphData);
     }
 
+    public function testAGraphNodeWithARootDataKeyWillConserveRootKeys()
+    {
+        $data = json_encode([
+            'id' => '123',
+            'foo' => 'bar',
+            'data' => [
+                'name' => 'Foo McBar',
+                'link' => 'http://facebook/foo',
+            ],
+        ]);
+
+        $res = new FacebookResponse($this->request, $data);
+        $factory = new GraphNodeFactory($res);
+        $graphNode = $factory->makeGraphNode();
+
+        $this->assertInstanceOf('\Facebook\GraphNodes\GraphNode', $graphNode);
+
+        $graphData = $graphNode->asArray();
+
+        $this->assertEquals([
+            'id' => '123',
+            'foo' => 'bar',
+            'name' => 'Foo McBar',
+            'link' => 'http://facebook/foo',
+        ], $graphData);
+    }
+
     public function testAGraphEdgeWillBeCastRecursively()
     {
         $someUser = [