update Swoole Library for v6.0.0-beta

Signed-off-by: Demin Yin <deminy@deminy.net>

Author: deminy

src/swoole_library/src/__init__.php

@@ -87,6 +87,9 @@
  'core/NameResolver/Redis.php',
  'core/NameResolver/Nacos.php',
  'core/NameResolver/Consul.php',
+ # <core for Thread> #
+ 'core/Thread/Pool.php',
+ 'core/Thread/Runnable.php',
  # <core for functions> #
  'core/Coroutine/functions.php',
  # <ext> #

src/swoole_library/src/core/Constant.php

@@ -125,6 +125,8 @@ class Constant
 
  public const OPTION_AIO_MAX_IDLE_TIME = 'aio_max_idle_time';
 
+ public const OPTION_IOURING_ENTRIES = 'iouring_entries';
+
  public const OPTION_ENABLE_SIGNALFD = 'enable_signalfd';
 
  public const OPTION_WAIT_SIGNAL = 'wait_signal';
@@ -281,36 +283,16 @@ class Constant
 
  public const OPTION_UPLOAD_TMP_DIR = 'upload_tmp_dir';
 
- public const OPTION_HOST = 'host';
-
- public const OPTION_PORT = 'port';
-
- public const OPTION_SSL = 'ssl';
-
- public const OPTION_USER = 'user';
-
- public const OPTION_PASSWORD = 'password';
-
- public const OPTION_DATABASE = 'database';
-
- public const OPTION_CHARSET = 'charset';
-
- public const OPTION_STRICT_TYPE = 'strict_type';
-
- public const OPTION_FETCH_MODE = 'fetch_mode';
-
  public const OPTION_ENABLE_MESSAGE_BUS = 'enable_message_bus';
 
  public const OPTION_MAX_PACKAGE_SIZE = 'max_package_size';
 
- public const OPTION_SERIALIZE = 'serialize';
-
- public const OPTION_RECONNECT = 'reconnect';
-
- public const OPTION_COMPATIBILITY_MODE = 'compatibility_mode';
+ public const OPTION_SSL = 'ssl';
 
  public const OPTION_CHROOT = 'chroot';
 
+ public const OPTION_USER = 'user';
+
  public const OPTION_GROUP = 'group';
 
  public const OPTION_DAEMONIZE = 'daemonize';
@@ -407,6 +389,10 @@ class Constant
 
  public const OPTION_MESSAGE_QUEUE_KEY = 'message_queue_key';
 
+ public const OPTION_BOOTSTRAP = 'bootstrap';
+
+ public const OPTION_INIT_ARGUMENTS = 'init_arguments';
+
  public const OPTION_BACKLOG = 'backlog';
 
  public const OPTION_KERNEL_SOCKET_RECV_BUFFER_SIZE = 'kernel_socket_recv_buffer_size';

src/swoole_library/src/core/Coroutine/Barrier.php

@@ -47,7 +47,7 @@ public static function make(): self
  /**
  * @throws Exception
  */
- public static function wait(Barrier &$barrier, float $timeout = -1)
+ public static function wait(Barrier &$barrier, float $timeout = -1): void
  {
  if ($barrier->cid !== -1) {
  throw new Exception('The barrier is waiting, cannot wait again.');

src/swoole_library/src/core/Coroutine/Http/functions.php

@@ -22,7 +22,7 @@ function request(
  mixed $data = null,
  ?array $options = null,
  ?array $headers = null,
- ?array $cookies = null
+ ?array $cookies = null,
 ): ClientProxy {
  $driver = swoole_library_get_option('http_client_driver');
  return match ($driver) {
@@ -41,7 +41,7 @@ function request_with_http_client(
  mixed $data = null,
  ?array $options = null,
  ?array $headers = null,
- ?array $cookies = null
+ ?array $cookies = null,
 ): ClientProxy {
  $info = parse_url($url);
  if (empty($info['scheme'])) {
@@ -85,7 +85,7 @@ function request_with_curl(
  mixed $data = null,
  ?array $options = null,
  ?array $headers = null,
- ?array $cookies = null
+ ?array $cookies = null,
 ): ClientProxy {
  $ch = curl_init($url);
  if (empty($ch)) {
@@ -154,7 +154,7 @@ function request_with_stream(
  mixed $data = null,
  ?array $options = null,
  ?array $headers = null,
- ?array $cookies = null
+ ?array $cookies = null,
 ): ClientProxy {
  $stream_options = [
  'http' => [

src/swoole_library/src/core/FastCGI/Record.php

@@ -98,7 +98,7 @@ final public static function unpack(string $binaryData): static
  $self->requestId,
  $self->contentLength,
  $self->paddingLength,
- $self->reserved
+ $self->reserved,
  ] = array_values($packet);
 
  $payload = substr($binaryData, FastCGI::HEADER_LEN);
@@ -205,7 +205,7 @@ protected static function unpackPayload(self $self, string $binaryData): void
  }
  [
  $self->contentData,
- $self->paddingData
+ $self->paddingData,
  ] = array_values($payload);
  }
 

src/swoole_library/src/core/FastCGI/Record/BeginRequest.php

@@ -97,7 +97,7 @@ protected static function unpackPayload($self, string $binaryData): void
  [
  $self->role,
  $self->flags,
- $self->reserved1
+ $self->reserved1,
  ] = array_values($payload);
  }
 

src/swoole_library/src/core/FastCGI/Record/EndRequest.php

@@ -98,7 +98,7 @@ protected static function unpackPayload($self, string $binaryData): void
  [
  $self->appStatus,
  $self->protocolStatus,
- $self->reserved1
+ $self->reserved1,
  ] = array_values($payload);
  }
 

src/swoole_library/src/core/Server/Admin.php

@@ -67,7 +67,7 @@ class Admin
 
  private static string $accessToken = '';
 
- public static function init(Server $server)
+ public static function init(Server $server): void
  {
  $accepted_process_types = SWOOLE_SERVER_COMMAND_MASTER |
  SWOOLE_SERVER_COMMAND_MANAGER |

src/swoole_library/src/core/Server/Helper.php

@@ -111,6 +111,8 @@ class Helper
  'output_buffer_size' => true,
  'buffer_output_size' => true,
  'message_queue_key' => true,
+ 'init_arguments' => true,
+ 'bootstrap' => true,
  ];
 
  public const PORT_OPTIONS = [
@@ -201,7 +203,7 @@ class Helper
  'admin_server' => true,
  ];
 
- public static function checkOptions(array $input_options)
+ public static function checkOptions(array $input_options): void
  {
  $const_options = self::GLOBAL_OPTIONS + self::SERVER_OPTIONS + self::PORT_OPTIONS
  + self::AIO_OPTIONS + self::COROUTINE_OPTIONS + self::HELPER_OPTIONS;
@@ -215,7 +217,7 @@ public static function checkOptions(array $input_options)
  }
  }
 
- public static function onBeforeStart(Server $server)
+ public static function onBeforeStart(Server $server): void
  {
  if (!empty($server->setting['admin_server'])) {
  Admin::init($server);
@@ -230,7 +232,7 @@ public static function onBeforeShutdown(Server $server): void
  }
  }
 
- public static function onWorkerStart(Server $server, int $workerId)
+ public static function onWorkerStart(Server $server, int $workerId): void
  {
  if (!empty($server->setting['stats_file']) and $workerId == 0) {
  $interval_ms = empty($server->setting['stats_timer_interval']) ? self::STATS_TIMER_INTERVAL_TIME : intval($server->setting['stats_timer_interval']);
@@ -254,7 +256,7 @@ public static function onWorkerStart(Server $server, int $workerId)
  }
  }
 
- public static function onWorkerExit(Server $server, int $workerId)
+ public static function onWorkerExit(Server $server, int $workerId): void
  {
  if ($server->stats_timer) {
  Timer::clear($server->stats_timer);