Merge pull request #53 from sandfox-im/master

Decode failure detection is incorrect in PestJSON
educoder · May 9, 2014 · 6a8e9f4 · 6a8e9f4
2 parents 31e1b7a + a8fc5f3
commit 6a8e9f4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /vendor/
-.idea
+.idea
+*.iml
+*.ipr
diff --git a/PestJSON.php b/PestJSON.php
@@ -93,7 +93,7 @@ public function jsonDecode($data, $asArray=true)
     {
         $ret = json_decode($data, $asArray);
 
-        if ($ret === false && $this->throwJsonExceptions) {
+        if ($ret === null && $this->hasJsonDecodeFailed() && $this->throwJsonExceptions) {
             throw new Pest_Json_Decode(
                 'Decoding error: ' . $this->getLastJsonErrorMessage(),
                 $this->getLastJsonErrorCode()
@@ -161,6 +161,20 @@ public function getLastJsonErrorCode()
         return json_last_error();
     }
 
+    /**
+     * Check if decoding failed
+     * @return bool
+     */
+    private function hasJsonDecodeFailed()
+    {
+        // you cannot safely determine decode errors in PHP < 5.3
+        if (!function_exists('json_last_error')) {
+            return false;
+        }
+
+        return json_last_error() !== JSON_ERROR_NONE;
+    }
+
     /**
      * Process body
      * @param string $body