Fix xlswriter with openssl conflict bug (#472)

* Fix xlswriter with openssl conflict bug

* bump version to 2.2.3
This commit is contained in:
Jerry Ma 2024-06-04 19:31:13 +08:00 committed by GitHub
parent 1ae1c81f9c
commit 7e6c2b4432
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 4 deletions

View File

@ -853,6 +853,9 @@
"ext-depends": [ "ext-depends": [
"zlib", "zlib",
"zip" "zip"
],
"lib-suggests": [
"openssl"
] ]
}, },
"xml": { "xml": {

View File

@ -25,7 +25,7 @@ use Symfony\Component\Console\Application;
*/ */
final class ConsoleApplication extends Application final class ConsoleApplication extends Application
{ {
public const VERSION = '2.2.2'; public const VERSION = '2.2.3';
public function __construct() public function __construct()
{ {

View File

@ -12,6 +12,10 @@ class xlswriter extends Extension
{ {
public function getUnixConfigureArg(): string public function getUnixConfigureArg(): string
{ {
return '--with-xlswriter --enable-reader'; $arg = '--with-xlswriter --enable-reader';
if ($this->builder->getLib('openssl')) {
$arg .= ' --with-openssl=' . BUILD_ROOT_PATH;
}
return $arg;
} }
} }

View File

@ -19,8 +19,8 @@ $upx = true;
// 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' => 'libxml,swoole', 'Linux', 'Darwin' => 'libxml,xlswriter,openssl',
'Windows' => 'mbstring,pdo_sqlite,mbregex,libxml', 'Windows' => 'mbstring,pdo_sqlite,mbregex',
}; };
// If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`). // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).