From f683263f51cc655a4bc1077aa6c52d08c3286dd2 Mon Sep 17 00:00:00 2001
From: Michal Schneider <schneider.michal@gmail.com>
Date: Thu, 12 Jun 2014 10:13:00 +0200
Subject: [PATCH 1/2] Json decode only responses with json content type

When I wanted to get code of JSON file (that exists in repository) using blob API method, I got parsed JSON, but I wanted plain text...
Url: projects/<project id>/repository/commits/<sha>/blob?filepath=<some json file>
---
 lib/Gitlab/HttpClient/Message/Response.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/Gitlab/HttpClient/Message/Response.php b/lib/Gitlab/HttpClient/Message/Response.php
index 4f33a85c6..55f5f9688 100644
--- a/lib/Gitlab/HttpClient/Message/Response.php
+++ b/lib/Gitlab/HttpClient/Message/Response.php
@@ -12,12 +12,16 @@ class Response extends BaseResponse
     public function getContent()
     {
         $response = parent::getContent();
-        $content  = json_decode($response, true);
-
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (parent::getHeader("Content-Type") === "application/json") {
+            $content  = json_decode($response, true);
+    
+            if (JSON_ERROR_NONE !== json_last_error()) {
+                return $response;
+            }
+    
+            return $content;
+        } else {
             return $response;
         }
-
-        return $content;
     }
 }

From d44de170effce6cff8c8fa3d0f27dfbe4e1942b1 Mon Sep 17 00:00:00 2001
From: Michal Schneider <schneider.michal@gmail.com>
Date: Fri, 13 Jun 2014 10:35:26 +0200
Subject: [PATCH 2/2] '$this' is better than 'parent'

---
 lib/Gitlab/HttpClient/Message/Response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Gitlab/HttpClient/Message/Response.php b/lib/Gitlab/HttpClient/Message/Response.php
index 55f5f9688..49228f32f 100644
--- a/lib/Gitlab/HttpClient/Message/Response.php
+++ b/lib/Gitlab/HttpClient/Message/Response.php
@@ -12,7 +12,7 @@ class Response extends BaseResponse
     public function getContent()
     {
         $response = parent::getContent();
-        if (parent::getHeader("Content-Type") === "application/json") {
+        if ($this->getHeader("Content-Type") === "application/json") {
             $content  = json_decode($response, true);
     
             if (JSON_ERROR_NONE !== json_last_error()) {