Remove Curl55 adapter and optimize Curl initialization for PHP 8+ compatibility adjustments

composer.json

@@ -13,6 +13,7 @@
   "homepage": "https://developers.facebook.com/",
   "require": {
     "php": ">=8.0",
+    "ext-curl": "*",
     "guzzlehttp/guzzle": "^6.5 || ^7.0"
   },
   "require-dev": {

src/FacebookAds/Http/Adapter/Curl/AbstractCurl.php

@@ -45,7 +45,7 @@ public function __clone() {
   }
 
   public function __destruct() {
-    if (is_resource($this->handle)) {
+    if ($this->handle instanceof \CurlHandle) {
       curl_close($this->handle);
     }
   }
@@ -54,11 +54,7 @@ public function __destruct() {
    * @return CurlInterface
    */
   public static function createOptimalVersion() {
-    if (version_compare(PHP_VERSION, '5.5.0') >= 0) {
-      return new Curl55();
-    } else {
-      return new Curl();
-    }
+    return new Curl();
   }
 
   /**

src/FacebookAds/Http/Adapter/Curl/Curl.php

@@ -28,59 +28,41 @@
 
 class Curl extends AbstractCurl {
 
-  /**
-   * @throws \RuntimeException
-   */
-  public function __construct() {
-    parent::__construct();
-    if (version_compare(PHP_VERSION, '5.5.0') >= 0) {
-      throw new \RuntimeException("Unsupported Curl version");
-    }
-  }
-
   /**
    * @param string $string
-   * @return string
+   * @return bool|string
    */
   public function escape($string) {
-    return rawurlencode($string);
+    return curl_escape($this->handle, $string);
   }
 
   /**
    * @param int $bitmask
    * @return int
    */
   public function pause($bitmask) {
-    return 0;
+    return curl_pause($this->handle, $bitmask);
   }
 
   /**
-   * FIXME should introduce v2.10 breaking change:
-   * implement abstract support for FileParameter in AdapterInterface
-   *
    * @param string|FileParameter $filepath
-   * @return string
+   * @return \CURLFile
    */
   public function preparePostFileField($filepath) {
     $mime_type = $name = '';
     if ($filepath instanceof FileParameter) {
-      $mime_type = $filepath->getMimeType() !== null
-        ? sprintf(';type=%s', $filepath->getMimeType())
-        : '';
-      $name = $filepath->getName() !== null
-        ? sprintf(';filename=%s', $filepath->getName())
-        : '';
+      $mime_type = $filepath->getMimeType() ?: '';
+      $name = $filepath->getName() ?: '';
       $filepath = $filepath->getPath();
     }
-    return sprintf('@%s%s%s', $filepath, $mime_type, $name);
+    return new \CURLFile($filepath, $mime_type, $name);
   }
 
   /**
    * @return void
    */
   public function reset() {
-    $this->handle && curl_close($this->handle);
-    $this->handle = curl_init();
+    $this->handle && curl_reset($this->handle);
   }
 
   /**

src/FacebookAds/Http/Adapter/CurlAdapter.php

@@ -25,7 +25,6 @@
 namespace FacebookAds\Http\Adapter;
 
 use FacebookAds\Exception\Exception;
-use FacebookAds\Http\Adapter\Curl\AbstractCurl;
 use FacebookAds\Http\Adapter\Curl\Curl;
 use FacebookAds\Http\Adapter\Curl\CurlInterface;
 use FacebookAds\Http\Client;
@@ -51,7 +50,7 @@ class CurlAdapter extends AbstractAdapter {
    */
   public function __construct(Client $client, ?CurlInterface $curl = null) {
     parent::__construct($client);
-    $this->curl = $curl ?: AbstractCurl::createOptimalVersion();
+    $this->curl = $curl ?: new Curl();
     $this->curl->init();
   }