StaticPHP v3

.github/workflows/build-unix.yml

@@ -46,6 +46,10 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Build with suggested libs
+        type: boolean
+        default: true
       debug:
         description: Show full build logs
         type: boolean
@@ -86,6 +90,10 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Include suggested libs
+        type: boolean
+        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -157,6 +165,9 @@ jobs:
           if [ ${{ inputs.prefer-pre-built }} == true ]; then
               DOWN_CMD="$DOWN_CMD --prefer-pre-built"
           fi
+          if [ ${{ inputs.with-suggested-libs }} == true ]; then
+              BUILD_CMD="$BUILD_CMD --with-suggested-libs"
+          fi
           if [ ${{ inputs.build-cli }} == true ]; then
               BUILD_CMD="$BUILD_CMD --build-cli"
           fi
@@ -202,6 +213,14 @@ jobs:
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3
 
+      # Upload debug logs
+      - if: ${{ inputs.debug && failure() }}
+        name: "Upload build logs on failure"
+        uses: actions/upload-artifact@v4
+        with:
+          name: spc-logs-${{ inputs.php-version }}-${{ inputs.os }}
+          path: log/*.log
+
       # Upload cli executable
       - if: ${{ inputs.build-cli == true }}
         name: "Upload PHP cli SAPI"

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

@@ -29,6 +29,10 @@ on:
         description: prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
+      with-suggested-libs:
+        description: Build with suggested libs
+        type: boolean
+        default: true
       debug:
         description: enable debug logs
         type: boolean

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "v3" ]
     types: [ opened, synchronize, reopened ]
     paths:
       - 'src/**'

.gitignore

@@ -1,8 +1,8 @@
 .idea
-runtime/
-docker/libraries/
-docker/extensions/
-docker/source/
+/runtime/
+/docker/libraries/
+/docker/extensions/
+/docker/source/
 
 # Vendor files
 /vendor/**
@@ -33,6 +33,9 @@ packlib_files.txt
 .php-cs-fixer.cache
 .phpunit.result.cache
 
+# doctor cache fallback (when ~/.cache/spc/ is not writable)
+.spc-doctor.lock
+
 # exclude self-runtime
 /bin/*
 !/bin/spc*
@@ -61,3 +64,6 @@ log/
 # spc.phar
 spc.phar
 spc.exe
+
+# dumped files from StaticPHP v3
+/dump-*.json

.php-cs-fixer.php

@@ -69,6 +69,6 @@
         'php_unit_data_provider_method_order' => false,
     ])
     ->setFinder(
-        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/SPC'])
+        PhpCsFixer\Finder::create()->in([__DIR__ . '/src', __DIR__ . '/tests/StaticPHP'])
     )
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());

README-zh.md

@@ -1,12 +1,12 @@
-# static-php-cli
+# StaticPHP
 
 [![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
 [![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
 [![CI](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)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
 
-**static-php-cli** 是一个用于构建静态、独立 PHP 运行时的强大工具，支持众多流行扩展。
+**StaticPHP** 是一个用于构建静态编译可执行文件（包括 PHP、扩展等）的强大工具。
 
 ## 特性
 
@@ -80,7 +80,7 @@ download-options:
 
 ### 3. 静态 PHP 使用
 
-现在您可以将 static-php-cli 构建的二进制文件复制到另一台机器上，无需依赖即可运行：
+现在您可以将 StaticPHP 构建的二进制文件复制到另一台机器上，无需依赖即可运行：
 
 ```
 # php-cli
@@ -97,7 +97,7 @@ buildroot/bin/php-fpm -v
 
 ## 文档
 
-当前 README 包含基本用法。有关 static-php-cli 的所有功能，
+当前 README 包含基本用法。有关 StaticPHP 的所有功能，
 请访问 <https://static-php.dev>。
 
 ## 直接下载

README.md

@@ -1,13 +1,12 @@
-# static-php-cli
+# StaticPHP
 
 [![Chinese readme](https://img.shields.io/badge/README-%E4%B8%AD%E6%96%87%20%F0%9F%87%A8%F0%9F%87%B3-moccasin?style=flat-square)](README-zh.md)
 [![English readme](https://img.shields.io/badge/README-English%20%F0%9F%87%AC%F0%9F%87%A7-moccasin?style=flat-square)](README.md)
 [![Releases](https://img.shields.io/packagist/v/crazywhalecc/static-php-cli?include_prereleases&label=Release&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/releases)
 [![CI](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)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://github.com/crazywhalecc/static-php-cli/blob/main/LICENSE)
 
-**static-php-cli** is a powerful tool designed for building static, standalone PHP runtime
-with popular extensions.
+**StaticPHP** is a powerful tool designed for building portable executables including PHP, extensions, and more.
 
 ## Features
 
@@ -81,7 +80,7 @@ Run command:
 
 ### 3. Static PHP usage
 
-Now you can copy binaries built by static-php-cli to another machine and run with no dependencies:
+Now you can copy binaries built by StaticPHP to another machine and run with no dependencies:
 
 ```
 # php-cli
@@ -98,7 +97,7 @@ buildroot/bin/php-fpm -v
 
 ## Documentation
 
-The current README contains basic usage. For all the features of static-php-cli,
+The current README contains basic usage. For all the features of StaticPHP,
 see <https://static-php.dev> .
 
 ## Direct Download

bin/spc

@@ -1,13 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-use SPC\ConsoleApplication;
-use SPC\exception\ExceptionHandler;
-
-// Load custom php if exists
-if (PHP_OS_FAMILY !== 'Windows' && PHP_BINARY !== (__DIR__ . '/php') && file_exists(__DIR__ . '/php') && is_executable(__DIR__ . '/php')) {
-    pcntl_exec(__DIR__ . '/php', $argv);
-}
+use StaticPHP\ConsoleApplication;
+use StaticPHP\Exception\ExceptionHandler;
+use StaticPHP\Exception\SPCException;
 
 if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     // Current: ./bin (git/project mode)
@@ -17,19 +13,16 @@ if (file_exists(dirname(__DIR__) . '/vendor/autoload.php')) {
     require_once dirname(__DIR__, 3) . '/autoload.php';
 }
 
-// 防止 Micro 打包状态下不支持中文的显示（虽然这个项目目前好像没输出过中文？）
-if (PHP_OS_FAMILY === 'Windows' && Phar::running()) {
-    exec('CHCP 65001');
-}
-
 // Print deprecation notice on PHP < 8.4, use red and highlight background
 if (PHP_VERSION_ID < 80400) {
     echo "\e[43mDeprecation Notice: PHP < 8.4 is deprecated, please upgrade your PHP version.\e[0m\n";
 }
 
 try {
     (new ConsoleApplication())->run();
-} catch (Exception $e) {
-    ExceptionHandler::getInstance()->handle($e);
-    exit(1);
+} catch (SPCException $e) {
+    exit(ExceptionHandler::handleSPCException($e));
+} catch (\Throwable $e) {
+    exit(ExceptionHandler::handleDefaultException($e));
 }
+

bin/spc-alpine-docker

@@ -3,7 +3,7 @@
 set -e
 
 # This file is using docker to run commands
-SPC_DOCKER_VERSION=v6
+SPC_DOCKER_VERSION=v7
 
 # Detect docker can run
 if ! which docker >/dev/null; then
@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php
@@ -123,6 +122,7 @@ COPY ./composer.* /app/
 ADD ./bin /app/bin
 RUN composer install --no-dev
 ADD ./config /app/config
+ADD ./spc.registry.json /app/spc.registry.json
 RUN bin/spc doctor --auto-fix
 RUN bin/spc install-pkg upx
 

bin/spc-debug

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# This script runs the 'spc' command with Xdebug enabled for debugging purposes.
+php -d xdebug.mode=debug -d xdebug.client_host=127.0.0.1 -d xdebug.client_port=9003 -d xdebug.start_with_request=yes "$(dirname "$0")/../bin/spc" "$@"

bin/spc-gnu-docker

@@ -92,11 +92,6 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which
 
-RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
-    mkdir -p /patchelf && \
-    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
-    cp /patchelf/bin/patchelf /usr/bin/
-
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1

box.json

@@ -1,19 +1,23 @@
 {
-  "alias": "spc-php.phar",
-  "banner": false,
-  "blacklist": [
-    ".github"
-  ],
-  "compression": "GZ",
-  "directories": [
-    "config",
-    "src",
-    "vendor/psr",
-    "vendor/laravel/prompts",
-    "vendor/illuminate",
-    "vendor/symfony",
-    "vendor/zhamao"
-  ],
-  "git-commit-short": "git_commit_short",
-  "output": "spc.phar"
+    "alias": "spc-php.phar",
+    "banner": false,
+    "blacklist": [
+        ".github"
+    ],
+    "compression": "GZ",
+    "check-requirements": false,
+    "directories": [
+        "config",
+        "src",
+        "vendor/psr",
+        "vendor/laravel/prompts",
+        "vendor/symfony",
+        "vendor/php-di",
+        "vendor/zhamao"
+    ],
+    "files": [
+        "spc.registry.yml"
+    ],
+    "git-commit-short": "git_commit_short",
+    "output": "spc.phar"
 }

captainhook.json

@@ -3,21 +3,30 @@
         "enabled": true,
         "actions": [
             {
-                "action": "composer analyse"
+                "action": "php vendor/bin/phpstan analyse --memory-limit 300M"
             }
         ]
     },
     "pre-commit": {
         "enabled": true,
         "actions": [
             {
-                "action": "composer cs-fix -- --config=.php-cs-fixer.php --dry-run --diff {$STAGED_FILES|of-type:php}",
+                "action": "php vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --dry-run --diff {$STAGED_FILES|of-type:php} --sequential",
                 "conditions": [
                     {
                         "exec": "\\CaptainHook\\App\\Hook\\Condition\\FileStaged\\OfType",
                         "args": ["php"]
                     }
                 ]
+            },
+            {
+                "action": "bin/spc dev:lint-config --check",
+                "conditions": [
+                    {
+                        "exec": "\\CaptainHook\\App\\Hook\\Condition\\FileStaged\\InDirectory",
+                        "args": ["config"]
+                    }
+                ]
             }
         ]
     },

composer.json

@@ -9,26 +9,29 @@
         }
     ],
     "require": {
-        "php": ">= 8.3",
+        "php": ">=8.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
-        "laravel/prompts": "^0.1.12",
+        "laravel/prompts": "~0.1",
+        "php-di/php-di": "^7.1",
         "symfony/console": "^5.4 || ^6 || ^7",
         "symfony/process": "^7.2",
         "symfony/yaml": "^7.2",
-        "zhamao/logger": "^1.1.3"
+        "zhamao/logger": "^1.1.4"
     },
     "require-dev": {
         "captainhook/captainhook-phar": "^5.23",
         "captainhook/hook-installer": "^1.0",
         "friendsofphp/php-cs-fixer": "^3.60",
         "humbug/box": "^4.5.0 || ^4.6.0",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10.3 || ^9.5"
     },
     "autoload": {
         "psr-4": {
-            "SPC\\": "src/SPC"
+            "SPC\\": "src/SPC",
+            "StaticPHP\\": "src/StaticPHP",
+            "Package\\": "src/Package"
         },
         "files": [
             "src/globals/defines.php",
@@ -37,7 +40,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SPC\\Tests\\": "tests/SPC"
+            "Tests\\StaticPHP\\": "tests/StaticPHP"
         }
     },
     "bin": [
@@ -46,6 +49,7 @@
     "scripts": {
         "analyse": "phpstan analyse --memory-limit 300M",
         "cs-fix": "php-cs-fixer fix",
+        "lint-config": "bin/spc dev:lint-config",
         "test": "vendor/bin/phpunit tests/ --no-coverage",
         "build:phar": "vendor/bin/box compile"
     },