set version to 2.0-rc7

only enable openssl when zlib ext is also enabled (missing 'deflate' otherwise)
move back from source/php-src/ext/ldap to source/ldap (fix "LICENSE not found")

.github/workflows/release-build.yml

@@ -0,0 +1,47 @@
+name: Upload SPC Binary (Release)
+
+on:
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+jobs:
+  build-release-artifacts:
+    name: "Upload SPC Binary (Release)"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        operating-system:
+          - "linux-x86_64"
+          - "macos-x86_64"
+          - "linux-aarch64"
+          - "macos-aarch64"
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+
+      - name: Reuse static-php-cli-hosted artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          repo: crazywhalecc/static-php-cli-hosted
+          branch: master
+          workflow: build-spc-release.yml
+          name: "spc-${{ matrix.operating-system }}"
+
+      - name: "Archive Executable"
+        run: |
+          tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
+          echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
+
+      - name: upload binaries to release
+        uses: softprops/action-gh-release@v1
+        if: ${{startsWith(github.ref, 'refs/tags/') }}
+        with:
+          files: ${{ env.filename }}
+
+      - name: "Upload Artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          path: spc
+          name: spc-${{ matrix.operating-system }}

.gitignore

@@ -4,8 +4,7 @@ docker/libraries/
 docker/extensions/
 docker/source/
 
-# Composer file
-composer.lock
+# Vendor files
 /vendor/
 
 # default source extract directory

README-en.md

@@ -41,7 +41,7 @@ Currently supported PHP versions for compilation are: `7.3`, `7.4`, `8.0`, `8.1`
 
 ## Docs
 
-docs here: <https://static-php-cli.zhamao.me>.
+docs here: <https://static-php.dev>.
 
 ## Simple Usage
 
@@ -49,13 +49,13 @@ Please first select the extension you want to compile based on the extension lis
 
 ### Direct Download
 
-If you don't compile yourself, you can download pre-compiled artifact from Actions, or from self-hosted server: [Here](https://dl.zhamao.xin/static-php-cli/)
+If you don't compile yourself, you can download pre-compiled artifact from Actions, or from self-hosted server: [Here](https://dl.static-php.dev/static-php-cli/common/)
 
 > self-hosted server contains extensions: `bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip`
 
 ### Supported Extensions
 
-[Supported Extension List](https://static-php-cli.zhamao.me/en/guide/extensions.html)
+[Supported Extension List](https://static-php.dev/en/guide/extensions.html)
 
 > If there is no extension you need here, you can submit an issue.
 
@@ -214,7 +214,7 @@ If you are familiar with this project, you are also welcome to initiate a pull r
 
 The basic principles for contributing are as follows:
 
-- This project uses php-cs-fixer and phpstan as code formatting tools. Before contributing, please run `composer analyze` and `composer cs-fix` on the updated code.
+- This project uses php-cs-fixer and phpstan as code formatting tools. Before contributing, please run `composer analyse` and `composer cs-fix` on the updated code.
 - If other open source libraries are involved, the corresponding licenses should be provided. 
     Also, configuration files should be sorted using the command `sort-config` after modification.
     For more information about sorting commands, see the documentation.
@@ -254,4 +254,4 @@ and comply with the corresponding project's LICENSE.
 
 The refactoring branch of this project is written modularly. 
 If you are interested in this project and want to join the development,
-you can refer to the [Contribution Guide](https://static-php-cli.zhamao.me) of the documentation to contribute code or documentation.
+you can refer to the [Contribution Guide](https://static-php.dev) of the documentation to contribute code or documentation.

README.md

@@ -40,7 +40,7 @@ Build single static PHP binary, with PHP project together, with popular extensio
 
 ## 文档
 
-点击这里查看文档：<https://static-php-cli.zhamao.me>。
+点击这里查看文档：<https://static-php.dev>。
 
 ## 使用
 
@@ -48,13 +48,13 @@ Build single static PHP binary, with PHP project together, with popular extensio
 
 ### 自托管直接下载
 
-如果你不想自行编译，可以从本项目现有的 Action 下载 Artifact，也可以从自托管的服务器下载：[进入](https://dl.zhamao.xin/static-php-cli/)
+如果你不想自行编译，可以从本项目现有的 Action 下载 Artifact，也可以从自托管的服务器下载：[进入](https://dl.static-php.dev/static-php-cli/common/)
 
 > 自托管的服务器默认包含的扩展有：`bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip`
 
 ### 支持的扩展情况
 
-[扩展支持列表](https://static-php-cli.zhamao.me/zh/guide/extensions.html)
+[扩展支持列表](https://static-php.dev/zh/guide/extensions.html)
 
 > 如果这里没有你需要的扩展，可以提交 Issue。
 
@@ -221,4 +221,4 @@ cat micro.sfx code.php > single-app && chmod +x single-app
 
 ## 进阶
 
-本项目重构分支为模块化编写。如果你对本项目感兴趣，想加入开发，可以参照文档的 [贡献指南](https://static-php-cli.zhamao.me) 贡献代码或文档。
+本项目重构分支为模块化编写。如果你对本项目感兴趣，想加入开发，可以参照文档的 [贡献指南](https://static-php.dev) 贡献代码或文档。

bin/setup-runtime

@@ -25,7 +25,7 @@ __DIR__=$(cd "$(dirname "$0")" && pwd)
 __PROJECT__=$(cd "${__DIR__}"/../ && pwd)
 
 # set download dir
-__PHP_RUNTIME_URL__="https://dl.zhamao.xin/static-php-cli/php-8.2.6-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.10-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
 __COMPOSER_URL__="https://getcomposer.org/download/latest-stable/composer.phar"
 
 # use china mirror
@@ -46,7 +46,7 @@ done
 
 case "$mirror" in
 china)
-  __PHP_RUNTIME_URL__="https://dl.zhamao.xin/static-php-cli/php-8.2.6-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.10-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
   __COMPOSER_URL__="https://mirrors.aliyun.com/composer/composer.phar"
   ;;
 

bin/spc-alpine-docker

@@ -81,6 +81,7 @@ RUN apk update; \
         php82-pcntl \
         php82-phar \
         php82-posix \
+        php82-sodium \
         php82-tokenizer \
         php82-dom \
         php82-xml \
@@ -88,13 +89,14 @@ RUN apk update; \
         composer \
         pkgconfig \
         wget \
-        xz
-RUN ln -s /usr/bin/php82 /usr/bin/php
+        xz ; \
+  ln -s /usr/bin/php82 /usr/bin/php
+
 WORKDIR /app
 ADD ./src /app/src
-ADD ./composer.json /app/composer.json
+COPY ./composer.* /app/
 ADD ./bin /app/bin
-RUN composer update --no-dev --classmap-authoritative
+RUN composer install --no-dev --classmap-authoritative
 EOF
 fi
 

config/ext.json

@@ -153,9 +153,16 @@
     },
     "ldap": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "with-prefix",
         "lib-depends": [
             "ldap"
+        ],
+        "lib-suggests": [
+            "gmp",
+            "libsodium"
+        ],
+        "ext-suggests": [
+            "openssl"
         ]
     },
     "mbregex": {
@@ -229,6 +236,9 @@
         "arg-type": "with",
         "lib-depends": [
             "openssl"
+        ],
+        "ext-depends": [
+            "zlib"
         ]
     },
     "pcntl": {

config/lib.json

@@ -139,6 +139,18 @@
             "libxml2"
         ]
     },
+    "ldap": {
+        "source": "ldap",
+        "static-libs-unix": [
+            "liblber.a",
+            "libldap.a"
+        ],
+        "lib-suggests": [
+            "openssl",
+            "gmp",
+            "libsodium"
+        ]
+    },
     "libavif": {
         "source": "libavif",
         "static-libs-unix": [

config/source.json

@@ -153,6 +153,15 @@
             "path": "LICENSE"
         }
     },
+    "ldap": {
+        "type": "filelist",
+        "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
+        "regex": "/href=\"(?<file>openldap-(?<version>[^\"]+)\\.tgz)\"/",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
@@ -241,7 +250,7 @@
     },
     "libwebp": {
         "type": "url",
-        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.0.tar.gz",
+        "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
         "license": {
             "type": "file",
             "path": "COPYING"

ext-support.md

@@ -1,3 +1,3 @@
 # Extension List
 
-See: [Docs - Extensions](https://static-php-cli.zhamao.me/en/guide/extensions.html)
+See: [Docs - Extensions](https://static-php.dev/en/guide/extensions.html)

src/SPC/ConsoleApplication.php

@@ -23,17 +23,12 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.0-rc6';
+    public const VERSION = '2.0-rc7';
 
     public function __construct()
     {
         parent::__construct('static-php-cli', self::VERSION);
 
-        global $argv;
-
-        // Detailed debugging errors are not displayed in the production environment. Only the error display provided by Symfony console is used.
-        $this->setCatchExceptions(file_exists(ROOT_DIR . '/.prod') || !in_array('--debug', $argv));
-
         $this->addCommands(
             [
                 new BuildCliCommand(),

src/SPC/builder/BuilderBase.php

@@ -227,12 +227,22 @@ abstract class BuilderBase
 
     /**
      * Get PHP Version ID from php-src/main/php_version.h
+     *
+     * @throws RuntimeException
+     * @throws WrongUsageException
      */
     public function getPHPVersionID(): int
     {
+        if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
+            throw new WrongUsageException('PHP source files are not available, you need to download them first');
+        }
+
         $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
-        preg_match('/PHP_VERSION_ID (\d+)/', $file, $match);
-        return intval($match[1]);
+        if (preg_match('/PHP_VERSION_ID (\d+)/', $file, $match) !== 0) {
+            return intval($match[1]);
+        }
+
+        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
     }
 
     /**

src/SPC/builder/extension/openssl.php

@@ -6,7 +6,6 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\util\CustomExt;
-use SPC\util\Util;
 
 #[CustomExt('openssl')]
 class openssl extends Extension
@@ -14,12 +13,13 @@ class openssl extends Extension
     public function patchBeforeMake(): bool
     {
         // patch openssl3 with php8.0 bug
-        if (file_exists(SOURCE_PATH . '/openssl/VERSION.dat') && Util::getPHPVersionID() < 80100) {
+        if (file_exists(SOURCE_PATH . '/openssl/VERSION.dat') && $this->builder->getPHPVersionID() < 80100) {
             $openssl_c = file_get_contents(SOURCE_PATH . '/php-src/ext/openssl/openssl.c');
             $openssl_c = preg_replace('/REGISTER_LONG_CONSTANT\s*\(\s*"OPENSSL_SSLV23_PADDING"\s*.+;/', '', $openssl_c);
             file_put_contents(SOURCE_PATH . '/php-src/ext/openssl/openssl.c', $openssl_c);
             return true;
         }
+
         return false;
     }
 }

src/SPC/builder/extension/swow.php

@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\exception\RuntimeException;
 use SPC\util\CustomExt;
-use SPC\util\Util;
 
 #[CustomExt('swow')]
 class swow extends Extension
@@ -25,7 +24,7 @@ class swow extends Extension
      */
     public function patchBeforeBuildconf(): bool
     {
-        if (Util::getPHPVersionID() >= 80000 && !is_link(SOURCE_PATH . '/php-src/ext/swow')) {
+        if ($this->builder->getPHPVersionID() >= 80000 && !is_link(SOURCE_PATH . '/php-src/ext/swow')) {
             if (PHP_OS_FAMILY === 'Windows') {
                 f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && mklink /D swow swow-src\ext');
             } else {

src/SPC/builder/linux/LinuxBuilder.php

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 
 class LinuxBuilder extends BuilderBase
@@ -52,7 +53,7 @@ class LinuxBuilder extends BuilderBase
 
         // ---------- set necessary compile environments ----------
         // set libc
-        $this->libc = 'musl'; // SystemUtil::selectLibc($this->cc);
+        $this->libc = $this->getOption('cc', 'gcc') === 'musl-gcc' ? 'musl_wrapper' : 'musl'; // SystemUtil::selectLibc($this->cc);
         // concurrency
         $this->concurrency = SystemUtil::getCpuCount();
         // cflags
@@ -223,16 +224,15 @@ class LinuxBuilder extends BuilderBase
         }
         if ($enableEmbed) {
             logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+            }
             $this->buildEmbed($extra_libs, $use_lld);
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
             $this->sanityCheck($build_target);
         }
-
-        if ($this->phar_patched) {
-            SourcePatcher::patchMicro(['phar'], true);
-        }
     }
 
     /**
@@ -290,6 +290,10 @@ class LinuxBuilder extends BuilderBase
         }
 
         $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::patchMicro(['phar'], true);
+        }
     }
 
     /**

src/SPC/builder/linux/SystemUtil.php

@@ -121,7 +121,7 @@ class SystemUtil
 
     public static function checkCCFlag(string $flag, string $cc): string
     {
-        [$ret] = shell()->execWithResult("echo | {$cc} -E -x c - {$flag}");
+        [$ret] = shell()->execWithResult("echo | {$cc} -E -x c - {$flag} 2>/dev/null");
         if ($ret != 0) {
             return '';
         }

src/SPC/builder/linux/library/ldap.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class ldap extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\ldap;
+
+    public const NAME = 'ldap';
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 
 class MacOSBuilder extends BuilderBase
@@ -195,16 +196,15 @@ class MacOSBuilder extends BuilderBase
         }
         if ($enableEmbed) {
             logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+            }
             $this->buildEmbed();
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
             $this->sanityCheck($build_target);
         }
-
-        if ($this->phar_patched) {
-            SourcePatcher::patchMicro(['phar'], true);
-        }
     }
 
     /**
@@ -258,6 +258,10 @@ class MacOSBuilder extends BuilderBase
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec("make -j{$this->concurrency} {$vars} micro");
         $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::patchMicro(['phar'], true);
+        }
     }
 
     /**

src/SPC/builder/macos/library/ldap.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class ldap extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\ldap;
+
+    public const NAME = 'ldap';
+}

src/SPC/builder/traits/UnixBuilderTrait.php

@@ -153,4 +153,26 @@ trait UnixBuilderTrait
             "-DCMAKE_INSTALL_INCLUDEDIR={$include} " .
             "-DCMAKE_TOOLCHAIN_FILE={$this->cmake_toolchain_file}";
     }
+
+    /**
+     * Generate configure flags
+     */
+    public function makeAutoconfFlags(int $flag = AUTOCONF_ALL): string
+    {
+        $extra = '';
+        // TODO: add auto pkg-config support
+        if (($flag & AUTOCONF_LIBS) === AUTOCONF_LIBS) {
+            $extra .= 'LIBS="' . BUILD_LIB_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_CFLAGS) === AUTOCONF_CFLAGS) {
+            $extra .= 'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_CPPFLAGS) === AUTOCONF_CPPFLAGS) {
+            $extra .= 'CPPFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_LDFLAGS) === AUTOCONF_LDFLAGS) {
+            $extra .= 'LDFLAGS="-L' . BUILD_LIB_PATH . '" ';
+        }
+        return $extra;
+    }
 }

src/SPC/builder/unix/library/curl.php

@@ -39,8 +39,8 @@ trait curl
         } else {
             $extra .= '-DUSE_NGHTTP2=OFF ';
         }
-        // TODO: ldap is not supported yet
-        $extra .= '-DCURL_DISABLE_LDAP=ON ';
+        // lib:ldap
+        $extra .= $this->builder->getLib('ldap') ? '-DCURL_DISABLE_LDAP=OFF ' : '-DCURL_DISABLE_LDAP=ON ';
         // lib:zstd
         $extra .= $this->builder->getLib('zstd') ? '-DCURL_ZSTD=ON ' : '-DCURL_ZSTD=OFF ';
         // lib:idn2

src/SPC/builder/unix/library/ldap.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+trait ldap
+{
+    protected function build(): void
+    {
+        $alt = '';
+        // openssl support
+        $alt .= $this->builder->getLib('openssl') && $this->builder->getExt('zlib') ? '--with-tls=openssl ' : '';
+        // gmp support
+        $alt .= $this->builder->getLib('gmp') ? '--with-mp=gmp ' : '';
+        // libsodium support
+        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '';
+        shell()->cd($this->source_dir)
+            ->exec(
+                $this->builder->configure_env . ' ' .
+                $this->builder->makeAutoconfFlags(AUTOCONF_LDFLAGS | AUTOCONF_CPPFLAGS) .
+                ' ./configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                '--disable-slapd ' .
+                '--disable-slurpd ' .
+                '--without-systemd ' .
+                '--without-cyrus-sasl ' .
+                $alt .
+                '--prefix='
+            )
+            ->exec('make clean')
+            // remove tests and doc to prevent compile failed with error: soelim not found
+            ->exec('sed -i -e "s/SUBDIRS= include libraries clients servers tests doc/SUBDIRS= include libraries clients servers/g" Makefile')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['ldap.pc', 'lber.pc']);
+    }
+}

src/SPC/builder/unix/library/postgresql.php

@@ -57,15 +57,14 @@ trait postgresql
                 '--with-ssl=openssl ' .
                 '--with-readline ' .
                 '--with-libxml ' .
+                ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .
                 ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
-                '--without-ldap ' .
                 '--without-libxslt ' .
                 '--without-lz4 ' .
                 '--without-zstd ' .
                 '--without-perl ' .
                 '--without-python ' .
                 '--without-pam ' .
-                '--without-ldap ' .
                 '--without-bonjour ' .
                 '--without-tcl '
             );

src/SPC/command/BuildCliCommand.php

@@ -41,11 +41,11 @@ class BuildCliCommand extends BuildCommand
         $extensions = array_map('trim', array_filter(explode(',', $this->getArgument('extensions'))));
 
         $rule = BUILD_TARGET_NONE;
-        $rule = $rule | ($this->getOption('build-cli') ? BUILD_TARGET_CLI : BUILD_TARGET_NONE);
-        $rule = $rule | ($this->getOption('build-micro') ? BUILD_TARGET_MICRO : BUILD_TARGET_NONE);
-        $rule = $rule | ($this->getOption('build-fpm') ? BUILD_TARGET_FPM : BUILD_TARGET_NONE);
-        $rule = $rule | ($this->getOption('build-embed') ? BUILD_TARGET_EMBED : BUILD_TARGET_NONE);
-        $rule = $rule | ($this->getOption('build-all') ? BUILD_TARGET_ALL : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-cli') ? BUILD_TARGET_CLI : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-micro') ? BUILD_TARGET_MICRO : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-fpm') ? BUILD_TARGET_FPM : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-embed') ? BUILD_TARGET_EMBED : BUILD_TARGET_NONE);
+        $rule |= ($this->getOption('build-all') ? BUILD_TARGET_ALL : BUILD_TARGET_NONE);
         if ($rule === BUILD_TARGET_NONE) {
             $this->output->writeln('<error>Please add at least one build target!</error>');
             $this->output->writeln("<comment>\t--build-cli\tBuild php-cli SAPI</comment>");

src/SPC/doctor/item/LinuxMuslCheck.php

@@ -24,7 +24,7 @@ class LinuxMuslCheck
         // non-exist, need to recognize distro
         $distro = SystemUtil::getOSRelease();
         return match ($distro['dist']) {
-            'ubuntu', 'alpine', 'debian' => CheckResult::fail('musl-libc is not installed on your system', 'fix-musl', [$distro]),
+            'ubuntu', 'alpine', 'debian', 'rhel', 'almalinux' => CheckResult::fail('musl-libc is not installed on your system', 'fix-musl', [$distro]),
             default => CheckResult::fail('musl-libc is not installed on your system'),
         };
     }
@@ -36,10 +36,18 @@ class LinuxMuslCheck
     #[AsFixItem('fix-musl')]
     public function fixMusl(array $distro): bool
     {
+        $rhel_install = 'wget https://musl.libc.org/releases/musl-1.2.4.tar.gz && tar -zxvf musl-1.2.4.tar.gz && \
+                         rm -f musl-1.2.4.tar.gz && cd musl-1.2.4 && 
+                         if [[ ! "$PATH" =~ (^|:)"/usr/local/musl/bin"(:|$) ]]; then echo "export PATH=/usr/local/musl/bin:$PATH" >> ~/.bash_profile
+                         fi && \
+                         ./configure --enable-wrapper=gcc && \
+                         make -j && make install && cd .. && rm -rf musl-1.2.4';
         $install_cmd = match ($distro['dist']) {
             'ubuntu', 'debian' => 'apt-get install musl musl-tools -y',
             'alpine' => 'apk add musl musl-utils musl-dev',
-            default => throw new RuntimeException('Current linux distro is not supported for auto-install musl packages'),
+            'rhel' => $rhel_install,
+            'almalinux' => $rhel_install,
+            default => throw new RuntimeException('Current linux distro does not have an auto-install script for musl packages yet.'),
         };
         $prefix = '';
         if (get_current_user() !== 'root') {

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -31,14 +31,24 @@ class LinuxToolCheckList
         'xz',
     ];
 
+    public const TOOLS_RHEL = [
+        'perl', 'make', 'bison', 'flex',
+        'git', 'autoconf', 'automake',
+        'tar', 'unzip', 'gzip', 'gcc',
+        'bzip2', 'cmake', 'patch',
+        'xz', 'wget', // to get musl
+    ];
+
     /** @noinspection PhpUnused */
-    #[AsCheckItem('if necessary tools are installed', limit_os: 'Linux')]
+    #[AsCheckItem('if necessary tools are installed', limit_os: 'Linux', level: 999)]
     public function checkCliTools(): ?CheckResult
     {
         $distro = SystemUtil::getOSRelease();
 
         $required = match ($distro['dist']) {
             'alpine' => self::TOOLS_ALPINE,
+            'almalinux' => self::TOOLS_RHEL,
+            'rhel' => self::TOOLS_RHEL,
             default => self::TOOLS_DEBIAN,
         };
         $missing = [];
@@ -49,7 +59,11 @@ class LinuxToolCheckList
         }
         if (!empty($missing)) {
             return match ($distro['dist']) {
-                'ubuntu', 'alpine', 'debian' => CheckResult::fail(implode(', ', $missing) . ' not installed on your system', 'install-linux-tools', [$distro, $missing]),
+                'ubuntu',
+                'alpine',
+                'rhel',
+                'almalinux',
+                'debian' => CheckResult::fail(implode(', ', $missing) . ' not installed on your system', 'install-linux-tools', [$distro, $missing]),
                 default => CheckResult::fail(implode(', ', $missing) . ' not installed on your system'),
             };
         }
@@ -80,7 +94,9 @@ class LinuxToolCheckList
         $install_cmd = match ($distro['dist']) {
             'ubuntu', 'debian' => 'apt-get install -y',
             'alpine' => 'apk add',
-            default => throw new RuntimeException('Current linux distro is not supported for auto-install musl packages'),
+            'rhel' => 'dnf install -y',
+            'almalinux' => 'dnf install -y',
+            default => throw new RuntimeException('Current linux distro does not have an auto-install script for musl packages yet.'),
         };
         $prefix = '';
         if (get_current_user() !== 'root') {
@@ -88,7 +104,9 @@ class LinuxToolCheckList
             logger()->warning('Current user is not root, using sudo for running command');
         }
         try {
-            shell(true)->exec($prefix . $install_cmd . ' ' . implode(' ', str_replace('xz', 'xz-utils', $missing)));
+            $is_rhel = in_array($distro['dist'], ['rhel', 'almalinux']);
+            $to_install = $is_rhel ? $missing : str_replace('xz', 'xz-utils', $missing);
+            shell(true)->exec($prefix . $install_cmd . ' ' . implode(' ', $to_install));
         } catch (RuntimeException) {
             return false;
         }

src/SPC/store/SourcePatcher.php

@@ -141,6 +141,8 @@ class SourcePatcher
         }
         FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/main/php_config.h', '/^#define HAVE_OPENPTY 1$/m', '');
 
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'install-micro', '');
+
         // call extension patch before make
         foreach ($builder->getExts() as $ext) {
             if ($ext->patchBeforeMake() === true) {
@@ -158,6 +160,8 @@ class SourcePatcher
         $cli_c_bak = SOURCE_PATH . '/php-src/sapi/cli/php_cli.c.bak';
         $micro_c = SOURCE_PATH . '/php-src/sapi/micro/php_micro.c';
         $micro_c_bak = SOURCE_PATH . '/php-src/sapi/micro/php_micro.c.bak';
+        $embed_c = SOURCE_PATH . '/php-src/sapi/embed/php_embed.c';
+        $embed_c_bak = SOURCE_PATH . '/php-src/sapi/embed/php_embed.c.bak';
 
         // Try to reverse backup file
         $find_str = 'const char HARDCODED_INI[] =';
@@ -168,13 +172,14 @@ class SourcePatcher
         $patch_str = "const char HARDCODED_INI[] =\n{$patch_str}";
 
         // Detect backup, if we have backup, it means we need to reverse first
-        if (file_exists($cli_c_bak) || file_exists($micro_c_bak)) {
+        if (file_exists($cli_c_bak) || file_exists($micro_c_bak) || file_exists($embed_c_bak)) {
             self::unpatchHardcodedINI();
         }
 
         // Backup it
         $result = file_put_contents($cli_c_bak, file_get_contents($cli_c));
         $result = $result && file_put_contents($micro_c_bak, file_get_contents($micro_c));
+        $result = $result && file_put_contents($embed_c_bak, file_get_contents($embed_c));
         if ($result === false) {
             return false;
         }
@@ -182,6 +187,7 @@ class SourcePatcher
         // Patch it
         FileSystem::replaceFileStr($cli_c, $find_str, $patch_str);
         FileSystem::replaceFileStr($micro_c, $find_str, $patch_str);
+        FileSystem::replaceFileStr($embed_c, $find_str, $patch_str);
         return true;
     }
 
@@ -191,13 +197,17 @@ class SourcePatcher
         $cli_c_bak = SOURCE_PATH . '/php-src/sapi/cli/php_cli.c.bak';
         $micro_c = SOURCE_PATH . '/php-src/sapi/micro/php_micro.c';
         $micro_c_bak = SOURCE_PATH . '/php-src/sapi/micro/php_micro.c.bak';
-        if (!file_exists($cli_c_bak) && !file_exists($micro_c_bak)) {
+        $embed_c = SOURCE_PATH . '/php-src/sapi/embed/php_embed.c';
+        $embed_c_bak = SOURCE_PATH . '/php-src/sapi/embed/php_embed.c.bak';
+        if (!file_exists($cli_c_bak) && !file_exists($micro_c_bak) && !file_exists($embed_c_bak)) {
             return false;
         }
         $result = file_put_contents($cli_c, file_get_contents($cli_c_bak));
         $result = $result && file_put_contents($micro_c, file_get_contents($micro_c_bak));
+        $result = $result && file_put_contents($embed_c, file_get_contents($embed_c_bak));
         @unlink($cli_c_bak);
         @unlink($micro_c_bak);
+        @unlink($embed_c_bak);
         return $result;
     }
 }

src/SPC/store/source/PhpSource.php

@@ -45,7 +45,6 @@ class PhpSource extends CustomSourceBase
         return [
             'type' => 'url',
             'url' => "https://www.php.net/distributions/php-{$version}.tar.gz",
-            // 'url' => "https://mirrors.zhamao.xin/php/php-{$version}.tar.gz",
         ];
     }
 }

src/SPC/util/Util.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\util;
-
-class Util
-{
-    /**
-     * Get current PHP version ID (downloaded)
-     */
-    public static function getPHPVersionID(): int
-    {
-        $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
-        preg_match('/PHP_VERSION_ID (\d+)/', $file, $match);
-        return intval($match[1]);
-    }
-}

src/globals/defines.php

@@ -59,4 +59,11 @@ const PKGCONF_PATCH_INCLUDEDIR = 8;
 const PKGCONF_PATCH_CUSTOM = 16;
 const PKGCONF_PATCH_ALL = 31;
 
+// autoconf flags
+const AUTOCONF_LIBS = 1;
+const AUTOCONF_CFLAGS = 2;
+const AUTOCONF_CPPFLAGS = 4;
+const AUTOCONF_LDFLAGS = 8;
+const AUTOCONF_ALL = 15;
+
 ConsoleLogger::$date_format = 'H:i:s';