From 5bbbf29a36d9e897e29a65293ad5092c0d4dcb25 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 19:09:13 +0800 Subject: [PATCH 1/2] add password-argon2 support --- docs/.vitepress/components/CliGenerator.vue | 1 + docs/en/guide/extension-notes.md | 4 + docs/en/guide/extensions.md | 160 ++++++++++---------- docs/zh/guide/extension-notes.md | 4 + docs/zh/guide/extensions.md | 160 ++++++++++---------- 5 files changed, 169 insertions(+), 160 deletions(-) diff --git a/docs/.vitepress/components/CliGenerator.vue b/docs/.vitepress/components/CliGenerator.vue index dbb46059..f9728211 100644 --- a/docs/.vitepress/components/CliGenerator.vue +++ b/docs/.vitepress/components/CliGenerator.vue @@ -197,6 +197,7 @@ const EXTENSIONS = [ 'mysqlnd', 'opcache', 'openssl', + 'password-argon2', 'pcntl', 'pdo', 'pdo_mysql', diff --git a/docs/en/guide/extension-notes.md b/docs/en/guide/extension-notes.md index cd75d883..578faaf3 100644 --- a/docs/en/guide/extension-notes.md +++ b/docs/en/guide/extension-notes.md @@ -90,3 +90,7 @@ Snappy configuration may break features of other extensions. Use with caution. S - https://github.com/kjdev/php-ext-snappy/issues/24 - https://github.com/crazywhalecc/static-php-cli/issues/285 + +## password-argon2 + +password-argon2 is not a standard extension, it is an additional algorithm for the `password_hash` function. \ No newline at end of file diff --git a/docs/en/guide/extensions.md b/docs/en/guide/extensions.md index b407ec00..0bb1110a 100644 --- a/docs/en/guide/extensions.md +++ b/docs/en/guide/extensions.md @@ -6,86 +6,86 @@ > - no with issue link: not supported yet due to issue > - partial with issue link: supported but not perfect due to issue -| | Linux | macOS | FreeBSD | Windows | -|--------------------------------------|---------------|---------------|---------------|---------| -| apcu | yes, untested | yes, untested | yes, untested | | -| bcmath | yes | yes | yes | | -| bz2 | yes | yes | yes | | -| calendar | yes | yes | yes | | -| ctype | yes | yes | yes | | -| curl | yes | yes | yes | | -| dba | yes | yes | yes | | -| dom | yes | yes | | | -| enchant | | | | | -| event | yes | yes | | | -| exif | yes | yes | yes | | -| ffi | yes | yes | | | -| filter | yes | yes | yes | | -| fileinfo | yes | yes | yes | | -| ftp | yes | yes | yes | | -| [gd](./extension-notes#gd) | yes | yes | | | -| gettext | | | | | -| [glfw](./extension-notes#glfw) | no | yes | no | | -| gmp | yes | yes | | | -| iconv | yes | yes | | | -| imagick | yes | yes | | | -| [imap](./extension-notes#imap) | yes | yes | | | -| inotify | yes | no | | | -| intl | yes | yes | | | -| ldap | yes | yes | | | -| mbstring | yes | yes | yes | | -| mbregex | yes | yes | yes | | -| [mcrypt](./extension-notes#mcrypt) | no | no | no | | -| memcache | yes, untested | yes, untested | | | -| memcached | no | yes, untested | | | -| [mongodb](./extension-notes#mongodb) | yes | no | | | -| mysqli | yes | yes | yes | | -| mysqlnd | yes | yes | yes | | -| [oci8](./extension-notes#oci8) | no | no | no | | -| opcache | yes | yes | yes | | -| openssl | yes | yes | yes | | -| password-argon2 | | | | | -| pcntl | yes | yes | yes | | -| pdo | yes | yes | yes | | -| pdo_mysql | yes | yes | yes | | -| pdo_sqlite | yes | yes | | | -| pdo_pgsql | yes | yes | | | -| [pgsql](./extension-notes#pgsql) | partial | partial | | | -| phar | yes | yes | yes | | -| posix | yes | yes | yes | | -| protobuf | yes | yes | | | -| pspell | | | | | -| [rar](./extension-notes#rar) | yes | partial | | | -| rdkafka | | | | | -| readline | yes, untested | yes, untested | | | -| redis | yes | yes | | | -| session | yes | yes | yes | | -| shmop | yes | yes | yes | | -| simplexml | yes | yes | | | -| [snappy](./extension-notes#snappy) | partial | partial | | | -| soap | yes | yes | | | -| sockets | yes | yes | yes | | -| sodium | yes | yes | | | -| sqlite3 | yes | yes | | | -| [sqlsrv](./extension-notes#sqlsrv) | no | no | no | | -| ssh2 | yes | yes | | | -| [swow](./extension-notes#swow) | yes | yes | | | -| [swoole](./extension-notes#swoole) | partial | yes | | | -| sysvmsg | yes | yes | | | -| sysvsem | yes | yes | | | -| sysvshm | yes | yes | | | -| tidy | yes | yes | | | -| tokenizer | yes | yes | yes | | -| [xdebug](./extension-notes#xdebug) | no | no | no | | -| xlswriter | yes | yes | | | -| [xml](./extension-notes#xml) | yes | yes | | | -| xmlreader | yes, untested | yes, untested | | | -| xmlwriter | yes, untested | yes, untested | | | -| xsl | yes, untested | yes, untested | | | -| yaml | yes | yes | | | -| zip | yes | yes | | | -| zlib | yes | yes | yes | | -| zstd | yes | yes | | | +| | Linux | macOS | FreeBSD | Windows | +|------------------------------------------------------|---------------|---------------|---------------|---------| +| apcu | yes, untested | yes, untested | yes, untested | | +| bcmath | yes | yes | yes | | +| bz2 | yes | yes | yes | | +| calendar | yes | yes | yes | | +| ctype | yes | yes | yes | | +| curl | yes | yes | yes | | +| dba | yes | yes | yes | | +| dom | yes | yes | | | +| enchant | | | | | +| event | yes | yes | | | +| exif | yes | yes | yes | | +| ffi | yes | yes | | | +| filter | yes | yes | yes | | +| fileinfo | yes | yes | yes | | +| ftp | yes | yes | yes | | +| [gd](./extension-notes#gd) | yes | yes | | | +| gettext | | | | | +| [glfw](./extension-notes#glfw) | no | yes | no | | +| gmp | yes | yes | | | +| iconv | yes | yes | | | +| imagick | yes | yes | | | +| [imap](./extension-notes#imap) | yes | yes | | | +| inotify | yes | no | | | +| intl | yes | yes | | | +| ldap | yes | yes | | | +| mbstring | yes | yes | yes | | +| mbregex | yes | yes | yes | | +| [mcrypt](./extension-notes#mcrypt) | no | no | no | | +| memcache | yes, untested | yes, untested | | | +| memcached | no | yes, untested | | | +| [mongodb](./extension-notes#mongodb) | yes | no | | | +| mysqli | yes | yes | yes | | +| mysqlnd | yes | yes | yes | | +| [oci8](./extension-notes#oci8) | no | no | no | | +| opcache | yes | yes | yes | | +| openssl | yes | yes | yes | | +| [password-argon2](./extension-notes#password-argon2) | yes | yes | | | +| pcntl | yes | yes | yes | | +| pdo | yes | yes | yes | | +| pdo_mysql | yes | yes | yes | | +| pdo_sqlite | yes | yes | | | +| pdo_pgsql | yes | yes | | | +| [pgsql](./extension-notes#pgsql) | partial | partial | | | +| phar | yes | yes | yes | | +| posix | yes | yes | yes | | +| protobuf | yes | yes | | | +| pspell | | | | | +| [rar](./extension-notes#rar) | yes | partial | | | +| rdkafka | | | | | +| readline | yes, untested | yes, untested | | | +| redis | yes | yes | | | +| session | yes | yes | yes | | +| shmop | yes | yes | yes | | +| simplexml | yes | yes | | | +| [snappy](./extension-notes#snappy) | partial | partial | | | +| soap | yes | yes | | | +| sockets | yes | yes | yes | | +| sodium | yes | yes | | | +| sqlite3 | yes | yes | | | +| [sqlsrv](./extension-notes#sqlsrv) | no | no | no | | +| ssh2 | yes | yes | | | +| [swow](./extension-notes#swow) | yes | yes | | | +| [swoole](./extension-notes#swoole) | partial | yes | | | +| sysvmsg | yes | yes | | | +| sysvsem | yes | yes | | | +| sysvshm | yes | yes | | | +| tidy | yes | yes | | | +| tokenizer | yes | yes | yes | | +| [xdebug](./extension-notes#xdebug) | no | no | no | | +| xlswriter | yes | yes | | | +| [xml](./extension-notes#xml) | yes | yes | | | +| xmlreader | yes, untested | yes, untested | | | +| xmlwriter | yes, untested | yes, untested | | | +| xsl | yes, untested | yes, untested | | | +| yaml | yes | yes | | | +| zip | yes | yes | | | +| zlib | yes | yes | yes | | +| zstd | yes | yes | | | ::: tip If an extension you need is missing, you can create a [Feature Request](https://github.com/crazywhalecc/static-php-cli/issues). diff --git a/docs/zh/guide/extension-notes.md b/docs/zh/guide/extension-notes.md index d08b33e6..ceb2d4ab 100644 --- a/docs/zh/guide/extension-notes.md +++ b/docs/zh/guide/extension-notes.md @@ -80,3 +80,7 @@ Snappy 配置可能会破坏其他扩展的功能，请谨慎使用。相关链 - https://github.com/kjdev/php-ext-snappy/issues/24 - https://github.com/crazywhalecc/static-php-cli/issues/285 + +## password-argon2 + +password-argon2不是一个标准的扩展，它是 `password_hash` 函数的额外算法。 diff --git a/docs/zh/guide/extensions.md b/docs/zh/guide/extensions.md index b407ec00..0bb1110a 100644 --- a/docs/zh/guide/extensions.md +++ b/docs/zh/guide/extensions.md @@ -6,86 +6,86 @@ > - no with issue link: not supported yet due to issue > - partial with issue link: supported but not perfect due to issue -| | Linux | macOS | FreeBSD | Windows | -|--------------------------------------|---------------|---------------|---------------|---------| -| apcu | yes, untested | yes, untested | yes, untested | | -| bcmath | yes | yes | yes | | -| bz2 | yes | yes | yes | | -| calendar | yes | yes | yes | | -| ctype | yes | yes | yes | | -| curl | yes | yes | yes | | -| dba | yes | yes | yes | | -| dom | yes | yes | | | -| enchant | | | | | -| event | yes | yes | | | -| exif | yes | yes | yes | | -| ffi | yes | yes | | | -| filter | yes | yes | yes | | -| fileinfo | yes | yes | yes | | -| ftp | yes | yes | yes | | -| [gd](./extension-notes#gd) | yes | yes | | | -| gettext | | | | | -| [glfw](./extension-notes#glfw) | no | yes | no | | -| gmp | yes | yes | | | -| iconv | yes | yes | | | -| imagick | yes | yes | | | -| [imap](./extension-notes#imap) | yes | yes | | | -| inotify | yes | no | | | -| intl | yes | yes | | | -| ldap | yes | yes | | | -| mbstring | yes | yes | yes | | -| mbregex | yes | yes | yes | | -| [mcrypt](./extension-notes#mcrypt) | no | no | no | | -| memcache | yes, untested | yes, untested | | | -| memcached | no | yes, untested | | | -| [mongodb](./extension-notes#mongodb) | yes | no | | | -| mysqli | yes | yes | yes | | -| mysqlnd | yes | yes | yes | | -| [oci8](./extension-notes#oci8) | no | no | no | | -| opcache | yes | yes | yes | | -| openssl | yes | yes | yes | | -| password-argon2 | | | | | -| pcntl | yes | yes | yes | | -| pdo | yes | yes | yes | | -| pdo_mysql | yes | yes | yes | | -| pdo_sqlite | yes | yes | | | -| pdo_pgsql | yes | yes | | | -| [pgsql](./extension-notes#pgsql) | partial | partial | | | -| phar | yes | yes | yes | | -| posix | yes | yes | yes | | -| protobuf | yes | yes | | | -| pspell | | | | | -| [rar](./extension-notes#rar) | yes | partial | | | -| rdkafka | | | | | -| readline | yes, untested | yes, untested | | | -| redis | yes | yes | | | -| session | yes | yes | yes | | -| shmop | yes | yes | yes | | -| simplexml | yes | yes | | | -| [snappy](./extension-notes#snappy) | partial | partial | | | -| soap | yes | yes | | | -| sockets | yes | yes | yes | | -| sodium | yes | yes | | | -| sqlite3 | yes | yes | | | -| [sqlsrv](./extension-notes#sqlsrv) | no | no | no | | -| ssh2 | yes | yes | | | -| [swow](./extension-notes#swow) | yes | yes | | | -| [swoole](./extension-notes#swoole) | partial | yes | | | -| sysvmsg | yes | yes | | | -| sysvsem | yes | yes | | | -| sysvshm | yes | yes | | | -| tidy | yes | yes | | | -| tokenizer | yes | yes | yes | | -| [xdebug](./extension-notes#xdebug) | no | no | no | | -| xlswriter | yes | yes | | | -| [xml](./extension-notes#xml) | yes | yes | | | -| xmlreader | yes, untested | yes, untested | | | -| xmlwriter | yes, untested | yes, untested | | | -| xsl | yes, untested | yes, untested | | | -| yaml | yes | yes | | | -| zip | yes | yes | | | -| zlib | yes | yes | yes | | -| zstd | yes | yes | | | +| | Linux | macOS | FreeBSD | Windows | +|------------------------------------------------------|---------------|---------------|---------------|---------| +| apcu | yes, untested | yes, untested | yes, untested | | +| bcmath | yes | yes | yes | | +| bz2 | yes | yes | yes | | +| calendar | yes | yes | yes | | +| ctype | yes | yes | yes | | +| curl | yes | yes | yes | | +| dba | yes | yes | yes | | +| dom | yes | yes | | | +| enchant | | | | | +| event | yes | yes | | | +| exif | yes | yes | yes | | +| ffi | yes | yes | | | +| filter | yes | yes | yes | | +| fileinfo | yes | yes | yes | | +| ftp | yes | yes | yes | | +| [gd](./extension-notes#gd) | yes | yes | | | +| gettext | | | | | +| [glfw](./extension-notes#glfw) | no | yes | no | | +| gmp | yes | yes | | | +| iconv | yes | yes | | | +| imagick | yes | yes | | | +| [imap](./extension-notes#imap) | yes | yes | | | +| inotify | yes | no | | | +| intl | yes | yes | | | +| ldap | yes | yes | | | +| mbstring | yes | yes | yes | | +| mbregex | yes | yes | yes | | +| [mcrypt](./extension-notes#mcrypt) | no | no | no | | +| memcache | yes, untested | yes, untested | | | +| memcached | no | yes, untested | | | +| [mongodb](./extension-notes#mongodb) | yes | no | | | +| mysqli | yes | yes | yes | | +| mysqlnd | yes | yes | yes | | +| [oci8](./extension-notes#oci8) | no | no | no | | +| opcache | yes | yes | yes | | +| openssl | yes | yes | yes | | +| [password-argon2](./extension-notes#password-argon2) | yes | yes | | | +| pcntl | yes | yes | yes | | +| pdo | yes | yes | yes | | +| pdo_mysql | yes | yes | yes | | +| pdo_sqlite | yes | yes | | | +| pdo_pgsql | yes | yes | | | +| [pgsql](./extension-notes#pgsql) | partial | partial | | | +| phar | yes | yes | yes | | +| posix | yes | yes | yes | | +| protobuf | yes | yes | | | +| pspell | | | | | +| [rar](./extension-notes#rar) | yes | partial | | | +| rdkafka | | | | | +| readline | yes, untested | yes, untested | | | +| redis | yes | yes | | | +| session | yes | yes | yes | | +| shmop | yes | yes | yes | | +| simplexml | yes | yes | | | +| [snappy](./extension-notes#snappy) | partial | partial | | | +| soap | yes | yes | | | +| sockets | yes | yes | yes | | +| sodium | yes | yes | | | +| sqlite3 | yes | yes | | | +| [sqlsrv](./extension-notes#sqlsrv) | no | no | no | | +| ssh2 | yes | yes | | | +| [swow](./extension-notes#swow) | yes | yes | | | +| [swoole](./extension-notes#swoole) | partial | yes | | | +| sysvmsg | yes | yes | | | +| sysvsem | yes | yes | | | +| sysvshm | yes | yes | | | +| tidy | yes | yes | | | +| tokenizer | yes | yes | yes | | +| [xdebug](./extension-notes#xdebug) | no | no | no | | +| xlswriter | yes | yes | | | +| [xml](./extension-notes#xml) | yes | yes | | | +| xmlreader | yes, untested | yes, untested | | | +| xmlwriter | yes, untested | yes, untested | | | +| xsl | yes, untested | yes, untested | | | +| yaml | yes | yes | | | +| zip | yes | yes | | | +| zlib | yes | yes | yes | | +| zstd | yes | yes | | | ::: tip If an extension you need is missing, you can create a [Feature Request](https://github.com/crazywhalecc/static-php-cli/issues). From 950b22b0f0400644b6c9907fb74c582adc86b4bc Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 20:57:32 +0800 Subject: [PATCH 2/2] add conflict message --- docs/en/guide/extension-notes.md | 3 ++- docs/zh/guide/extension-notes.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/en/guide/extension-notes.md b/docs/en/guide/extension-notes.md index 578faaf3..84269439 100644 --- a/docs/en/guide/extension-notes.md +++ b/docs/en/guide/extension-notes.md @@ -93,4 +93,5 @@ Snappy configuration may break features of other extensions. Use with caution. S ## password-argon2 -password-argon2 is not a standard extension, it is an additional algorithm for the `password_hash` function. \ No newline at end of file +1. password-argon2 is not a standard extension, it is an additional algorithm for the `password_hash` function. +2. On Linux systems, `password-argon2` dependency `libargon2` conflicts with the `libsodium` library. diff --git a/docs/zh/guide/extension-notes.md b/docs/zh/guide/extension-notes.md index ceb2d4ab..80536275 100644 --- a/docs/zh/guide/extension-notes.md +++ b/docs/zh/guide/extension-notes.md @@ -83,4 +83,5 @@ Snappy 配置可能会破坏其他扩展的功能，请谨慎使用。相关链 ## password-argon2 -password-argon2不是一个标准的扩展，它是 `password_hash` 函数的额外算法。 +1. password-argon2不是一个标准的扩展，它是 `password_hash` 函数的额外算法。 +2. 在Linux系统，password-argon2 的依赖库 `libargon2` 与 `libsodium` 库冲突。