From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 19 Feb 2019 14:16:16 +0000 (+0100)
Subject: Avoid port conflicts in stream socket tests
X-Git-Tag: php-7.4.0alpha1~974
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9094d4d6455811c2bd9f23511ec0adbdb607b4f;p=php

Avoid port conflicts in stream socket tests

Also drop some useless --CLEAN-- sections.
---

diff --git a/ext/standard/tests/streams/stream_socket_get_name.phpt b/ext/standard/tests/streams/stream_socket_get_name.phpt
index 34c88b9c96..affc3762ea 100644
--- a/ext/standard/tests/streams/stream_socket_get_name.phpt
+++ b/ext/standard/tests/streams/stream_socket_get_name.phpt
@@ -4,17 +4,12 @@ string stream_socket_get_name ( resource $handle , bool $want_peer ) ;
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
 <?php
-$serverUri = "tcp://127.0.0.1:31854";
+$serverUri = "tcp://127.0.0.1:31855";
 $sock = stream_socket_server($serverUri, $errno, $errstr);
 
 var_dump(stream_socket_get_name($sock, false));
 var_dump(stream_socket_get_name($sock, true));
 ?>
---CLEAN--
-<?php
-unset($serverUri);
-unset($sock);
-?>
 --EXPECT--
-string(15) "127.0.0.1:31854"
+string(15) "127.0.0.1:31855"
 bool(false)
diff --git a/ext/standard/tests/streams/stream_socket_recvfrom.phpt b/ext/standard/tests/streams/stream_socket_recvfrom.phpt
index 08de4e31a9..a4a1efdb4f 100644
--- a/ext/standard/tests/streams/stream_socket_recvfrom.phpt
+++ b/ext/standard/tests/streams/stream_socket_recvfrom.phpt
@@ -4,7 +4,7 @@ string stream_socket_recvfrom ( resource $socket , int $length [, int $flags = 0
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --FILE--
 <?php
-$serverUri = "tcp://127.0.0.1:31854";
+$serverUri = "tcp://127.0.0.1:31856";
 $sock = stream_socket_server($serverUri, $errno, $errstr);
 $sockLen = 1500;
 
@@ -12,16 +12,6 @@ var_dump(stream_socket_recvfrom($sock, $sockLen));
 var_dump(stream_socket_recvfrom($sock, $sockLen, STREAM_OOB));
 var_dump(stream_socket_recvfrom($sock, $sockLen, STREAM_PEEK));
 ?>
---CLEAN--
-<?php
-fclose($sock);
-unset($serverUri);
-unset($clientFlags);
-unset($sock);
-unset($sockLen);
-unset($errno);
-unset($errstr);
-?>
 --EXPECT--
 bool(false)
 bool(false)
diff --git a/ext/standard/tests/streams/stream_socket_sendto.phpt b/ext/standard/tests/streams/stream_socket_sendto.phpt
index 73515a7434..2812d30930 100644
--- a/ext/standard/tests/streams/stream_socket_sendto.phpt
+++ b/ext/standard/tests/streams/stream_socket_sendto.phpt
@@ -8,7 +8,7 @@ if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); }
 ?>
 --FILE--
 <?php
-$serverUri = "tcp://127.0.0.1:31854";
+$serverUri = "tcp://127.0.0.1:31857";
 $serverUrl = "http://php.net";
 $stringSocket = "out of band data.";
 $stringFWrite = "normal data to transmit";