Backport CI fixes to security branches

Closes phpGH-16469

Working towards phpGH-16286

commit e0db221143b808d97bc3a44e9f0968c6308794b4
Author: Ilija Tovilo <[email protected]>
Date:   Fri Oct 25 22:48:20 2024 +0200

    Move CFLAGS into ./configure command for consistency

commit 8ad67768250d181cd7fef30e0c866625bbd8ac94
Author: Ilija Tovilo <[email protected]>
Date:   Fri Oct 25 22:47:03 2024 +0200

    Also upgrade nightly to macOS 13

commit 58a88cc
Author: Ilija Tovilo <[email protected]>
Date:   Wed Oct 23 19:07:59 2024 +0200

    Fix call to dc[n]gettext in tests with 0 $category

    This causes a segfault on PHP-8.1

commit 611af05
Author: Ilija Tovilo <[email protected]>
Date:   Fri Dec 8 13:36:52 2023 +0100

    [skip ci] Skip intermittently failing curl test on macOS

    The test fails with "CURL ERROR: 56". I will create an issue for it shortly.

commit ec74517
Author: Ilija Tovilo <[email protected]>
Date:   Wed Oct 23 19:05:32 2024 +0200

    Backport parts of 9999a0c for gettext

    See 9999a0c

commit 5ce7034
Author: Niels Dossche <[email protected]>
Date:   Sun Jul 28 14:34:26 2024 +0200

    Fix CI failure on macOS after Curl update

commit 714a3e7
Author: Niels Dossche <[email protected]>
Date:   Sat Jul 27 16:09:50 2024 +0200

    Fix CI failure after Curl update (php#15124)

commit 4f2eb92
Author: Niels Dossche <[email protected]>
Date:   Thu May 23 22:20:37 2024 +0200

    Fix phpGH-14307: Test curl_basic_024 fails with curl 8.8.0

    Curl changed the behaviour, from the changelog:
      - lib: make protocol handlers store scheme name lowercase curl/curl@c294f9c

    From the docs: "The returned scheme might be upper or lowercase. Do
    comparisons case insensitively."

    Closes phpGH-14312.

commit 251195b
Author: Ayesh Karunaratne <[email protected]>
Date:   Thu Feb 1 02:03:55 2024 +0700

    ext/curl: Fix failing tests due to string changes in libcurl 8.6.0

    Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
    This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.

    [^1]: curl/curl@45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683

    Closes phpGH-13293.

commit fc5d83f
Author: Christoph M. Becker <[email protected]>
Date:   Wed Oct 16 22:46:20 2024 +0200

    Prepare for necessary move to macOS 13

    GH will remove macOS 12 runner images as of December 3rd, so we prepare
    for that.

    Besides the obvious need to change the runner, we also suppress a
    couple of warnings, because otherwise the build would fail due to
    `-Werror`.

Author: iluuu1994

.github/actions/configure-macos/action.yml

@@ -20,6 +20,7 @@ runs:
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
         ./buildconf --force
         ./configure \
+          CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
           --enable-fpm \

.github/workflows/nightly.yml

@@ -199,7 +199,7 @@ jobs:
         debug: [true, false]
         zts: [true, false]
     name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4

.github/workflows/push.yml

@@ -97,7 +97,7 @@ jobs:
         uses: ./.github/actions/verify-generated-files
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: git checkout
         uses: actions/checkout@v4

Zend/tests/arginfo_zpp_mismatch.inc

@@ -29,6 +29,9 @@ function skipFunction($function): bool {
      || $function === 'posix_setrlimit'
      || $function === 'sapi_windows_generate_ctrl_event'
      || $function === 'imagegrabscreen'
+     // PHP-8.1 only
+     || $function === 'dcgettext'
+     || $function === 'dcngettext'
     ) {
         return true;
     }

ext/curl/tests/bug77946.phpt

@@ -34,4 +34,4 @@ curl_multi_close($mh);
 --EXPECTF--
 int(1)
 int(1)
-string(%d) "Protocol %Sunknown%S not supported or disabled in libcurl"
+string(%d) "Protocol %Sunknown%S %rnot supported( or disabled in libcurl)?%r"

ext/curl/tests/curl_basic_024.phpt

@@ -25,7 +25,7 @@ var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT));
 var_dump(curl_getinfo($ch, CURLINFO_SCHEME));
 curl_close($ch);
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(true)
-string(4) "HTTP"
+string(4) "%r(HTTP|http)%r"

ext/curl/tests/curl_setopt_ssl.phpt

@@ -8,6 +8,7 @@ if (!function_exists("proc_open")) die("skip no proc_open");
 exec('openssl version', $out, $code);
 if ($code > 0) die("skip couldn't locate openssl binary");
 if (PHP_OS_FAMILY === 'Windows') die('skip not for Windows');
+if (PHP_OS_FAMILY === 'Darwin') die('skip Fails intermittently on macOS');
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x074700) {
     die("skip: blob options not supported for curl < 7.71.0");

ext/gettext/tests/dcngettext.phpt

@@ -11,10 +11,10 @@ if (!function_exists("dcngettext")) die("skip dcngettext() doesn't exist");
 
 var_dump(dcngettext(1,1,1,1,1));
 var_dump(dcngettext("test","test","test",1,1));
-var_dump(dcngettext("test","test","test",0,0));
+var_dump(dcngettext("test","test","test",0,1));
 var_dump(dcngettext("test","test","test",-1,-1));
 var_dump(dcngettext("","","",1,1));
-var_dump(dcngettext("","","",0,0));
+var_dump(dcngettext("","","",0,1));
 
 echo "Done\n";
 ?>

ext/standard/tests/file/bug52820.phpt

@@ -46,21 +46,21 @@ echo "\nDone.\n";
 temp stream \(close after\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 memory stream \(close after\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 temp stream \(leak\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 memory stream \(leak\):
 About to rewind!
 (\* processing: file:\/\/\/i_dont_exist\/\n)?\* Couldn't open file \/i_dont_exist\/
-\* Closing connection( -?\d+)?
+\* [Cc]losing connection( #?-?\d+)?
 
 Done\.