From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 11 Oct 2019 08:58:03 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85c8c5bfaccc4370fb3cac2c2ab9f30ff2ce71e4;p=php

Merge branch 'PHP-7.4'
---

85c8c5bfaccc4370fb3cac2c2ab9f30ff2ce71e4
diff --cc ext/sockets/tests/socket_import_stream-2.phpt
index 19b3bf1029,c9eb583a3d..dfa291c283
--- a/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:58392", $errno, $errstr, STREAM_SERVER_BIND);
+ $s = stream_socket_server("udp://127.0.0.1:58394", $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
 -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.