Using http status code to determine successful API connection instead of error text.

Author: Jippe Holwerda

src/class-tiny-compress-curl.php

@@ -56,10 +56,11 @@ protected function shrink($input) {
         }
 
         $header_size = curl_getinfo($request, CURLINFO_HEADER_SIZE);
+        $status_code = curl_getinfo($request, CURLINFO_HTTP_CODE);
         $headers = self::parse_headers(substr($response, 0, $header_size));
         curl_close($request);
 
-        return array(self::decode(substr($response, $header_size)), $headers);
+        return array(self::decode(substr($response, $header_size)), $headers, $status_code);
     }
 
     protected function output_options($url) {

src/class-tiny-compress-fopen.php

@@ -41,11 +41,20 @@ protected function shrink($input) {
         $context = stream_context_create($this->shrink_options($input));
         $request = @fopen(Tiny_Config::URL, 'r', false, $context);
 
+        $status_code = null;
+        if ($http_response_header && count($http_response_header) > 0) {
+            $http_code_values = explode(' ', $http_response_header[0]);
+            if (count($http_code_values) > 1) {
+                $status_code = intval($http_code_values[1]);
+            }
+        }
+
         if (!$request) {
+            $headers = self::parse_headers($http_response_header);
             return array(array(
                 'error' => 'FopenError',
-                'message' => 'Could not compress, enable cURL for detailed error'
-              ), null
+                'message' => 'Could not compress, enable cURL for detailed error',
+              ), $headers, $status_code
             );
         }
 
@@ -54,7 +63,7 @@ protected function shrink($input) {
         $headers = self::parse_headers($meta_data['wrapper_data']);
         fclose($request);
 
-        return array(self::decode($response), $headers);
+        return array(self::decode($response), $headers, $status_code);
     }
 
     protected function output_options() {
@@ -82,8 +91,4 @@ protected function output($url) {
 
         return $response;
     }
-
-    public function get_status(&$details) {
-        return null;
-    }
 }

src/class-tiny-compress.php

@@ -44,10 +44,10 @@ abstract protected function shrink($input);
     abstract protected function output($url);
 
     public function get_status(&$details) {
-        list($details, $headers) = $this->shrink(null);
+        list($details, $headers, $status_code) = $this->shrink(null);
 
         $this->call_after_compress_callback($details, $headers);
-        if (!isset($details['error']) || $details["error"] == 'InputMissing' || $details["error"] == 'TooManyRequests') {
+        if ($status_code >= 400 && $status_code < 500 && $status_code != 401) {
             return true;
         } else {
             return false;

test/integration/CompressIntegrationTest.php

@@ -80,5 +80,4 @@ public function testIncorrectJsonButton() {
         self::$driver->wait(2)->until(WebDriverExpectedCondition::textToBePresentInElement(
             WebDriverBy::cssSelector('td.tiny-compress-images'), 'JSON: Syntax error [4]'));
     }
-
 }