Skip to content

Prepare for necessary move to macOS 13 #16469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/configure-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ runs:
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
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' ./configure \
--enable-option-checking=fatal \
--prefix=/usr/local \
--enable-fpm \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Zend/tests/arginfo_zpp_mismatch.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/tests/bug77946.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions ext/curl/tests/curl_basic_024.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions ext/curl/tests/curl_setopt_ssl.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions ext/gettext/tests/dcngettext.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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";
?>
Expand Down
8 changes: 4 additions & 4 deletions ext/standard/tests/file/bug52820.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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\.
Loading