Merge branch 'main' into libargon2-support

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+## What does this PR do?
+
+
+
+## Checklist before merging
+
+> If your PR involves the changes mentioned below and completed the action, please tick the corresponding option.
+> If a modification is not involved, please skip it directly.
+
+- [ ] If it's a extension or dependency update, make sure adding related extensions in `src/global/test-extensions.php`.
+- [ ] If you changed the behavior of static-php-cli, add docs in [static-php/static-php-cli-docs](https://github.com/static-php/static-php-cli-docs) .
+- [ ] If you updated `config/xxxx.json` content, run `bin/spc dev:sort-config xxx`.

.github/workflows/build-linux-arm.yml

@@ -15,6 +15,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -51,7 +52,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -67,7 +68,7 @@ jobs:
 
       # If there's no dependencies cache, fetch sources, with or without debug
       - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/build-linux-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -56,7 +57,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -72,7 +73,7 @@ jobs:
 
       # If there's no dependencies cache, fetch sources, with or without debug
       - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/build-macos-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -61,7 +62,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -77,7 +78,7 @@ jobs:
 
       # 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=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: ./bin/spc build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/download-cache.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ "8.0", "8.1", "8.2" ]
+        php-version: [ "8.0", "8.1", "8.2", "8.3" ]
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/tests.yml

@@ -1,98 +1,146 @@
 name: Tests
 
 on:
-    push:
-        branches: [ "main" ]
-    pull_request:
-        branches: [ "main" ]
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 permissions:
-    contents: read
+  contents: read
 
 jobs:
-    php-cs-fixer:
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.1'
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
-                  tools: pecl, composer, php-cs-fixer
-
-            - name: Run PHP-CS-Fixer fix
-              run: php-cs-fixer fix --dry-run --diff --ansi
-
-    phpstan:
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.1'
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
-                  tools: composer
-
-            - name: Cache Composer packages
-              id: composer-cache
-              uses: actions/cache@v3
-              with:
-                  path: vendor
-                  key: ${{ runner.os }}-phpstan-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-phpstan-
-
-            - name: Install Dependencies
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-
-            - name: Run phpstan
-              run: vendor/bin/phpstan analyse
-
-    phpunit:
-        name: PHPUnit (PHP ${{ matrix.php }})
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                    - php: '8.2'
-            fail-fast: false
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: "${{ matrix.php }}"
-                  tools: pecl, composer
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
-
-            - name: Cache Composer packages
-              id: composer-cache
-              uses: actions/cache@v3
-              with:
-                  path: vendor
-                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-php-
-
-            - name: Install Dependencies
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-
-            - name: Run PHPUnit tests
-              run: |
-                  vendor/bin/phpunit tests/ --no-coverage
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+          tools: pecl, composer, php-cs-fixer
+
+      - name: Run PHP-CS-Fixer fix
+        run: php-cs-fixer fix --dry-run --diff --ansi
+
+  phpstan:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+          tools: composer
+
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-phpstan-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-phpstan-
+
+      - name: "Install Dependencies"
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: "Run phpstan"
+        run: vendor/bin/phpstan analyse
+
+  phpunit:
+    name: "PHPUnit (PHP ${{ matrix.php }})"
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        include:
+          - php: '8.1'
+          - php: '8.2'
+          - php: '8.3'
+
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: "Install Dependencies"
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: "Run PHPUnit Tests"
+        run: |
+          vendor/bin/phpunit tests/ --no-coverage
+
+  build:
+    name: "Build PHP Test (PHP ${{ matrix.php }} ${{ matrix.os }})"
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 120
+    strategy:
+      matrix:
+        php:
+          - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+        os:
+          - ubuntu-latest
+          - macos-latest
+      fail-fast: false
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: pecl, composer
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: "Install Dependencies"
+        run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: "Run Build Tests (doctor)"
+        run: bin/spc doctor --auto-fix
+
+      - name: "Run Build Tests (download)"
+        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)" --build-cli --build-micro --build-fpm --debug

README-zh.md

@@ -28,9 +28,11 @@ Build single static PHP binary, with PHP project together, with popular extensio
 
 ## 自托管直接下载
 
-如果你不想自行编译 PHP，可以从本项目现有的示例 Action 下载 Artifact，也可以从自托管的服务器下载：[进入](https://dl.static-php.dev/static-php-cli/common/)
+如果你不想自行编译 PHP，可以从本项目现有的示例 Action 下载 Artifact，也可以从自托管的服务器下载。
 
-> 自托管的服务器默认包含的扩展有：`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`
+- [扩展组合 - common](https://dl.static-php.dev/static-php-cli/common/)：common 组合包含了约 [30+](https://dl.static-php.dev/static-php-cli/common/README.txt) 个常用扩展，体积为 22MB 左右。
+- [扩展组合 - bulk](https://dl.static-php.dev/static-php-cli/bulk/)：bulk 组合包含了 [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt) 个扩展，体积为 70MB 左右。
+- [扩展组合 - minimal](https://dl.static-php.dev/static-php-cli/minimal/)：minimal 组合包含了 [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt) 个扩展，体积为 6MB 左右。
 
 ## 使用 static-php-cli 构建 PHP
 
@@ -130,7 +132,7 @@ chmod +x bin/spc
 ./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
 ```
 
-你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.2：
+你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.3：
 
 ```bash
 # 优先考虑使用 >= 8.0 的 PHP 版本，因为 phpmicro 不支持在 PHP7 中构建

README.md

@@ -24,16 +24,21 @@ You can also use the micro binary file to combine php binary and php source code
 [![](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)]()
 
-## Docs
+## Documentation
 
 The current README contains basic usage. For all the features of static-php-cli,
 see <https://static-php.dev> .
 
 ## Direct Download
 
-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](https://dl.static-php.dev/static-php-cli/common/).
+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.
 
-> self-hosted server contains extensions: `bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip`
+Below are several precompiled static-php binaries with different extension combinations,
+which can be downloaded directly according to your needs.
+
+- [Extension-Combination - common](https://dl.static-php.dev/static-php-cli/common/): `common` contains about [30+](https://dl.static-php.dev/static-php-cli/common/README.txt) commonly used extensions, and the size is about 22MB.
+- [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.
 
 ## Use static-php-cli to build PHP
 
@@ -65,6 +70,8 @@ Please first select the extension you want to compile based on the extension lis
 
 > If an extension you need is missing, you can submit an issue.
 
+Here is the current planned roadmap for extension support: [#152](https://github.com/crazywhalecc/static-php-cli/issues/152) .
+
 ### GitHub Actions Build
 
 Use GitHub Action to easily build a statically compiled PHP,
@@ -88,13 +95,12 @@ Currently, the platforms supported by `spc` binary are Linux and macOS.
 
 Here's how to download from GitHub Actions:
 
-1. Enter [GitHub Actions](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml).
-2. Select the latest build task, select `Artifacts`, and download the binary file of the corresponding platform.
-3. Unzip the `.zip` file. After decompressing, add execution permissions to it: `chmod +x ./spc`.
-
-You can also download binaries from a self-hosted server: [enter](https://dl.static-php.dev/static-php-cli/spc-bin/nightly/).
+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.
+> 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)
 
@@ -134,7 +140,7 @@ 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, fix them automatically
+# Check system tool dependencies, fix them if possible
 ./bin/spc doctor
 # fetch all libraries
 ./bin/spc download --all
@@ -144,7 +150,7 @@ Basic usage for building php and micro with some extensions:
 ./bin/spc build bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl --build-cli --build-micro
 ```
 
-You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.2:
+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
@@ -166,7 +172,7 @@ If anything goes wrong, use `--debug` option to display full terminal output:
 ./bin/spc fetch --all --debug
 ```
 
-In addition, we build NTS by default. If you are going to build ZTS version, just add `--enable-zts` option.
+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
@@ -227,7 +233,7 @@ cat buildroot/bin/micro.sfx my-app.phar > my-app && chmod +x my-app
 bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=system" --output my-app-2
 ```
 
-> In some cases, PHAR files may not run in a micro environment.
+> In some cases, PHAR files may not run in a micro environment. Overall, micro is not production ready.
 
 ### Use fpm
 
@@ -235,7 +241,7 @@ When using the parameter `--build-all` or `--build-fpm`,
 the final compilation result will output a file named `./php-fpm`,
 This file will be located in the path `buildroot/bin/`, simply copy it out for use.
 
-In normal Linux distributions and macOS systems, the package manager will automatically generate a default fpm configuration file after installing php-fpm.
+In common Linux distributions and macOS systems, the package manager will automatically generate a default fpm configuration file after installing php-fpm.
 Because php-fpm must specify a configuration file before running, the php-fpm compiled by this project will not have any configuration files, so you need to write `php-fpm.conf` and `pool.conf` configuration files yourself.
 
 Specifying `php-fpm.conf` can use the command parameter `-y`, for example: `./php-fpm -y php-fpm.conf`.
@@ -261,10 +267,6 @@ If you want to contribute documentation, please go to [static-php/static-php-cli
 
 Now there is a [static-php](https://github.com/static-php) organization, which is used to store the repo related to the project.
 
-Part of the English document is written by me, and part is translated by Google,
-and there may be inaccurate descriptions, strange or offensive expressions.
-If you are a native English speaker, some corrections to the documentation are welcome.
-
 ## Sponsor this project
 
 You can sponsor my project on [this page](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md).
@@ -272,11 +274,13 @@ You can sponsor my project on [this page](https://github.com/crazywhalecc/crazyw
 ## Open-Source License
 
 This project itself is based on MIT License,
-some newly added extensions and dependencies may originate from the following projects (including but not limited to),
-and the headers of these code files will also be given additional instructions LICENSE and AUTHOR:
+some newly added extensions and dependencies may originate from the the other projects,
+and the headers of these code files will also be given additional instructions LICENSE and AUTHOR.
+
+These are similar projects:
 
-- [dixyes/lwmbs](https://github.com/dixyes/lwmbs) (Mulun Permissive License)
-- [swoole/swoole-cli](https://github.com/swoole/swoole-cli) (Apache 2.0 LICENSE+SWOOLE-CLI LICENSE)
+- [dixyes/lwmbs](https://github.com/dixyes/lwmbs)
+- [swoole/swoole-cli](https://github.com/swoole/swoole-cli)
 
 Due to the special nature of this project,
 many other open source projects such as curl and protobuf will be used during the project compilation process,
@@ -285,8 +289,3 @@ 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.
 
-## Advanced
-
-The refactoring branch of this project is written modularly.
-If you are interested in this project and want to join the development,
-you can refer to the [Contribution Guide](https://static-php.dev) of the documentation to contribute code or documentation.

bin/setup-runtime

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

bin/spc-alpine-docker

@@ -73,6 +73,7 @@ RUN apk update; \
         git \
         jq \
         libgcc \
+        libtool \
         libstdc++ \
         linux-headers \
         m4 \