Skip to content

Commit 9489a7b

Browse files
nikicnikic
committed
Merge branch 'PHP-7.4'
2 parents 761b063 + 251e948 commit 9489a7b

File tree

7 files changed

+34
-28
lines changed

7 files changed

+34
-28
lines changed

‎ext/sockets/tests/socket_export_stream-3.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ if (!extension_loaded('sockets')) {
66
die('SKIP sockets extension not available.');
77
}
88
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
9-
$br = socket_bind($s, '0.0.0.0', 58381);
9+
$br = socket_bind($s, '0.0.0.0', 58393);
1010
if ($br === false)
11-
die("SKIP IPv4/port 58381 not available");
11+
die("SKIP IPv4/port 58393 not available");
1212
$so = socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
1313
"group" => '224.0.0.23',
1414
"interface" => "lo",
@@ -19,7 +19,7 @@ if ($so === false)
1919
<?php
2020

2121
$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
22-
socket_bind($sock, '0.0.0.0', 58381);
22+
socket_bind($sock, '0.0.0.0', 58393);
2323
$stream = socket_export_stream($sock);
2424
var_dump($stream);
2525
$so = socket_set_option($sock, IPPROTO_IP, MCAST_JOIN_GROUP, array(
@@ -31,7 +31,7 @@ var_dump($so);
3131
$sendsock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
3232
var_dump($sendsock);
3333
$br = socket_bind($sendsock, '127.0.0.1');
34-
$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58381);
34+
$so = socket_sendto($sendsock, $m = "my message", strlen($m), 0, "224.0.0.23", 58393);
3535
var_dump($so);
3636

3737
stream_set_blocking($stream, 0);

‎ext/sockets/tests/socket_export_stream-5.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ if (!function_exists('zend_leak_variable'))
1111
<?php
1212

1313
$sock0 = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
14-
socket_bind($sock0, '0.0.0.0', 58380);
14+
socket_bind($sock0, '0.0.0.0', 58385);
1515
$stream0 = socket_export_stream($sock0);
1616
zend_leak_variable($stream0);
1717

1818
$sock1 = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
19-
socket_bind($sock1, '0.0.0.0', 58381);
19+
socket_bind($sock1, '0.0.0.0', 58386);
2020
$stream1 = socket_export_stream($sock1);
2121
zend_leak_variable($sock1);
2222

‎ext/sockets/tests/socket_import_stream-4-win.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ function test($stream, $sock) {
2929
}
3030

3131
echo "normal\n";
32-
$stream0 = stream_socket_server("udp://0.0.0.0:58380", $errno, $errstr, STREAM_SERVER_BIND);
32+
$stream0 = stream_socket_server("udp://0.0.0.0:58387", $errno, $errstr, STREAM_SERVER_BIND);
3333
$sock0 = socket_import_stream($stream0);
3434
test($stream0, $sock0);
3535

3636
echo "\nunset stream\n";
37-
$stream1 = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
37+
$stream1 = stream_socket_server("udp://0.0.0.0:58388", $errno, $errstr, STREAM_SERVER_BIND);
3838
$sock1 = socket_import_stream($stream1);
3939
unset($stream1);
4040
test(null, $sock1);
4141

4242
echo "\nunset socket\n";
43-
$stream2 = stream_socket_server("udp://0.0.0.0:58382", $errno, $errstr, STREAM_SERVER_BIND);
43+
$stream2 = stream_socket_server("udp://0.0.0.0:58389", $errno, $errstr, STREAM_SERVER_BIND);
4444
$sock2 = socket_import_stream($stream2);
4545
unset($sock2);
4646
test($stream2, null);
4747

4848
echo "\nclose stream\n";
49-
$stream3 = stream_socket_server("udp://0.0.0.0:58383", $errno, $errstr, STREAM_SERVER_BIND);
49+
$stream3 = stream_socket_server("udp://0.0.0.0:58390", $errno, $errstr, STREAM_SERVER_BIND);
5050
$sock3 = socket_import_stream($stream3);
5151
fclose($stream3);
5252
test($stream3, $sock3);
5353

5454
echo "\nclose socket\n";
55-
$stream4 = stream_socket_server("udp://0.0.0.0:58384", $errno, $errstr, STREAM_SERVER_BIND);
55+
$stream4 = stream_socket_server("udp://0.0.0.0:58391", $errno, $errstr, STREAM_SERVER_BIND);
5656
$sock4 = socket_import_stream($stream4);
5757
socket_close($sock4);
5858
test($stream4, $sock4);

‎ext/sockets/tests/socket_import_stream-4.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ function test($stream, $sock) {
2929
}
3030

3131
echo "normal\n";
32-
$stream0 = stream_socket_server("udp://0.0.0.0:58380", $errno, $errstr, STREAM_SERVER_BIND);
32+
$stream0 = stream_socket_server("udp://0.0.0.0:58387", $errno, $errstr, STREAM_SERVER_BIND);
3333
$sock0 = socket_import_stream($stream0);
3434
test($stream0, $sock0);
3535

3636
echo "\nunset stream\n";
37-
$stream1 = stream_socket_server("udp://0.0.0.0:58381", $errno, $errstr, STREAM_SERVER_BIND);
37+
$stream1 = stream_socket_server("udp://0.0.0.0:58388", $errno, $errstr, STREAM_SERVER_BIND);
3838
$sock1 = socket_import_stream($stream1);
3939
unset($stream1);
4040
test(null, $sock1);
4141

4242
echo "\nunset socket\n";
43-
$stream2 = stream_socket_server("udp://0.0.0.0:58382", $errno, $errstr, STREAM_SERVER_BIND);
43+
$stream2 = stream_socket_server("udp://0.0.0.0:58389", $errno, $errstr, STREAM_SERVER_BIND);
4444
$sock2 = socket_import_stream($stream2);
4545
unset($sock2);
4646
test($stream2, null);
4747

4848
echo "\nclose stream\n";
49-
$stream3 = stream_socket_server("udp://0.0.0.0:58383", $errno, $errstr, STREAM_SERVER_BIND);
49+
$stream3 = stream_socket_server("udp://0.0.0.0:58390", $errno, $errstr, STREAM_SERVER_BIND);
5050
$sock3 = socket_import_stream($stream3);
5151
fclose($stream3);
5252
test($stream3, $sock3);
5353

5454
echo "\nclose socket\n";
55-
$stream4 = stream_socket_server("udp://0.0.0.0:58384", $errno, $errstr, STREAM_SERVER_BIND);
55+
$stream4 = stream_socket_server("udp://0.0.0.0:58391", $errno, $errstr, STREAM_SERVER_BIND);
5656
$sock4 = socket_import_stream($stream4);
5757
socket_close($sock4);
5858
test($stream4, $sock4);

‎ext/standard/tests/dir/opendir_basic.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Test opendir() function : basic functionality
1313

1414
echo "*** Testing opendir() : basic functionality ***\n";
1515

16-
$base_dir_path = dirname(__FILE__);
16+
$base_dir_path = __DIR__ . '/opendir_basic';
17+
@mkdir($base_dir_path);
1718

1819
$level_one_dir_name = "level_one";
1920
$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
@@ -42,9 +43,10 @@ var_dump($dh2);
4243
===DONE===
4344
--CLEAN--
4445
<?php
45-
$file_path = dirname(__FILE__);
46-
rmdir("$file_path/level_one/level_two");
47-
rmdir("$file_path/level_one");
46+
$base_dir_path = __DIR__ . '/opendir_basic';
47+
rmdir("$base_dir_path/level_one/level_two");
48+
rmdir("$base_dir_path/level_one");
49+
rmdir($base_dir_path);
4850
?>
4951
--EXPECTF--
5052
*** Testing opendir() : basic functionality ***

‎ext/standard/tests/dir/opendir_variation4.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Test opendir() function : usage variations - different relative paths
1313

1414
echo "*** Testing opendir() : usage variation ***\n";
1515

16-
$base_dir_path = dirname(__FILE__);
16+
$base_dir_path = __DIR__ . '/opendir_variation4';
17+
@mkdir($base_dir_path);
1718

1819
$level_one_dir_name = "level_one";
1920
$level_one_dir_path = "$base_dir_path/$level_one_dir_name";
@@ -72,9 +73,10 @@ function clean_dh($dh){
7273
===DONE===
7374
--CLEAN--
7475
<?php
75-
$file_path = dirname(__FILE__);
76-
rmdir("$file_path/level_one/level_two");
77-
rmdir("$file_path/level_one");
76+
$base_dir_path = __DIR__ . '/opendir_variation4';
77+
rmdir("$base_dir_path/level_one/level_two");
78+
rmdir("$base_dir_path/level_one");
79+
rmdir($base_dir_path);
7880
?>
7981
--EXPECTF--
8082
*** Testing opendir() : usage variation ***

‎ext/standard/tests/dir/scandir_variation4.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ echo "*** Testing scandir() : usage variations ***\n";
1616
// include for create_files/delete_files functions
1717
include (dirname(__FILE__) . '/../file/file.inc');
1818

19-
$base_dir_path = dirname(__FILE__);
19+
$base_dir_path = __DIR__ . '/scandir_variation4';
20+
@mkdir($base_dir_path);
2021

2122
$level_one_dir_path = "$base_dir_path/level_one";
2223
$level_two_dir_path = "$level_one_dir_path/level_two";
@@ -61,9 +62,10 @@ var_dump(scandir('../../level_one'));
6162
===DONE===
6263
--CLEAN--
6364
<?php
64-
$dir_path = dirname(__FILE__);
65-
rmdir("$dir_path/level_one/level_two");
66-
rmdir("$dir_path/level_one");
65+
$base_dir_path = __DIR__ . '/scandir_variation4';
66+
rmdir("$base_dir_path/level_one/level_two");
67+
rmdir("$base_dir_path/level_one");
68+
rmdir($base_dir_path);
6769
?>
6870
--EXPECT--
6971
*** Testing scandir() : usage variations ***

0 commit comments

Comments
 (0)