Merge branch 'develop' into imported-magento-magento2-functional-testing-framework-871

Author: jilu1

src/Magento/FunctionalTestingFramework/Config/Dom/ArrayNodeConfig.php

@@ -64,7 +64,7 @@ public function __construct(
     public function isNumericArray($nodeXpath)
     {
         foreach ($this->numericArrays as $pathPattern) {
-            if ($this->nodePathMatcher->match($pathPattern, $nodeXpath)) {
+            if ($this->nodePathMatcher->pathMatch($pathPattern, $nodeXpath)) {
                 return true;
             }
         }
@@ -84,7 +84,7 @@ public function getAssocArrayKeyAttribute($nodeXpath)
         }
 
         foreach ($this->assocArrays as $pathPattern => $keyAttribute) {
-            if ($this->nodePathMatcher->match($pathPattern, $nodeXpath)) {
+            if ($this->nodePathMatcher->pathMatch($pathPattern, $nodeXpath)) {
                 return $keyAttribute;
             }
         }

src/Magento/FunctionalTestingFramework/Config/Dom/NodeMergingConfig.php

@@ -44,7 +44,7 @@ public function __construct(NodePathMatcher $nodePathMatcher, array $idAttribute
     public function getIdAttribute($nodeXpath)
     {
         foreach ($this->idAttributes as $pathPattern => $idAttribute) {
-            if ($this->nodePathMatcher->match($pathPattern, $nodeXpath)) {
+            if ($this->nodePathMatcher->pathMatch($pathPattern, $nodeXpath)) {
                 return $idAttribute;
             }
         }

src/Magento/FunctionalTestingFramework/Config/Dom/NodePathMatcher.php

@@ -17,7 +17,7 @@ class NodePathMatcher
      * @param string $xpathSubject Example: '/some[@attr="value"]/static/ns:path'.
      * @return boolean
      */
-    public function match($pathPattern, $xpathSubject)
+    public function pathMatch($pathPattern, $xpathSubject)
     {
         $pathSubject = $this->simplifyXpath($xpathSubject);
         $pathPattern = '#^' . $pathPattern . '$#';

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();