Update Tinify client.

Author: rolftimmermans

composer.lock

@@ -2,14 +2,16 @@
 
 namespace Tinify;
 
-const VERSION = "1.3.0";
+const VERSION = "1.4.0";
 
 class Tinify {
     const AUTHENTICATED = true;
     const ANONYMOUS = false;
 
     private static $key = NULL;
     private static $appIdentifier = NULL;
+    private static $proxy = NULL;
+
     private static $compressionCount = NULL;
 
     private static $client = NULL;
@@ -34,6 +36,11 @@ public static function setAppIdentifier($appIdentifier) {
         self::$client = NULL;
     }
 
+    public static function setProxy($proxy) {
+        self::$proxy = $proxy;
+        self::$client = NULL;
+    }
+
     public static function getCompressionCount() {
         return self::$compressionCount;
     }
@@ -48,7 +55,7 @@ public static function getClient($mode = self::AUTHENTICATED) {
         }
 
         if (!self::$client) {
-            self::$client = new Client(self::$key, self::$appIdentifier);
+            self::$client = new Client(self::$key, self::$appIdentifier, self::$proxy);
         }
 
         return self::$client;
@@ -75,6 +82,10 @@ function setAppIdentifier($appIdentifier) {
     return Tinify::setAppIdentifier($appIdentifier);
 }
 
+function setProxy($proxy) {
+    return Tinify::setProxy($proxy);
+}
+
 function getCompressionCount() {
     return Tinify::getCompressionCount();
 }

src/vendor/tinify/Tinify.php

@@ -16,8 +16,9 @@ private static function caBundle() {
         return __DIR__ . "/../data/cacert.pem";
     }
 
-    function __construct($key, $appIdentifier = NULL) {
+    function __construct($key, $appIdentifier = NULL, $proxy = NULL) {
         $userAgent = join(" ", array_filter(array(self::userAgent(), $appIdentifier)));
+
         $this->options = array(
             CURLOPT_BINARYTRANSFER => true,
             CURLOPT_RETURNTRANSFER => true,
@@ -27,9 +28,33 @@ function __construct($key, $appIdentifier = NULL) {
             CURLOPT_SSL_VERIFYPEER => true,
             CURLOPT_USERAGENT => $userAgent,
         );
+
+        if ($proxy) {
+            $parts = parse_url($proxy);
+            if (isset($parts["host"])) {
+                $this->options[CURLOPT_PROXYTYPE] = CURLPROXY_HTTP;
+                $this->options[CURLOPT_PROXY] = $parts["host"];
+            } else {
+                throw new ConnectionException("Invalid proxy");
+            }
+
+            if (isset($parts["port"])) {
+                $this->options[CURLOPT_PROXYPORT] = $parts["port"];
+            }
+
+            $creds = "";
+            if (isset($parts["user"])) $creds .= $parts["user"];
+            if (isset($parts["pass"])) $creds .= ":" . $parts["pass"];
+
+            if ($creds) {
+                $this->options[CURLOPT_PROXYAUTH] = CURLAUTH_ANY;
+                $this->options[CURLOPT_PROXYUSERPWD] = $creds;
+            }
+        }
     }
 
-    function request($method, $url, $body = NULL, $header = array()) {
+    function request($method, $url, $body = NULL) {
+        $header = array();
         if (is_array($body)) {
             if (!empty($body)) {
                 $body = json_encode($body);
@@ -40,6 +65,12 @@ function request($method, $url, $body = NULL, $header = array()) {
         }
 
         $request = curl_init();
+        if ($request === false || $request === null) {
+            throw new ConnectionException(
+                "Error while connecting: curl extension is not functional or disabled."
+            );
+        }
+
         curl_setopt_array($request, $this->options);
 
         $url = strtolower(substr($url, 0, 6)) == "https:" ? $url : self::API_ENDPOINT . $url;