Remove deprecated args for PHP 8.4 (#616)

* Remove deprecated args for PHP 8.4

* Add tests

* Use nts for testing

* Test

* memcache still uses `--with-zlib-dir`
This commit is contained in:
Jerry Ma 2025-03-07 18:25:19 +08:00 committed by GitHub
parent a95d034e98
commit cf30418be9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 13 deletions

View File

@ -355,10 +355,8 @@
"type": "external", "type": "external",
"source": "ext-memcache", "source": "ext-memcache",
"arg-type": "custom", "arg-type": "custom",
"lib-depends": [
"zlib"
],
"ext-depends": [ "ext-depends": [
"zlib",
"session" "session"
] ]
}, },

View File

@ -13,6 +13,7 @@ class memcached extends Extension
public function getUnixConfigureArg(): string public function getUnixConfigureArg(): string
{ {
$rootdir = BUILD_ROOT_PATH; $rootdir = BUILD_ROOT_PATH;
return "--enable-memcached --with-zlib-dir={$rootdir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json"; $zlib_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : "--with-zlib-dir={$rootdir}";
return "--enable-memcached {$zlib_dir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json";
} }
} }

View File

@ -25,6 +25,7 @@ class openssl extends Extension
public function getUnixConfigureArg(): string public function getUnixConfigureArg(): string
{ {
return '--with-openssl=' . BUILD_ROOT_PATH . ' --with-openssl-dir=' . BUILD_ROOT_PATH; $openssl_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : ' --with-openssl-dir=' . BUILD_ROOT_PATH;
return '--with-openssl=' . BUILD_ROOT_PATH . $openssl_dir;
} }
} }

View File

@ -12,9 +12,7 @@ class zlib extends Extension
{ {
public function getUnixConfigureArg(): string public function getUnixConfigureArg(): string
{ {
if ($this->builder->getPHPVersionID() >= 80400) { $zlib_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : ' --with-zlib-dir=' . BUILD_ROOT_PATH;
return '--with-zlib'; return '--with-zlib' . $zlib_dir;
}
return '--with-zlib --with-zlib-dir="' . BUILD_ROOT_PATH . '"';
} }
} }

View File

@ -13,8 +13,6 @@ declare(strict_types=1);
// test php version // test php version
$test_php_version = [ $test_php_version = [
'8.1',
'8.2',
'8.3', '8.3',
'8.4', '8.4',
]; ];
@ -28,7 +26,7 @@ $test_os = [
]; ];
// whether enable thread safe // whether enable thread safe
$zts = true; $zts = false;
$no_strip = false; $no_strip = false;
@ -40,7 +38,7 @@ $prefer_pre_built = false;
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
$extensions = match (PHP_OS_FAMILY) { $extensions = match (PHP_OS_FAMILY) {
'Linux', 'Darwin' => 'gettext', 'Linux', 'Darwin' => 'imap,openssl,zlib,memcache',
'Windows' => 'gettext', 'Windows' => 'gettext',
}; };