Skip to content

Commit c9d6e61

Browse files
matyhtfmatyhtf
committed
fix tests[1]
1 parent d22770d commit c9d6e61

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

‎ext-src/swoole_websocket_server.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ int php_swoole_websocket_frame_object_pack_ex(String *buffer, zval *zdata, zend_
242242
zval *ztmp = nullptr;
243243

244244
zdata = nullptr;
245-
if ((ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_OPCODE), 0))) {
245+
if ((ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_OPCODE), 1))) {
246246
opcode = zval_get_long(ztmp);
247247
}
248248
if (opcode == WebSocket::OPCODE_CLOSE) {
@@ -256,14 +256,14 @@ int php_swoole_websocket_frame_object_pack_ex(String *buffer, zval *zdata, zend_
256256
}
257257
}
258258
if (!zdata &&
259-
(ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_DATA), 0))) {
259+
(ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_DATA), 1))) {
260260
zdata = ztmp;
261261
}
262-
if ((ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_FLAGS), 0))) {
262+
if ((ztmp = sw_zend_read_property_ex(swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_FLAGS), 1))) {
263263
flags = zval_get_long(ztmp) & WebSocket::FLAGS_ALL;
264264
}
265265
if ((ztmp = sw_zend_read_property_not_null_ex(
266-
swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_FINISH), 0))) {
266+
swoole_websocket_frame_ce, zframe, SW_ZSTR_KNOWN(SW_ZEND_STR_FINISH), 1))) {
267267
if (zval_is_true(ztmp)) {
268268
flags |= WebSocket::FLAG_FIN;
269269
} else {

‎tests/include/lib/src/Redis/SQLPool.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22

33
namespace SwooleTest\Redis;
44

5-
Class SQLPool
5+
class SQLPool
66
{
7+
/**
8+
* @var self
9+
*/
710
private static $instance;
811

9-
public static function init()
10-
{
11-
self::$instance = new self;
12-
}
13-
1412
/**
1513
* @param string $name
1614
* @return \SplQueue
1715
*/
1816
public static function i(string $name): \SplQueue
1917
{
18+
if (!self::$instance) {
19+
self::$instance = new self;
20+
}
2021
return self::$instance->$name ?? (self::$instance->$name = new \SplQueue);
2122
}
2223

‎tests/swoole_feature/cross_close/stream.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ READ
3434
CLOSE
3535
CLOSED
3636

37-
Warning: fclose(): supplied resource is not a valid stream resource in %s/tests/swoole_feature/cross_close/stream.php on line 18
37+
Warning: fclose(): supplied resource is not a valid stream resource in %s/tests/swoole_feature/cross_close/stream.php on line %d
3838
DONE

‎tests/swoole_redis_coro/bug_lock.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ require __DIR__ . '/../include/bootstrap.php';
1010
use SwooleTest\Redis\Lock;
1111
use SwooleTest\Redis\SQLPool;
1212

13-
SQLPool::init();
14-
1513
go(function () {
1614
$redis_lock = Lock::i();
1715
for ($i = 3; $i--;) {

‎tests/swoole_server/getSocket.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ swoole_server: getSocket
77
require __DIR__ . '/../include/bootstrap.php';
88

99
use Swoole\Coroutine\Client;
10-
use Swoole\Timer;
11-
use Swoole\Event;
1210
use Swoole\Server;
1311

1412
$pm = new SwooleTest\ProcessManager;
1513
$pm->parentFunc = function ($pid) use ($pm) {
1614
Co\Run(function () use ($pm) {
17-
$cli = new Swoole\Coroutine\Client(SWOOLE_SOCK_TCP);
15+
$cli = new Client(SWOOLE_SOCK_TCP);
1816
$r = $cli->connect(TCP_SERVER_HOST, $pm->getFreePort(), 1);
1917
Assert::assert($r);
2018
$cli->send("test");
@@ -41,7 +39,11 @@ $pm->childFunc = function () use ($pm) {
4139
$serv->shutdown();
4240
return;
4341
} else {
44-
$serv->send($fd, get_resource_type($socket));
42+
if (PHP_VERSION_ID > 80000) {
43+
$serv->send($fd, get_class($socket));
44+
} else {
45+
$serv->send($fd, get_resource_type($socket));
46+
}
4547
}
4648
});
4749
$serv->start();

‎tests/swoole_websocket_server/pack.phpt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ swoole_websocket_server: websocket frame pack/unpack
44
<?php require __DIR__ . '/../include/skipif.inc'; ?>
55
--FILE--
66
<?php
7-
declare(strict_types=1);
8-
97
require __DIR__ . '/../include/bootstrap.php';
108

119
error_reporting(error_reporting() & ~(E_NOTICE));
1210

13-
use Swoole\WebSocket\Frame as f;
14-
use Swoole\WebSocket\CloseFrame as cf;
11+
use Swoole\WebSocket\Frame;
12+
use Swoole\WebSocket\CloseFrame;
1513

1614
for ($i = 1000; $i--;) {
1715
// generate some rand frames
@@ -26,11 +24,11 @@ for ($i = 1000; $i--;) {
2624
// pack them
2725
if (mt_rand(0, 1) || $opcode === WEBSOCKET_OPCODE_CLOSE) {
2826
if ($opcode === WEBSOCKET_OPCODE_CLOSE) {
29-
$frame = new cf;
27+
$frame = new CloseFrame;
3028
$frame->code = $code;
3129
$frame->reason = $data;
3230
} else {
33-
$frame = new f;
31+
$frame = new Frame;
3432
$frame->data = $data;
3533
}
3634
$frame->opcode = $opcode;
@@ -43,14 +41,14 @@ for ($i = 1000; $i--;) {
4341
if (mt_rand(0, 1)) {
4442
$packed = (string)$frame;
4543
} else {
46-
$packed = f::pack($frame);
44+
$packed = Frame::pack($frame);
4745
}
4846
} else {
49-
$packed = f::pack($data, $opcode, $finish);
47+
$packed = Frame::pack($data, $opcode, $finish);
5048
}
5149

5250
// unpack
53-
$unpacked = f::unpack($packed);
51+
$unpacked = Frame::unpack($packed);
5452

5553
// verify
5654
if ($opcode === WEBSOCKET_OPCODE_CLOSE) {

0 commit comments

Comments
 (0)