Skip to content

Remove deprecated args for PHP 8.4 #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazywhalecc merged 5 commits into from
Mar 7, 2025
Merged

Remove deprecated args for PHP 8.4 #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38f007b
Remove deprecated args for PHP 8.4
crazywhalecc Mar 7, 2025
5541c2a
Add tests
crazywhalecc Mar 7, 2025
de62143
Use nts for testing
crazywhalecc Mar 7, 2025
4145010
Test
crazywhalecc Mar 7, 2025
efaf42e
memcache still uses `--with-zlib-dir`
crazywhalecc Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions config/ext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,8 @@
"type": "external",
"source": "ext-memcache",
"arg-type": "custom",
"lib-depends": [
"zlib"
],
"ext-depends": [
"zlib",
"session"
]
},
Expand Down
3 changes: 2 additions & 1 deletion src/SPC/builder/extension/memcached.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class memcached extends Extension
public function getUnixConfigureArg(): string
{
$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";
}
}
3 changes: 2 additions & 1 deletion src/SPC/builder/extension/openssl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public function patchBeforeMake(): bool

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;
}
}
6 changes: 2 additions & 4 deletions src/SPC/builder/extension/zlib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ class zlib extends Extension
{
public function getUnixConfigureArg(): string
{
if ($this->builder->getPHPVersionID() >= 80400) {
return '--with-zlib';
}
return '--with-zlib --with-zlib-dir="' . BUILD_ROOT_PATH . '"';
$zlib_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : ' --with-zlib-dir=' . BUILD_ROOT_PATH;
return '--with-zlib' . $zlib_dir;
}
}
6 changes: 2 additions & 4 deletions src/globals/test-extensions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

// test php version
$test_php_version = [
'8.1',
'8.2',
'8.3',
'8.4',
];
Expand All @@ -28,7 +26,7 @@
];

// whether enable thread safe
$zts = true;
$zts = false;

$no_strip = false;

Expand All @@ -40,7 +38,7 @@

// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
$extensions = match (PHP_OS_FAMILY) {
'Linux', 'Darwin' => 'gettext',
'Linux', 'Darwin' => 'imap,openssl,zlib,memcache',
'Windows' => 'gettext',
};

Expand Down