Fix xlswriter with openssl conflict bug (#472)

* Fix xlswriter with openssl conflict bug * bump version to 2.2.3
crazywhalecc · Jun 4, 2024 · 7e6c2b4 · 7e6c2b4
1 parent 1ae1c81
commit 7e6c2b4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/config/ext.json b/config/ext.json
@@ -853,6 +853,9 @@
         "ext-depends": [
             "zlib",
             "zip"
+        ],
+        "lib-suggests": [
+            "openssl"
         ]
     },
     "xml": {

diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php
@@ -25,7 +25,7 @@
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.2.2';
+    public const VERSION = '2.2.3';
 
     public function __construct()
     {

diff --git a/src/SPC/builder/extension/xlswriter.php b/src/SPC/builder/extension/xlswriter.php
@@ -12,6 +12,10 @@ class xlswriter extends Extension
 {
     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;
     }
 }
diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
@@ -19,8 +19,8 @@
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'libxml,swoole',
-    'Windows' => 'mbstring,pdo_sqlite,mbregex,libxml',
+    'Linux', 'Darwin' => 'libxml,xlswriter,openssl',
+    'Windows' => 'mbstring,pdo_sqlite,mbregex',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).