Skip to content

Commit d4efb68

Browse files
committed
Fix tests
1 parent 53f655f commit d4efb68

File tree

4 files changed

+29
-73
lines changed

4 files changed

+29
-73
lines changed

ext-src/php_swoole_library.h

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
+----------------------------------------------------------------------+
1515
*/
1616

17-
/* $Id: 80b1fce4629583863ab271926e012c3242b754fc */
17+
/* $Id: 920d9b72d619facc0cb02fdcad24c0a04085dbc7 */
1818

1919
#ifndef SWOOLE_LIBRARY_H
2020
#define SWOOLE_LIBRARY_H
@@ -238,7 +238,7 @@ static const char* swoole_library_source_core_constant =
238238
" *\n"
239239
" * This one works the same as option \"socket_send_timeout\", but has higher priority.\n"
240240
" *\n"
241-
" * @see \\Swoole\\Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
241+
" * @see Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
242242
" */\n"
243243
" public const OPTION_SOCKET_WRITE_TIMEOUT = 'socket_write_timeout';\n"
244244
"\n"
@@ -247,7 +247,7 @@ static const char* swoole_library_source_core_constant =
247247
" *\n"
248248
" * This one works the same as option \"socket_write_timeout\", but has lower priority.\n"
249249
" *\n"
250-
" * @see \\Swoole\\Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
250+
" * @see Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
251251
" */\n"
252252
" public const OPTION_SOCKET_SEND_TIMEOUT = 'socket_send_timeout';\n"
253253
"\n"
@@ -256,7 +256,7 @@ static const char* swoole_library_source_core_constant =
256256
" *\n"
257257
" * This one works the same as option \"socket_recv_timeout\", but has higher priority.\n"
258258
" *\n"
259-
" * @see \\Swoole\\Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
259+
" * @see Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
260260
" */\n"
261261
" public const OPTION_SOCKET_READ_TIMEOUT = 'socket_read_timeout';\n"
262262
"\n"
@@ -265,23 +265,23 @@ static const char* swoole_library_source_core_constant =
265265
" *\n"
266266
" * This one works the same as option \"socket_read_timeout\", but has lower priority.\n"
267267
" *\n"
268-
" * @see \\Swoole\\Constant::OPTION_SOCKET_READ_TIMEOUT\n"
268+
" * @see Constant::OPTION_SOCKET_READ_TIMEOUT\n"
269269
" */\n"
270270
" public const OPTION_SOCKET_RECV_TIMEOUT = 'socket_recv_timeout';\n"
271271
"\n"
272272
" /**\n"
273273
" * Default socket read/write timeout in seconds.\n"
274274
" *\n"
275275
" * This one has the highest priority than the other read/write timeout options:\n"
276-
" * - \\Swoole\\Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
277-
" * - \\Swoole\\Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
278-
" * - \\Swoole\\Constant::OPTION_SOCKET_READ_TIMEOUT\n"
279-
" * - \\Swoole\\Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
276+
" * - Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
277+
" * - Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
278+
" * - Constant::OPTION_SOCKET_READ_TIMEOUT\n"
279+
" * - Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
280280
" *\n"
281-
" * @see \\Swoole\\Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
282-
" * @see \\Swoole\\Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
283-
" * @see \\Swoole\\Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
284-
" * @see \\Swoole\\Constant::OPTION_SOCKET_READ_TIMEOUT\n"
281+
" * @see Constant::OPTION_SOCKET_SEND_TIMEOUT\n"
282+
" * @see Constant::OPTION_SOCKET_WRITE_TIMEOUT\n"
283+
" * @see Constant::OPTION_SOCKET_RECV_TIMEOUT\n"
284+
" * @see Constant::OPTION_SOCKET_READ_TIMEOUT\n"
285285
" */\n"
286286
" public const OPTION_SOCKET_TIMEOUT = 'socket_timeout';\n"
287287
"\n"
@@ -324,6 +324,11 @@ static const char* swoole_library_source_core_constant =
324324
"\n"
325325
" public const OPTION_ENABLE_SIGNALFD = 'enable_signalfd';\n"
326326
"\n"
327+
" /**\n"
328+
" * @since 6.1.0\n"
329+
" */\n"
330+
" public const OPTION_ENABLE_KQUEUE = 'enable_kqueue';\n"
331+
"\n"
327332
" public const OPTION_WAIT_SIGNAL = 'wait_signal';\n"
328333
"\n"
329334
" public const OPTION_DNS_CACHE_REFRESH_TIME = 'dns_cache_refresh_time';\n"
@@ -334,6 +339,9 @@ static const char* swoole_library_source_core_constant =
334339
"\n"
335340
" public const OPTION_MAX_THREAD_NUM = 'max_thread_num';\n"
336341
"\n"
342+
" /**\n"
343+
" * @removed 6.1.0\n"
344+
" */\n"
337345
" public const OPTION_SOCKET_DONTWAIT = 'socket_dontwait';\n"
338346
"\n"
339347
" public const OPTION_DNS_LOOKUP_RANDOM = 'dns_lookup_random';\n"
@@ -574,6 +582,11 @@ static const char* swoole_library_source_core_constant =
574582
"\n"
575583
" public const OPTION_STATIC_HANDLER_LOCATIONS = 'static_handler_locations';\n"
576584
"\n"
585+
" /**\n"
586+
" * @since 6.2.0\n"
587+
" */\n"
588+
" public const OPTION_URL_REWRITE_RULES = 'url_rewrite_rules';\n"
589+
"\n"
577590
" public const OPTION_INPUT_BUFFER_SIZE = 'input_buffer_size';\n"
578591
"\n"
579592
" public const OPTION_BUFFER_INPUT_SIZE = 'buffer_input_size';\n"
@@ -9412,6 +9425,7 @@ static const char* swoole_library_source_core_server_helper =
94129425
" 'message_queue_key' => true,\n"
94139426
" 'bootstrap' => true,\n"
94149427
" 'init_arguments' => true,\n"
9428+
" 'url_rewrite_rules' => true,\n"
94159429
" ];\n"
94169430
"\n"
94179431
" public const PORT_OPTIONS = [\n"
@@ -10419,7 +10433,7 @@ static const char* swoole_library_source_core_coroutine_functions =
1041910433
" \"\\n {$hr1}\",\n"
1042010434
" \"\\n [FATAL ERROR]: all coroutines (count: {$count}) are asleep - deadlock!\",\n"
1042110435
" \"\\n {$hr1}\",\n"
10422-
" \"\\n \";\n"
10436+
" \"\\n\";\n"
1042310437
"\n"
1042410438
" // print all coroutine backtraces\n"
1042510439
" $options = Coroutine::getOptions();\n"

tests/swoole_pdo_sqlite/bug60104.phpt

Lines changed: 0 additions & 28 deletions
This file was deleted.

tests/swoole_pdo_sqlite/bug70221.phpt

Lines changed: 0 additions & 30 deletions
This file was deleted.

tests/swoole_pdo_sqlite/gh9032.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ run(function() {
3030
?>
3131
--EXPECT--
3232
int(0)
33-
SQLSTATE[HY000]: General error: 23 not authorized
33+
int(0)

0 commit comments

Comments
 (0)