Better error message for cURL and JSON

Author: Jacob Middag

src/class-tiny-compress-curl.php

@@ -47,10 +47,10 @@ protected function shrink($input) {
 
         $output_url = null;
         $response = curl_exec($request);
-        if ($response === false) {
+        if ($response === false || $response === null) {
             return array(array(
                 'error' => 'CurlError',
-                'message' => sprintf("%s [%d]", curl_error($request), curl_errno($request))
+                'message' => sprintf("cURL: %s [%d]", curl_error($request), curl_errno($request))
               ), null
             );
         }

src/class-tiny-compress.php

@@ -102,7 +102,10 @@ protected static function parse_headers($headers) {
     protected static function decode($text) {
         $result = json_decode($text, true);
         if ($result === null) {
-            throw new Tiny_Exception('Could not decode JSON', 'JsonError');
+            throw new Tiny_Exception(sprintf('JSON: %s [%d]',
+                    PHP_VERSION_ID >= 50500 ? json_last_error_msg() : 'Error',
+                    json_last_error()),
+                'JsonError');
         }
         return $result;
     }

test/integration/CompressIntegrationTest.php

@@ -67,4 +67,18 @@ public function testLimitReachedDismisses() {
         self::$driver->get(wordpress('/wp-admin/options-media.php'));
         $this->assertEquals(0, count(self::$driver->findElements(WebDriverBy::cssSelector('div.error p'))));
     }
+
+    public function testIncorrectJsonButton() {
+        $this->enable_compression_sizes(array());
+        $this->upload_image(dirname(__FILE__) . '/../fixtures/input-example.png');
+        $this->enable_compression_sizes(array('medium', 'large'));
+
+        $this->set_api_key('JSON1234');
+        self::$driver->get(wordpress('/wp-admin/upload.php'));
+
+        self::$driver->findElement(WebDriverBy::cssSelector('td.tiny-compress-images button'))->click();
+        self::$driver->wait(2)->until(WebDriverExpectedCondition::textToBePresentInElement(
+            WebDriverBy::cssSelector('td.tiny-compress-images'), 'JSON: Syntax error [4]'));
+    }
+
 }

test/mock-tinypng-webservice/shrink.php

@@ -94,6 +94,16 @@ function mock_limit_reached_response() {
     return json_encode($response);
 }
 
+function mock_invalid_json_response() {
+    global $session;
+
+    $session['Compression-Count'] += 1;
+    header('HTTP/1.1 201 Created');
+    header("Location: http://webservice/output/example.png");
+    header("Compression-Count: {$session['Compression-Count']}");
+    return '{invalid: json}';
+}
+
 $request_headers = apache_request_headers();
 $basic_auth = base64_decode(str_replace('Basic ', '', $request_headers['Authorization']));
 $api_key_elements = explode(':', $basic_auth);
@@ -113,6 +123,12 @@ function mock_limit_reached_response() {
     } else {
         echo mock_jpg_response();
     }
+} else if ($api_key == 'JSON1234') {
+    if (intval($_SERVER['CONTENT_LENGTH']) == 0) {
+        echo mock_empty_response();
+    } else {
+        echo mock_invald_json_response();
+    }
 } else if ($api_key == 'LIMIT123') {
     echo mock_limit_reached_response();
 } else {