Added support for Bitly version-4

src/Base/ClientAdapter.php

@@ -59,9 +59,35 @@ private function defaultClient()
      */
     public function fetchUrl($url, $parameters = [], $json_formatted = true, $verb = 'get')
     {
-        $full_url = $this->buildUrl($url, $parameters);
+        if ($verb == 'post') {
+            $data = json_encode(['long_url' => urldecode($parameters['longUrl'])]);
+            $curl = curl_init();
+            curl_setopt_array($curl, array(
+                CURLOPT_URL => $url,
+                CURLOPT_RETURNTRANSFER => true,
+                CURLOPT_ENCODING => "",
+                CURLOPT_MAXREDIRS => 10,
+                CURLOPT_TIMEOUT => 0,
+                CURLOPT_FOLLOWLOCATION => true,
+                CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
+                CURLOPT_CUSTOMREQUEST => 'POST',
+                CURLOPT_POSTFIELDS =>$data,
+                CURLOPT_HTTPHEADER => array(
+                    "Content-Type: application/json",
+                    "Authorization: Bearer ".$parameters['access_token']
+                ),
+            ));
 
-        $response = $this->client->{$verb}($full_url);
+            $response = curl_exec($curl);
+            $httpcode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+            $response=json_decode($response);
+            $response->status_code = $httpcode;
+            $json_formatted = false;
+        }else{
+            $full_url = $this->buildUrl($url, $parameters);
+            $response = $this->client->{$verb}($full_url);
+        }
 
         return ($json_formatted) ? $response->json() : $response;
     }

src/Base/DriversAbstract.php

@@ -50,8 +50,8 @@ public function getClient()
      *
      * @return mixed
      */
-    public function fetchUrl($url, $parameters)
+    public function fetchUrl($url, $parameters, $json_formatted = true, $verb = 'get')
     {
-        return $this->clientAdapter->fetchUrl($url, $parameters);
+        return $this->clientAdapter->fetchUrl($url, $parameters, $json_formatted, $verb);
     }
 }

src/Drivers/Bitly.php

@@ -77,7 +77,11 @@ private function setParameters($parameters)
     public function shorten($url)
     {
         // make the API call through the extended client
-        $response = $this->fetchUrl($this->url(), $this->parameters($url));
+        $verb = 'get';
+        if ($this->domain == 'https://api-ssl.bitly.com' && $this->endpoint == '/v4/shorten') {
+            $verb = 'post';
+        }
+        $response = $this->fetchUrl($this->url(), $this->parameters($url), true, $verb);
 
         // read the shorted url from the response object
         $shorter_url = $this->parse($response);
@@ -126,6 +130,10 @@ private function parse($response_object)
         $this->validateResponseCode($response_object->status_code);
 
         // return only the short generated url
-        return $response_object->data->url;
+        if (isset($response_object->data)) {
+            return $response_object->data->url;
+        }else{
+            return $response_object->link;
+        }
     }
 }

tests/Drivers/BitlyTest.php

@@ -31,6 +31,7 @@ private function driverParameters()
         return [
             'domain' => 'https://api-ssl.bitly.com',
             'endpoint' => '/v3/shorten',
+            //'endpoint' => '/v4/shorten',
             'token' => '1234567890qwertyuiopasdfghjklzxcvbnm',
         ];
     }