Compare commits

..

5 Commits

Author SHA1 Message Date
as2252258 2e54326aba eee 2025-07-16 09:17:03 +08:00
as2252258 59632ac4a3 eee 2025-07-16 09:09:56 +08:00
as2252258 da5a6a6b83 eee 2025-07-14 18:12:17 +08:00
as2252258 d758d21f08 eee 2025-07-11 17:44:34 +08:00
as2252258 c59212da78 eee 2025-07-11 17:32:17 +08:00
3 changed files with 6 additions and 7 deletions
+4 -5
View File
@@ -9,7 +9,7 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": ">=8.3", "php": ">=8.4",
"ext-json": "*", "ext-json": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-pdo": "*", "ext-pdo": "*",
@@ -23,19 +23,18 @@
"ext-openssl": "*", "ext-openssl": "*",
"ext-swoole": "*", "ext-swoole": "*",
"ext-msgpack": "*", "ext-msgpack": "*",
"symfony/console": "~v5.3.10", "symfony/console": "^v7.3.1",
"psr/log": "1.*", "psr/log": "1.*",
"composer-runtime-api": "^2.0", "composer-runtime-api": "^2.0",
"psr/http-server-middleware": "1.0.1", "psr/http-server-middleware": "1.0.1",
"ext-pcntl": "*", "ext-pcntl": "*",
"ext-sockets": "*", "ext-sockets": "*",
"nikic/php-parser": "^4.15", "nikic/php-parser": "^v5.5.0",
"ext-inotify": "*", "ext-inotify": "*",
"game-worker/kiri-pool": "~v1.0", "game-worker/kiri-pool": "~v1.0",
"monolog/monolog": "^2.9", "monolog/monolog": "^2.9",
"psr/container": "^2.0", "psr/container": "^2.0",
"ext-libsodium": "*", "swiftmailer/swiftmailer": "^v6.3.0"
"swiftmailer/swiftmailer": "^6.3"
}, },
"replace": { "replace": {
"symfony/polyfill-apcu": "*", "symfony/polyfill-apcu": "*",
+1 -1
View File
@@ -763,7 +763,7 @@ if (!function_exists('process_name_set')) {
* @param string|null $prefix * @param string|null $prefix
* @throws * @throws
*/ */
function process_name_set(int $pid, string $prefix = NULL): void function process_name_set(int $pid, ?string $prefix = NULL): void
{ {
if (Kiri::getPlatform()->isMac()) { if (Kiri::getPlatform()->isMac()) {
return; return;
+1 -1
View File
@@ -185,7 +185,7 @@ class Str
* @return array * @return array
* 剩余天,带分秒 * 剩余天,带分秒
*/ */
public static function timeout($endTime, int $startTime = NULL): array public static function timeout($endTime, ?int $startTime = NULL): array
{ {
$endTime = $endTime - (!empty($startTime) ? $startTime : time()); $endTime = $endTime - (!empty($startTime) ? $startTime : time());