Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  ext/curl: mark certain tests as xfail on curl 8.10.0

Author: cmb69

ext/curl/tests/bug48203_multi.phpt

@@ -4,8 +4,9 @@ Variation of bug #48203 with curl_multi_exec (Crash when file pointers passed to
 curl
 --SKIPIF--
 <?php
-if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
-    die("xfail Test fails for unknown reasons");
+if (curl_version()['version_number'] === 0x080a00) {
+    // https://github.com/php/php-src/issues/15997
+    die('xfail due to a libcurl bug');
 }
 ?>
 --FILE--

ext/curl/tests/bug71523.phpt

@@ -4,8 +4,9 @@ Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_
 curl
 --SKIPIF--
 <?php
-if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
-    die("xfail Test fails for unknown reasons");
+if (curl_version()['version_number'] === 0x080a00) {
+    // https://github.com/php/php-src/issues/15997
+    die('xfail due to a libcurl bug');
 }
 ?>
 --FILE--

ext/curl/tests/curl_basic_018.phpt

@@ -6,8 +6,9 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
 curl
 --SKIPIF--
 <?php
-if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
-    die("xfail Test fails for unknown reasons");
+if (curl_version()['version_number'] === 0x080a00) {
+    // https://github.com/php/php-src/issues/15997
+    die('xfail due to a libcurl bug');
 }
 ?>
 --FILE--

ext/curl/tests/curl_multi_getcontent_basic3.phpt

@@ -7,8 +7,9 @@ Rein Velt (rein@velt.org)
 curl
 --SKIPIF--
 <?php
-if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin" && php_uname("m") === "x86_64") {
-    die("xfail Test fails for unknown reasons");
+if (curl_version()['version_number'] === 0x080a00) {
+    // https://github.com/php/php-src/issues/15997
+    die('xfail due to a libcurl bug');
 }
 ?>
 --FILE--