Merge pull request #64 from msiebeneicher/issue-63

Ensure that json_decode always return an assoc array (Fix #63)
trivago · Dec 15, 2016 · 8bdf77d · 8bdf77d
2 parents ea77a0f + 39adac7
commit 8bdf77d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Component/Http/HttpGuzzlResponse.php b/src/Component/Http/HttpGuzzlResponse.php
@@ -50,6 +50,6 @@ public function getBody()
      */
     public function json()
     {
-        return json_decode($this->getBody());
+        return json_decode($this->getBody(), true);
     }
 }
diff --git a/test/unit/Component/Http/HttpGuzzleResponseTest.php b/test/unit/Component/Http/HttpGuzzleResponseTest.php
@@ -55,4 +55,29 @@ public function testJsonSuccess()
 
         $this->assertEquals([1,2,3], $_oHttpGuzzleResponse->json());
     }
+
+    public function testJsonReturnAssocArray()
+    {
+        $dummyBody = [
+            'histogram' => [
+                '75thPercentile' => 539159,
+                '95thPercentile' => 539159,
+                '98thPercentile' => 539159,
+                '99thPercentile' => 539159,
+                'median' => 539159,
+                'count' => 15
+            ],
+            'taskStatHistory' => []
+        ];
+        $this->oResponseInterface
+            ->getBody()
+            ->shouldBeCalledTimes(1)
+            ->willReturn(json_encode($dummyBody));
+
+        $_oHttpGuzzleResponse = new HttpGuzzlResponse($this->oResponseInterface->reveal());
+
+        $result = $_oHttpGuzzleResponse->json();
+        $this->assertInternalType('array', $result);
+        $this->assertEquals($dummyBody, $result);
+    }
 }