add pocketmine support

.github/workflows/download-cache.yml

@@ -0,0 +1,40 @@
+name: archive download sources weekly
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "* 14 * * 5"
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+jobs:
+  download:
+    name: cache download sources
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ "8.0", "8.1", "8.2", "8.3" ]
+    steps:
+      - uses: actions/checkout@v3
+
+      # Cache composer dependencies
+      - id: cache-composer-deps
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: composer-dependencies
+
+      # If there's no Composer cache, install dependencies
+      - if: steps.cache-composer-deps.outputs.cache-hit != 'true'
+        run: composer update --no-dev
+
+      # If there's no dependencies cache, fetch sources, with or without debug
+      - if: steps.cache-download.outputs.cache-hit != 'true'
+        run: ./bin/spc download --with-php=${{ matrix.php-version }} --all --debug
+
+      # Upload downloaded files
+      - uses: actions/upload-artifact@v3
+        with:
+          name: download-files-${{ matrix.php-version }}
+          path: downloads/

.github/workflows/release-build.yml

@@ -1,8 +1,6 @@
-name: Build SPC Binary
+name: Upload SPC Binary (Release)
 
 on:
-  push:
-    branches: [ "main" ]
   release:
     types:
       - published
@@ -10,14 +8,10 @@ on:
 
 jobs:
   build-release-artifacts:
-    name: "Build SPC Binary"
+    name: "Upload SPC Binary (Release)"
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version:
-          - "8.1"
-        micro-version:
-          - "8.1.26"
         operating-system:
           - "linux-x86_64"
           - "macos-x86_64"
@@ -27,57 +21,18 @@ jobs:
       - name: "Checkout"
         uses: "actions/checkout@v4"
 
-      - if: inputs.debug == true
+      - name: Reuse static-php-cli-hosted artifacts
-        run: echo "SPC_BUILD_DEBUG=--debug" >> $GITHUB_ENV
+        uses: dawidd6/action-download-artifact@v2
-
-      - name: "Install PHP for official runners"
-        uses: "shivammathur/setup-php@v2"
         with:
-          coverage: none
+          repo: static-php/static-php-cli-hosted
-          tools: composer:v2
+          branch: master
-          php-version: "${{ matrix.php-version }}"
+          workflow: build-spc-release.yml
-          ini-values: memory_limit=-1
+          name: "spc-${{ matrix.operating-system }}"
-
-      - name: "Get Composer Cache Directory"
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: "Cache Composer dependencies"
-        uses: "actions/cache@v3"
-        with:
-          path: "${{ steps.composer-cache.outputs.dir }}"
-          key: "php-${{ matrix.php-version }}-locked-composer-${{ hashFiles('**/composer.lock') }}"
-          restore-keys: |
-            php-${{ matrix.php-version }}-locked-composer
-
-      - name: "Install Locked Dependencies"
-        run: "composer install --no-interaction --no-progress"
-
-      - name: "Build PHAR File"
-        run: "composer build:phar"
-
-      - name: "Download minimal combination"
-        run: |
-          curl https://dl.static-php.dev/static-php-cli/minimal/php-${{ matrix.micro-version }}-micro-${{ matrix.operating-system }}.tar.gz -o tmp.tgz
-          tar -zxvf tmp.tgz
-
-      - name: "Generate Executable"
-        run: |
-          cat micro.sfx spc.phar > spc
-          chmod +x spc
 
       - name: "Archive Executable"
         run: |
           tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
           echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
-          echo "OS=${{ matrix.operating-system }}" >> $GITHUB_ENV
-          if [ "${{ matrix.operating-system }}" == "linux-x86_64" ]; then
-            ./spc dev:extensions
-          fi
-
-      - name: "Copy file"
-        run: "mkdir dist/ && cp ${{ env.filename }} dist/ && cp spc dist/spc-$OS"
 
       - name: upload binaries to release
         uses: softprops/action-gh-release@v1
@@ -85,18 +40,6 @@ jobs:
         with:
           files: ${{ env.filename }}
 
-      - name: "Deploy to Self-Hosted Server"
-        if: github.repository == 'crazywhalecc/static-php-cli'
-        uses: easingthemes/ssh-deploy@main
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.DEPLOY_SERVER_SECRET_KEY }}
-          ARGS: "-rltgoDzvO"
-          SOURCE: "dist/"
-          REMOTE_HOST: ${{ secrets.DEPLOY_SERVER_HOST }}
-          REMOTE_PORT: ${{ secrets.DEPLOY_SERVER_PORT }}
-          REMOTE_USER: ${{ secrets.DEPLOY_SERVER_USER }}
-          TARGET: ${{ secrets.DEPLOY_SERVER_TARGET_SPC_NIGHTLY }}
-
       - name: "Upload Artifact"
         uses: actions/upload-artifact@v3
         with:

.github/workflows/tests.yml

@@ -2,10 +2,7 @@ name: Tests
 
 on:
   push:
-    branches:
+    branches: [ "main" ]
-      - main
-    paths:
-      - 'src/globals/test-extensions.php'
   pull_request:
     branches: [ "main" ]
 
@@ -136,13 +133,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-php-
 
-      # Cache downloaded source
-      - id: cache-download
-        uses: actions/cache@v3
-        with:
-          path: downloads
-          key: php-${{ matrix.php }}-dependencies
-
       - name: "Install Dependencies"
         run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
@@ -150,7 +140,7 @@ jobs:
         run: bin/spc doctor --auto-fix
 
       - name: "Run Build Tests (download)"
-        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --with-php=${{ matrix.php }} --debug
+        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php)" --with-php=${{ matrix.php }} --debug
 
       - name: "Run Build Tests (build)"
-        run: bin/spc build $(php src/globals/test-extensions.php cmd) --build-cli --build-micro --build-fpm --debug
+        run: bin/spc build "$(php src/globals/test-extensions.php)" --build-cli --build-micro --build-fpm --debug

.github/workflows/update-docs-config.yml

@@ -1,43 +0,0 @@
-name: Update Docs Config
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'config/**.json'
-
-jobs:
-  update-docs-config:
-    name: "Update Docs Config"
-    runs-on: ubuntu-latest
-    if: github.repository == 'crazywhalecc/static-php-cli'
-    steps:
-      - name: "Checkout static-php-cli"
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          path: static-php-cli
-
-      - name: "Checkout static-php-cli-docs"
-        uses: actions/checkout@v4
-        with:
-          repository: static-php/static-php-cli-docs
-          ref: master
-          token: ${{ secrets.DOCS_REPO_TOKEN }}
-          path: static-php-cli-docs
-
-      - name: "Set up Git"
-        run: |
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-
-      - name: "Copy Config Files"
-        run: cp -r static-php-cli/config/* static-php-cli-docs/docs/.vitepress/config/
-
-      - name: "Commit and Push Changes"
-        run: |
-          cd static-php-cli-docs
-          git add -A
-          git commit -m "Sync config files from main"
-          git push origin master

.gitignore

@@ -22,12 +22,9 @@ docker/source/
 
 # exclude self-runtime
 /bin/*
-!/bin/spc*
+!/bin/spc
-!/bin/setup-runtime*
+!/bin/setup-runtime
 !/bin/spc-alpine-docker
 
-# exclude windows build tools
-/php-sdk-binary-tools/
-
 # default test directory
 /tests/var/

.php-cs-fixer.php

@@ -63,7 +63,6 @@ return (new PhpCsFixer\Config())
         'phpdoc_summary' => false,
         'php_unit_test_class_requires_covers' => false,
         'phpdoc_var_without_name' => false,
-        'fully_qualified_strict_types' => false,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/SPC'])

README-zh.md

@@ -1,46 +1,32 @@
 # static-php-cli
 
-[![Version](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)]()
+Build single static PHP binary, with PHP project together, with popular extensions included.
-[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+
+🌐 **[中文](README-zh.md)** | **[English](README.md)**
+
+编译纯静态的 PHP Binary 二进制文件，带有各种扩展，让 PHP-cli 应用变得更便携！（cli SAPI）
+
+<img width="600" alt="截屏2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
+
+同时可以使用 micro 二进制文件，将 PHP 源码和 PHP 二进制构建为一个文件分发！（micro SAPI）
+
+<img width="600" alt="截屏2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
+
+> 该 SAPI 源自 [dixyes/phpmicro](https://github.com/dixyes/phpmicro) 的 [Fork 仓库](https://github.com/static-php/phpmicro)。
+
+[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
-[![](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)]([https://static-php.dev/](https://static-php.dev/en/guide/extensions.html))
+[![](https://img.shields.io/github/actions/workflow/status/static-php/static-php-cli-hosted/build-php-common.yml?branch=refactor&label=Build%20Common%20Extensions&style=flat-square)](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-common.yml)
-[![](https://dcbadge.vercel.app/api/server/RNpegEYW?style=flat-square&compact=true&theme=default-inverted)](https://discord.gg/RNpegEYW)
+[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]()
+[![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
 
-**static-php-cli**是一个用于静态编译、构建 PHP 解释器的工具，支持众多流行扩展。
+> 项目名称是 static-php-cli，但其实支持 cli、fpm、micro 和 embed SAPI 😎
-
-目前 static-php-cli 支持 `cli`、`fpm`、`embed` 和 `micro` SAPI。
-
-**static-php-cli**也支持将 PHP 代码和 PHP 运行时打包为一个文件并运行。
-
-- [README - English](./README.md)
-- [README - 中文](./README-zh.md)
-
-## 特性
-
-static-php-cli（简称 `spc`）有许多特性：
-
-- :handbag: 构建独立的单文件 PHP 解释器，无需任何依赖
-- :hamburger: 构建 **[phpmicro](https://github.com/dixyes/phpmicro)** 自执行二进制（将 PHP 代码和 PHP 解释器打包为一个文件）
-- :pill: 提供一键检查和修复编译环境的 Doctor 模块
-- :zap: 支持多个系统：`Linux`、`macOS`、`FreeBSD`、[`Windows (WIP)`](https://github.com/crazywhalecc/static-php-cli/pull/301)
-- :wrench: 高度自定义的代码 patch 功能
-- :books: 自带编译依赖管理
-- 📦 提供由自身编译的独立 `spc` 二进制（使用 spc 和 [box](https://github.com/box-project/box) 构建）
-- :fire: 支持大量 [扩展](https://static-php.dev/zh/guide/extensions.html)
-
-**静态 php-cli:**
-
-<img width="700" alt="out1" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/01a2e60f-13b0-4242-a645-f7afa4936396">
-
-**使用 phpmicro 打包 PHP 代码:**
-
-<img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">
 
 ## 文档
 
 目前 README 编写了基本用法。有关 static-php-cli 所有的功能，请点击这里查看文档：<https://static-php.dev>。
 
-## 直接下载
+## 自托管直接下载
 
 如果你不想自行编译 PHP，可以从本项目现有的示例 Action 下载 Artifact，也可以从自托管的服务器下载。
 
@@ -52,10 +38,6 @@ static-php-cli（简称 `spc`）有许多特性：
 
 ### 编译环境需求
 
-- PHP >= 8.1（spc 自身是用 PHP 写的）
-- 扩展：`mbstring,pcntl,posix,tokenizer,phar`
-- 系统安装了 `curl` 和 `git`
-
 是的，本项目采用 PHP 编写，编译前需要一个 PHP 环境，比较滑稽。
 但本项目默认可通过自身构建的 micro 和 static-php 二进制运行，其他只需要包含 mbstring、pcntl 扩展和 PHP 版本大于等于 8.1 即可。
 
@@ -68,9 +50,11 @@ static-php-cli（简称 `spc`）有许多特性：
 | Windows |                      |                      |
 | FreeBSD | :computer:           | :computer:           |
 
+> macOS-arm64 因 GitHub 暂未提供 arm runner，如果要构建 arm 二进制，可以使用手动构建。
+
 目前支持编译的 PHP 版本为：`7.3`，`7.4`，`8.0`，`8.1`，`8.2`，`8.3`。
 
-### 支持的扩展
+### 支持的扩展情况
 
 请先根据下方扩展列表选择你要编译的扩展。
 
@@ -79,7 +63,7 @@ static-php-cli（简称 `spc`）有许多特性：
 
 > 如果这里没有你需要的扩展，可以提交 Issue。
 
-### 在线构建（使用 GitHub Actions）
+### 使用 Actions 构建
 
 使用 GitHub Action 可以方便地构建一个静态编译的 PHP，同时可以自行定义要编译的扩展。
 
@@ -90,77 +74,72 @@ static-php-cli（简称 `spc`）有许多特性：
 
 如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
 
-### 本地构建（使用 spc 二进制）
+### 手动构建（使用 SPC 二进制）
 
-该项目提供了 static-php-cli 的二进制文件：`spc`。
+本项目提供了一个 static-php-cli 的二进制文件，你可以直接下载对应平台的二进制文件，然后使用它来构建静态的 PHP。目前 `spc` 二进制支持的平台有 Linux 和 macOS。
-您可以使用 `spc` 二进制文件，无需安装任何运行时（用起来就像 golang 程序）。
-目前，`spc` 二进制文件提供的平台有 Linux 和 macOS。
 
-使用以下命令从自托管服务器下载：
+下面是从 GitHub Action 下载的方法：
+
+1. 进入 [GitHub Action](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml)。
+2. 选择一个最新的构建任务，进入后选择 `Artifacts`，下载对应平台的二进制文件。
+3. 解压 `.zip` 文件。解压后，为其添加执行权限：`chmod +x ./spc`。
+
+你也可以从自托管的服务器下载二进制文件：[进入](https://dl.static-php.dev/static-php-cli/spc-bin/nightly/)。
+
+### 手动构建（使用源码）
+
+先克隆本项目：
 
 ```bash
-# Download from self-hosted nightly builds (sync with main branch)
-# For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
-# macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
-# macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
-
-# add x perm
-chmod +x ./spc
-./spc --version
-```
-
-自托管 `spc` 由 GitHub Actions 构建，你也可以从 Actions 直接下载：[此处](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml)。
-
-### 本地构建（使用 git 源码）
-
-```bash
-# clone 仓库即可
 git clone https://github.com/crazywhalecc/static-php-cli.git
 ```
 
-如果您的系统上尚未安装 php，我们建议你使用内置的 setup-runtime 自动安装 PHP 和 Composer。
+如果你本机没有安装 PHP，你需要先使用包管理（例如 brew、apt、yum、apk 等）安装 php。
+
+你也可以通过 `bin/setup-runtime` 命令下载静态编译好的 php-cli 和 Composer。下载的 php 和 Composer 将保存为 `bin/php` 和 `bin/composer`。
 
 ```bash
 cd static-php-cli
 chmod +x bin/setup-runtime
-# it will download static php (from self-hosted server) and composer (from getcomposer)
+./bin/setup-runtime
-bin/setup-runtime
+
-# initialize composer deps
+# 使用独立的 php 运行 static-php-cli
-bin/composer install
+./bin/php bin/spc
-# chmod
+
+# 使用 composer
+./bin/php bin/composer
+
+# 初始化本项目
+cd static-php-cli
+composer update
 chmod +x bin/spc
-bin/spc --version
 ```
 
-### 开始构建 PHP
+### 使用 static-php-cli 命令行程序
 
-下面是使用 static-php-cli 的基础用法：
+下面是使用 static-php-cli 编译静态 php 和 micro 的基础用法：
 
-> 如果你使用的是打包好的 `spc` 二进制，你需要将下列命令的 `./bin/spc` 替换为 `./spc`。
+> 如果你使用的是打包好的 `spc` 二进制，你需要将下列命令的 `bin/spc` 替换为 `./spc`。
 
 ```bash
-# 检查环境依赖，并根据尝试自动安装缺失的编译工具
+# 检查环境依赖，并根据提示的命令安装缺失的编译工具
-./bin/spc doctor --auto-fix
+./bin/spc doctor
-
 # 拉取所有依赖库
-./bin/spc download --all
+./bin/spc fetch --all
-# 只拉取编译指定扩展需要的所有依赖（推荐）
+# 只拉取编译指定扩展需要的所有依赖
 ./bin/spc download --for-extensions=openssl,pcntl,mbstring,pdo_sqlite
-# 下载编译不同版本的 PHP (--with-php=x.y，推荐 7.3 ~ 8.3)
-./bin/spc download --for-extensions=openssl,curl,mbstring --with-php=8.1
-
 # 构建包含 bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl 扩展的 php-cli 和 micro.sfx
 ./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
-# 编译线程安全版本 (--enable-zts)
-./bin/spc build curl,phar --enable-zts --build-cli
 ```
 
-其中，目前支持构建 cli，micro，fpm 和 embed，使用以下参数的一个或多个来指定编译的 SAPI：
+你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.3：
+
+```bash
+# 优先考虑使用 >= 8.0 的 PHP 版本，因为 phpmicro 不支持在 PHP7 中构建
+./bin/spc download --with-php=8.2 --all
+```
+
+其中，目前支持构建 cli，micro，fpm 三种静态二进制，使用以下参数的一个或多个来指定编译的 SAPI：
 
 - `--build-cli`：构建 cli 二进制
 - `--build-micro`：构建 phpmicro 自执行二进制
@@ -172,9 +151,17 @@ bin/spc --version
 
 ```bash
 ./bin/spc build openssl,pcntl,mbstring --debug --build-all
-./bin/spc download --all --debug
+./bin/spc fetch --all --debug
 ```
 
+此外，默认编译的 PHP 为 NTS 版本。如需编译线程安全版本（ZTS），只需添加参数 `--enable-zts` 即可。
+
+```bash
+./bin/spc build openssl,pcntl --build-all --enable-zts
+```
+
+同时，你也可以使用参数 `--no-strip` 来关闭裁剪，关闭裁剪后可以使用 gdb 等工具调试，但这样会让静态二进制体积变大。
+
 ## 不同 SAPI 的使用
 
 ### 使用 cli

README.md

@@ -1,42 +1,27 @@
 # static-php-cli
 
-[![Version](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)]()
+Build single static PHP binary, with PHP project together, with popular extensions included.
-[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
+
+🌐 **[中文](README-zh.md)** | **[English](README.md)**
+
+The project name is static-php-cli, but it actually supports cli, fpm, micro and embed SAPI 😎
+
+Compile a purely static php-cli binary file with various extensions to make PHP applications more portable! (cli SAPI)
+
+<img width="600" alt="2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
+
+You can also use the micro binary file to combine php binary and php source code into one for distribution! (micro SAPI)
+
+<img width="600" alt="2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
+
+> This SAPI feature is from the [Fork](https://github.com/static-php/phpmicro) of [dixyes/phpmicro](https://github.com/dixyes/phpmicro).
+
+[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
-[![](https://img.shields.io/badge/Extension%20Counter-75+-yellow.svg?style=flat-square)]([https://static-php.dev/](https://static-php.dev/en/guide/extensions.html))
+[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/tests.yml?branch=main&label=Build%20Test&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/tests.yml)
-[![](https://dcbadge.vercel.app/api/server/RNpegEYW?style=flat-square&compact=true&theme=default-inverted)](https://discord.gg/RNpegEYW)
 
-**static-php-cli** is a powerful tool designed for building static, standalone PHP runtime
+[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]([https://static-php.dev/](https://static-php.dev/en/guide/extensions.html))
-with popular extensions.
+[![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
-
-Static PHP built by **static-php-cli** supports `cli`, `fpm`, `embed` and `micro` SAPI.
-
-**static-php-cli** also has the ability to package PHP projects
-along with the PHP interpreter into one single executable file.
-
-- [README - English](./README.md)
-- [README - 中文](./README-zh.md)
-
-## Features
-
-static-php-cli (you can call it `spc`) has a lot of features:
-
-- :handbag: Build single-file php executable, without any dependencies
-- :hamburger: Build **[phpmicro](https://github.com/dixyes/phpmicro)** self-extracted executable (glue php binary and php source code into one file)
-- :pill: Automatic build environment checker (Doctor module)
-- :zap: `Linux`, `macOS`, `FreeBSD`, [`Windows (WIP)`](https://github.com/crazywhalecc/static-php-cli/pull/301) support
-- :wrench: Configurable source code patches
-- :books: Build dependency management
-- 📦 Provide `spc` own standalone executable (built by spc and [box](https://github.com/box-project/box))
-- :fire: Support many popular [extensions](https://static-php.dev/en/guide/extensions.html)
-
-**Single-file standalone php-cli:**
-
-<img width="700" alt="out1" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/01a2e60f-13b0-4242-a645-f7afa4936396">
-
-**Combine PHP code with PHP interpreter using phpmicro:**
-
-<img width="700" alt="out2" src="https://github.com/crazywhalecc/static-php-cli/assets/20330940/46b7128d-fb72-4169-957e-48564c3ff3e2">
 
 ## Documentation
 
@@ -45,7 +30,7 @@ see <https://static-php.dev> .
 
 ## Direct Download
 
-If you don't want to build or want to test first, you can download example pre-compiled artifact from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-bulk.yml), or from self-hosted server.
+If you don't want to compile yourself, you can download example pre-compiled artifact from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-common.yml), or from self-hosted server.
 
 Below are several precompiled static-php binaries with different extension combinations,
 which can be downloaded directly according to your needs.
@@ -54,18 +39,14 @@ which can be downloaded directly according to your needs.
 - [Extension-Combination - bulk](https://dl.static-php.dev/static-php-cli/bulk/): `bulk` contains [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt) extensions and is about 70MB in size.
 - [Extension-Combination - minimal](https://dl.static-php.dev/static-php-cli/minimal/): `minimal` contains [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt) extensions and is about 6MB in size.
 
-## Build
+## Use static-php-cli to build PHP
 
 ### Compilation Requirements
 
-- PHP >= 8.1 (static-php-cli is written in PHP)
+Yes, this project is written in PHP, pretty funny.
-- Extension: `mbstring,pcntl,posix,tokenizer,phar`
-- Supported OS with `curl` and `git` installed
-
-You can say I made a PHP builder written in PHP, pretty funny.
 But static-php-cli runtime only requires an environment above PHP 8.1 and `mbstring`, `pcntl` extension.
 
-Here is the supported OS and arch, where :octocat: represents support for GitHub Action builds,
+Here is the architecture support status, where :octocat: represents support for GitHub Action builds,
 :computer: represents support for local manual builds, and blank represents not currently supported.
 
 |         | x86_64               | aarch64              |
@@ -75,6 +56,8 @@ Here is the supported OS and arch, where :octocat: represents support for GitHub
 | Windows |                      |                      |
 | FreeBSD | :computer:           | :computer:           |
 
+> macOS-arm64 is not supported for GitHub Actions, if you are going to build on arm, you can build it manually on your own machine.
+
 Currently supported PHP versions for compilation are: `7.3`, `7.4`, `8.0`, `8.1`, `8.2`, `8.3`.
 
 ### Supported Extensions
@@ -88,7 +71,7 @@ Please first select the extension you want to compile based on the extension lis
 
 Here is the current planned roadmap for extension support: [#152](https://github.com/crazywhalecc/static-php-cli/issues/152) .
 
-### Build Online (using GitHub Actions)
+### GitHub Actions Build
 
 Use GitHub Action to easily build a statically compiled PHP,
 and at the same time define the extensions to be compiled by yourself.
@@ -100,77 +83,80 @@ and at the same time define the extensions to be compiled by yourself.
 
 If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.
 
-### Build Locally (using SPC binary)
+- When using ubuntu-latest, it will build linux-x86_64 binary.
+- When using macos-latest, it will build macOS-x86_64 binary.
 
-This project provides a binary file of static-php-cli: `spc`.
+### Manual build (using SPC binary)
-You can use `spc` binary instead of installing any runtime like golang app.
+
+This project provides a binary file of static-php-cli.
+You can directly download the binary file of the corresponding platform and then use it to build static PHP.
 Currently, the platforms supported by `spc` binary are Linux and macOS.
 
-Download from self-hosted nightly builds using commands below:
+Here's how to download from GitHub Actions:
+
+1. Enter [GitHub Actions](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml) or [self-hosted nightly builds](https://dl.static-php.dev/static-php-cli/spc-bin/nightly/).
+2. If you download from GHA, select the latest build task, select `Artifacts`, and download the binary file of the corresponding platform.
+3. If you download from GHA, unzip the `.zip` file. After decompressing, add execution permissions to it: `chmod +x ./spc`.
+4. If you download from self-hosted server, download `spc-$os-$arch` file and just use it (don't forget `chmod +x`).
+
+> SPC single-file binary is built by phpmicro and box, and it doesn't need to install PHP. Just treat `spc` as a standalone executable.
+
+### Manual build (using source code)
+
+Clone repo first:
 
 ```bash
-# Download from self-hosted nightly builds (sync with main branch)
-# For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
-# For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
-# macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
-# macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
-
-# add x perm
-chmod +x ./spc
-./spc --version
-```
-
-Self-hosted `spc` is built by GitHub Actions, you can also download from Actions artifacts [here](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml).
-
-### Build Locally (using git source)
-
-```bash
-# just clone me!
 git clone https://github.com/crazywhalecc/static-php-cli.git
 ```
 
-If you have not installed php on your system, we recommend that you use the built-in setup-runtime to install PHP and Composer automatically.
+If you have not installed php on your system, you can use package management to install PHP (such as brew, apt, yum, apk etc.).
+
+And you can also download single-file php binary and composer using command `bin/setup-runtime`.
+The PHP runtime for static-php-cli itself will be downloaded at `bin/php`, and composer is at `bin/composer`.
 
 ```bash
 cd static-php-cli
 chmod +x bin/setup-runtime
-# it will download static php (from self-hosted server) and composer (from getcomposer)
+# It will download php-cli from self-hosted server and composer from getcomposer.org
-bin/setup-runtime
+./bin/setup-runtime
-# initialize composer deps
+
-bin/composer install
+# Use this php runtime to run static-php-cli compiler
-# chmod
+./bin/php bin/spc
+
+# Use composer
+./bin/php bin/composer
+
+# Initialize this project
+cd static-php-cli
+composer update
 chmod +x bin/spc
-bin/spc --version
 ```
 
-### Start Building PHP
+### Use static-php-cli
 
-Basic usage for building php with some extensions:
+Basic usage for building php and micro with some extensions:
 
 > If you are using the packaged `spc` binary, you need to replace `bin/spc` with `./spc` in the following commands.
 
 ```bash
-# Check system tool dependencies, auto-fix them if possible
+# Check system tool dependencies, fix them if possible
-./bin/spc doctor --auto-fix
+./bin/spc doctor
-
 # fetch all libraries
 ./bin/spc download --all
-# only fetch necessary sources by needed extensions (recommended)
+# only fetch necessary sources by needed extensions
 ./bin/spc download --for-extensions=openssl,pcntl,mbstring,pdo_sqlite
-# download different PHP version (--with-php=x.y, recommend 7.3 ~ 8.3)
-./bin/spc download --for-extensions=openssl,curl,mbstring --with-php=8.1
-
 # with bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl extension, build both CLI and phpmicro SAPI
 ./bin/spc build bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl --build-cli --build-micro
-# build thread-safe (ZTS) version (--enable-zts)
-./bin/spc build curl,phar --enable-zts --build-cli
 ```
 
-Now we support `cli`, `micro`, `fpm` and `embed` SAPI. You can use one or more of the following parameters to specify the compiled SAPI:
+You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.3:
+
+```bash
+# Using PHP >= 8.0 is recommended, because PHP7 cannot use phpmicro
+./bin/spc fetch --with-php=8.2 --all
+```
+
+Now we support `cli`, `micro`, `fpm`, you can use one or more of the following parameters to specify the compiled SAPI:
 
 - `--build-cli`: build static cli executable
 - `--build-micro`: build static phpmicro self-extracted executable
@@ -182,9 +168,17 @@ If anything goes wrong, use `--debug` option to display full terminal output:
 
 ```bash
 ./bin/spc build openssl,pcntl,mbstring --debug --build-all
-./bin/spc download --all --debug
+./bin/spc fetch --all --debug
 ```
 
+In addition, we build NTS (non-thread-safe) by default. If you are going to build ZTS version, just add `--enable-zts` option.
+
+```bash
+./bin/spc build openssl,pcntl --build-all --enable-zts
+```
+
+Adding option `--no-strip` can produce binaries with debug symbols, in order to debug (using gdb). Disabling strip will increase the size of static binary.
+
 ## Different SAPI Usage
 
 ### Use cli
@@ -293,3 +287,4 @@ and they all have their own open source licenses.
 
 Please use the `bin/spc dump-license` command to export the open source licenses used in the project after compilation,
 and comply with the corresponding project's LICENSE.
+

bin/setup-runtime

@@ -35,6 +35,7 @@ while [ $# -gt 0 ]; do
   case "$1" in
   --mirror)
     mirror="$2"
+    shift
     ;;
   --*)
     echo "Illegal option $1"
@@ -46,7 +47,7 @@ done
 case "$mirror" in
 china)
   __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/bulk/php-8.2.13-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
-  __COMPOSER_URL__="https://mirrors.tencent.com/composer/composer.phar"
+  __COMPOSER_URL__="https://mirrors.aliyun.com/composer/composer.phar"
   ;;
 
 esac

bin/setup-runtime.ps1

@@ -1,115 +0,0 @@
-param (
-    [string] ${action}
-)
-
-function AddToPath {
-    param (
-        [string]$pathToAdd
-    )
-
-    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
-
-    if ($currentPath -notlike "*$pathToAdd*") {
-        $newPath = $currentPath + ";$pathToAdd"
-        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
-        Write-Host "Added '$pathToAdd' to Path."
-        Write-Host "To remove path, use: " -NoNewline
-        Write-Host "bin/setup-runtime remove-path" -ForegroundColor Cyan
-    } else {
-        Write-Host "Path already exists."
-    }
-}
-
-function RemoveFromPath {
-    param (
-        [string]$pathToRemove
-    )
-
-    $currentPath = [System.Environment]::GetEnvironmentVariable('Path', 'User')
-
-    if ($currentPath -like "*$pathToRemove*") {
-        $newPath = $currentPath -replace [regex]::Escape($pathToRemove), ''
-        [System.Environment]::SetEnvironmentVariable('Path', $newPath, 'User')
-        Write-Host "Removed Path '$pathToRemove'"
-    } else {
-        Write-Host "Path '$pathToRemove' not in Path"
-    }
-}
-
-# working dir
-$WorkingDir = (Split-Path -Parent (Split-Path -Parent $MyInvocation.MyCommand.Definition))
-
-if ($action -eq 'add-path') {
-    AddToPath ($WorkingDir + '\runtime')
-    exit 0
-} elseif ($action -eq 'remove-path') {
-    RemoveFromPath ($WorkingDir + '\runtime')
-    exit 0
-} elseif (-not($action -eq '')) {
-    Write-Host ("Invalid action: " + $action) -ForegroundColor Red
-    exit 1
-}
-
-# get php 8.1 specific version
-$API = (Invoke-WebRequest -Uri "https://www.php.net/releases/index.php?json&version=8.1") | ConvertFrom-Json
-
-# php windows download
-$PHPRuntimeUrl = "https://windows.php.net/downloads/releases/php-" + $API.version + "-Win32-vs16-x64.zip"
-$ComposerUrl = "https://getcomposer.org/download/latest-stable/composer.phar"
-
-# create dir
-New-Item -Path "downloads" -ItemType Directory -Force | Out-Null
-
-# download php
-if (-not(Test-Path "downloads\php.zip"))
-{
-    Write-Host "Downloading PHP ..."
-    Invoke-WebRequest $PHPRuntimeUrl -OutFile "downloads\php.zip"
-}
-
-# extract php
-New-Item -Path "runtime" -ItemType Directory -Force | Out-Null
-Write-Host "Extracting php.zip ..."
-Expand-Archive -Path "downloads/php.zip" -DestinationPath "runtime" -Force
-# make php.ini
-Move-Item -Path "runtime\php.ini-production" -Destination "runtime\php.ini" -Force
-$OriginINI = Get-Content -Path "runtime\php.ini" -Raw
-$OriginINI = $OriginINI -replace ';extension=openssl', 'extension=openssl'
-$OriginINI = $OriginINI -replace ';extension=curl', 'extension=curl'
-$OriginINI = $OriginINI -replace ';extension=mbstring', 'extension=mbstring'
-$OriginINI = $OriginINI -replace ';extension=sodium', 'extension=sodium'
-$OriginINI = $OriginINI -replace ';extension_dir = "./"', ('extension_dir = "' + (Split-Path -Parent $MyInvocation.MyCommand.Definition) + '\..\runtime\ext"')
-$OriginINI | Set-Content -Path "runtime\php.ini"
-
-# download composer
-if (-not(Test-Path "runtime\composer.phar"))
-{
-    Write-Host "Downloading composer ..."
-    Invoke-WebRequest $ComposerUrl -OutFile "downloads\composer.phar"
-    Move-Item -Path "downloads\composer.phar" -Destination "runtime\composer.phar" -Force
-}
-
-# create runtime\composer.ps1
-$ComposerContent = '
-$WorkingDir = (Split-Path -Parent $MyInvocation.MyCommand.Definition)
-Start-Process ($WorkingDir + "\php.exe") ($WorkingDir + "\composer.phar " + $args) -NoNewWindow -Wait
-'
-$ComposerContent | Set-Content -Path 'runtime\composer.ps1' -Encoding UTF8
-
-Write-Host "Successfully downloaded PHP and Composer !" -ForegroundColor Green
-Write-Host "Use static-php-cli: " -NoNewline
-Write-Host "bin/spc" -ForegroundColor Cyan
-Write-Host "Use php:            " -NoNewline
-Write-Host "runtime/php" -ForegroundColor Cyan
-Write-Host "Use composer:       " -NoNewline
-Write-Host "runtime/composer" -ForegroundColor Cyan
-Write-Host ""
-Write-Host "Don't forget installing composer dependencies '" -NoNewline
-Write-Host "runtime/composer install" -ForegroundColor Cyan -NoNewline
-Write-Host "' before using static-php-cli !"
-Write-Host ""
-Write-Host "If you want to use this PHP for quality tools (like phpstan, php-cs-fixer) or other project,"
-Write-Host "or use PHP, Composer as system executable,"
-Write-Host "use '" -NoNewline
-Write-Host "bin/setup-runtime add-path" -ForegroundColor Cyan -NoNewline
-Write-Host "' to add runtime dir in Path."

bin/spc

@@ -4,13 +4,7 @@
 use SPC\ConsoleApplication;
 use SPC\exception\ExceptionHandler;
 
-if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
+require_once __DIR__ . '/../vendor/autoload.php';
-    // Current: ./bin (git/project mode)
-    require_once dirname(__DIR__) . '/vendor/autoload.php';
-} else {
-    // Current: ./vendor/crazywhalecc/static-php-cli/bin (composer library mode)
-    require_once dirname(__DIR__, 3) . '/autoload.php';
-}
 
 // 防止 Micro 打包状态下不支持中文的显示（虽然这个项目目前好像没输出过中文？）
 if (PHP_OS_FAMILY === 'Windows' && Phar::running()) {

bin/spc.ps1

@@ -1,12 +0,0 @@
-$PHP_Exec = "runtime\php.exe"
-
-if (-not(Test-Path $PHP_Exec)) {
-    $PHP_Exec = Get-Command php.exe -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Definition
-    if (-not $PHP_Exec) {
-        Write-Host "Error: PHP not found, you need to install PHP on your system or use 'bin/setup-runtime'." -ForegroundColor Red
-        exit 1
-    }
-}
-
-$phpArgs = "bin\spc " + $args
-Start-Process $PHP_Exec -ArgumentList $phpArgs -NoNewWindow -Wait

composer.json

@@ -11,6 +11,7 @@
     "require": {
         "php": ">= 8.1",
         "ext-mbstring": "*",
+        "ext-pcntl": "*",
         "laravel/prompts": "^0.1.12",
         "symfony/console": "^5.4 || ^6 || ^7",
         "zhamao/logger": "^1.0"

config/ext.json

@@ -16,6 +16,14 @@
     "calendar": {
         "type": "builtin"
     },
+    "crypto": {
+        "type": "external",
+        "arg-type": "with",
+        "source": "ext-crypto",
+        "lib-depends": [
+            "openssl"
+        ]
+    },
     "ctype": {
         "type": "builtin"
     },
@@ -168,6 +176,14 @@
             "openssl"
         ]
     },
+    "leveldb": {
+        "type": "external",
+        "arg-type": "with-prefix",
+        "source": "pmmp-leveldb",
+        "lib-depends": [
+            "leveldb"
+        ]
+    },
     "mbregex": {
         "type": "builtin",
         "arg-type": "custom",
@@ -217,6 +233,10 @@
             "zlib"
         ]
     },
+    "morton": {
+        "type": "external",
+        "source": "ext-morton"
+    },
     "mysqli": {
         "type": "builtin",
         "arg-type": "with",
@@ -303,6 +323,16 @@
             "zlib"
         ]
     },
+    "pmmp-chunkutils2": {
+        "type": "external",
+        "source": "pmmp-chunkutils2",
+        "arg-type": "custom",
+        "cpp-extension": true
+    },
+    "pmmpthread": {
+        "type": "external",
+        "source": "pmmpthread"
+    },
     "posix": {
         "type": "builtin",
         "unix-only": true
@@ -335,12 +365,7 @@
         "source": "redis",
         "arg-type": "custom",
         "ext-suggests": [
-            "session",
+            "session"
-            "igbinary"
-        ],
-        "lib-suggests": [
-            "zstd",
-            "liblz4"
         ]
     },
     "session": {
@@ -400,17 +425,6 @@
             "sqlite"
         ]
     },
-    "sqlsrv": {
-        "type": "external",
-        "source": "sqlsrv",
-        "lib-depends": [
-            "unixodbc"
-        ],
-        "ext-depends-linux": [
-            "pcntl"
-        ],
-        "cpp-extension": true
-    },
     "ssh2": {
         "type": "external",
         "source": "ext-ssh2",
@@ -424,50 +438,17 @@
         "source": "swoole",
         "arg-type": "custom",
         "cpp-extension": true,
-        "unix-only": true,
         "lib-depends": [
-            "libcares",
+            "openssl"
-            "brotli",
-            "nghttp2",
-            "zlib"
         ],
         "ext-depends": [
-            "openssl",
+            "openssl"
-            "curl"
         ],
         "ext-suggests": [
-            "swoole-hook-pgsql",
+            "curl",
-            "swoole-hook-mysql",
+            "pgsql"
-            "swoole-hook-sqlite"
-        ]
-    },
-    "swoole-hook-mysql": {
-        "type": "addon",
-        "arg-type": "custom",
-        "ext-depends": [
-            "mysqlnd",
-            "pdo",
-            "pdo_mysql"
         ],
-        "ext-suggests": [
+        "unix-only": true
-            "mysqli"
-        ]
-    },
-    "swoole-hook-pgsql": {
-        "type": "addon",
-        "arg-type": "custom",
-        "ext-depends": [
-            "pgsql",
-            "pdo"
-        ]
-    },
-    "swoole-hook-sqlite": {
-        "type": "addon",
-        "arg-type": "custom",
-        "ext-depends": [
-            "sqlite3",
-            "pdo"
-        ]
     },
     "swow": {
         "type": "external",
@@ -504,24 +485,6 @@
     "tokenizer": {
         "type": "builtin"
     },
-    "uv": {
-        "type": "external",
-        "source": "ext-uv",
-        "arg-type": "with-prefix",
-        "lib-depends": [
-            "libuv"
-        ],
-        "ext-depends": [
-            "sockets"
-        ]
-    },
-    "xhprof": {
-        "type": "external",
-        "source": "xhprof",
-        "ext-depends": [
-            "ctype"
-        ]
-    },
     "xlswriter": {
         "type": "external",
         "source": "xlswriter",

config/lib.json

@@ -2,14 +2,14 @@
     "brotli": {
         "source": "brotli",
         "static-libs-unix": [
-            "libbrotlidec.a",
+            "libbrotlidec-static.a",
-            "libbrotlienc.a",
+            "libbrotlienc-static.a",
-            "libbrotlicommon.a"
+            "libbrotlicommon-static.a"
         ],
         "static-libs-windows": [
-            "brotlicommon.lib",
+            "brotlicommon-static.lib",
-            "brotlienc.lib",
+            "brotlienc-static.lib",
-            "brotlidec.lib"
+            "brotlidec-static.lib"
         ],
         "headers": [
             "brotli"
@@ -163,6 +163,13 @@
             "libsodium"
         ]
     },
+    "leveldb": {
+        "source": "leveldb",
+        "static-libs-unix": [
+            "libleveldb.a"
+        ],
+        "cpp-library": true
+    },
     "libargon2": {
         "source": "libargon2",
         "static-libs-unix": [
@@ -175,18 +182,6 @@
             "libavif.a"
         ]
     },
-    "libcares": {
-        "source": "libcares",
-        "static-libs-unix": [
-            "libcares.a"
-        ],
-        "headers-unix": [
-            "ares.h",
-            "ares_dns.h",
-            "ares_nameser.h",
-            "ares_rules.h"
-        ]
-    },
     "libevent": {
         "source": "libevent",
         "static-libs-unix": [
@@ -236,10 +231,10 @@
             "libturbojpeg.a"
         ]
     },
-    "liblz4": {
+    "libmcrypt": {
-        "source": "liblz4",
+        "source": "libmcrypt",
         "static-libs-unix": [
-            "liblz4.a"
+            "libmcrypt.a"
         ]
     },
     "libmemcached": {
@@ -296,12 +291,6 @@
             "zlib"
         ]
     },
-    "libuv": {
-        "source": "libuv",
-        "static-libs-unix": [
-            "libuv.a"
-        ]
-    },
     "libwebp": {
         "source": "libwebp",
         "static-libs-unix": [
@@ -327,12 +316,16 @@
             "libxml2"
         ],
         "lib-depends": [
-            "libiconv"
+            "libiconv",
+            "zlib"
         ],
         "lib-suggests": [
             "xz",
+            "icu"
+        ],
+        "lib-suggests-windows": [
             "icu",
-            "zlib"
+            "xz"
         ]
     },
     "libxslt": {
@@ -382,6 +375,12 @@
             "openssl"
         ]
     },
+    "mcrypt": {
+        "source": "mcrypt",
+        "static-libs-unix": [
+            "libmcrypt.a"
+        ]
+    },
     "ncurses": {
         "source": "ncurses",
         "static-libs-unix": [
@@ -504,17 +503,6 @@
             "libtidy.a"
         ]
     },
-    "unixodbc": {
-        "source": "unixodbc",
-        "static-libs-unix": [
-            "libodbc.a",
-            "libodbccr.a",
-            "libodbcinst.a"
-        ],
-        "lib-depends": [
-            "libiconv"
-        ]
-    },
     "xz": {
         "source": "xz",
         "static-libs-unix": [

config/source.json

@@ -42,6 +42,16 @@
             "path": "COPYING"
         }
     },
+    "ext-crypto": {
+        "type": "git",
+        "path": "php-src/ext/crypto",
+        "rev": "master",
+        "url": "https://github.com/bukka/php-crypto.git",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-event": {
         "type": "url",
         "url": "https://bitbucket.org/osmanov/pecl-event/get/3.0.8.tar.gz",
@@ -80,6 +90,16 @@
             "path": "LICENSE"
         }
     },
+    "ext-morton": {
+        "type": "git",
+        "path": "php-src/ext/morton",
+        "rev": "master",
+        "url": "https://github.com/pmmp/ext-morton.git",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-snappy": {
         "type": "git",
         "path": "php-src/ext/snappy",
@@ -100,16 +120,6 @@
             "path": "LICENSE"
         }
     },
-    "ext-uv": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/uv",
-        "path": "php-src/ext/uv",
-        "filename": "uv.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "ext-zstd": {
         "type": "git",
         "path": "php-src/ext/zstd",
@@ -147,10 +157,9 @@
         }
     },
     "igbinary": {
-        "type": "url",
+        "type": "ghtar",
-        "url": "https://pecl.php.net/get/igbinary",
         "path": "php-src/ext/igbinary",
-        "filename": "igbinary.tgz",
+        "repo": "igbinary/igbinary",
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -192,6 +201,15 @@
             "path": "LICENSE"
         }
     },
+    "leveldb": {
+        "type": "git",
+        "rev": "mojang-compatible",
+        "url": "https://github.com/pmmp/leveldb.git",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "libargon2": {
         "type": "git",
         "rev": "master",
@@ -209,15 +227,6 @@
             "path": "LICENSE"
         }
     },
-    "libcares": {
-        "type": "filelist",
-        "url": "https://c-ares.org/download/",
-        "regex": "/href=\"\\/download\\/(?<file>c-ares-(?<version>[^\"]+)\\.tar\\.gz)\"/",
-        "license": {
-            "type": "file",
-            "path": "LICENSE.md"
-        }
-    },
     "libevent": {
         "type": "ghrel",
         "repo": "libevent/libevent",
@@ -253,13 +262,12 @@
             "path": "LICENSE.md"
         }
     },
-    "liblz4": {
+    "libmcrypt": {
-        "type": "ghrel",
+        "type": "url",
-        "repo": "lz4/lz4",
+        "url": "https://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz",
-        "match": "lz4-.+\\.tar\\.gz",
         "license": {
             "type": "file",
-            "path": "LICENSE"
+            "path": "COPYING"
         }
     },
     "libmemcached": {
@@ -281,9 +289,8 @@
         }
     },
     "libsodium": {
-        "type": "ghrel",
+        "type": "url",
-        "repo": "jedisct1/libsodium",
+        "url": "https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz",
-        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -298,20 +305,6 @@
             "path": "COPYING"
         }
     },
-    "libuv": {
-        "type": "ghtar",
-        "repo": "libuv/libuv",
-        "license": [
-            {
-                "type": "file",
-                "path": "LICENSE"
-            },
-            {
-                "type": "file",
-                "path": "LICENSE-extra"
-            }
-        ]
-    },
     "libwebp": {
         "type": "url",
         "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
@@ -355,6 +348,14 @@
             "path": "LICENSE"
         }
     },
+    "mcrypt": {
+        "type": "url",
+        "url": "https://downloads.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "memcached": {
         "type": "url",
         "url": "https://pecl.php.net/get/memcached",
@@ -429,6 +430,34 @@
             "path": "COPYING"
         }
     },
+    "pmmp-chunkutils2": {
+        "type": "ghtar",
+        "path": "php-src/ext/chunkutils2",
+        "repo": "pmmp/ext-chunkutils2",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "pmmp-leveldb": {
+        "type": "git",
+        "path": "php-src/ext/leveldb",
+        "rev": "pmmp-mojang-compatible",
+        "url": "https://github.com/pmmp/php-leveldb.git",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "pmmpthread": {
+        "type": "ghtar",
+        "path": "php-src/ext/pmmpthread",
+        "repo": "pmmp/ext-pmmpthread",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "postgresql": {
         "type": "url",
         "url": "https://ftp.postgresql.org/pub/source/v16.1/postgresql-16.1.tar.gz",
@@ -494,16 +523,6 @@
             "text": "The author disclaims copyright to this source code.  In place of\na legal notice, here is a blessing:\n\n  *   May you do good and not evil.\n  *   May you find forgiveness for yourself and forgive others.\n  *   May you share freely, never taking more than you give."
         }
     },
-    "sqlsrv": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/sqlsrv",
-        "path": "php-src/ext/sqlsrv",
-        "filename": "sqlsrv.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "swoole": {
         "type": "ghtar",
         "path": "php-src/ext/swoole",
@@ -533,24 +552,6 @@
             "path": "README/LICENSE.md"
         }
     },
-    "unixodbc": {
-        "type": "url",
-        "url": "https://www.unixodbc.org/unixODBC-2.3.12.tar.gz",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
-    "xhprof": {
-        "type": "url",
-        "url": "https://pecl.php.net/get/xhprof",
-        "path": "php-src/ext/xhprof-src",
-        "filename": "xhprof.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "xlswriter": {
         "type": "url",
         "url": "https://pecl.php.net/get/xlswriter",
@@ -562,9 +563,9 @@
         }
     },
     "xz": {
-        "type": "ghrel",
+        "type": "filelist",
-        "repo": "tukaani-project/xz",
+        "url": "https://tukaani.org/xz/",
-        "match": "xz-.+\\.tar\\.gz",
+        "regex": "/href=\"(?<file>xz-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "license": {
             "type": "file",
             "path": "COPYING"

phpstan.neon

@@ -8,10 +8,5 @@ parameters:
     - '#Unsafe usage of new static#'
     - '#class Fiber#'
     - '#Attribute class JetBrains\\PhpStorm\\ArrayShape does not exist#'
-    - '#Function Swoole\\Coroutine\\run not found.#'
   dynamicConstantNames:
     - PHP_OS_FAMILY
-  excludePaths:
-      analyseAndScan:
-            - ./src/globals/tests/swoole.php
-            - ./src/globals/tests/swoole.phpt

src/SPC/ConsoleApplication.php

@@ -23,7 +23,7 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.0.1';
+    public const VERSION = '2.0.0-rc9';
 
     public function __construct()
     {

src/SPC/builder/BuilderBase.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\exception\ExceptionHandler;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -31,19 +30,15 @@ abstract class BuilderBase
     /** @var array<string, mixed> compile options */
     protected array $options = [];
 
-    /** @var string patch point name */
-    protected string $patch_point = '';
-
     /**
      * Build libraries
      *
-     * @param  array<string>       $sorted_libraries Libraries to build (if not empty, must sort first)
+     * @param  array<string>       $libraries Libraries to build
      * @throws FileSystemException
      * @throws RuntimeException
      * @throws WrongUsageException
-     * @internal
      */
-    public function buildLibs(array $sorted_libraries): void
+    public function buildLibs(array $libraries): void
     {
         // search all supported libs
         $support_lib_list = [];
@@ -58,18 +53,20 @@ abstract class BuilderBase
         }
 
         // if no libs specified, compile all supported libs
-        if ($sorted_libraries === [] && $this->isLibsOnly()) {
+        if ($libraries === [] && $this->isLibsOnly()) {
             $libraries = array_keys($support_lib_list);
-            $sorted_libraries = DependencyUtil::getLibsByDeps($libraries);
         }
 
         // pkg-config must be compiled first, whether it is specified or not
-        if (!in_array('pkg-config', $sorted_libraries)) {
+        if (!in_array('pkg-config', $libraries)) {
-            array_unshift($sorted_libraries, 'pkg-config');
+            array_unshift($libraries, 'pkg-config');
         }
 
+        // append dependencies
+        $libraries = DependencyUtil::getLibsByDeps($libraries);
+
         // add lib object for builder
-        foreach ($sorted_libraries as $library) {
+        foreach ($libraries as $library) {
             // if some libs are not supported (but in config "lib.json", throw exception)
             if (!isset($support_lib_list[$library])) {
                 throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
@@ -83,13 +80,8 @@ abstract class BuilderBase
             $lib->calcDependency();
         }
 
-        // patch point
-        $this->emitPatchPoint('before-libs-extract');
-
         // extract sources
-        SourceExtractor::initSource(libs: $sorted_libraries);
+        SourceExtractor::initSource(libs: $libraries);
-
-        $this->emitPatchPoint('after-libs-extract');
 
         // build all libs
         foreach ($this->libs as $lib) {
@@ -182,8 +174,6 @@ abstract class BuilderBase
 
     /**
      * Set libs only mode.
-     *
-     * @internal
      */
     public function setLibsOnly(bool $status = true): void
     {
@@ -197,22 +187,15 @@ abstract class BuilderBase
      * @throws RuntimeException
      * @throws \ReflectionException
      * @throws WrongUsageException
-     * @internal
      */
     public function proveExts(array $extensions): void
     {
         CustomExt::loadCustomExt();
-        $this->emitPatchPoint('before-php-extract');
         SourceExtractor::initSource(sources: ['php-src']);
-        $this->emitPatchPoint('after-php-extract');
         if ($this->getPHPVersionID() >= 80000) {
-            $this->emitPatchPoint('before-micro-extract');
             SourceExtractor::initSource(sources: ['micro']);
-            $this->emitPatchPoint('after-micro-extract');
         }
-        $this->emitPatchPoint('before-exts-extract');
         SourceExtractor::initSource(exts: $extensions);
-        $this->emitPatchPoint('after-exts-extract');
         foreach ($extensions as $extension) {
             $class = CustomExt::getExtClass($extension);
             $ext = new $class($extension, $this);
@@ -244,7 +227,7 @@ abstract class BuilderBase
         foreach ($this->exts as $ext) {
             $ret[] = trim($ext->getConfigureArg());
         }
-        logger()->debug('Using configure: ' . implode(' ', $ret));
+        logger()->info('Using configure: ' . implode(' ', $ret));
         return implode(' ', $ret);
     }
 
@@ -361,39 +344,6 @@ abstract class BuilderBase
         return implode(' ', $env);
     }
 
-    /**
-     * Get builder patch point name.
-     */
-    public function getPatchPoint(): string
-    {
-        return $this->patch_point;
-    }
-
-    public function emitPatchPoint(string $point_name): void
-    {
-        $this->patch_point = $point_name;
-        if (($patches = $this->getOption('with-added-patch', [])) === []) {
-            return;
-        }
-
-        foreach ($patches as $patch) {
-            try {
-                if (!file_exists($patch)) {
-                    throw new RuntimeException("Additional patch script file {$patch} not found!");
-                }
-                logger()->debug('Running additional patch script: ' . $patch);
-                require $patch;
-            } catch (\Throwable $e) {
-                logger()->critical('Patch script ' . $patch . ' failed to run.');
-                if ($this->getOption('debug')) {
-                    ExceptionHandler::getInstance()->handle($e);
-                } else {
-                    logger()->critical('Please check with --debug option to see more details.');
-                }
-            }
-        }
-    }
-
     /**
      * Check if all libs are downloaded.
      * If not, throw exception.

src/SPC/builder/BuilderProvider.php

@@ -17,8 +17,6 @@ use Symfony\Component\Console\Input\InputInterface;
  */
 class BuilderProvider
 {
-    private static ?BuilderBase $builder = null;
-
     /**
      * @throws FileSystemException
      * @throws RuntimeException
@@ -26,7 +24,7 @@ class BuilderProvider
      */
     public static function makeBuilderByInput(InputInterface $input): BuilderBase
     {
-        self::$builder = match (PHP_OS_FAMILY) {
+        return match (PHP_OS_FAMILY) {
             // 'Windows' => new WindowsBuilder(
             //   binary_sdk_dir: $input->getOption('with-sdk-binary-dir'),
             //    vs_ver: $input->getOption('vs-ver'),
@@ -37,17 +35,5 @@ class BuilderProvider
             'BSD' => new BSDBuilder($input->getOptions()),
             default => throw new WrongUsageException('Current OS "' . PHP_OS_FAMILY . '" is not supported yet'),
         };
-        return self::$builder;
-    }
-
-    /**
-     * @throws WrongUsageException
-     */
-    public static function getBuilder(): BuilderBase
-    {
-        if (self::$builder === null) {
-            throw new WrongUsageException('Builder has not been initialized');
-        }
-        return self::$builder;
     }
 }

src/SPC/builder/LibraryBase.php

@@ -140,9 +140,7 @@ abstract class LibraryBase
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }
-            $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-build');
             $this->build();
-            $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-build');
             return BUILD_STATUS_OK;
         }
 

src/SPC/builder/extension/ldap.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('ldap')]
-class ldap extends Extension
-{
-    public function patchBeforeConfigure(): bool
-    {
-        $output = shell()->execWithResult('$PKG_CONFIG --libs-only-l --static ldap');
-        if (!empty($output[1][0])) {
-            $libs = $output[1][0];
-            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lldap ', $libs . ' ');
-        }
-        return true;
-    }
-}

src/SPC/builder/extension/pmmp_chunkutils2.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('pmmp-chunkutils2')]
+class pmmp_chunkutils2 extends Extension
+{
+    public function getDistName(): string
+    {
+        return 'chunkutils2';
+    }
+
+    public function getUnixConfigureArg(): string
+    {
+        return '--enable-chunkutils2';
+    }
+}

src/SPC/builder/extension/redis.php

@@ -13,14 +13,14 @@ class redis extends Extension
     public function getUnixConfigureArg(): string
     {
         $arg = '--enable-redis';
-        $arg .= $this->builder->getExt('session') ? ' --enable-redis-session' : ' --disable-redis-session';
+        if (!$this->builder->getExt('session')) {
-        $arg .= $this->builder->getExt('igbinary') ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary';
+            $arg .= ' --disable-redis-session';
+        } else {
+            $arg .= ' --enable-redis-session';
+        }
         if ($this->builder->getLib('zstd')) {
             $arg .= ' --enable-redis-zstd --with-libzstd="' . BUILD_ROOT_PATH . '"';
         }
-        if ($this->builder->getLib('liblz4')) {
-            $arg .= ' --enable-redis-lz4 --with-liblz4="' . BUILD_ROOT_PATH . '"';
-        }
         return $arg;
     }
 }

src/SPC/builder/extension/swoole.php

@@ -12,31 +12,13 @@ class swoole extends Extension
 {
     public function getUnixConfigureArg(): string
     {
-        // enable swoole
         $arg = '--enable-swoole';
-
+        // pgsql hook is buggy for static php
-        // commonly-used feature: coroutine-time, thread-context
+        $arg .= ' --disable-swoole-pgsql';
-        $arg .= ' --enable-swoole-coro-time --enable-thread-context';
+        $arg .= $this->builder->getLib('openssl') ? ' --enable-openssl' : ' --disable-openssl --without-openssl';
-
+        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : ' --disable-brotli';
-        // required feature: curl, openssl (but curl hook is buggy for php 8.0)
+        // swoole curl hook is buggy for php 8.0
-        $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
+        $arg .= $this->builder->getExt('curl') && $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
-        $arg .= ' --enable-openssl';
-
-        // additional feature: c-ares, brotli, nghttp2 (can be disabled, but we enable it by default in config to support full network feature)
-        $arg .= $this->builder->getLib('libcares') ? ' --enable-cares' : '';
-        $arg .= $this->builder->getLib('brotli') ? (' --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
-        $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
-
-        // additional feature: swoole-pgsql, it should depend on lib [postgresql], but it will lack of CFLAGS etc.
-        // so this is a tricky way (enable ext [pgsql,pdo] to add postgresql hook and pdo_pgsql support)
-        $arg .= $this->builder->getExt('swoole-hook-pgsql') ? '' : ' --disable-swoole-pgsql';
-
-        // enable this feature , need remove pdo_sqlite
-        // more info : https://wenda.swoole.com/detail/109023
-        $arg .= $this->builder->getExt('swoole-hook-sqlite') ? '' : ' --disable-swoole-sqlite';
-
-        // enable this feature , need stop pdo_*
-        // $arg .= $this->builder->getLib('unixodbc') ? ' --with-swoole-odbc=unixODBC,'  : ' ';
         return $arg;
     }
 }

src/SPC/builder/extension/swoole_hook_mysql.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
-use SPC\util\CustomExt;
-
-#[CustomExt('swoole-hook-mysql')]
-class swoole_hook_mysql extends Extension
-{
-    public function getUnixConfigureArg(): string
-    {
-        // pdo_mysql doesn't need to be disabled
-        // enable swoole-hook-mysql will enable mysqli, pdo, pdo_mysql, we don't need to add any additional options
-        return '';
-    }
-
-    public function runCliCheck(): void
-    {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
-        [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "swoole"', false);
-        $out = implode('', $out);
-        if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
-        }
-        if (!str_contains($out, 'mysqlnd')) {
-            throw new RuntimeException('swoole mysql hook is not enabled correctly.');
-        }
-    }
-}

src/SPC/builder/extension/swoole_hook_pgsql.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
-use SPC\util\CustomExt;
-
-#[CustomExt('swoole-hook-pgsql')]
-class swoole_hook_pgsql extends Extension
-{
-    public function getUnixConfigureArg(): string
-    {
-        // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_pgsql') !== null) {
-            throw new WrongUsageException('swoole-hook-pgsql provides pdo_pgsql, if you enable pgsql hook for swoole, you must remove pdo_pgsql extension.');
-        }
-        // enable swoole pgsql hook
-        return '--enable-swoole-pgsql';
-    }
-
-    public function runCliCheck(): void
-    {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
-        [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "swoole"', false);
-        $out = implode('', $out);
-        if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
-        }
-        if (!str_contains($out, 'coroutine_pgsql')) {
-            throw new RuntimeException('swoole pgsql hook is not enabled correctly.');
-        }
-    }
-}

src/SPC/builder/extension/swoole_hook_sqlite.php

@@ -1,40 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
-use SPC\util\CustomExt;
-
-#[CustomExt('swoole-hook-sqlite')]
-class swoole_hook_sqlite extends Extension
-{
-    public function getUnixConfigureArg(): string
-    {
-        // pdo_pgsql need to be disabled
-        if ($this->builder->getExt('pdo_sqlite') !== null) {
-            throw new WrongUsageException('swoole-hook-sqlite provides pdo_sqlite, if you enable sqlite hook for swoole, you must remove pdo_sqlite extension.');
-        }
-        // enable swoole pgsql hook
-        return '--enable-swoole-sqlite';
-    }
-
-    public function runCliCheck(): void
-    {
-        // skip if not enable swoole
-        if ($this->builder->getExt('swoole') === null) {
-            return;
-        }
-        [$ret, $out] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "swoole"', false);
-        $out = implode('', $out);
-        if ($ret !== 0) {
-            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
-        }
-        if (!str_contains($out, 'coroutine_sqlite')) {
-            throw new RuntimeException('swoole sqlite hook is not enabled correctly.');
-        }
-    }
-}

src/SPC/builder/extension/xhprof.php

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\store\FileSystem;
-use SPC\util\CustomExt;
-
-#[CustomExt('xhprof')]
-class xhprof extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        if (!is_link(SOURCE_PATH . '/php-src/ext/xhprof')) {
-            if (PHP_OS_FAMILY === 'Windows') {
-                f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && mklink /D xhprof xhprof-src\extension');
-            } else {
-                f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && ln -s xhprof-src/extension xhprof');
-            }
-
-            // patch config.m4
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/php-src/ext/xhprof/config.m4',
-                'if test -f $phpincludedir/ext/pcre/php_pcre.h; then',
-                'if test -f $abs_srcdir/ext/pcre/php_pcre.h; then'
-            );
-            return true;
-        }
-        return false;
-    }
-}

src/SPC/builder/freebsd/BSDBuilder.php

@@ -81,12 +81,10 @@ class BSDBuilder extends BuilderBase
         }
         $this->setOption('extra-libs', $extra_libs);
 
-        $this->emitPatchPoint('before-php-buildconf');
         SourcePatcher::patchBeforeBuildconf($this);
 
         shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force');
 
-        $this->emitPatchPoint('before-php-configure');
         SourcePatcher::patchBeforeConfigure($this);
 
         $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
@@ -117,7 +115,6 @@ class BSDBuilder extends BuilderBase
                 $this->makeExtensionArgs()
             );
 
-        $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
 
         $this->cleanMake();
@@ -143,7 +140,6 @@ class BSDBuilder extends BuilderBase
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
-            $this->emitPatchPoint('before-sanity-check');
             $this->sanityCheck($build_target);
         }
     }
@@ -154,7 +150,7 @@ class BSDBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function buildCli(): void
+    public function buildCli(): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
@@ -177,7 +173,7 @@ class BSDBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws WrongUsageException
      */
-    protected function buildMicro(): void
+    public function buildMicro(): void
     {
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
@@ -215,7 +211,7 @@ class BSDBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function buildFpm(): void
+    public function buildFpm(): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
@@ -235,7 +231,7 @@ class BSDBuilder extends BuilderBase
      *
      * @throws RuntimeException
      */
-    protected function buildEmbed(): void
+    public function buildEmbed(): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size

src/SPC/builder/linux/LinuxBuilder.php

@@ -138,22 +138,19 @@ class LinuxBuilder extends BuilderBase
         // add libstdc++, some extensions or libraries need it
         $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lstdc++ ' : '');
         $this->setOption('extra-libs', $extra_libs);
+
         $cflags = $this->arch_c_flags;
 
         // prepare build php envs
         $envs_build_php = SystemUtil::makeEnvVarString([
             'CFLAGS' => $cflags,
-            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
-            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
             'LIBS' => '-ldl -lpthread',
         ]);
 
-        $this->emitPatchPoint('before-php-buildconf');
         SourcePatcher::patchBeforeBuildconf($this);
 
         shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force');
 
-        $this->emitPatchPoint('before-php-configure');
         SourcePatcher::patchBeforeConfigure($this);
 
         $phpVersionID = $this->getPHPVersionID();
@@ -192,11 +189,10 @@ class LinuxBuilder extends BuilderBase
                 $json_74 .
                 $zts .
                 $maxExecutionTimers .
-                $this->makeExtensionArgs() .
+                $this->makeExtensionArgs() . ' ' .
-                ' ' . $envs_build_php . ' '
+                $envs_build_php
             );
 
-        $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
 
         $this->cleanMake();
@@ -222,7 +218,6 @@ class LinuxBuilder extends BuilderBase
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
-            $this->emitPatchPoint('before-sanity-check');
             $this->sanityCheck($build_target);
         }
     }
@@ -233,7 +228,7 @@ class LinuxBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function buildCli(): void
+    public function buildCli(): void
     {
         $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
         shell()->cd(SOURCE_PATH . '/php-src')
@@ -254,7 +249,7 @@ class LinuxBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws WrongUsageException
      */
-    protected function buildMicro(): void
+    public function buildMicro(): void
     {
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
@@ -288,7 +283,7 @@ class LinuxBuilder extends BuilderBase
      * @throws FileSystemException
      * @throws RuntimeException
      */
-    protected function buildFpm(): void
+    public function buildFpm(): void
     {
         $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
         shell()->cd(SOURCE_PATH . '/php-src')
@@ -307,7 +302,7 @@ class LinuxBuilder extends BuilderBase
      *
      * @throws RuntimeException
      */
-    protected function buildEmbed(): void
+    public function buildEmbed(): void
     {
         $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
 
@@ -327,11 +322,10 @@ class LinuxBuilder extends BuilderBase
         $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : '';
         $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : '';
         $ldflags = isset($input['EXTRA_LDFLAGS_PROGRAM']) && $input['EXTRA_LDFLAGS_PROGRAM'] ? " {$input['EXTRA_LDFLAGS_PROGRAM']}" : '';
-        $tune_c_flags = implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags));
         return [
-            'EXTRA_CFLAGS' => "{$optimization} -fno-ident -fPIE {$tune_c_flags}{$cflags}",
+            'EXTRA_CFLAGS' => "{$optimization} -fno-ident -fPIE " . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)) . $cflags,
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs', '')} {$libs}",
+            'EXTRA_LIBS' => $this->getOption('extra-libs', '') . $libs,
-            'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static{$ldflags}",
+            'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static" . $ldflags,
         ];
     }
 }

src/SPC/builder/linux/SystemUtil.php

@@ -209,21 +209,4 @@ class SystemUtil
         }
         return $ret;
     }
-
-    /**
-     * Get fully-supported linux distros.
-     *
-     * @return string[] List of supported Linux distro name for doctor
-     */
-    public static function getSupportedDistros(): array
-    {
-        return [
-            // debian-like
-            'debian', 'ubuntu', 'Deepin',
-            // rhel-like
-            'redhat',
-            // alpine
-            'alpine',
-        ];
-    }
 }

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

@@ -47,10 +47,6 @@ class imap extends LinuxLibraryBase
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
-            ->exec('chmod +x tools/an')
-            ->exec('chmod +x tools/ua')
-            ->exec('chmod +x src/osdep/unix/drivers')
-            ->exec('chmod +x src/osdep/unix/mkauths')
             ->exec(
                 "yes | make slx {$ssl_options}"
             );

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

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

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

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

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

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

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

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

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

@@ -26,9 +26,7 @@ class libxml2 extends LinuxLibraryBase
         shell()->cd($this->source_dir . '/build')
             ->exec(
                 'cmake ' .
-                '-DCMAKE_BUILD_TYPE=Release ' .
+                "{$this->builder->makeCmakeArgs()} " .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DIconv_IS_BUILT_IN=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
@@ -41,7 +39,7 @@ class libxml2 extends LinuxLibraryBase
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install');
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
 
         FileSystem::replaceFileStr(
             BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',

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

@@ -1,12 +1,72 @@
 <?php
+/**
+ * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
+ *
+ * lwmbs is licensed under Mulan PSL v2. You can use this
+ * software according to the terms and conditions of the
+ * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
+ *
+ * http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *
+ * See the Mulan PSL v2 for more details.
+ */
 
 declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+
 class nghttp2 extends LinuxLibraryBase
 {
-    use \SPC\builder\unix\library\nghttp2;
-
     public const NAME = 'nghttp2';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    public function build(): void
+    {
+        $args = $this->builder->makeAutoconfArgs(static::NAME, [
+            'zlib' => null,
+            'openssl' => null,
+            'libxml2' => null,
+            'libev' => null,
+            'libcares' => null,
+            'libngtcp2' => null,
+            'libnghttp3' => null,
+            'libbpf' => null,
+            'libevent-openssl' => null,
+            'jansson' => null,
+            'jemalloc' => null,
+            'systemd' => null,
+            'cunit' => null,
+        ]);
+
+        [,,$destdir] = SEPARATED_PATH;
+
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
+                '--enable-lib-only ' .
+                '--with-boost=no ' .
+                $args . ' ' .
+                '--prefix='
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec("make install DESTDIR={$destdir}");
+        $this->patchPkgconfPrefix(['libnghttp2.pc']);
+    }
 }

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

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

src/SPC/builder/macos/MacOSBuilder.php

@@ -141,12 +141,10 @@ class MacOSBuilder extends BuilderBase
         }
         $this->setOption('extra-libs', $extra_libs);
 
-        $this->emitPatchPoint('before-php-buildconf');
         SourcePatcher::patchBeforeBuildconf($this);
 
         shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force');
 
-        $this->emitPatchPoint('before-php-configure');
         SourcePatcher::patchBeforeConfigure($this);
 
         $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
@@ -157,21 +155,6 @@ class MacOSBuilder extends BuilderBase
         $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
         $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
 
-        // prepare build php envs
-        $envs_build_php = SystemUtil::makeEnvVarString([
-            'CFLAGS' => " {$this->arch_c_flags} -Werror=unknown-warning-option ",
-            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
-            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
-        ]);
-
-        if ($this->getLib('postgresql')) {
-            shell()
-                ->cd(SOURCE_PATH . '/php-src')
-                ->exec(
-                    'sed -i.backup "s/ac_cv_func_explicit_bzero\" = xyes/ac_cv_func_explicit_bzero\" = x_fake_yes/" ./configure'
-                );
-        }
-
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
                 './configure ' .
@@ -179,6 +162,7 @@ class MacOSBuilder extends BuilderBase
                 '--with-valgrind=no ' .     // Not detect memory leak
                 '--enable-shared=no ' .
                 '--enable-static=yes ' .
+                "CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " .
                 '--disable-all ' .
                 '--disable-cgi ' .
                 '--disable-phpdbg ' .
@@ -188,11 +172,9 @@ class MacOSBuilder extends BuilderBase
                 ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                 $json_74 .
                 $zts .
-                $this->makeExtensionArgs() . ' ' .
+                $this->makeExtensionArgs()
-                $envs_build_php
             );
 
-        $this->emitPatchPoint('before-php-make');
         SourcePatcher::patchBeforeMake($this);
 
         $this->cleanMake();
@@ -218,7 +200,6 @@ class MacOSBuilder extends BuilderBase
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
-            $this->emitPatchPoint('before-sanity-check');
             $this->sanityCheck($build_target);
         }
     }
@@ -229,9 +210,12 @@ class MacOSBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function buildCli(): void
+    public function buildCli(): void
     {
-        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
+        ]);
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
         $shell->exec("make -j{$this->concurrency} {$vars} cli");
@@ -248,7 +232,7 @@ class MacOSBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws WrongUsageException
      */
-    protected function buildMicro(): void
+    public function buildMicro(): void
     {
         if ($this->getPHPVersionID() < 80000) {
             throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
@@ -262,8 +246,9 @@ class MacOSBuilder extends BuilderBase
         $vars = [
             // with debug information, optimize for size, remove identifiers, patch fake cli for micro
             'EXTRA_CFLAGS' => '-g -Os -fno-ident' . $enable_fake_cli,
+            // link resolv library (macOS needs it)
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv",
         ];
-        $vars = $this->getBuildVars($vars);
         if (!$this->getOption('no-strip', false)) {
             $vars['STRIP'] = 'dsymutil -f ';
         }
@@ -284,9 +269,12 @@ class MacOSBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function buildFpm(): void
+    public function buildFpm(): void
     {
-        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
+        ]);
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
         $shell->exec("make -j{$this->concurrency} {$vars} fpm");
@@ -301,9 +289,12 @@ class MacOSBuilder extends BuilderBase
      *
      * @throws RuntimeException
      */
-    protected function buildEmbed(): void
+    public function buildEmbed(): void
     {
-        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
+        ]);
 
         shell()
             ->cd(SOURCE_PATH . '/php-src')
@@ -317,15 +308,4 @@ class MacOSBuilder extends BuilderBase
             ->exec('ar rcs ' . BUILD_ROOT_PATH . '/lib/libphp.a *.o')
             ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o');
     }
-
-    private function getBuildVars($input = []): array
-    {
-        $optimization = $this->getOption('no-strip', false) ? '-g -O0' : '-g0 -Os';
-        $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : '';
-        $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : '';
-        return [
-            'EXTRA_CFLAGS' => "{$optimization} {$cflags} " . $this->getOption('x-extra-cflags'),
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv {$libs} " . $this->getOption('x-extra-libs'),
-        ];
-    }
 }

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

@@ -50,10 +50,6 @@ class imap extends MacOSLibraryBase
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
-            ->exec('chmod +x tools/an')
-            ->exec('chmod +x tools/ua')
-            ->exec('chmod +x src/osdep/unix/drivers')
-            ->exec('chmod +x src/osdep/unix/mkauths')
             ->exec(
                 "yes | EXTRACFLAGS='-Wimplicit-function-declaration -include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h' make osx {$ssl_options}"
             );

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

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

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

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

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

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

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

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

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

@@ -27,9 +27,7 @@ class libxml2 extends MacOSLibraryBase
             ->exec(
                 'cmake ' .
                 // '--debug-find ' .
-                '-DCMAKE_BUILD_TYPE=Release ' .
+                "{$this->builder->makeCmakeArgs()} " .
-                '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
                 "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
@@ -41,6 +39,6 @@ class libxml2 extends MacOSLibraryBase
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install');
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
     }
 }

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

@@ -20,9 +20,51 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
 class nghttp2 extends MacOSLibraryBase
 {
-    use \SPC\builder\unix\library\nghttp2;
-
     public const NAME = 'nghttp2';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        $args = $this->builder->makeAutoconfArgs(static::NAME, [
+            'zlib' => null,
+            'openssl' => null,
+            'libxml2' => null,
+            'libev' => null,
+            'libcares' => null,
+            'libngtcp2' => null,
+            'libnghttp3' => null,
+            'libbpf' => null,
+            'libevent-openssl' => null,
+            'jansson' => null,
+            'jemalloc' => null,
+            'systemd' => null,
+            'cunit' => null,
+        ]);
+
+        [,,$destdir] = SEPARATED_PATH;
+
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
+                '--enable-lib-only ' .
+                '--with-boost=no ' .
+                $args . ' ' .
+                '--prefix='
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec("make install DESTDIR={$destdir}");
+        $this->patchPkgconfPrefix(['libnghttp2.pc']);
+    }
 }

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

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

src/SPC/builder/traits/UnixBuilderTrait.php

@@ -49,49 +49,12 @@ trait UnixBuilderTrait
         return array_map(fn ($x) => realpath(BUILD_LIB_PATH . "/{$x}"), $libFiles);
     }
 
-    /**
-     * Return generic cmake options when configuring cmake projects
-     */
-    public function makeCmakeArgs(): string
-    {
-        $extra = $this instanceof LinuxBuilder ? '-DCMAKE_C_COMPILER=' . getenv('CC') . ' ' : '';
-        return $extra .
-            '-DCMAKE_BUILD_TYPE=Release ' .
-            '-DCMAKE_INSTALL_PREFIX=/ ' .
-            '-DCMAKE_INSTALL_BINDIR=/bin ' .
-            '-DCMAKE_INSTALL_LIBDIR=/lib ' .
-            '-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;
-    }
-
     /**
      * Sanity check after build complete
      *
      * @throws RuntimeException
      */
-    protected function sanityCheck(int $build_target): void
+    public function sanityCheck(int $build_target): void
     {
         // sanity check for php-cli
         if (($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI) {
@@ -132,7 +95,7 @@ trait UnixBuilderTrait
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    protected function deployBinary(int $type): bool
+    public function deployBinary(int $type): bool
     {
         $src = match ($type) {
             BUILD_TARGET_CLI => SOURCE_PATH . '/php-src/sapi/cli/php',
@@ -151,9 +114,46 @@ trait UnixBuilderTrait
      *
      * @throws RuntimeException
      */
-    protected function cleanMake(): void
+    public function cleanMake(): void
     {
         logger()->info('cleaning up');
         shell()->cd(SOURCE_PATH . '/php-src')->exec('make clean');
     }
+
+    /**
+     * Return generic cmake options when configuring cmake projects
+     */
+    public function makeCmakeArgs(): string
+    {
+        $extra = $this instanceof LinuxBuilder ? '-DCMAKE_C_COMPILER=' . getenv('CC') . ' ' : '';
+        return $extra .
+            '-DCMAKE_BUILD_TYPE=Release ' .
+            '-DCMAKE_INSTALL_PREFIX=/ ' .
+            '-DCMAKE_INSTALL_BINDIR=/bin ' .
+            '-DCMAKE_INSTALL_LIBDIR=/lib ' .
+            '-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/brotli.php

@@ -27,7 +27,10 @@ trait brotli
             ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']);
-        shell()->cd(BUILD_ROOT_PATH . '/lib')->exec('ln -sf libbrotlicommon.a libbrotli.a');
+        shell()->cd(BUILD_ROOT_PATH . '/lib')
+            ->exec('ln -s libbrotlicommon.a libbrotlicommon-static.a')
+            ->exec('ln -s libbrotlidec.a libbrotlidec-static.a')
+            ->exec('ln -s libbrotlienc.a libbrotlienc-static.a');
         foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
             if (str_starts_with($filename, 'libbrotli') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                 unlink(BUILD_ROOT_PATH . '/lib/' . $filename);

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

@@ -4,25 +4,17 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
-use SPC\store\FileSystem;
-
 trait ldap
 {
-    public function patchBeforeBuild(): bool
-    {
-        FileSystem::replaceFileStr($this->source_dir . '/configure', '"-lssl -lcrypto', '"-lssl -lcrypto -lz');
-        return true;
-    }
-
     protected function build(): void
     {
         $alt = '';
         // openssl support
-        $alt .= $this->builder->getLib('openssl') ? '--with-tls=openssl ' : '';
+        $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 ' : '--enable-argon2=no ';
+        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '';
         f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
         f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
         shell()->cd($this->source_dir)
@@ -32,6 +24,7 @@ trait ldap
                 '--enable-static ' .
                 '--disable-shared ' .
                 '--disable-slapd ' .
+                '--disable-slurpd ' .
                 '--without-systemd ' .
                 '--without-cyrus-sasl ' .
                 $alt .

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

@@ -8,7 +8,7 @@ use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 
-trait libuv
+trait leveldb
 {
     /**
      * @throws FileSystemException
@@ -20,10 +20,14 @@ trait libuv
         FileSystem::resetDir($this->source_dir . '/build');
         // Start build
         shell()->cd($this->source_dir . '/build')
-            ->exec("cmake {$this->builder->makeCmakeArgs()} -DLIBUV_BUILD_SHARED=OFF ..")
+            ->exec(
+                "cmake {$this->builder->makeCmakeArgs()} " .
+                '-DBUILD_SHARED_LIBS=OFF ' .
+                '-DLEVELDB_BUILD_TESTS=OFF ' .
+                '-DLEVELDB_BUILD_BENCHMARKS=OFF ' .
+                '..'
+            )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
-        // patch pkgconfig
-        $this->patchPkgconfPrefix(['libuv-static.pc']);
     }
 }

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

@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\exception\RuntimeException;
-
-trait libcares
-{
-    /**
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        shell()->cd($this->source_dir)
-            ->exec('./configure --prefix=' . BUILD_ROOT_PATH . ' --enable-static --disable-shared --disable-tests')
-            ->exec("make -j {$this->builder->concurrency}")
-            ->exec('make install');
-    }
-}

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

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\store\FileSystem;
-
-trait liblz4
-{
-    protected function build()
-    {
-        shell()->cd($this->source_dir)
-            ->exec("make PREFIX='' clean")
-            ->exec("make -j{$this->builder->concurrency} PREFIX=''")
-            ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
-
-        $this->patchPkgconfPrefix(['liblz4.pc']);
-
-        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
-            if (str_starts_with($filename, 'liblz4') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
-                unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
-            }
-        }
-    }
-}

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

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
-
-trait nghttp2
-{
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     * @throws WrongUsageException
-     */
-    protected function build(): void
-    {
-        $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
-            'openssl' => null,
-            'libxml2' => null,
-            'libev' => null,
-            'libcares' => null,
-            'libngtcp2' => null,
-            'libnghttp3' => null,
-            'libbpf' => null,
-            'libevent-openssl' => null,
-            'jansson' => null,
-            'jemalloc' => null,
-            'systemd' => null,
-            'cunit' => null,
-        ]);
-
-        [,,$destdir] = SEPARATED_PATH;
-
-        shell()->cd($this->source_dir)
-            ->exec(
-                './configure ' .
-                '--enable-static ' .
-                '--disable-shared ' .
-                '--enable-lib-only ' .
-                '--with-boost=no ' .
-                $args . ' ' .
-                '--prefix='
-            )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec("make install DESTDIR={$destdir}");
-        $this->patchPkgconfPrefix(['libnghttp2.pc']);
-    }
-}

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

@@ -28,6 +28,9 @@ trait postgresql
             'icu' => 'icu-i18n',
         ];
 
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+
         foreach ($optional_packages as $lib => $pkg) {
             if ($this->getBuilder()->getLib($lib)) {
                 $packages .= ' ' . $pkg;

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

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-
-trait unixodbc
-{
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        shell()->cd($this->source_dir)
-            ->exec(
-                './configure ' .
-                '--enable-static --disable-shared ' .
-                '--disable-debug ' .
-                '--disable-dependency-tracking ' .
-                '--with-libiconv-prefix=' . BUILD_ROOT_PATH . ' ' .
-                '--with-included-ltdl ' .
-                '--enable-gui=no ' .
-                '--prefix='
-            )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
-        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
-        $this->cleanLaFiles();
-    }
-}

src/SPC/builder/windows/SystemUtil.php

@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\windows;
-
-class SystemUtil
-{
-    /**
-     * @param  string      $name  命令名称
-     * @param  array       $paths 寻找的目标路径（如果不传入，则使用环境变量 PATH）
-     * @return null|string 找到了返回命令路径，找不到返回 null
-     */
-    public static function findCommand(string $name, array $paths = []): ?string
-    {
-        if (!$paths) {
-            $paths = explode(PATH_SEPARATOR, getenv('Path'));
-        }
-        foreach ($paths as $path) {
-            if (file_exists($path . DIRECTORY_SEPARATOR . $name)) {
-                return $path . DIRECTORY_SEPARATOR . $name;
-            }
-        }
-        return null;
-    }
-}

src/SPC/command/BaseCommand.php

@@ -4,17 +4,13 @@ declare(strict_types=1);
 
 namespace SPC\command;
 
-use Laravel\Prompts\ConfirmPrompt;
-use Laravel\Prompts\Prompt;
 use Psr\Log\LogLevel;
 use SPC\ConsoleApplication;
 use SPC\exception\ExceptionHandler;
 use SPC\exception\WrongUsageException;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use ZM\Logger\ConsoleLogger;
 
 abstract class BaseCommand extends Command
@@ -82,15 +78,6 @@ abstract class BaseCommand extends Command
     {
         $this->input = $input;
         $this->output = $output;
-
-        // windows fallback
-        Prompt::fallbackWhen(PHP_OS_FAMILY === 'Windows');
-        ConfirmPrompt::fallbackUsing(function (ConfirmPrompt $prompt) use ($input, $output) {
-            $helper = new QuestionHelper();
-            $case = $prompt->default ? ' [Y/n] ' : ' [y/N] ';
-            $question = new ConfirmationQuestion($prompt->label . $case, $prompt->default);
-            return $helper->ask($input, $output, $question);
-        });
         if ($this->shouldExecute()) {
             try {
                 return $this->handle();

src/SPC/command/BuildCliCommand.php

@@ -35,7 +35,6 @@ class BuildCliCommand extends BuildCommand
         $this->addOption('with-micro-fake-cli', null, null, 'Enable phpmicro fake cli');
         $this->addOption('with-suggested-libs', 'L', null, 'Build with suggested libs for selected exts and libs');
         $this->addOption('with-suggested-exts', 'E', null, 'Build with suggested extensions for selected exts');
-        $this->addOption('with-added-patch', 'P', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Inject patch script outside');
     }
 
     public function handle(): int

src/SPC/command/BuildLibsCommand.php

@@ -7,7 +7,6 @@ namespace SPC\command;
 use SPC\builder\BuilderProvider;
 use SPC\exception\ExceptionHandler;
 use SPC\exception\RuntimeException;
-use SPC\util\DependencyUtil;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -60,7 +59,6 @@ class BuildLibsCommand extends BuildCommand
             // 只编译 library 的情况下，标记
             $builder->setLibsOnly();
             // 编译和检查库完整
-            $libraries = DependencyUtil::getLibsByDeps($libraries);
             $builder->buildLibs($libraries);
 
             $time = round(microtime(true) - START_TIME, 3);

src/SPC/command/DoctorCommand.php

@@ -75,9 +75,8 @@ class DoctorCommand extends BaseCommand
         } catch (\Throwable $e) {
             $this->output->writeln('<error>' . $e->getMessage() . '</error>');
 
-            if (extension_loaded('pcntl')) {
             pcntl_signal(SIGINT, SIG_IGN);
-            }
+
             return static::FAILURE;
         }
 

src/SPC/command/DownloadCommand.php

@@ -188,8 +188,7 @@ class DownloadCommand extends BaseCommand
         // create downloads
         try {
             if (PHP_OS_FAMILY !== 'Windows') {
-                $abs_path = realpath($path);
+                f_passthru('mkdir ' . DOWNLOAD_PATH . ' && cd ' . DOWNLOAD_PATH . ' && unzip ' . escapeshellarg($path));
-                f_passthru('mkdir ' . DOWNLOAD_PATH . ' && cd ' . DOWNLOAD_PATH . ' && unzip ' . escapeshellarg($abs_path));
             }
             // Windows TODO
 

src/SPC/doctor/CheckListHandler.php

@@ -34,23 +34,12 @@ final class CheckListHandler
      */
     public function emitFix(OutputInterface $output, CheckResult $result): void
     {
-        if (PHP_OS_FAMILY === 'Windows') {
-            sapi_windows_set_ctrl_handler(function () use ($output) {
-                $output->writeln('<error>You cancelled fix</error>');
-            });
-        } elseif (extension_loaded('pcntl')) {
         pcntl_signal(SIGINT, function () use ($output) {
             $output->writeln('<error>You cancelled fix</error>');
         });
-        }
 
         $fix_result = call_user_func($this->fix_map[$result->getFixItem()], ...$result->getFixParams());
-
-        if (PHP_OS_FAMILY === 'Windows') {
-            sapi_windows_set_ctrl_handler(null);
-        } elseif (extension_loaded('pcntl')) {
         pcntl_signal(SIGINT, SIG_IGN);
-        }
 
         if ($fix_result) {
             $output->writeln('<info>Fix done</info>');

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -62,7 +62,6 @@ class LinuxToolCheckList
                 'ubuntu',
                 'alpine',
                 'redhat',
-                'Deepin',
                 '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'),
             };
@@ -71,7 +70,7 @@ class LinuxToolCheckList
     }
 
     /** @noinspection PhpUnused */
-    #[AsCheckItem('if necessary linux headers are installed', limit_os: 'Linux')]
+    #[AsCheckItem('if necessary packages are installed', limit_os: 'Linux')]
     public function checkSystemOSPackages(): ?CheckResult
     {
         if (SystemUtil::isMuslDist()) {
@@ -91,7 +90,7 @@ class LinuxToolCheckList
     public function fixBuildTools(array $distro, array $missing): bool
     {
         $install_cmd = match ($distro['dist']) {
-            'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
+            'ubuntu', 'debian' => 'apt-get install -y',
             'alpine' => 'apk add',
             'redhat' => 'dnf install -y',
             default => throw new RuntimeException('Current linux distro does not have an auto-install script for musl packages yet.'),
@@ -102,7 +101,7 @@ class LinuxToolCheckList
             logger()->warning('Current user is not root, using sudo for running command');
         }
         try {
-            $is_debian = in_array($distro['dist'], ['debian', 'ubuntu', 'Deepin']);
+            $is_debian = in_array($distro['dist'], ['debian', 'ubuntu']);
             $to_install = $is_debian ? str_replace('xz', 'xz-utils', $missing) : $missing;
             // debian, alpine libtool -> libtoolize
             $to_install = str_replace('libtoolize', 'libtool', $to_install);

src/SPC/doctor/item/OSCheckList.php

@@ -13,14 +13,13 @@ class OSCheckList
 {
     use UnixSystemUtilTrait;
 
-    #[AsCheckItem('if current OS are supported', level: 1000)]
+    #[AsCheckItem('if current OS are supported', level: 999)]
     public function checkOS(): ?CheckResult
     {
-        if (!in_array(PHP_OS_FAMILY, ['Darwin', 'Linux', 'BSD', 'Windows'])) {
+        if (!in_array(PHP_OS_FAMILY, ['Darwin', 'Linux', 'BSD'])) {
-            return CheckResult::fail('Current OS is not supported: ' . PHP_OS_FAMILY);
+            return CheckResult::fail('Current OS is not supported');
         }
         $distro = PHP_OS_FAMILY === 'Linux' ? (' ' . SystemUtil::getOSRelease()['dist']) : '';
-        $known_distro = PHP_OS_FAMILY === 'Linux' && in_array(SystemUtil::getOSRelease()['dist'], SystemUtil::getSupportedDistros());
+        return CheckResult::ok(PHP_OS_FAMILY . ' ' . php_uname('m') . $distro . ', supported');
-        return CheckResult::ok(PHP_OS_FAMILY . ' ' . php_uname('m') . $distro . ', supported' . ($known_distro ? '' : ' (but not tested on this distro)'));
     }
 }

src/SPC/doctor/item/WindowsToolCheckList.php

@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\doctor\item;
-
-use SPC\builder\windows\SystemUtil;
-use SPC\doctor\AsCheckItem;
-use SPC\doctor\AsFixItem;
-use SPC\doctor\CheckResult;
-use SPC\exception\RuntimeException;
-
-class WindowsToolCheckList
-{
-    #[AsCheckItem('if git are installed', limit_os: 'Windows', level: 999)]
-    public function checkGit(): ?CheckResult
-    {
-        if (SystemUtil::findCommand('git.exe') === null) {
-            return CheckResult::fail('Git not installed, please install git for windows manually, see: https://git-scm.com/download/win');
-            // return CheckResult::fail('Git not installed, see https://static-php.dev/en/guide/windows-setup.html');
-        }
-        return CheckResult::ok();
-    }
-
-    #[AsCheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 998)]
-    public function checkSDK(): ?CheckResult
-    {
-        if (!file_exists(PHP_SDK_PATH . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) {
-            return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk');
-        }
-        return CheckResult::ok(PHP_SDK_PATH);
-    }
-
-    #[AsFixItem('install-php-sdk')]
-    public function installPhpSdk(): bool
-    {
-        try {
-            cmd(true)->exec('git clone https://github.com/php/php-sdk-binary-tools.git ' . PHP_SDK_PATH);
-        } catch (RuntimeException) {
-            return false;
-        }
-        return true;
-    }
-}

src/SPC/store/FileSystem.php

@@ -233,7 +233,6 @@ class FileSystem
                         throw new FileSystemException("unknown archive format: {$filename}");
                 }
             }
-            self::emitSourceExtractHook($name);
         } catch (RuntimeException $e) {
             if (PHP_OS_FAMILY === 'Windows') {
                 f_passthru('rmdir /s /q ' . SOURCE_PATH . "/{$name}");

src/SPC/store/SourcePatcher.php

@@ -16,7 +16,6 @@ class SourcePatcher
         // FileSystem::addSourceExtractHook('swow', [SourcePatcher::class, 'patchSwow']);
         FileSystem::addSourceExtractHook('micro', [SourcePatcher::class, 'patchMicro']);
         FileSystem::addSourceExtractHook('openssl', [SourcePatcher::class, 'patchOpenssl11Darwin']);
-        FileSystem::addSourceExtractHook('swoole', [SourcePatcher::class, 'patchSwoole']);
     }
 
     /**
@@ -160,17 +159,6 @@ class SourcePatcher
         return false;
     }
 
-    public static function patchSwoole(): bool
-    {
-        // swoole hook needs pdo/pdo.h
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/php-src/ext/swoole/config.m4',
-            'PHP_ADD_INCLUDE([$ext_srcdir])',
-            "PHP_ADD_INCLUDE( [\$ext_srcdir] )\n    PHP_ADD_INCLUDE([\$abs_srcdir/ext])"
-        );
-        return true;
-    }
-
     /**
      * @throws FileSystemException
      */

src/SPC/util/UnixShell.php

@@ -17,9 +17,6 @@ class UnixShell
 
     public function __construct(?bool $debug = null)
     {
-        if (PHP_OS_FAMILY === 'Windows') {
-            throw new RuntimeException('Windows cannot use UnixShell');
-        }
         $this->debug = $debug ?? defined('DEBUG_MODE');
     }
 

src/SPC/util/WindowsCmd.php

@@ -1,90 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\util;
-
-use SPC\exception\RuntimeException;
-use ZM\Logger\ConsoleColor;
-
-class WindowsCmd
-{
-    private ?string $cd = null;
-
-    private bool $debug;
-
-    private array $env = [];
-
-    public function __construct(?bool $debug = null)
-    {
-        if (PHP_OS_FAMILY !== 'Windows') {
-            throw new RuntimeException('Only windows can use WindowsCmd');
-        }
-        $this->debug = $debug ?? defined('DEBUG_MODE');
-    }
-
-    public function cd(string $dir): WindowsCmd
-    {
-        logger()->info('Entering dir: ' . $dir);
-        $c = clone $this;
-        $c->cd = $dir;
-        return $c;
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public function exec(string $cmd): WindowsCmd
-    {
-        /* @phpstan-ignore-next-line */
-        logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd));
-        if ($this->cd !== null) {
-            $cmd = 'cd /d ' . escapeshellarg($this->cd) . ' && ' . $cmd;
-        }
-        if (!$this->debug) {
-            $cmd .= ' >nul 2>&1';
-        }
-        echo $cmd . PHP_EOL;
-
-        f_passthru($cmd);
-        return $this;
-    }
-
-    public function execWithResult(string $cmd, bool $with_log = true): array
-    {
-        if ($with_log) {
-            /* @phpstan-ignore-next-line */
-            logger()->info(ConsoleColor::blue('[EXEC] ') . ConsoleColor::green($cmd));
-        } else {
-            logger()->debug('Running command with result: ' . $cmd);
-        }
-        exec($cmd, $out, $code);
-        return [$code, $out];
-    }
-
-    public function setEnv(array $env): WindowsCmd
-    {
-        $this->env = array_merge($this->env, $env);
-        return $this;
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public function execWithEnv(string $cmd): WindowsCmd
-    {
-        if ($this->getEnvString() !== '') {
-            return $this->exec($this->getEnvString() . "call {$cmd}");
-        }
-        return $this->exec($cmd);
-    }
-
-    private function getEnvString(): string
-    {
-        $str = '';
-        foreach ($this->env as $k => $v) {
-            $str .= 'set ' . $k . '=' . $v . ' && ';
-        }
-        return $str;
-    }
-}

src/globals/defines.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use ZM\Logger\ConsoleLogger;
 
 define('WORKING_DIR', getcwd());
-define('ROOT_DIR', dirname(__DIR__, 2));
+const ROOT_DIR = __DIR__ . '/../..';
 
 // CLI start time
 define('START_TIME', microtime(true));
@@ -22,10 +22,6 @@ define('SEPARATED_PATH', [
     BUILD_ROOT_PATH,
 ]);
 
-if (PHP_OS_FAMILY === 'Windows') {
-    define('PHP_SDK_PATH', is_string($a = getenv('PHP_SDK_PATH')) ? $a : (WORKING_DIR . DIRECTORY_SEPARATOR . 'php-sdk-binary-tools'));
-}
-
 // dangerous command
 const DANGER_CMD = [
     'rm',

src/globals/functions.php

@@ -3,12 +3,8 @@
 declare(strict_types=1);
 
 use Psr\Log\LoggerInterface;
-use SPC\builder\BuilderBase;
-use SPC\builder\BuilderProvider;
-use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
 use SPC\util\UnixShell;
-use SPC\util\WindowsCmd;
 use ZM\Logger\ConsoleLogger;
 
 /**
@@ -72,7 +68,7 @@ function osfamily2dir(): string
 /**
  * Execute the shell command, and the output will be directly printed in the terminal. If there is an error, an exception will be thrown
  *
- * @throws RuntimeException
+ * @throws \SPC\exception\RuntimeException
  */
 function f_passthru(string $cmd): ?bool
 {
@@ -90,7 +86,7 @@ function f_passthru(string $cmd): ?bool
     }
     $ret = passthru($cmd, $code);
     if ($code !== 0) {
-        throw new RuntimeException('Command run failed with code[' . $code . ']: ' . $cmd, $code);
+        throw new \SPC\exception\RuntimeException('Command run failed with code[' . $code . ']: ' . $cmd, $code);
     }
     return $ret;
 }
@@ -124,28 +120,3 @@ function shell(?bool $debug = null): UnixShell
 {
     return new UnixShell($debug);
 }
-
-function cmd(?bool $debug = null): WindowsCmd
-{
-    return new WindowsCmd($debug);
-}
-
-/**
- * Get current builder.
- *
- * @throws WrongUsageException
- */
-function builder(): BuilderBase
-{
-    return BuilderProvider::getBuilder();
-}
-
-/**
- * Get current patch point.
- *
- * @throws WrongUsageException
- */
-function patch_point(): string
-{
-    return BuilderProvider::getBuilder()->getPatchPoint();
-}

src/globals/test-extensions.php

@@ -2,55 +2,11 @@
 
 declare(strict_types=1);
 
-/**
+# If you want to test new extensions here, just modify it.
- * This is GitHub Actions automatic test extension args generator.
+$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib';
- * You can edit $extensions, $with_libs and $base_combination.
- */
 
-// --------------------------------- edit area ---------------------------------
+if (PHP_OS_FAMILY === 'Darwin') {
-
+    $extensions .= ',sodium';
-// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
-$extensions = 'ldap';
-
-// If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
-$with_libs = '';
-
-// Please change your test base combination. We recommend testing with `common`.
-// You can use `common`, `bulk`, `minimal` or `none`.
-$base_combination = 'minimal';
-
-// -------------------------- code area, do not modify --------------------------
-
-/**
- * get combination for tests, do not modify it if not necessary.
- */
-function _getCombination(string $type = 'common'): string
-{
-    return match ($type) {
-        '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',
-        'bulk' => 'apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,' .
-            'intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,' .
-            'posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sodium,sqlite3,swoole,sysvmsg,sysvsem,' .
-            'sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib',
-        'minimal' => 'pcntl,posix,mbstring,tokenizer,phar',
-        default => '', // none
-    };
 }
 
-if (!isset($argv[1])) {
+echo $extensions;
-    exit("Please use 'extensions', 'cmd' or 'libs' as output type");
-}
-
-$trim_value = "\r\n \t,";
-
-$final_extensions = trim(trim($extensions, $trim_value) . ',' . _getCombination($base_combination), $trim_value);
-$final_libs = trim($with_libs, $trim_value);
-
-echo match ($argv[1]) {
-    'extensions' => $final_extensions,
-    'libs' => $final_libs,
-    'cmd' => $final_extensions . ($final_libs === '' ? '' : (' --with-libs=' . $final_libs)),
-    default => '',
-};

src/globals/tests/swoole.php

@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-assert(function_exists('swoole_cpu_num'));
-assert(function_exists('swoole_string'));
-assert(class_exists('Swoole\Coroutine'));
-assert(class_exists('Swoole\Coroutine\Http2\Client'));
-assert(class_exists('Swoole\Coroutine\Redis'));
-assert(class_exists('Swoole\Coroutine\WaitGroup'));
-assert(class_exists('Swoole\Http2\Request'));
-assert(constant('SWOOLE_VERSION'));