diff --git a/.github/workflows/ext-matrix-tests.yml b/.github/workflows/ext-matrix-tests.yml index 22db8ad6..84d3b518 100644 --- a/.github/workflows/ext-matrix-tests.yml +++ b/.github/workflows/ext-matrix-tests.yml @@ -65,7 +65,7 @@ jobs: - sqlsrv - ssh2 - swoole - - swoole,swoole-hook-pgsql,swoole-hook-mysql,swoole-hook-sqlite + - swoole,swoole-hook-pgsql,swoole-hook-mysql,swoole-hook-sqlite,swoole-hook-odbc - swow - sysvmsg,sysvsem,sysvshm - tidy @@ -82,7 +82,7 @@ jobs: - zlib - zstd php-version: - - "8.5" + - "8.4" operating-system: - "ubuntu-latest" #- "macos-13" diff --git a/config/ext.json b/config/ext.json index 87097c4b..8e02b118 100644 --- a/config/ext.json +++ b/config/ext.json @@ -842,14 +842,23 @@ "nghttp2", "zlib" ], + "lib-suggests": [ + "zstd" + ], + "lib-suggests-linux": [ + "zstd", + "liburing" + ], "ext-depends": [ "openssl", "curl" ], "ext-suggests": [ + "sockets", "swoole-hook-pgsql", "swoole-hook-mysql", - "swoole-hook-sqlite" + "swoole-hook-sqlite", + "swoole-hook-odbc" ] }, "swoole-hook-mysql": { @@ -859,11 +868,12 @@ }, "notes": true, "type": "addon", - "arg-type": "custom", + "arg-type": "none", "ext-depends": [ "mysqlnd", "pdo", - "pdo_mysql" + "pdo_mysql", + "swoole" ], "ext-suggests": [ "mysqli" @@ -877,10 +887,11 @@ }, "notes": true, "type": "addon", - "arg-type": "custom", + "arg-type": "none", "ext-depends": [ "pgsql", - "pdo" + "pdo", + "swoole" ] }, "swoole-hook-sqlite": { @@ -890,10 +901,27 @@ }, "notes": true, "type": "addon", - "arg-type": "custom", + "arg-type": "none", "ext-depends": [ "sqlite3", - "pdo" + "pdo", + "swoole" + ] + }, + "swoole-hook-odbc": { + "support": { + "Windows": "no", + "BSD": "wip" + }, + "notes": true, + "type": "addon", + "arg-type": "none", + "ext-depends": [ + "pdo", + "swoole" + ], + "lib-depends": [ + "unixodbc" ] }, "swow": { diff --git a/config/lib.json b/config/lib.json index 1c366743..079ebc1e 100644 --- a/config/lib.json +++ b/config/lib.json @@ -925,5 +925,20 @@ "zstd.h", "zstd_errors.h" ] + }, + "liburing": { + "source": "liburing", + "pkg-configs": [ + "liburing", + "liburing-ffi" + ], + "static-libs-linux": [ + "liburing.a", + "liburing-ffi.a" + ], + "headers-linux": [ + "liburing/", + "liburing.h" + ] } } diff --git a/config/source.json b/config/source.json index 79e4b153..4a0e0fdb 100644 --- a/config/source.json +++ b/config/source.json @@ -1136,5 +1136,14 @@ "type": "file", "path": "LICENSE" } + }, + "liburing": { + "type": "ghtar", + "repo": "axboe/liburing", + "prefer-stable": true, + "license": { + "type": "file", + "path": "COPYING" + } } } diff --git a/docs/.vitepress/components/CliGenerator.vue b/docs/.vitepress/components/CliGenerator.vue index f9f3613d..6cef60d0 100644 --- a/docs/.vitepress/components/CliGenerator.vue +++ b/docs/.vitepress/components/CliGenerator.vue @@ -15,9 +15,9 @@
WARNING
{{ I18N[lang].microUnavailable }}
WARNING
{{ I18N[lang].windowsSAPIUnavailable }}