From: Antony Dovgal <tony2001@php.net>
Date: Thu, 20 Mar 2008 08:35:11 +0000 (+0000)
Subject: fix tests (tcp_socket is tcp_socket/ssl when/if openssl is enabled)
X-Git-Tag: RELEASE_2_0_0a1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b1c720c3db8029e52cd427fe24da22f5167bb2a;p=php

fix tests (tcp_socket is tcp_socket/ssl when/if openssl is enabled)
---

diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt
index e36b632cbe..861e78183b 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_basic.phpt
@@ -11,7 +11,7 @@ fclose($tcp_socket);
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -30,7 +30,7 @@ array(8) {
 --UEXPECT--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
index 0066ca7fc3..926638823a 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation1.phpt
@@ -37,7 +37,7 @@ var_dump(stream_get_meta_data($client));
 Write some data:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -58,7 +58,7 @@ array(8) {
 Read a line from the client, causing data to be buffered:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -79,7 +79,7 @@ array(8) {
 Read 3 bytes of data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -100,7 +100,7 @@ array(8) {
 Close the server side socket and read the remaining data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -122,7 +122,7 @@ Write some data:
 Notice: fwrite(): 23 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -143,7 +143,7 @@ array(8) {
 Read a line from the client, causing data to be buffered:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -164,7 +164,7 @@ array(8) {
 Read 3 bytes of data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -185,7 +185,7 @@ array(8) {
 Close the server side socket and read the remaining data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
index 95f7034ae2..03fc55f57b 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation2.phpt
@@ -35,7 +35,7 @@ fclose($server);
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -56,7 +56,7 @@ array(8) {
 Set a timeout on the client and attempt a read:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -77,7 +77,7 @@ array(8) {
 Write some data from the server:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -98,7 +98,7 @@ array(8) {
 Read some data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -117,7 +117,7 @@ array(8) {
 --UEXPECTF--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -138,7 +138,7 @@ array(8) {
 Set a timeout on the client and attempt a read:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -161,7 +161,7 @@ Write some data from the server:
 Notice: fwrite(): 5 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -182,7 +182,7 @@ array(8) {
 Read some data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
index 98dc092c3a..74d4a90737 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation3.phpt
@@ -30,7 +30,7 @@ fclose($server);
 --EXPECT--
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -52,7 +52,7 @@ Set blocking to false:
 bool(true)
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -74,7 +74,7 @@ Set blocking to true:
 bool(true)
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -93,7 +93,7 @@ array(8) {
 --UEXPECT--
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -115,7 +115,7 @@ Set blocking to false:
 bool(true)
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -137,7 +137,7 @@ Set blocking to true:
 bool(true)
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
diff --git a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
index af3ff72f44..cfc06bf37a 100644
--- a/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
+++ b/ext/standard/tests/streams/stream_get_meta_data_socket_variation4.phpt
@@ -35,7 +35,7 @@ fclose($client);
 Write some data:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -56,7 +56,7 @@ array(8) {
 Read a line from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -77,7 +77,7 @@ array(8) {
 Close the server side socket and read the remaining data from the client:
 array(8) {
   ["stream_type"]=>
-  string(10) "tcp_socket"
+  string(%d) "tcp_socke%s"
   ["mode"]=>
   string(2) "r+"
   ["unread_bytes"]=>
@@ -99,7 +99,7 @@ Write some data:
 Notice: fwrite(): 23 character unicode buffer downcoded for binary stream runtime_encoding in %s on line %d
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -120,7 +120,7 @@ array(8) {
 Read a line from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>
@@ -141,7 +141,7 @@ array(8) {
 Close the server side socket and read the remaining data from the client:
 array(8) {
   [u"stream_type"]=>
-  unicode(10) "tcp_socket"
+  unicode(%d) "tcp_socke%s"
   [u"mode"]=>
   unicode(2) "r+"
   [u"unread_bytes"]=>