summaryrefslogtreecommitdiff
path: root/ext/sockets
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2020-09-18 14:28:32 +0200
committerNikita Popov <nikita.ppv@gmail.com>2020-09-18 14:28:32 +0200
commitc5401854fcea27ff9aabfd0682ff4d81bbb3c888 (patch)
treef6b8e94b80d682da470133f0771fa83182d2226e /ext/sockets
parentbfceb710becab71d7d561d64667be4c9668b6a9c (diff)
downloadphp-git-c5401854fcea27ff9aabfd0682ff4d81bbb3c888.tar.gz
Run tidy
This should fix most of the remaining issues with tabs and spaces being mixed in tests.
Diffstat (limited to 'ext/sockets')
-rw-r--r--ext/sockets/tests/bug51958.phpt4
-rw-r--r--ext/sockets/tests/ipv4loop.phpt6
-rw-r--r--ext/sockets/tests/ipv6loop.phpt8
-rw-r--r--ext/sockets/tests/mcast_ipv4_recv.phpt4
-rw-r--r--ext/sockets/tests/mcast_ipv4_send.phpt2
-rw-r--r--ext/sockets/tests/mcast_ipv4_send_error.phpt4
-rw-r--r--ext/sockets/tests/mcast_ipv6_recv.phpt18
-rw-r--r--ext/sockets/tests/mcast_ipv6_recv_limited.phpt28
-rw-r--r--ext/sockets/tests/mcast_ipv6_send.phpt4
-rw-r--r--ext/sockets/tests/socket_abstract_path.phpt4
-rw-r--r--ext/sockets/tests/socket_abstract_path_sendmsg.phpt4
-rw-r--r--ext/sockets/tests/socket_clear_error-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_clear_error.phpt2
-rw-r--r--ext/sockets/tests/socket_create_listen-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_create_listen.phpt2
-rw-r--r--ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_create_pair-wrongparams.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-1.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-2.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-3.phpt10
-rw-r--r--ext/sockets/tests/socket_export_stream-4-win.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-4.phpt2
-rw-r--r--ext/sockets/tests/socket_export_stream-5.phpt4
-rw-r--r--ext/sockets/tests/socket_getpeername_ipv6loop.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-1.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-2.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-3.phpt10
-rw-r--r--ext/sockets/tests/socket_import_stream-4-win.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-4.phpt2
-rw-r--r--ext/sockets/tests/socket_import_stream-5.phpt4
-rw-r--r--ext/sockets/tests/socket_listen-wrongparams.phpt2
-rw-r--r--ext/sockets/tests/socket_select-wrongparams-1-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_select-wrongparams-1.phpt2
-rw-r--r--ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt6
-rw-r--r--ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt4
-rw-r--r--ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt2
-rw-r--r--ext/sockets/tests/socket_sentto_recvfrom_unix.phpt2
-rw-r--r--ext/sockets/tests/socket_set_option_bindtodevice.phpt4
-rw-r--r--ext/sockets/tests/socket_shutdown-win32.phpt2
-rw-r--r--ext/sockets/tests/socket_shutdown.phpt2
-rw-r--r--ext/sockets/tests/unixloop.phpt8
-rw-r--r--ext/sockets/tests/wsaprotocol_info_0.phpt4
43 files changed, 93 insertions, 93 deletions
diff --git a/ext/sockets/tests/bug51958.phpt b/ext/sockets/tests/bug51958.phpt
index 9756266343..8f47fad0f0 100644
--- a/ext/sockets/tests/bug51958.phpt
+++ b/ext/sockets/tests/bug51958.phpt
@@ -6,10 +6,10 @@ if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
if (!defined('IPPROTO_IPV6')) {
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
}
if (PHP_OS != "WINNT")
- die('skip test relies Winsock\'s error code for WSAEWOULDBLOCK/EAGAIN');
+ die('skip test relies Winsock\'s error code for WSAEWOULDBLOCK/EAGAIN');
--FILE--
<?php
$listenfd = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
diff --git a/ext/sockets/tests/ipv4loop.phpt b/ext/sockets/tests/ipv4loop.phpt
index 4e5d15453b..0314773291 100644
--- a/ext/sockets/tests/ipv4loop.phpt
+++ b/ext/sockets/tests/ipv4loop.phpt
@@ -2,9 +2,9 @@
IPv4 Loopback test
--SKIPIF--
<?php
- if (!extension_loaded('sockets')) {
- die('skip sockets extension not available.');
- }
+ if (!extension_loaded('sockets')) {
+ die('skip sockets extension not available.');
+ }
?>
--FILE--
<?php
diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt
index 109da5bc2d..f6f141805d 100644
--- a/ext/sockets/tests/ipv6loop.phpt
+++ b/ext/sockets/tests/ipv6loop.phpt
@@ -2,10 +2,10 @@
IPv6 Loopback test
--SKIPIF--
<?php
- if (!extension_loaded('sockets')) {
- die('skip sockets extension not available.');
- }
- require 'ipv6_skipif.inc';
+ if (!extension_loaded('sockets')) {
+ die('skip sockets extension not available.');
+ }
+ require 'ipv6_skipif.inc';
?>
--FILE--
<?php
diff --git a/ext/sockets/tests/mcast_ipv4_recv.phpt b/ext/sockets/tests/mcast_ipv4_recv.phpt
index 0f17eb67c6..fded01e2e8 100644
--- a/ext/sockets/tests/mcast_ipv4_recv.phpt
+++ b/ext/sockets/tests/mcast_ipv4_recv.phpt
@@ -9,8 +9,8 @@ if (getenv('SKIP_ONLINE_TESTS')) die('skip online test');
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
$br = socket_bind($s, '0.0.0.0', 3000);
$so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
- "group" => '224.0.0.23',
- "interface" => 'lo',
+ "group" => '224.0.0.23',
+ "interface" => 'lo',
));
if ($so === false) {
die('skip interface \'lo\' is unavailable.');
diff --git a/ext/sockets/tests/mcast_ipv4_send.phpt b/ext/sockets/tests/mcast_ipv4_send.phpt
index e1e88aca41..027c07f1b8 100644
--- a/ext/sockets/tests/mcast_ipv4_send.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded('sockets')) {
}
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die("err");
if (socket_set_option($s, IPPROTO_IP, IP_MULTICAST_IF, 1) === false) {
- die("skip interface 1 either doesn't exist or has no ipv4 address");
+ die("skip interface 1 either doesn't exist or has no ipv4 address");
}
--FILE--
<?php
diff --git a/ext/sockets/tests/mcast_ipv4_send_error.phpt b/ext/sockets/tests/mcast_ipv4_send_error.phpt
index 978b78938b..5e3ff394cf 100644
--- a/ext/sockets/tests/mcast_ipv4_send_error.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send_error.phpt
@@ -9,10 +9,10 @@ $domain = AF_INET;
$level = IPPROTO_IP;
$s = socket_create($domain, SOCK_DGRAM, SOL_UDP);
if ($s === false) {
- die("skip unable to create socket");
+ die("skip unable to create socket");
}
if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) {
- die("skip interface 1 either doesn't exist or has no ipv4 address");
+ die("skip interface 1 either doesn't exist or has no ipv4 address");
}
--FILE--
<?php
diff --git a/ext/sockets/tests/mcast_ipv6_recv.phpt b/ext/sockets/tests/mcast_ipv6_recv.phpt
index 757bf9889b..127e9d17cf 100644
--- a/ext/sockets/tests/mcast_ipv6_recv.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
if (!defined('IPPROTO_IPV6')) {
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
}
$s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
if ($s === false) {
@@ -17,28 +17,28 @@ $br = socket_bind($s, '::', 3000);
* troublesome to send multicast traffic from lo, which we must since
* we're dealing with interface-local traffic... */
$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
+ "group" => 'ff01::114',
+ "interface" => 0,
));
if ($so === false) {
die('skip unable to join multicast group on any interface.');
}
$r = socket_sendto($s, $m = "testing packet", strlen($m), 0, 'ff01::114', 3000);
if ($r === false) {
- die('skip unable to send multicast packet.');
+ die('skip unable to send multicast packet.');
}
if (!defined("MCAST_JOIN_SOURCE_GROUP"))
die('skip source operations are unavailable');
$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_LEAVE_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
+ "group" => 'ff01::114',
+ "interface" => 0,
));
$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
- "source" => '2001::dead:beef',
+ "group" => 'ff01::114',
+ "interface" => 0,
+ "source" => '2001::dead:beef',
));
if ($so === false) {
die('skip protocol independent multicast API is unavailable.');
diff --git a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
index 9bf0bbf914..247c41b19d 100644
--- a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
if (!defined('IPPROTO_IPV6')) {
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
}
$s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
$br = socket_bind($s, '::', 3000);
@@ -14,29 +14,29 @@ $br = socket_bind($s, '::', 3000);
* troublesome to send multicast traffic from lo, which we must since
* we're dealing with interface-local traffic... */
$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
+ "group" => 'ff01::114',
+ "interface" => 0,
));
if ($so === false) {
die('skip unable to join multicast group on any interface.');
}
$r = socket_sendto($s, $m = "testing packet", strlen($m), 0, 'ff01::114', 3000);
if ($r === false) {
- die('skip unable to send multicast packet.');
+ die('skip unable to send multicast packet.');
}
$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_LEAVE_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
+ "group" => 'ff01::114',
+ "interface" => 0,
));
if (defined("MCAST_JOIN_SOURCE_GROUP")) {
- $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
- "group" => 'ff01::114',
- "interface" => 0,
- "source" => '2001::dead:beef',
- ));
- if ($so !== false) {
- die('skip protocol independent multicast API is available.');
- }
+ $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
+ "group" => 'ff01::114',
+ "interface" => 0,
+ "source" => '2001::dead:beef',
+ ));
+ if ($so !== false) {
+ die('skip protocol independent multicast API is available.');
+ }
}
--FILE--
<?php
diff --git a/ext/sockets/tests/mcast_ipv6_send.phpt b/ext/sockets/tests/mcast_ipv6_send.phpt
index d9fec9e72b..ed8fe55ef5 100644
--- a/ext/sockets/tests/mcast_ipv6_send.phpt
+++ b/ext/sockets/tests/mcast_ipv6_send.phpt
@@ -6,12 +6,12 @@ if (!extension_loaded('sockets')) {
die('skip sockets extension not available.');
}
if (getenv('CI_NO_IPV6') || !defined('IPPROTO_IPV6')) {
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
}
$level = IPPROTO_IPV6;
$s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("skip Can not create socket");
if (socket_set_option($s, $level, IPV6_MULTICAST_IF, 1) === false) {
- die("skip interface 1 either doesn't exist or has no ipv6 address");
+ die("skip interface 1 either doesn't exist or has no ipv6 address");
}
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_abstract_path.phpt b/ext/sockets/tests/socket_abstract_path.phpt
index bbe4debeaa..686a487791 100644
--- a/ext/sockets/tests/socket_abstract_path.phpt
+++ b/ext/sockets/tests/socket_abstract_path.phpt
@@ -3,10 +3,10 @@ Support for paths in the abstract namespace (bind, connect)
--SKIPIF--
<?php
if (!extension_loaded('sockets'))
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
if (PHP_OS != 'Linux') {
- die('skip For Linux only');
+ die('skip For Linux only');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
index ca9ab3f534..796b406e26 100644
--- a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
+++ b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
@@ -3,10 +3,10 @@ Support for paths in the abstract namespace (bind, sendmsg, recvmsg)
--SKIPIF--
<?php
if (!extension_loaded('sockets'))
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
if (PHP_OS != 'Linux') {
- die('skip For Linux only');
+ die('skip For Linux only');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_clear_error-win32.phpt b/ext/sockets/tests/socket_clear_error-win32.phpt
index 3a0b1ea162..c875cfd2e8 100644
--- a/ext/sockets/tests/socket_clear_error-win32.phpt
+++ b/ext/sockets/tests/socket_clear_error-win32.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
- die('skip windows only test');
+ die('skip windows only test');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_clear_error.phpt b/ext/sockets/tests/socket_clear_error.phpt
index 273f7a0ca8..9ea770954d 100644
--- a/ext/sockets/tests/socket_clear_error.phpt
+++ b/ext/sockets/tests/socket_clear_error.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) == 'WIN' ) {
- die('skip windows only test');
+ die('skip windows only test');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt
index 89d8dde0b2..73cc857617 100644
--- a/ext/sockets/tests/socket_create_listen-win32.phpt
+++ b/ext/sockets/tests/socket_create_listen-win32.phpt
@@ -3,7 +3,7 @@ Test if socket binds on 31338
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
- die('skip.. Not valid for non Windows');
+ die('skip.. Not valid for non Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 180b91368c..131526bb0d 100644
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -3,7 +3,7 @@ Test if socket binds on 31338
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 5b6934d965..1abab2a1e7 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_create_pair()
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
- die('skip.. Not valid for non Windows');
+ die('skip.. Not valid for non Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 7adbc91d8a..8dc56d1e36 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_create_pair()
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_export_stream-1.phpt b/ext/sockets/tests/socket_export_stream-1.phpt
index a3788f8c72..45ed57974c 100644
--- a/ext/sockets/tests/socket_export_stream-1.phpt
+++ b/ext/sockets/tests/socket_export_stream-1.phpt
@@ -3,7 +3,7 @@ socket_export_stream: Basic test
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index 503db5b004..00e7a61929 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -3,7 +3,7 @@ socket_export_stream: Bad arguments
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_export_stream-3.phpt b/ext/sockets/tests/socket_export_stream-3.phpt
index a1bffdbad6..560718b457 100644
--- a/ext/sockets/tests/socket_export_stream-3.phpt
+++ b/ext/sockets/tests/socket_export_stream-3.phpt
@@ -3,18 +3,18 @@ socket_export_stream: Test with multicasting
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
$br = @socket_bind($s, '0.0.0.0', 58393);
if ($br === false)
- die("SKIP IPv4/port 58393 not available");
+ die("SKIP IPv4/port 58393 not available");
$so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
- "group" => '224.0.0.23',
- "interface" => "lo",
+ "group" => '224.0.0.23',
+ "interface" => "lo",
));
if ($so === false)
- die("SKIP joining group 224.0.0.23 on interface lo failed");
+ die("SKIP joining group 224.0.0.23 on interface lo failed");
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_export_stream-4-win.phpt b/ext/sockets/tests/socket_export_stream-4-win.phpt
index 067e9fcc19..fddd459a7d 100644
--- a/ext/sockets/tests/socket_export_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_export_stream-4-win.phpt
@@ -3,7 +3,7 @@ socket_export_stream: effects of closing
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
die("skip Not Valid for Linux");
diff --git a/ext/sockets/tests/socket_export_stream-4.phpt b/ext/sockets/tests/socket_export_stream-4.phpt
index 390689cce5..a467b6d845 100644
--- a/ext/sockets/tests/socket_export_stream-4.phpt
+++ b/ext/sockets/tests/socket_export_stream-4.phpt
@@ -3,7 +3,7 @@ socket_export_stream: effects of closing
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) == 'WIN' ) {
die("skip Not Valid for Windows");
diff --git a/ext/sockets/tests/socket_export_stream-5.phpt b/ext/sockets/tests/socket_export_stream-5.phpt
index 3ce2c2579c..d5499222e2 100644
--- a/ext/sockets/tests/socket_export_stream-5.phpt
+++ b/ext/sockets/tests/socket_export_stream-5.phpt
@@ -3,10 +3,10 @@ socket_export_stream: effects of leaked handles
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if (!function_exists('zend_leak_variable'))
- die('SKIP only for debug builds');
+ die('SKIP only for debug builds');
?>
--INI--
report_memleaks=0
diff --git a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
index 3dab562bbb..c5f61ec547 100644
--- a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
+++ b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
@@ -6,7 +6,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
}
require 'ipv6_skipif.inc';
?>
diff --git a/ext/sockets/tests/socket_import_stream-1.phpt b/ext/sockets/tests/socket_import_stream-1.phpt
index 9931535721..a89ccf807e 100644
--- a/ext/sockets/tests/socket_import_stream-1.phpt
+++ b/ext/sockets/tests/socket_import_stream-1.phpt
@@ -3,7 +3,7 @@ socket_import_stream: Basic test
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index a16a3dc18a..ff2b9ee975 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -3,7 +3,7 @@ socket_import_stream: Bad arguments
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_import_stream-3.phpt b/ext/sockets/tests/socket_import_stream-3.phpt
index 972a3d6fcf..635d43cdbd 100644
--- a/ext/sockets/tests/socket_import_stream-3.phpt
+++ b/ext/sockets/tests/socket_import_stream-3.phpt
@@ -3,18 +3,18 @@ socket_import_stream: Test with multicasting
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
$s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
$br = @socket_bind($s, '0.0.0.0', 58379);
if ($br === false)
- die("SKIP IPv4/port 58379 not available");
+ die("SKIP IPv4/port 58379 not available");
$so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
- "group" => '224.0.0.23',
- "interface" => "lo",
+ "group" => '224.0.0.23',
+ "interface" => "lo",
));
if ($so === false)
- die("SKIP joining group 224.0.0.23 on interface lo failed");
+ die("SKIP joining group 224.0.0.23 on interface lo failed");
--FILE--
<?php
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index 9b5863cf2b..94af0ab5c1 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -3,7 +3,7 @@ socket_import_stream: effects of closing
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
die("skip Not Valid for Linux");
diff --git a/ext/sockets/tests/socket_import_stream-4.phpt b/ext/sockets/tests/socket_import_stream-4.phpt
index 592dbd6c04..9c11611d03 100644
--- a/ext/sockets/tests/socket_import_stream-4.phpt
+++ b/ext/sockets/tests/socket_import_stream-4.phpt
@@ -3,7 +3,7 @@ socket_import_stream: effects of closing
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) == 'WIN' ) {
die("skip Not Valid for Windows");
diff --git a/ext/sockets/tests/socket_import_stream-5.phpt b/ext/sockets/tests/socket_import_stream-5.phpt
index ce10168650..c2acf94f36 100644
--- a/ext/sockets/tests/socket_import_stream-5.phpt
+++ b/ext/sockets/tests/socket_import_stream-5.phpt
@@ -3,10 +3,10 @@ socket_import_stream: effects of leaked handles
--SKIPIF--
<?php
if (!extension_loaded('sockets')) {
- die('SKIP sockets extension not available.');
+ die('SKIP sockets extension not available.');
}
if (!function_exists('zend_leak_variable'))
- die('SKIP only for debug builds');
+ die('SKIP only for debug builds');
?>
--INI--
report_memleaks=0
diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt
index 5262d5e4b3..c7c066b5ed 100644
--- a/ext/sockets/tests/socket_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_listen-wrongparams.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_listen().
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
index 21c3c9e8d9..40a9e118e4 100644
--- a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_select().
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
- die('skip.. Not valid for non Windows');
+ die('skip.. Not valid for non Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_select-wrongparams-1.phpt b/ext/sockets/tests/socket_select-wrongparams-1.phpt
index 91286d1372..695eb62d01 100644
--- a/ext/sockets/tests/socket_select-wrongparams-1.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-1.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_select().
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
index a5aaea35a4..062ed094f2 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
@@ -3,14 +3,14 @@ sendmsg()/recvmsg(): test ability to receive multiple messages
--SKIPIF--
<?php
if (!extension_loaded('sockets'))
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
require 'ipv6_skipif.inc';
if (!defined('IPPROTO_IPV6'))
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
if (substr(PHP_OS, 0, 3) == 'WIN')
- die('skip Not for the Windows!');
+ die('skip Not for the Windows!');
/* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
* WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
* does not accept IPV6_TCLASS messages */
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 9fe57a8258..abbd2a7aa8 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -3,12 +3,12 @@ sendmsg()/recvmsg(): test ability to receive multiple messages (WIN32)
--SKIPIF--
<?php
if (!extension_loaded('sockets'))
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
require 'ipv6_skipif.inc';
if (!defined('IPPROTO_IPV6'))
- die('skip IPv6 not available.');
+ die('skip IPv6 not available.');
/* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
* WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
* does not accept IPV6_TCLASS messages. We still test that sendmsg() works
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
index 2aa5f7f115..9a686539da 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
if (substr(PHP_OS, 0, 3) != 'WIN') {
- die('skip only for Windows');
+ die('skip only for Windows');
}
require 'ipv6_skipif.inc';
--FILE--
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
index de16c5c580..75a2f73e68 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
}
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip Not valid for Windows');
+ die('skip Not valid for Windows');
}
require 'ipv6_skipif.inc';
?>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
index 6e063c5b52..a355a24864 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
@@ -3,7 +3,7 @@ Test if socket_recvfrom() receives data sent by socket_sendto() through a Unix d
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
if (!extension_loaded('sockets')) {
die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
index acce4d832c..9bd608384f 100644
--- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt
+++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
@@ -9,10 +9,10 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
if (!defined("SO_BINDTODEVICE")) {
- die('SKIP SO_BINDTODEVICE not supported on this platform.');
+ die('SKIP SO_BINDTODEVICE not supported on this platform.');
}
if (!function_exists("posix_getuid") || posix_getuid() != 0) {
- die('SKIP SO_BINDTODEVICE requires root permissions.');
+ die('SKIP SO_BINDTODEVICE requires root permissions.');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_shutdown-win32.phpt b/ext/sockets/tests/socket_shutdown-win32.phpt
index aced74b7f8..cc16c3a215 100644
--- a/ext/sockets/tests/socket_shutdown-win32.phpt
+++ b/ext/sockets/tests/socket_shutdown-win32.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) != 'WIN' ) {
- die('skip windows only test');
+ die('skip windows only test');
}
?>
--FILE--
diff --git a/ext/sockets/tests/socket_shutdown.phpt b/ext/sockets/tests/socket_shutdown.phpt
index 3dc62bc270..7c12b616c1 100644
--- a/ext/sockets/tests/socket_shutdown.phpt
+++ b/ext/sockets/tests/socket_shutdown.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded('sockets')) {
die('SKIP sockets extension not available.');
}
if(substr(PHP_OS, 0, 3) == 'WIN' ) {
- die('skip not for windows');
+ die('skip not for windows');
}
?>
--FILE--
diff --git a/ext/sockets/tests/unixloop.phpt b/ext/sockets/tests/unixloop.phpt
index 31740c97c6..c3b80ff588 100644
--- a/ext/sockets/tests/unixloop.phpt
+++ b/ext/sockets/tests/unixloop.phpt
@@ -3,11 +3,11 @@ Unix domain socket Loopback test
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip.. Not valid for Windows');
+ die('skip.. Not valid for Windows');
}
- if (!extension_loaded('sockets')) {
- die('skip sockets extension not available.');
- }
+ if (!extension_loaded('sockets')) {
+ die('skip sockets extension not available.');
+ }
?>
--FILE--
<?php
diff --git a/ext/sockets/tests/wsaprotocol_info_0.phpt b/ext/sockets/tests/wsaprotocol_info_0.phpt
index 7ea50d359f..2d189d55bc 100644
--- a/ext/sockets/tests/wsaprotocol_info_0.phpt
+++ b/ext/sockets/tests/wsaprotocol_info_0.phpt
@@ -3,10 +3,10 @@ Winsock export/import socket, basic test
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) != 'WIN') {
- die('skip.. Windows only test');
+ die('skip.. Windows only test');
}
if (!extension_loaded('sockets')) {
- die('skip sockets extension not available.');
+ die('skip sockets extension not available.');
}
?>
--FILE--