Update Tinify SDK (#44)

* Remove webdriver and yaml

* Run update

Author: tijmenbruggeman

composer.json

@@ -18,11 +18,9 @@
   },
   "require-dev": {
     "phpunit/phpunit": "~4.6",
-    "facebook/webdriver": "1.1.3",
     "mikey179/vfsstream": "~1.5",
     "mockery/mockery": "~0.9",
     "phpdocumentor/reflection-docblock": "~2.0",
-    "symfony/yaml": "~2.8",
     "squizlabs/php_codesniffer": "~2.2",
     "tinify/tinify": "dev-create-key",
     "wp-coding-standards/wpcs": "0.11"

composer.lock

@@ -2,7 +2,7 @@
 
 namespace Tinify;
 
-const VERSION = "1.5.2";
+const VERSION = "1.6.2";
 
 class Tinify {
     const AUTHENTICATED = true;

src/vendor/tinify/Tinify.php

@@ -34,7 +34,6 @@ function __construct($key, $appIdentifier = NULL, $proxy = NULL) {
         $userAgent = join(" ", array_filter(array(self::userAgent(), $appIdentifier)));
 
         $this->options = array(
-            CURLOPT_BINARYTRANSFER => true,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_HEADER => true,
             CURLOPT_USERPWD => $key ? ("api:" . $key) : NULL,
@@ -114,7 +113,7 @@ function request($method, $url, $body = NULL) {
                 $headers = self::parseHeaders(substr($response, 0, $headerSize));
                 $responseBody = substr($response, $headerSize);
 
-                if (isset($headers["compression-count"])) {
+                if ( isset($headers["compression-count"] ) ) {
                     Tinify::setCompressionCount(intval($headers["compression-count"]));
                 }
 
@@ -126,6 +125,17 @@ function request($method, $url, $body = NULL) {
                     Tinify::setPayingState( $headers["paying-state"] );
                 }
 
+                $details = json_decode($responseBody);
+                if (!$details) {
+                    $message = sprintf("Error while parsing response: %s (#%d)",
+                        PHP_VERSION_ID >= 50500 ? json_last_error_msg() : "Error",
+                        json_last_error());
+                    $details = (object) array(
+                        "message" => $message,
+                        "error" => "ParseError"
+                    );
+                }
+
                 if ( isset( $headers["email-address"] ) ) {
                     Tinify::setEmailAddress( $headers["email-address"] );
                 }

src/vendor/tinify/Tinify/Client.php

@@ -20,4 +20,12 @@ public function height() {
     public function location() {
         return isset($this->meta["location"]) ? $this->meta["location"] : null;
     }
+
+    public function extension() {
+        if (isset($this->meta["content-type"])) {
+            $parts = explode("/", $this->meta["content-type"]);
+            return end($parts);
+        }
+        return null;
+    }
 }

src/vendor/tinify/Tinify/ResultMeta.php

@@ -42,6 +42,16 @@ public function store($options) {
         return new Result($response->headers, $response->body);
     }
 
+    public function convert($options) {
+        $commands = array_merge($this->commands, array("convert" => $options));
+        return new self($this->url, $commands);
+    }
+
+    public function transform($options) {
+        $commands = array_merge($this->commands, array("transform" => $options));
+        return new self($this->url, $commands);
+    }
+
     public function result() {
         $response = Tinify::getClient()->request("get", $this->url, $this->commands);
         return new Result($response->headers, $response->body);