Merge pull request magento#103 from magento-commerce/imported-magento-magento2-functional-testing-framework-868

[Imported] PHP 8 support - fix code related to changes in CURL

Author: KevinBKozan

src/Magento/FunctionalTestingFramework/DataTransport/Protocol/CurlTransport.php

@@ -132,18 +132,18 @@ public function write($url, $body = [], $method = CurlInterface::POST, $headers
  CURLOPT_RETURNTRANSFER => true,
  CURLOPT_FOLLOWLOCATION => true,
  CURLOPT_COOKIEFILE => '',
- CURLOPT_HTTPHEADER => $headers,
+ CURLOPT_HTTPHEADER => is_object($headers) ? (array) $headers : $headers,
  CURLOPT_SSL_VERIFYPEER => false,
  CURLOPT_SSL_VERIFYHOST => false,
  ];
  switch ($method) {
  case CurlInterface::POST:
  $options[CURLOPT_POST] = true;
- $options[CURLOPT_POSTFIELDS] = $body;
+ $options[CURLOPT_POSTFIELDS] = is_object($body) ? (array) $body : $body;
  break;
  case CurlInterface::PUT:
  $options[CURLOPT_CUSTOMREQUEST] = self::PUT;
- $options[CURLOPT_POSTFIELDS] = $body;
+ $options[CURLOPT_POSTFIELDS] = is_object($body) ? (array) $body : $body;
  break;
  case CurlInterface::DELETE:
  $options[CURLOPT_CUSTOMREQUEST] = self::DELETE;
@@ -189,7 +189,10 @@ public function read($successRegex = null, $returnRegex = null, $returnIndex = n
  */
  public function close()
  {
- curl_close($this->getResource());
+ if (version_compare(PHP_VERSION, '8.0') < 0) {
+ // this function no longer has an effect in PHP 8.0, but it's required in earlier versions
+ curl_close($this->getResource());
+ }
  $this->resource = null;
  }
 
@@ -271,7 +274,11 @@ public function multiRequest(array $urls, array $options = [])
  $result[$key] = curl_multi_getcontent($handle);
  curl_multi_remove_handle($multiHandle, $handle);
  }
- curl_multi_close($multiHandle);
+ if (version_compare(PHP_VERSION, '8.0') < 0) {
+ // this function no longer has an effect in PHP 8.0, but it's required in earlier versions
+ curl_multi_close($multiHandle);
+ }
+
  return $result;
  }
 

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

@@ -72,7 +72,10 @@ public function testStart(\Codeception\Event\TestEvent $e)
  CURLOPT_URL => getenv('MAGENTO_BASE_URL') . "/test.php?test=" . $this->currentTest,
  ]);
  curl_exec($cURLConnection);
- curl_close($cURLConnection);
+ if (version_compare(PHP_VERSION, '8.0') < 0) {
+ // this function no longer has an effect in PHP 8.0, but it's required in earlier versions
+ curl_close($cURLConnection);
+ }
  }
 
  PersistedObjectHandler::getInstance()->clearHookObjects();