Skip to content

Commit e6e4d05

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: [ci skip] Silence test warning
2 parents ebaaa7d + f9519cc commit e6e4d05

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

ext/openssl/tests/gh21031.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $clientCode = <<<'CODE'
6565
],
6666
]);
6767
68-
var_dump(file_get_contents("https://cs.php.net/", false, $clientCtx));
68+
var_dump(@file_get_contents("https://cs.php.net/", false, $clientCtx));
6969
7070
phpt_notify('proxy');
7171
phpt_notify('server');
@@ -77,6 +77,5 @@ ServerClientTestCase::getInstance()->run($clientCode, [
7777
'proxy' => $proxyCode,
7878
]);
7979
?>
80-
--EXPECTF--
81-
Warning: file_get_contents(https://cs.php.net/): Failed to open stream: Cannot connect to HTTPS server through proxy in %s
80+
--EXPECT--
8281
bool(false)

0 commit comments

Comments
 (0)