From 4537bfb247e48292d0ffe378ce39930e1f686f9c Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Wed, 31 May 2023 10:03:40 +0200 Subject: [PATCH 01/13] Add support for libargon2 --- config/ext.json | 7 ++++++ config/lib.json | 6 +++++ config/source.json | 8 +++++++ src/SPC/builder/macos/library/libargon2.php | 12 ++++++++++ src/SPC/builder/unix/library/libargon2.php | 26 +++++++++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 src/SPC/builder/macos/library/libargon2.php create mode 100644 src/SPC/builder/unix/library/libargon2.php diff --git a/config/ext.json b/config/ext.json index 3c0b1960f..f6d2d93cf 100644 --- a/config/ext.json +++ b/config/ext.json @@ -295,6 +295,13 @@ "libsodium" ] }, + "password-argon2": { + "type": "builtin", + "arg-type": "with-prefix", + "lib-depends": [ + "libargon2" + ] + }, "sqlite3": { "type": "builtin", "arg-type": "with-prefix", diff --git a/config/lib.json b/config/lib.json index bfe6ec6c9..4c2c0caee 100644 --- a/config/lib.json +++ b/config/lib.json @@ -460,5 +460,11 @@ "static-libs-unix": [ "libsodium.a" ] + }, + "libargon2": { + "source": "libargon2", + "static-libs-unix": [ + "libargon2.a" + ] } } \ No newline at end of file diff --git a/config/source.json b/config/source.json index d74fd4963..d9784cbae 100644 --- a/config/source.json +++ b/config/source.json @@ -419,5 +419,13 @@ "type": "file", "path": "LICENSE" } + }, + "libargon2": { + "type": "ghtar", + "repo": "P-H-C/phc-winner-argon2", + "license": { + "type": "file", + "path": "LICENSE" + } } } \ No newline at end of file diff --git a/src/SPC/builder/macos/library/libargon2.php b/src/SPC/builder/macos/library/libargon2.php new file mode 100644 index 000000000..f39afa4fe --- /dev/null +++ b/src/SPC/builder/macos/library/libargon2.php @@ -0,0 +1,12 @@ +cd($this->source_dir) + ->exec("make {$this->builder->configure_env} PREFIX='' clean") + ->exec("make -j{$this->builder->concurrency} PREFIX=''") + ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); + + $this->patchPkgconfPrefix(['libargon2.pc']); + + foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) { + if (str_starts_with($filename, 'libargon2') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) { + unlink(BUILD_ROOT_PATH . '/lib/' . $filename); + } + } + } +} From 1b734073b023ab63003748431298dffab5ab4c25 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Fri, 2 Jun 2023 22:47:59 +0200 Subject: [PATCH 02/13] Merge refactor --- config/ext.json | 16 ++++++++-------- config/lib.json | 12 ++++++------ config/source.json | 18 ++++++++++-------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/config/ext.json b/config/ext.json index 59e07925d..727907f86 100644 --- a/config/ext.json +++ b/config/ext.json @@ -195,6 +195,13 @@ "openssl" ] }, + "password-argon2": { + "type": "builtin", + "arg-type": "with-prefix", + "lib-depends": [ + "libargon2" + ] + }, "pcntl": { "type": "builtin", "unix-only": true @@ -302,13 +309,6 @@ "libsodium" ] }, - "password-argon2": { - "type": "builtin", - "arg-type": "with-prefix", - "lib-depends": [ - "libargon2" - ] - }, "sqlite3": { "type": "builtin", "arg-type": "with-prefix", @@ -435,4 +435,4 @@ "zstd" ] } -} +} \ No newline at end of file diff --git a/config/lib.json b/config/lib.json index 6f5d06824..a68fbf744 100644 --- a/config/lib.json +++ b/config/lib.json @@ -127,6 +127,12 @@ "libxml2" ] }, + "libargon2": { + "source": "libargon2", + "static-libs-unix": [ + "libargon2.a" + ] + }, "libavif": { "source": "libavif", "static-libs-unix": [ @@ -469,11 +475,5 @@ "zstd.h", "zstd_errors.h" ] - }, - "libargon2": { - "source": "libargon2", - "static-libs-unix": [ - "libargon2.a" - ] } } \ No newline at end of file diff --git a/config/source.json b/config/source.json index 977ae8adb..c61239ac5 100644 --- a/config/source.json +++ b/config/source.json @@ -125,6 +125,16 @@ "path": "LICENSE" } }, + "libargon2": { + "type": "git", + "path": "", + "rev": "master", + "url": "https://github.com/mpociot/phc-winner-argon2", + "license": { + "type": "file", + "path": "LICENSE" + } + }, "libavif": { "type": "ghtar", "repo": "AOMediaCodec/libavif", @@ -427,13 +437,5 @@ "type": "file", "path": "LICENSE" } - }, - "libargon2": { - "type": "ghtar", - "repo": "P-H-C/phc-winner-argon2", - "license": { - "type": "file", - "path": "LICENSE" - } } } \ No newline at end of file From 0569c696349d75e988668132c13766c2bdfd7cd2 Mon Sep 17 00:00:00 2001 From: Marcel Pociot Date: Sat, 3 Jun 2023 00:04:02 +0200 Subject: [PATCH 03/13] remove path --- config/source.json | 1 - 1 file changed, 1 deletion(-) diff --git a/config/source.json b/config/source.json index c61239ac5..169143c73 100644 --- a/config/source.json +++ b/config/source.json @@ -127,7 +127,6 @@ }, "libargon2": { "type": "git", - "path": "", "rev": "master", "url": "https://github.com/mpociot/phc-winner-argon2", "license": { From 967292be5cb31e68355b6a38bdc78c105fc0a8e8 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 5 Nov 2023 17:31:17 +0800 Subject: [PATCH 04/13] Remove old configure_env --- src/SPC/builder/unix/library/libargon2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SPC/builder/unix/library/libargon2.php b/src/SPC/builder/unix/library/libargon2.php index 4cd9a9419..222e8b439 100644 --- a/src/SPC/builder/unix/library/libargon2.php +++ b/src/SPC/builder/unix/library/libargon2.php @@ -11,7 +11,7 @@ trait libargon2 protected function build() { shell()->cd($this->source_dir) - ->exec("make {$this->builder->configure_env} PREFIX='' clean") + ->exec("make PREFIX='' clean") ->exec("make -j{$this->builder->concurrency} PREFIX=''") ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH); From 3604ea6d6797d93b40341062c41711fbca0d045a Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 5 Nov 2023 17:32:29 +0800 Subject: [PATCH 05/13] Update lock --- composer.lock | 54 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/composer.lock b/composer.lock index 109c39b34..5f25211db 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "illuminate/collections", - "version": "v10.29.0", + "version": "v10.30.1", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", @@ -63,7 +63,7 @@ }, { "name": "illuminate/conditionable", - "version": "v10.29.0", + "version": "v10.30.1", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", @@ -109,16 +109,16 @@ }, { "name": "illuminate/contracts", - "version": "v10.29.0", + "version": "v10.30.1", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "6c39fba7b2311e28f5c6ac7d729e3d49a2a98406" + "reference": "f6bf37a272fda164f6c451407c99f820eb1eb95b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/6c39fba7b2311e28f5c6ac7d729e3d49a2a98406", - "reference": "6c39fba7b2311e28f5c6ac7d729e3d49a2a98406", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/f6bf37a272fda164f6c451407c99f820eb1eb95b", + "reference": "f6bf37a272fda164f6c451407c99f820eb1eb95b", "shasum": "" }, "require": { @@ -153,11 +153,11 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-05T19:07:46+00:00" + "time": "2023-10-30T00:59:22+00:00" }, { "name": "illuminate/macroable", - "version": "v10.29.0", + "version": "v10.30.1", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -203,16 +203,16 @@ }, { "name": "laravel/prompts", - "version": "v0.1.12", + "version": "v0.1.13", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "b35f249028c22016e45e48626e19e5d42fd827ff" + "reference": "e1379d8ead15edd6cc4369c22274345982edc95a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/b35f249028c22016e45e48626e19e5d42fd827ff", - "reference": "b35f249028c22016e45e48626e19e5d42fd827ff", + "url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a", + "reference": "e1379d8ead15edd6cc4369c22274345982edc95a", "shasum": "" }, "require": { @@ -254,9 +254,9 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.12" + "source": "https://github.com/laravel/prompts/tree/v0.1.13" }, - "time": "2023-10-18T14:18:57+00:00" + "time": "2023-10-27T13:53:59+00:00" }, { "name": "psr/container", @@ -2247,16 +2247,16 @@ }, { "name": "filp/whoops", - "version": "2.15.3", + "version": "2.15.4", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "c83e88a30524f9360b11f585f71e6b17313b7187" + "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187", - "reference": "c83e88a30524f9360b11f585f71e6b17313b7187", + "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", + "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", "shasum": "" }, "require": { @@ -2306,7 +2306,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.3" + "source": "https://github.com/filp/whoops/tree/2.15.4" }, "funding": [ { @@ -2314,7 +2314,7 @@ "type": "github" } ], - "time": "2023-07-13T12:00:00+00:00" + "time": "2023-11-03T12:00:00+00:00" }, { "name": "friendsofphp/php-cs-fixer", @@ -2521,16 +2521,16 @@ }, { "name": "humbug/php-scoper", - "version": "0.18.4", + "version": "0.18.7", "source": { "type": "git", "url": "https://github.com/humbug/php-scoper.git", - "reference": "d79c1486537280c21c907e9a8a610eceb391407f" + "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/humbug/php-scoper/zipball/d79c1486537280c21c907e9a8a610eceb391407f", - "reference": "d79c1486537280c21c907e9a8a610eceb391407f", + "url": "https://api.github.com/repos/humbug/php-scoper/zipball/9386a0af946f175d7a1ebfb68851bc2bb8ad7858", + "reference": "9386a0af946f175d7a1ebfb68851bc2bb8ad7858", "shasum": "" }, "require": { @@ -2548,7 +2548,7 @@ "bamarni/composer-bin-plugin": "^1.1", "ergebnis/composer-normalize": "^2.28", "fidry/makefile": "^1.0", - "humbug/box": "^4.0", + "humbug/box": "^4.5.1", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.0", "symfony/yaml": "^6.1" @@ -2598,9 +2598,9 @@ "description": "Prefixes all PHP namespaces in a file or directory.", "support": { "issues": "https://github.com/humbug/php-scoper/issues", - "source": "https://github.com/humbug/php-scoper/tree/0.18.4" + "source": "https://github.com/humbug/php-scoper/tree/0.18.7" }, - "time": "2023-10-20T17:14:04+00:00" + "time": "2023-11-04T18:01:12+00:00" }, { "name": "jetbrains/phpstorm-stubs", From 672a4102cdce711be89ec52fb328f92dbbe5948c Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 5 Nov 2023 17:53:48 +0800 Subject: [PATCH 06/13] overwrite password-argon2 cli check --- src/SPC/builder/extension/password_argon2.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/SPC/builder/extension/password_argon2.php diff --git a/src/SPC/builder/extension/password_argon2.php b/src/SPC/builder/extension/password_argon2.php new file mode 100644 index 000000000..fb3c4b044 --- /dev/null +++ b/src/SPC/builder/extension/password_argon2.php @@ -0,0 +1,21 @@ +execWithResult(BUILD_ROOT_PATH . '/bin/php -r "assert(defined(\'PASSWORD_ARGON2I\'));"'); + if ($ret !== 0) { + throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check'); + } + } +} From fbf5c958d085a43a7f2b7d9d084397ff55d8ae6e Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 5 Nov 2023 17:55:39 +0800 Subject: [PATCH 07/13] sort configs --- config/ext.json | 2 +- config/lib.json | 12 ++++++------ config/source.json | 16 ++++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/ext.json b/config/ext.json index 85139f1f2..130e2cea2 100644 --- a/config/ext.json +++ b/config/ext.json @@ -518,4 +518,4 @@ "zstd" ] } -} \ No newline at end of file +} diff --git a/config/lib.json b/config/lib.json index 13f1f1b87..2b9500fd6 100644 --- a/config/lib.json +++ b/config/lib.json @@ -141,12 +141,6 @@ "libxml2" ] }, - "libargon2": { - "source": "libargon2", - "static-libs-unix": [ - "libargon2.a" - ] - }, "ldap": { "source": "ldap", "static-libs-unix": [ @@ -159,6 +153,12 @@ "libsodium" ] }, + "libargon2": { + "source": "libargon2", + "static-libs-unix": [ + "libargon2.a" + ] + }, "libavif": { "source": "libavif", "static-libs-unix": [ diff --git a/config/source.json b/config/source.json index 9df19068b..12015a21f 100644 --- a/config/source.json +++ b/config/source.json @@ -154,19 +154,19 @@ "path": "LICENSE" } }, - "libargon2": { - "type": "git", - "rev": "master", - "url": "https://github.com/mpociot/phc-winner-argon2", + "ldap": { + "type": "filelist", + "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/", + "regex": "/href=\"(?openldap-(?[^\"]+)\\.tgz)\"/", "license": { "type": "file", "path": "LICENSE" } }, - "ldap": { - "type": "filelist", - "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/", - "regex": "/href=\"(?openldap-(?[^\"]+)\\.tgz)\"/", + "libargon2": { + "type": "git", + "rev": "master", + "url": "https://github.com/mpociot/phc-winner-argon2", "license": { "type": "file", "path": "LICENSE" From 93a55e87d5fe2e6e259b456955a9f498709c6b82 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 19:03:16 +0800 Subject: [PATCH 08/13] temporarily use pkg-config mirror (freedesktop.org down) --- config/source.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/source.json b/config/source.json index 23b4ab1be..09cd20647 100644 --- a/config/source.json +++ b/config/source.json @@ -385,9 +385,8 @@ } }, "pkg-config": { - "type": "filelist", - "url": "https://pkgconfig.freedesktop.org/releases/", - "regex": "/href=\"(?pkg-config-(?[^\"]+)\\.tar\\.gz)\"/", + "type": "url", + "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz", "license": { "type": "file", "path": "COPYING" From e0550b4a4520931c2fba3aa7ecefa7173d57fd14 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 19:04:49 +0800 Subject: [PATCH 09/13] add argon2 test --- src/globals/test-extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index a80c9a781..06eaf68e3 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -3,6 +3,6 @@ declare(strict_types=1); # If you want to test new extensions here, just modify it. -$extensions = 'apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,ldap,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sodium,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; +$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,ldap,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sodium,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; echo $extensions; From 48551cc602dbda7e5688f1f60882a60896429162 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 19:13:19 +0800 Subject: [PATCH 10/13] add linux support for libargon2 --- src/SPC/builder/linux/library/libargon2.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/SPC/builder/linux/library/libargon2.php diff --git a/src/SPC/builder/linux/library/libargon2.php b/src/SPC/builder/linux/library/libargon2.php new file mode 100644 index 000000000..59e85112c --- /dev/null +++ b/src/SPC/builder/linux/library/libargon2.php @@ -0,0 +1,12 @@ + Date: Tue, 19 Dec 2023 19:31:56 +0800 Subject: [PATCH 11/13] fix linux build (dont know why linux failed) --- src/SPC/builder/linux/library/libargon2.php | 13 +++++++++++++ src/globals/test-extensions.php | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/SPC/builder/linux/library/libargon2.php b/src/SPC/builder/linux/library/libargon2.php index 59e85112c..ca4a72acd 100644 --- a/src/SPC/builder/linux/library/libargon2.php +++ b/src/SPC/builder/linux/library/libargon2.php @@ -4,9 +4,22 @@ namespace SPC\builder\linux\library; +use SPC\exception\WrongUsageException; +use SPC\store\FileSystem; + class libargon2 extends LinuxLibraryBase { use \SPC\builder\unix\library\libargon2; public const NAME = 'libargon2'; + + public function patchBeforeBuild(): bool + { + // detect libsodium (The libargon2 conflicts with the libsodium library.) + if ($this->builder->getLib('libsodium') !== null) { + throw new WrongUsageException('libargon2 (required by password-argon2) conflicts with the libsodium library !'); + } + FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'LIBRARY_REL ?= lib/x86_64-linux-gnu', 'LIBRARY_REL ?= lib'); + return true; + } } diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 06eaf68e3..fd55f0c49 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -3,6 +3,10 @@ declare(strict_types=1); # If you want to test new extensions here, just modify it. -$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,ldap,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sodium,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; +$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,ldap,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; + +if (PHP_OS_FAMILY === 'Darwin') { + $extensions .= ',sodium'; +} echo $extensions; From c4cfc01b88a88585f23358409b78585b162cdbe3 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 19:37:19 +0800 Subject: [PATCH 12/13] fix linux build (dont know why linux failed) --- src/globals/test-extensions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index fd55f0c49..6de2bdf80 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -3,10 +3,10 @@ declare(strict_types=1); # If you want to test new extensions here, just modify it. -$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,ldap,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; +$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; if (PHP_OS_FAMILY === 'Darwin') { - $extensions .= ',sodium'; + $extensions .= ',ldap,sodium'; } echo $extensions; From 248918e4580fd3b52b0a8459daca53b1014f5232 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Tue, 19 Dec 2023 20:04:13 +0800 Subject: [PATCH 13/13] remove ldap test for known reason --- src/globals/test-extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 6de2bdf80..f047e2493 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -6,7 +6,7 @@ $extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib'; if (PHP_OS_FAMILY === 'Darwin') { - $extensions .= ',ldap,sodium'; + $extensions .= ',sodium'; } echo $extensions;