Stricter checking of success and error codes

PopuriAO29 · Mar 16, 2015 · 0905859 · 0905859
1 parent e743b73
commit 0905859
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/ReCaptcha/Response.php b/src/ReCaptcha/Response.php
@@ -51,17 +51,21 @@ class Response
      */
     public static function fromJson($json)
     {
-        $answers = json_decode($json, true);
+        $responseData = json_decode($json, true);
 
-        if (!$answers) {
+        if (!$responseData) {
             return new Response(false, array('invalid-json'));
         }
 
-        if (trim($answers['success']) == true) {
+        if (isset($responseData['success']) && $responseData['success'] == true) {
             return new Response(true);
         }
 
-        return new Response(false, $answers['error-codes']);
+        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
+            return new Response(false, $responseData['error-codes']);
+        }
+
+        return new Response(false);
     }
 
     /**

diff --git a/tests/ReCaptcha/ResponseTest.php b/tests/ReCaptcha/ResponseTest.php
@@ -45,6 +45,7 @@ public function provideJson()
             array('{"success": true}', true, array()),
             array('{"success": false, "error-codes": ["test"]}', false, array('test')),
             array('{"success": true, "error-codes": ["test"]}', true, array()),
+            array('{"success": false}', false, array()),
             array('BAD JSON', false, array('invalid-json')),
         );
     }