Merge branch 'PHP-7.4'

* PHP-7.4:
  Use automatic port assignment in socket_import/export test

diff --cc ext/sockets/tests/socket_export_stream-2.phpt
index e95945038a7dbe031b74aedd7f218f65b712c565,6d5835e4a5d36c40b9e54d42d01cdd1a465fc75c..65a2a7f7559f1dc1f854c7d5561dd6c2c5f26084
--- 1/ext/sockets/tests/socket_export_stream-2.phpt
--- 2/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@@ -8,16 -8,12 +8,16 @@@ if (!extension_loaded('sockets')) 
  --FILE--
  <?php
  
 -var_dump(socket_export_stream());
 -var_dump(socket_export_stream(1, 2));
 -var_dump(socket_export_stream(1));
 -var_dump(socket_export_stream(new stdclass));
 -var_dump(socket_export_stream(fopen(__FILE__, "rb")));
 -var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND)));
 +try {
 +    var_dump(socket_export_stream(fopen(__FILE__, "rb")));
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
 +try {
-     var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:58392", $errno, $errstr, STREAM_SERVER_BIND)));
++    var_dump(socket_export_stream(stream_socket_server("udp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND)));
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
  $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
  var_dump($s);
  socket_close($s);

diff --cc ext/sockets/tests/socket_import_stream-2.phpt
index 16c25f23072a37104b5f8a4168d98a8c6c7d9572,ab303fdae8e1b200e0eba22353b4a56e737419fb..37849f67ab4969b8d118ec1cab89d08e6d2d79dd
--- 1/ext/sockets/tests/socket_import_stream-2.phpt
--- 2/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@@ -8,28 -8,40 +8,28 @@@ if (!extension_loaded('sockets')) 
  --FILE--
  <?php
  
 -var_dump(socket_import_stream());
 -var_dump(socket_import_stream(1, 2));
 -var_dump(socket_import_stream(1));
 -var_dump(socket_import_stream(new stdclass));
  var_dump(socket_import_stream(fopen(__FILE__, "rb")));
 -var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
 +try {
 +    var_dump(socket_import_stream(socket_create(AF_INET, SOCK_DGRAM, SOL_UDP)));
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
- $s = stream_socket_server("udp://127.0.0.1:58394", $errno, $errstr, STREAM_SERVER_BIND);
+ $s = stream_socket_server("udp://127.0.0.1:0", $errno, $errstr, STREAM_SERVER_BIND);
  var_dump($s);
  var_dump(fclose($s));
 -var_dump(socket_import_stream($s));
 -
 +try {
 +    var_dump(socket_import_stream($s));
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
  
  echo "Done.";
 +?>
  --EXPECTF--
 -Warning: socket_import_stream() expects exactly 1 parameter, 0 given in %s on line %d
 -NULL
 -
 -Warning: socket_import_stream() expects exactly 1 parameter, 2 given in %s on line %d
 -NULL
 -
 -Warning: socket_import_stream() expects parameter 1 to be resource, int given in %s on line %d
 -NULL
 -
 -Warning: socket_import_stream() expects parameter 1 to be resource, object given in %s on line %d
 -NULL
 -
 -Warning: socket_import_stream(): cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d
 -bool(false)
 -
 -Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d
 +Warning: socket_import_stream(): Cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d
  bool(false)
 +socket_import_stream(): supplied resource is not a valid stream resource
  resource(%d) of type (stream)
  bool(true)
 -
 -Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d
 -bool(false)
 +socket_import_stream(): supplied resource is not a valid stream resource
  Done.