llvm-tools: build host llvm-objcopy/strip/profdata under ZigToolchain

Add an `llvm-tools` target artifact that downloads llvm-project source
matching the version of clang shipped by the active zig install,
builds llvm-objcopy, llvm-strip and llvm-profdata into
PKG_ROOT_PATH/llvm-tools/bin, and exposes them through the same
path/binary/isInstalled static surface as the other artifacts.

A new LlvmToolsCheck doctor item runs when the active toolchain is
ZigToolchain and reports whether the three tools are built, with a
fix that installs the package and runs the build.

PackageBuilder now picks the right tool when the active toolchain is
ZigToolchain:
- extractDebugInfo() honours OBJCOPY from the environment, then falls
  back to llvm-tools' llvm-objcopy under Zig and plain objcopy
  otherwise.
- stripBinary() uses llvm-strip under Zig and plain strip otherwise.

System strip/objcopy refuse zig-produced archives and bitcode
sections, so without this the strip stage breaks LTO builds. Other
toolchains keep using the system binaries.

ApplicationContext::tryGet() wraps the container's get() in a
try/catch and returns null on failure, so PackageBuilder can ask
"which toolchain is active right now" without PHP-DI throwing on
autowirable-but-unconstructable classes.

Depends on v3c/artifact-static-helpers (uses zig::isInstalled()
and zig::binary()).

.github/workflows/release-build.yml

@@ -38,9 +38,6 @@ jobs:
           - name: "windows-x64"
             os: "ubuntu-latest"
             filename: "spc-windows-x64.exe"
-    permissions:
-      id-token: write
-      attestations: write
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v5"
@@ -108,12 +105,6 @@ jobs:
             fi
           fi
 
-      - name: "Generate build provenance attestation"
-        if: github.event_name != 'pull_request'
-        uses: actions/attest-build-provenance@v4
-        with:
-          subject-path: "${{ github.workspace }}/${{ matrix.operating-system.name == 'windows-x64' && 'spc.exe' || 'spc' }}"
-
       - name: "Copy file"
         run: |
           if [ "${{ matrix.operating-system.name }}" != "windows-x64" ]; then

box.json

@@ -10,6 +10,7 @@
         "config",
         "src",
         "vendor/psr",
+        "vendor/laravel/prompts",
         "vendor/symfony",
         "vendor/php-di",
         "vendor/zhamao"

composer.json

@@ -12,8 +12,10 @@
         "php": ">=8.4",
         "ext-mbstring": "*",
         "ext-zlib": "*",
+        "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.4"
     },

config/artifact/ncurses.yml

@@ -3,10 +3,6 @@ ncurses:
     license-files:
       - COPYING
   source:
-    type: filelist
-    url: 'https://ftp.gnu.org/gnu/ncurses/'
-    regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'
-  source-mirror:
     type: filelist
     url: 'https://ftpmirror.gnu.org/gnu/ncurses/'
     regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'

config/env.ini

@@ -68,8 +68,8 @@ SPC_PRESERVE_LOGS="no"
 [windows]
 ; build target: win7-static
 SPC_TARGET=native-windows
-; MSYS2 root directory (msys64 subfolder), used by the Windows toolchain
+; php-sdk-binary-tools path
-SPC_MSYS2_PATH="${PKG_ROOT_PATH}\msys2-build-essentials\msys64"
+PHP_SDK_PATH="${WORKING_DIR}\php-sdk-binary-tools"
 ; upx executable path
 UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches

config/pkg/ext/ext-fastchart.yml

@@ -1,20 +0,0 @@
-ext-fastchart:
-  type: php-extension
-  artifact:
-    source:
-      type: ghtar
-      repo: iliaal/fastchart
-      extract: php-src/ext/fastchart
-      prefer-stable: true
-    metadata:
-      license-files: [LICENSE]
-  depends:
-    - freetype
-  suggests:
-    - libpng
-    - libjpeg
-    - libwebp
-  php-extension:
-    os:
-      - Linux
-      - Darwin

config/pkg/ext/ext-fastjson.yml

@@ -1,14 +0,0 @@
-ext-fastjson:
-  type: php-extension
-  artifact:
-    source:
-      type: ghtar
-      repo: iliaal/fastjson
-      extract: php-src/ext/fastjson
-      prefer-stable: true
-    metadata:
-      license-files: [LICENSE]
-  php-extension:
-    os:
-      - Linux
-      - Darwin

config/pkg/ext/ext-gmssl.yml

@@ -10,5 +10,3 @@ ext-gmssl:
       license: PHP-3.01
   depends:
     - gmssl
-  php-extension:
-    arg-type: with-path

config/pkg/lib/gettext.yml

@@ -2,10 +2,6 @@ gettext:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gettext/'
-      regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gettext/'
       regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'

config/pkg/lib/gmp.yml

@@ -2,13 +2,12 @@ gmp:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/gmp/'
-      regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/gmp/'
       regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
+    source-mirror:
+      type: url
+      url: 'https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz'
     metadata:
       license-files: ['@/gmp.txt']
       license: Custom

config/pkg/lib/idn2.yml

@@ -2,10 +2,6 @@ idn2:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libidn/'
-      regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libidn/'
       regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libiconv.yml

@@ -2,10 +2,6 @@ libiconv:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libiconv/'
-      regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libiconv/'
       regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/libssh2.yml

@@ -9,10 +9,8 @@ libssh2:
     metadata:
       license-files: [COPYING]
       license: BSD-3-Clause
-  depends@unix:
+  depends:
     - openssl
-  depends@windows:
-    - zlib
   headers:
     - libssh2.h
     - libssh2_publickey.h

config/pkg/lib/libunistring.yml

@@ -2,10 +2,6 @@ libunistring:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/libunistring/'
-      regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/libunistring/'
       regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/lib/readline.yml

@@ -2,10 +2,6 @@ readline:
   type: library
   artifact:
     source:
-      type: filelist
-      url: 'https://ftp.gnu.org/gnu/readline/'
-      regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
-    source-mirror:
       type: filelist
       url: 'https://ftpmirror.gnu.org/gnu/readline/'
       regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'

config/pkg/target/7za-win.yml

@@ -1,5 +0,0 @@
-7za-win:
-  type: target
-  artifact:
-    binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/v3/tools/7zip/7za.exe', extract: '{pkg_root_path}/bin/7za.exe' }

config/pkg/target/llvm-tools.yml

@@ -0,0 +1,6 @@
+llvm-tools:
+  type: target
+  artifact:
+    binary: custom
+  depends:
+    - zig

config/pkg/target/msys2-build-essentials.yml

@@ -1,8 +0,0 @@
-msys2-build-essentials:
-  type: target
-  artifact:
-    binary: custom
-  env:
-    SPC_MSYS2_PATH: '{pkg_root_path}/msys2-build-essentials/msys64'
-  path@windows:
-    - '{pkg_root_path}/msys2-build-essentials/msys64/usr/bin'

config/pkg/target/nasm.yml

@@ -2,4 +2,4 @@ nasm:
   type: target
   artifact:
     binary:
-      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{pkg_root_path}/bin/nasm.exe', ndisasm.exe: '{pkg_root_path}/bin/ndisasm.exe' } }
+      windows-x86_64: { type: url, url: 'https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip', extract: { nasm.exe: '{php_sdk_path}/bin/nasm.exe', ndisasm.exe: '{php_sdk_path}/bin/ndisasm.exe' } }

config/pkg/target/php-sdk-binary-tools.yml

@@ -0,0 +1,5 @@
+php-sdk-binary-tools:
+  type: target
+  artifact:
+    binary:
+      windows-x86_64: { type: git, rev: master, url: 'https://github.com/php/php-sdk-binary-tools.git', extract: '{php_sdk_path}' }

docs/en/develop/package-model.md

@@ -229,7 +229,7 @@ The following path placeholders are supported in string values of the `path`, `e
 | `{working_dir}` | Working directory (project root) |
 | `{download_path}` | Download cache directory (`downloads/`) |
 | `{source_path}` | Extracted source directory (`source/`) |
-| `{spc_msys2_path}` | MSYS2 root directory (`msys64/`) — Windows only |
+| `{php_sdk_path}` | Windows PHP SDK directory |
 
 ## target Package Type
 

docs/en/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ A single-file hook API for lightweight patches may be provided in a future relea
 
 ### Windows-only: `--with-sdk-binary-dir` and `--vs-ver`
 
-These options are no longer accepted on the command line. In v3, the `php-sdk-binary-tools` dependency has been completely removed. v3 now manages its own **MSYS2** environment to support autotools-based library builds on Windows. Run `spc doctor --install` to download and configure MSYS2 automatically.
+These options are no longer accepted on the command line. Instead, set the `PHP_SDK_PATH` environment variable to point to your PHP SDK binary tools directory. The Visual Studio version is now managed by the toolchain configuration.
-
-If you need to point to a custom MSYS2 installation, set the `SPC_MSYS2_PATH` environment variable to the `msys64` directory (e.g. `C:\msys64`). Visual Studio is now auto-detected by the toolchain — no manual version flag needed.
-
-::: warning Migrating from v2
-v2 relied on `php-sdk-binary-tools` and required `--with-sdk-binary-dir` and `--vs-ver` on every build invocation. In v3 these options are gone. Remove them from all CI scripts and run `spc doctor --install` once to set up the Windows build environment.
-:::
 
 ## Renamed / Deprecated Options
 

docs/zh/develop/package-model.md

@@ -223,7 +223,7 @@ openssl:
 | `{working_dir}` | 工作目录（项目根目录） |
 | `{download_path}` | 下载缓存目录（`downloads/`） |
 | `{source_path}` | 解压源码目录（`source/`） |
-| `{spc_msys2_path}` | MSYS2 根目录（`msys64/`）——仅 Windows |
+| `{php_sdk_path}` | Windows PHP SDK 目录 |
 
 ## target 包类型
 

docs/zh/guide/migrate-from-v2.md

@@ -58,13 +58,7 @@ curl -o spc https://dl.static-php.dev/v3/spc-bin/nightly/spc-linux-x86_64
 
 ### Windows 专有：`--with-sdk-binary-dir` 和 `--vs-ver`
 
-这两个选项已不再被命令行接受。在 v3 中，`php-sdk-binary-tools` 依赖已被完全移除。v3 现在通过管理自己的 **MSYS2** 环境来支持 Windows 上基于 autotools 的库构建。运行 `spc doctor --install` 即可自动下载并配置 MSYS2。
+这两个选项已不再被命令行接受。请改为设置 `PHP_SDK_PATH` 环境变量，指向你的 PHP SDK binary tools 目录。Visual Studio 版本现在由工具链配置统一管理。
-
-如需指向自定义 MSYS2 安装目录，请设置 `SPC_MSYS2_PATH` 环境变量，值为 `msys64` 目录路径（例如 `C:\msys64`）。Visual Studio 版本现在由工具链自动检测，无需手动指定版本号。
-
-::: warning 从 v2 迁移
-v2 依赖 `php-sdk-binary-tools`，并在每次构建时需要传入 `--with-sdk-binary-dir` 和 `--vs-ver` 参数。在 v3 中这些选项已被移除。请从所有 CI 脚本中删除这些参数，并使用 `spc doctor --install` 一次性完成 Windows 构建环境的配置。
-:::
 
 ## 已重命名 / 已弃用的选项
 

phpstan.neon

@@ -1,6 +1,6 @@
 parameters:
   reportUnmatchedIgnoredErrors: false
-  level: 5
+  level: 4
   phpVersion: 80400
   paths:
     - ./src/

src/Package/Artifact/llvm_tools.php

@@ -0,0 +1,162 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Package\Artifact;
+
+use StaticPHP\Artifact\ArtifactDownloader;
+use StaticPHP\Artifact\Downloader\DownloadResult;
+use StaticPHP\Artifact\Downloader\Type\CheckUpdateResult;
+use StaticPHP\Artifact\Downloader\Type\GitHubTokenSetupTrait;
+use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
+use StaticPHP\Attribute\Artifact\CustomBinary;
+use StaticPHP\Attribute\Artifact\CustomBinaryCheckUpdate;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Exception\BuildFailureException;
+use StaticPHP\Exception\DownloaderException;
+use StaticPHP\Package\PackageBuilder;
+
+class llvm_tools
+{
+    use GitHubTokenSetupTrait;
+
+    public const array TOOLS = ['llvm-objcopy', 'llvm-strip', 'llvm-profdata'];
+
+    /** Install prefix for the locally-built llvm-tools. */
+    public static function path(): string
+    {
+        return PKG_ROOT_PATH . '/llvm-tools';
+    }
+
+    /** Path to a binary under llvm-tools/bin (llvm-objcopy, llvm-strip, llvm-profdata, …). */
+    public static function binary(string $name = 'llvm-strip'): string
+    {
+        return self::path() . '/bin/' . $name;
+    }
+
+    /** True when every required TOOLS binary is present and executable. */
+    public static function isInstalled(): bool
+    {
+        foreach (self::TOOLS as $t) {
+            $p = self::binary($t);
+            if (!is_file($p) || !is_executable($p)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    #[CustomBinary('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function downBinary(ArtifactDownloader $downloader): DownloadResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        $tarball = "llvm-project-{$llvmVersion}.src.tar.xz";
+        $url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-{$llvmVersion}/{$tarball}";
+        $tarballPath = DOWNLOAD_PATH . '/' . $tarball;
+        default_shell()->executeCurlDownload($url, $tarballPath, headers: $this->getGitHubTokenHeaders(), retries: $downloader->getRetry());
+        return DownloadResult::archive($tarball, ['url' => $url, 'version' => $llvmVersion], extract: '{source_path}/llvm-tools', verified: false, version: $llvmVersion);
+    }
+
+    #[CustomBinaryCheckUpdate('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function checkUpdateBinary(?string $old_version, ArtifactDownloader $downloader): CheckUpdateResult
+    {
+        $llvmVersion = $this->detectLlvmVersion()
+            ?? throw new DownloaderException('Could not detect a clang version on host; install zig or clang first');
+        return new CheckUpdateResult(
+            old: $old_version,
+            new: $llvmVersion,
+            needUpdate: $old_version === null || $llvmVersion !== $old_version,
+        );
+    }
+
+    #[AfterBinaryExtract('llvm-tools', [
+        'linux-x86_64',
+        'linux-aarch64',
+        'macos-x86_64',
+        'macos-aarch64',
+    ])]
+    public function postExtract(string $target_path): void
+    {
+        $this->buildForHost($target_path);
+    }
+
+    public function buildForHost(?string $sourceRoot = null): void
+    {
+        $sourceRoot ??= SOURCE_PATH . '/llvm-tools';
+        if (self::isInstalled()) {
+            return;
+        }
+        $llvmDir = "{$sourceRoot}/llvm";
+        if (!is_dir($llvmDir)) {
+            throw new BuildFailureException("llvm-tools: missing source at {$llvmDir} (extraction layout changed?)");
+        }
+        $buildDir = "{$sourceRoot}/build";
+        $installDir = self::path();
+        $binDir = self::path() . '/bin';
+        f_mkdir($buildDir, recursive: true);
+        f_mkdir($binDir, recursive: true);
+
+        $cmakeArgs = implode(' ', array_map('escapeshellarg', [
+            '-S', $llvmDir,
+            '-B', $buildDir,
+            '-DCMAKE_BUILD_TYPE=Release',
+            '-DLLVM_ENABLE_PROJECTS=',
+            '-DLLVM_TARGETS_TO_BUILD=',
+            '-DLLVM_INCLUDE_BENCHMARKS=OFF',
+            '-DLLVM_INCLUDE_TESTS=OFF',
+            '-DLLVM_INCLUDE_EXAMPLES=OFF',
+            '-DLLVM_INCLUDE_DOCS=OFF',
+            '-DLLVM_ENABLE_ZLIB=OFF',
+            '-DLLVM_ENABLE_ZSTD=OFF',
+            '-DLLVM_ENABLE_LIBXML2=OFF',
+            '-DLLVM_ENABLE_TERMINFO=OFF',
+            '-DLLVM_ENABLE_LIBEDIT=OFF',
+            '-DLLVM_ENABLE_LIBPFM=OFF',
+            '-DLLVM_BUILD_LLVM_DYLIB=OFF',
+            '-DLLVM_LINK_LLVM_DYLIB=OFF',
+            '-DBUILD_SHARED_LIBS=OFF',
+            '-DCMAKE_C_COMPILER=' . zig::binary('zig-cc'),
+            '-DCMAKE_CXX_COMPILER=' . zig::binary('zig-c++'),
+            '-DCMAKE_INSTALL_PREFIX=' . $installDir,
+        ]));
+        $jobs = ApplicationContext::get(PackageBuilder::class)->concurrency;
+        $targetArgs = implode(' ', array_map(fn ($t) => '--target ' . escapeshellarg($t), self::TOOLS));
+
+        shell()
+            ->setEnv(['SPC_TARGET' => GNU_ARCH . '-linux-musl'])
+            ->exec('cmake ' . $cmakeArgs)
+            ->exec('cmake --build ' . escapeshellarg($buildDir) . ' ' . $targetArgs . " -j {$jobs}");
+
+        foreach (self::TOOLS as $t) {
+            $built = "{$buildDir}/bin/{$t}";
+            if (!is_file($built)) {
+                throw new BuildFailureException("llvm-tools: missing build output {$built}");
+            }
+            copy($built, self::binary($t));
+            chmod(self::binary($t), 0755);
+        }
+    }
+
+    private function detectLlvmVersion(): ?string
+    {
+        if (!zig::isInstalled()) {
+            return null;
+        }
+        [$rc, $out] = shell()->execWithResult(escapeshellarg(zig::binary()) . ' cc --version', false);
+        if ($rc !== 0) {
+            return null;
+        }
+        return preg_match('/clang version (\d+\.\d+\.\d+)/', implode("\n", $out), $m) ? $m[1] : null;
+    }
+}

src/Package/Artifact/msys2_build_essentials.php

@@ -1,93 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Artifact;
-
-use StaticPHP\Artifact\ArtifactDownloader;
-use StaticPHP\Artifact\Downloader\DownloadResult;
-use StaticPHP\Attribute\Artifact\AfterBinaryExtract;
-use StaticPHP\Attribute\Artifact\BinaryExtract;
-use StaticPHP\Attribute\Artifact\CustomBinary;
-use StaticPHP\Exception\DownloaderException;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalEnvManager;
-
-class msys2_build_essentials
-{
-    // MSYS subsystem packages required for autotools-based builds.
-    private const REQUIRED_PACKAGES = ['make', 'autoconf', 'automake', 'libtool', 'pkgconf', 'perl', 'bison', 're2c'];
-
-    #[CustomBinary('msys2-build-essentials', ['windows-x86_64'])]
-    public function downBinary(ArtifactDownloader $downloader): DownloadResult
-    {
-        // MSYS2 nightly self-extracting archive; running it with `-y -oTARGET` extracts to TARGET\msys64\.
-        $url = 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.sfx.exe';
-        $filename = 'msys2-base-x86_64-latest.sfx.exe';
-        $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . $filename;
-
-        default_shell()->executeCurlDownload($url, $path, retries: $downloader->getRetry());
-
-        return DownloadResult::file(
-            $filename,
-            ['url' => $url, 'version' => 'nightly'],
-            version: 'nightly',
-            extract: '{pkg_root_path}/msys2-build-essentials',
-        );
-    }
-
-    #[BinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function extractBinary(string $source_file, string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $source_file = FileSystem::convertPath($source_file);
-
-        // Guard: skip re-extraction if already initialized (marker written at end of this method).
-        $marker = "{$target_path}\\.spc-msys2-initialized";
-        if (file_exists($marker)) {
-            return;
-        }
-
-        if (!is_dir($target_path)) {
-            FileSystem::createDir($target_path);
-        }
-
-        cmd()->exec("\"{$source_file}\" -y -o\"{$target_path}\"");
-
-        $msys2_bin = "{$target_path}\\msys64\\usr\\bin";
-        if (!file_exists("{$msys2_bin}\\bash.exe")) {
-            throw new DownloaderException("MSYS2 extraction failed: bash.exe not found at {$msys2_bin}\\bash.exe");
-        }
-
-        // Add MSYS2 usr\bin to PATH so pacman.exe can load msys-2.0.dll.
-        GlobalEnvManager::addPathIfNotExists($msys2_bin);
-        GlobalEnvManager::putenv('CHERE_INVOKING=yes');
-        GlobalEnvManager::putenv('MSYSTEM=MSYS');
-
-        // Disable PGP signature checking: pacman-key --init requires a pseudo-TTY which is unavailable
-        // from PHP. Patching pacman.conf is the standard approach for CI pipelines.
-        $pacman_conf = "{$target_path}\\msys64\\etc\\pacman.conf";
-        FileSystem::replaceFileRegex($pacman_conf, '/^SigLevel\s*=.*$/m', 'SigLevel = Never');
-
-        $pacman = "{$target_path}\\msys64\\usr\\bin\\pacman.exe";
-
-        // Two-pass update as recommended by MSYS2 CI docs.
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-        cmd()->exec("\"{$pacman}\" --noconfirm -Syuu");
-
-        $pkgs = implode(' ', self::REQUIRED_PACKAGES);
-        cmd()->exec("\"{$pacman}\" --noconfirm -S --needed {$pkgs}");
-
-        FileSystem::writeFile($marker, date('Y-m-d H:i:s'));
-    }
-
-    #[AfterBinaryExtract('msys2-build-essentials', ['windows-x86_64'])]
-    public function afterExtract(string $target_path): void
-    {
-        $target_path = FileSystem::convertPath($target_path);
-        $msys2_root = "{$target_path}\\msys64";
-
-        GlobalEnvManager::putenv("SPC_MSYS2_PATH={$msys2_root}");
-        GlobalEnvManager::addPathIfNotExists("{$msys2_root}\\usr\\bin");
-    }
-}

src/Package/Artifact/zig.php

@@ -15,6 +15,23 @@ use StaticPHP\Runtime\SystemTarget;
 
 class zig
 {
+    /** Directory zig extracts into. */
+    public static function path(): string
+    {
+        return PKG_ROOT_PATH . '/zig';
+    }
+
+    /** Path to a binary inside the zig install dir (zig, zig-cc, zig-c++, zig-ar, …). */
+    public static function binary(string $name = 'zig'): string
+    {
+        return self::path() . '/' . $name;
+    }
+
+    public static function isInstalled(): bool
+    {
+        return is_file(self::binary());
+    }
+
     #[CustomBinary('zig', [
         'linux-x86_64',
         'linux-aarch64',

src/Package/Extension/gmssl.php

@@ -1,57 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Package\Extension;
-
-use Package\Target\php;
-use StaticPHP\Attribute\Package\BeforeStage;
-use StaticPHP\Attribute\Package\Extension;
-use StaticPHP\Attribute\PatchDescription;
-use StaticPHP\Package\PhpExtensionPackage;
-use StaticPHP\Util\FileSystem;
-
-#[Extension('gmssl')]
-class gmssl extends PhpExtensionPackage
-{
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1 compatibility with GmSSL >= 3.1.0 where SM2_VERIFY_CTX was removed (unified into SM2_SIGN_CTX)')]
-    public function patchSm2VerifyCtx(): void
-    {
-        // See: https://github.com/crazywhalecc/static-php-cli/issues/1182
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'SM2_VERIFY_CTX',
-            'SM2_SIGN_CTX'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForUnix'], 'ext-gmssl')]
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Fix ext-gmssl v1.1.1: pbkdf2_hmac_sm3_genkey was renamed to sm3_pbkdf2 in GmSSL >= 3.2.0')]
-    public function patchPbkdf2Rename(): void
-    {
-        FileSystem::replaceFileStr(
-            "{$this->getSourceDir()}/gmssl.c",
-            'pbkdf2_hmac_sm3_genkey',
-            'sm3_pbkdf2'
-        );
-    }
-
-    #[BeforeStage('php', [php::class, 'buildconfForWindows'], 'ext-gmssl')]
-    #[PatchDescription('Add CHECK_LIB to config.w32 for static Windows builds')]
-    public function patchBeforeBuildconfWin(): bool
-    {
-        $configW32 = "{$this->getSourceDir()}/config.w32";
-        if (str_contains(FileSystem::readFile($configW32), 'CHECK_LIB(')) {
-            return false;
-        }
-        FileSystem::replaceFileStr(
-            $configW32,
-            'AC_DEFINE(',
-            'CHECK_LIB("gmssl.lib", "gmssl", PHP_GMSSL);' . PHP_EOL . 'AC_DEFINE('
-        );
-        return true;
-    }
-}

src/Package/Library/gettext_win.php

@@ -22,7 +22,6 @@ class gettext_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
             '17' => '\MSVC17',
             '16' => '\MSVC16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -45,9 +44,7 @@ class gettext_win
     {
         $vs_ver_dir = ApplicationContext::get('gettext_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}\\libintl_static")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libintl_static.vcxproj /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WindowsTargetPlatformVersion=10.0 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         // libintl_a.lib is the static library output; copy as libintl.lib for linker compatibility

src/Package/Library/gmssl.php

@@ -18,9 +18,7 @@ class gmssl
     #[BuildFor('Darwin')]
     public function build(LibraryPackage $lib): void
     {
-        UnixCMakeExecutor::create($lib)
+        UnixCMakeExecutor::create($lib)->build();
-            ->addConfigureArgs('-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON')
-            ->build();
     }
 
     #[BuildFor('Windows')]
@@ -35,7 +33,6 @@ class gmssl
                 '-G "NMake Makefiles"',
                 '-DWIN32=ON',
                 '-DBUILD_SHARED_LIBS=OFF',
-                '-DENABLE_SM2_PRIVATE_KEY_EXPORT=ON',
                 '-DCMAKE_BUILD_TYPE=Release',
                 '-DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
                 '-DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG"',
@@ -45,13 +42,13 @@ class gmssl
             ->toStep(1)
             ->build();
 
-        cmd()->cd($buildDir)->exec('nmake gmssl XCFLAGS=/MT');
+        // fix cmake_install.cmake install prefix (GmSSL overrides it internally)
+        $installCmake = "{$buildDir}\\cmake_install.cmake";
+        FileSystem::writeFile(
+            $installCmake,
+            'set(CMAKE_INSTALL_PREFIX "' . str_replace('\\', '/', $lib->getBuildRootPath()) . '")' . PHP_EOL . FileSystem::readFile($installCmake)
+        );
 
-        $libPath = "{$lib->getBuildRootPath()}/lib";
+        cmd()->cd($buildDir)->exec('nmake install XCFLAGS=/MT');
-        $incPath = "{$lib->getBuildRootPath()}/include/gmssl";
-        FileSystem::createDir($libPath);
-        FileSystem::createDir($incPath);
-        FileSystem::copy("{$buildDir}\\bin\\gmssl.lib", "{$libPath}/gmssl.lib");
-        FileSystem::copyDir("{$lib->getSourceDir()}\\include\\gmssl", $incPath);
     }
 }

src/Package/Library/libffi_win.php

@@ -21,7 +21,6 @@ class libffi_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs17 solution, which msbuild builds via forward compatibility.
             '17' => '\win32\vs17_x64',
             '16' => '\win32\vs16_x64',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported!"),
@@ -34,9 +33,7 @@ class libffi_win
     {
         $vs_ver_dir = ApplicationContext::get('libffi_win_vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libffi-msvc.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/libiconv_win.php

@@ -21,7 +21,6 @@ class libiconv_win
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the VS2022 (MSVC17) solution, which msbuild builds via forward compatibility.
             '17' => '\MSVC17',
             '16' => '\MSVC16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
@@ -34,9 +33,7 @@ class libiconv_win
     {
         $vs_ver_dir = ApplicationContext::get('vs_ver_dir');
         cmd()->cd("{$lib->getSourceDir()}{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libiconv.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 /p:WholeProgramOptimization=false');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
         FileSystem::copy("{$lib->getSourceDir()}{$vs_ver_dir}\\x64\\lib\\libiconv.lib", "{$lib->getLibDir()}\\libiconv.lib");

src/Package/Library/libsodium.php

@@ -42,16 +42,13 @@ class libsodium
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the vs2022 solution, which msbuild builds via forward compatibility.
             '17' => '\vs2022',
             '16' => '\vs2019',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),
         };
 
         cmd()->cd("{$lib->getSourceDir()}\\builds\\msvc{$vs_ver_dir}")
-            // WholeProgramOptimization (/GL) emits LTCG objects that frankenphp's lld-link cannot
+            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
-            // read ("is not a native COFF file"); disable it so the .lib stays plain COFF.
-            ->exec('msbuild libsodium.sln /t:Rebuild /p:Configuration=StaticRelease /p:Platform=x64 /p:WholeProgramOptimization=false /p:PreprocessorDefinitions="SODIUM_STATIC=1"');
         FileSystem::createDir($lib->getLibDir());
         FileSystem::createDir($lib->getIncludeDir());
 

src/Package/Library/libssh2.php

@@ -18,7 +18,6 @@ class libssh2
     {
         WindowsCMakeExecutor::create($lib)
             ->addConfigureArgs(
-                '-DCRYPTO_BACKEND=WinCNG',
                 '-DENABLE_ZLIB_COMPRESSION=ON',
                 '-DBUILD_TESTING=OFF'
             )

src/Package/Library/mpir.php

@@ -21,7 +21,6 @@ class mpir
     {
         $ver = WindowsUtil::findVisualStudio();
         $vs_ver_dir = match ($ver['major_version']) {
-            '18', // VS 2026 reuses the build.vc17 solution, which msbuild builds via forward compatibility.
             '17' => '\build.vc17',
             '16' => '\build.vc16',
             default => throw new EnvironmentException("Current VS version {$ver['major_version']} is not supported yet!"),

src/Package/Library/openssl.php

@@ -24,7 +24,7 @@ class openssl
     {
         if (SystemTarget::getTargetOS() === 'Windows') {
             global $argv;
-            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl\perl\bin\perl.exe';
+            $perl_path_native = PKG_ROOT_PATH . '\strawberry-perl-' . arch2gnu(php_uname('m')) . '-win\perl\bin\perl.exe';
             $perl = file_exists($perl_path_native) ? ($perl_path_native) : WindowsUtil::findCommand('perl.exe');
             if ($perl === null) {
                 throw new EnvironmentException(

src/Package/Library/unixodbc.php

@@ -20,8 +20,8 @@ class unixodbc extends LibraryPackage
     {
         $sysconf_selector = match ($os = SystemTarget::getTargetOS()) {
             'Darwin' => match (SystemTarget::getTargetArch()) {
-                'x86_64' => is_dir('/usr/local/etc') ? '/usr/local/etc' : '/opt/local/etc',
+                'x86_64' => '/usr/local/etc',
-                'aarch64' => is_dir('/opt/homebrew/etc') ? '/opt/homebrew/etc' : '/opt/local/etc',
+                'aarch64' => '/opt/homebrew/etc',
                 default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
             },
             'Linux' => '/etc',

src/Package/Target/curl.php

@@ -40,7 +40,7 @@ class curl
             ->optionalPackage('brotli', ...cmake_boolean_args('CURL_BROTLI'))
             ->addConfigureArgs(
                 '-DBUILD_CURL_EXE=ON',
-                '-DZSTD_LIBRARY=' . BUILD_LIB_PATH . '/zstd_static.lib',
+                '-DZSTD_LIBRARY=zstd_static.lib',
                 '-DBUILD_TESTING=OFF',
                 '-DBUILD_EXAMPLES=OFF',
                 '-DUSE_LIBIDN2=OFF',

src/Package/Target/php.php

@@ -255,11 +255,6 @@ class php extends TargetPackage
             $installer->addBuildPackage('php-embed');
         }
 
-        // UPX compression: ensure the upx binary package is installed when requested
-        if ($package->getBuildOption('with-upx-pack')) {
-            $additional_packages[] = 'upx';
-        }
-
         return [...$extensions_pkg, ...$additional_packages];
     }
 

src/Package/Target/php/windows.php

@@ -39,13 +39,6 @@ trait windows
         InteractiveTerm::setMessage('Building php: ' . ConsoleColor::yellow('./buildconf.bat'));
         cmd()->cd($package->getSourceDir())->exec('.\buildconf.bat');
 
-        // Bypass the phpsdk_version check in configure.js: we use MSVC + msys2 instead of PHP SDK, so phpsdk_version is not available and the check would always fail.
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\configure.js",
-            'check_binary_tools_sdk();',
-            '/* check_binary_tools_sdk(); skipped: using MSVC + msys2 without PHP SDK */'
-        );
-
         if ($package->getBuildOption('enable-micro-win32') && $installer->isPackageResolved('php-micro')) {
             SourcePatcher::patchMicroWin32();
         } else {
@@ -95,17 +88,6 @@ trait windows
         cmd()->cd($package->getSourceDir())->exec(".\\configure.bat {$args} {$static_extension_str}");
     }
 
-    #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
-    #[PatchDescription('Patch Makefile to ensure buildroot/include comes before extension CFLAGS (fixes zip.h conflict with minizip)')]
-    public function patchMakefileIncludeOrder(TargetPackage $package): void
-    {
-        FileSystem::replaceFileStr(
-            "{$package->getSourceDir()}\\Makefile",
-            '$(CFLAGS_PHP_OBJ) $(CFLAGS)',
-            '$(CFLAGS) $(CFLAGS_PHP_OBJ)'
-        );
-    }
-
     #[BeforeStage('php', [self::class, 'makeCliForWindows'])]
     #[PatchDescription('Patch Windows Makefile for CLI target')]
     public function patchCLITarget(TargetPackage $package): void
@@ -530,7 +512,6 @@ HEADER;
             $vc_matches = ['unknown', 'unknown'];
         } else {
             $vc_matches = match ($vc['major_version']) {
-                '18', // VS 2026 shares the VS2022 (v143) runtime conventions, so it reports as VS17.
                 '17' => ['VS17', 'Visual C++ 2022'],
                 '16' => ['VS16', 'Visual C++ 2019'],
                 default => ['unknown', 'unknown'],

src/StaticPHP/Artifact/Artifact.php

@@ -644,7 +644,7 @@ class Artifact
             '{artifact_name}' => $this->name,
             '{pkg_root_path}' => PKG_ROOT_PATH,
             '{build_root_path}' => BUILD_ROOT_PATH,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH'),
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: WORKING_DIR . '/php-sdk-binary-tools',
             '{working_dir}' => WORKING_DIR,
             '{download_path}' => DOWNLOAD_PATH,
             '{source_path}' => SOURCE_PATH,

src/StaticPHP/Artifact/ArtifactExtractor.php

@@ -614,7 +614,7 @@ class ArtifactExtractor
             '{source_path}' => SOURCE_PATH,
             '{download_path}' => DOWNLOAD_PATH,
             '{working_dir}' => WORKING_DIR,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH') ?: '',
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ?: '',
         ];
         return str_replace(array_keys($replacement), array_values($replacement), $path);
     }

src/StaticPHP/Artifact/Downloader/DownloadResult.php

@@ -76,10 +76,9 @@ class DownloadResult
         ?string $version = null,
         array $metadata = [],
         ?string $downloader = null,
-        mixed $extract = null,
     ): DownloadResult {
         $cache_type = self::isArchiveFile($filename) ? 'archive' : 'file';
-        return new self($cache_type, config: $config, filename: $filename, extract: $extract, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
+        return new self($cache_type, config: $config, filename: $filename, verified: $verified, version: $version, metadata: $metadata, downloader: $downloader);
     }
 
     /**

src/StaticPHP/Artifact/Downloader/Type/FileList.php

@@ -45,11 +45,7 @@ class FileList implements DownloadTypeInterface, CheckUpdateInterface
             throw new DownloaderException("Failed to get {$name} file list from {$config['url']}");
         }
         $versions = [];
-        $cnt = count($matches['version']);
+        logger()->debug('Matched ' . count($matches['version']) . " versions for {$name}");
-        if ($cnt === 0) {
-            throw new DownloaderException("Failed to get {$name} file list from {$config['url']}: no version parsed");
-        }
-        logger()->debug("Matched {$cnt} versions for {$name}");
         foreach ($matches['version'] as $i => $version) {
             $lower = strtolower($version);
             foreach (['alpha', 'beta', 'rc', 'pre', 'nightly', 'snapshot', 'dev'] as $beta) {

src/StaticPHP/Attribute/Package/Tool.php

@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Attribute\Package;
-
-/**
- * Indicates that the annotated class defines a tool package.
- */
-#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
-readonly class Tool
-{
-    public function __construct(public string $name) {}
-}

src/StaticPHP/Command/BaseCommand.php

@@ -54,10 +54,6 @@ abstract class BaseCommand extends Command
         }
 
         set_error_handler(static function ($error_no, $error_msg, $error_file, $error_line) {
-            // Respect the @ suppression operator (error_reporting() returns 0 when @ is used)
-            if (error_reporting() === 0) {
-                return true;
-            }
             $tips = [
                 E_WARNING => ['PHP Warning: ', 'warning'],
                 E_NOTICE => ['PHP Notice: ', 'notice'],

src/StaticPHP/Command/CraftCommand.php

@@ -36,15 +36,6 @@ class CraftCommand extends BaseCommand
         // set verbosity
         $this->output->setVerbosity($craft['verbosity']);
 
-        // sync logger level and ApplicationContext debug mode to match the new verbosity
-        $level = match ($this->output->getVerbosity()) {
-            OutputInterface::VERBOSITY_VERBOSE => 'info',
-            OutputInterface::VERBOSITY_VERY_VERBOSE, OutputInterface::VERBOSITY_DEBUG => 'debug',
-            default => 'warning',
-        };
-        logger()->setLevel($level);
-        ApplicationContext::setDebug($this->output->getVerbosity() >= OutputInterface::VERBOSITY_DEBUG);
-
         // apply env
         array_walk($craft['extra-env'], fn ($v, $k) => f_putenv("{$k}={$v}"));
 
@@ -119,7 +110,7 @@ class CraftCommand extends BaseCommand
      *     shared-extensions: array<string>,
      *     packages: array<string>,
      *     sapi: array<string>,
-     *     verbosity: 128|16|256|32|64|8,
+     *     verbosity: int,
      *     debug: bool,
      *     clean-build: bool,
      *     build-options: array<string, mixed>,
@@ -180,16 +171,11 @@ class CraftCommand extends BaseCommand
         }
 
         // verbosity
+        $verbosity_level = $craft['verbosity'] ?? OutputInterface::VERBOSITY_NORMAL;
         $debug = $craft['debug'] ?? false;
-        $verbosity_level = $debug
+        if ($debug) {
-            ? OutputInterface::VERBOSITY_DEBUG
+            $verbosity_level = OutputInterface::VERBOSITY_DEBUG;
-            : match ((int) ($craft['verbosity'] ?? 0)) {
+        }
-                OutputInterface::VERBOSITY_QUIET => OutputInterface::VERBOSITY_QUIET,
-                OutputInterface::VERBOSITY_VERBOSE => OutputInterface::VERBOSITY_VERBOSE,
-                OutputInterface::VERBOSITY_VERY_VERBOSE => OutputInterface::VERBOSITY_VERY_VERBOSE,
-                OutputInterface::VERBOSITY_DEBUG => OutputInterface::VERBOSITY_DEBUG,
-                default => OutputInterface::VERBOSITY_NORMAL,
-            };
         $craft['verbosity'] = $verbosity_level;
 
         // clean-build (if true, reset before all builds)

src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php

@@ -16,7 +16,7 @@ class GenExtTestMatrixCommand extends BaseCommand
 
     private const array OS_RUNNERS = [
         'linux' => ['arch' => 'x86_64', 'runner' => 'ubuntu-latest', 'os_key' => 'Linux'],
-        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-2025', 'os_key' => 'Windows'],
+        'windows' => ['arch' => 'x86_64', 'runner' => 'windows-latest', 'os_key' => 'Windows'],
         'macos' => ['arch' => 'aarch64', 'runner' => 'macos-15', 'os_key' => 'Darwin'],
     ];
 
@@ -60,8 +60,6 @@ class GenExtTestMatrixCommand extends BaseCommand
         'glfw',
         'imagick',
         'intl',
-        'mongodb',
-        'gmssl',
     ];
 
     /**

src/StaticPHP/Command/Dev/TestBotCommand.php

@@ -154,7 +154,7 @@ class TestBotCommand extends BaseCommand
             'targets' => array_values($targets),
             'gen_matrix_args' => $gen_matrix_args,
             'gen_matrix_args_tier2' => $gen_matrix_args_tier2,
-            'php_versions' => $php_versions,
+            'php_versions' => array_values($php_versions),
             'tier2' => $tier2,
             'comment_body' => $comment_body,
         ];
@@ -253,13 +253,6 @@ class TestBotCommand extends BaseCommand
             $fmt($targets),
         );
 
-        $available_labels = implode(', ', [
-            '`need-test` (gate)',
-            '`test/linux` `test/windows` `test/macos` (platform)',
-            '`test/tier2` (extra arch)',
-            '`test/php-83` `test/php-84` (PHP version)',
-        ]);
-
         // Case 1: need-test absent → invite the author to add it
         if (!$need_test) {
             return implode("\n", [
@@ -268,9 +261,11 @@ class TestBotCommand extends BaseCommand
                 '',
                 $detected,
                 '',
-                'To trigger extension build tests on this PR, add the `need-test` label.',
+                'To trigger extension build tests on this PR, add the `need-test` label:',
                 '',
-                '**Available labels**: ' . $available_labels,
+                '**Gate**: `need-test`',
+                '**Platform filter** (optional, default all): `test/linux` `test/windows` `test/macos` · `test/tier2`',
+                '**PHP version** (optional, default 8.5): `test/php-83` `test/php-84`',
             ]);
         }
 
@@ -312,7 +307,6 @@ class TestBotCommand extends BaseCommand
             '',
             $detected,
             '**Active labels**: ' . $labels_str,
-            '**Available labels**: ' . $available_labels,
             '**Config**: ' . implode(' + ', $platform_parts) . ' | ' . $php_str,
         ]);
     }

src/StaticPHP/Command/ResetCommand.php

@@ -4,14 +4,13 @@ declare(strict_types=1);
 
 namespace StaticPHP\Command;
 
-use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\InteractiveTerm;
 use Symfony\Component\Console\Attribute\AsCommand;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+use function Laravel\Prompts\confirm;
 
 #[AsCommand('reset')]
 class ResetCommand extends BaseCommand
@@ -47,11 +46,7 @@ class ResetCommand extends BaseCommand
 
         // Confirm with user unless --yes is specified
         if (!$this->input->getOption('yes')) {
-            $helper = $this->getHelper('question');
+            if (!confirm('Are you sure you want to continue?', false)) {
-            if (!$helper instanceof QuestionHelper) {
-                throw new SPCInternalException('Question helper not provided');
-            }
-            if (!$helper->ask($this->input, $this->output, new ConfirmationQuestion('Are you sure you want to continue? [y/N] ', false))) {
                 InteractiveTerm::error(message: 'Reset operation cancelled.');
                 return static::SUCCESS;
             }

src/StaticPHP/Config/ArtifactConfig.php

@@ -38,7 +38,7 @@ class ArtifactConfig
      */
     public static function loadFromFile(string $file, string $registry_name): string
     {
-        $content = @file_get_contents($file);
+        $content = file_get_contents($file);
         if ($content === false) {
             throw new WrongUsageException("Failed to read artifact config file: {$file}");
         }

src/StaticPHP/Config/ConfigType.php

@@ -19,7 +19,6 @@ enum ConfigType
         'php-extension',
         'target',
         'virtual-target',
-        'tool',
     ];
 
     public static function validateLicenseField(mixed $value): bool

src/StaticPHP/Config/ConfigValidator.php

@@ -44,13 +44,6 @@ class ConfigValidator
         'path' => ConfigType::LIST_ARRAY, // @
         'env' => ConfigType::ASSOC_ARRAY, // @
         'append-env' => ConfigType::ASSOC_ARRAY, // @
-
-        // tool type fields (nested under 'tool' key)
-        'tool' => ConfigType::ASSOC_ARRAY,
-        'provides' => ConfigType::LIST_ARRAY,
-        'binary-subdir' => ConfigType::STRING,
-        'install-root' => ConfigType::STRING,
-        'min-version' => ConfigType::STRING,
     ];
 
     public const array PACKAGE_FIELDS = [
@@ -74,9 +67,6 @@ class ConfigValidator
         'path' => false, // @
         'env' => false, // @
         'append-env' => false, // @
-
-        // tool fields (nested object)
-        'tool' => false,
     ];
 
     public const array SUFFIX_ALLOWED_FIELDS = [
@@ -88,7 +78,6 @@ class ConfigValidator
         'path',
         'env',
         'append-env',
-        'tools',
     ];
 
     public const array PHP_EXTENSION_FIELDS = [
@@ -103,13 +92,6 @@ class ConfigValidator
         'os' => false,
     ];
 
-    public const array TOOL_FIELDS = [
-        'provides' => true,
-        'binary-subdir' => false,
-        'install-root' => false,
-        'min-version' => false,
-    ];
-
     public const array ARTIFACT_TYPE_FIELDS = [ // [required_fields, optional_fields]
         'filelist' => [['url', 'regex'], ['extract']],
         'git' => [['url'], ['extract', 'submodules', 'rev', 'regex']],
@@ -238,8 +220,8 @@ class ConfigValidator
             $fields = self::SUFFIX_ALLOWED_FIELDS;
             self::validateSuffixAllowedFields($name, $pkg, $fields, $suffixes);
 
-            // check if "library|target|tool" package has artifact field
+            // check if "library|target" package has artifact field for target and library types
-            if (in_array($pkg['type'], ['target', 'library', 'tool']) && !isset($pkg['artifact'])) {
+            if (in_array($pkg['type'], ['target', 'library']) && !isset($pkg['artifact'])) {
                 throw new ValidationException("Package [{$name}] in {$config_file_name} of type '{$pkg['type']}' must have an 'artifact' field");
             }
 
@@ -253,11 +235,6 @@ class ConfigValidator
                 self::validatePhpExtensionFields($name, $pkg);
             }
 
-            // check if "tool" package has tool specific fields and validate inside
-            if ($pkg['type'] === 'tool') {
-                self::validateToolFields($name, $pkg);
-            }
-
             // check for unknown fields
             self::validateNoInvalidFields('package', $name, $pkg, array_keys(self::PACKAGE_FIELD_TYPES));
         }
@@ -420,29 +397,6 @@ class ConfigValidator
         self::validateNoInvalidFields('php-extension', $name, $pkg['php-extension'], array_keys(self::PHP_EXTENSION_FIELDS));
     }
 
-    /**
-     * Validate tool specific fields for tool package type.
-     */
-    private static function validateToolFields(int|string $name, mixed $pkg): void
-    {
-        if (!isset($pkg['tool'])) {
-            throw new ValidationException("Package {$name} of type 'tool' must have a 'tool' field");
-        }
-        if (!is_assoc_array($pkg['tool'])) {
-            throw new ValidationException("Package {$name} [tool] must be an object");
-        }
-        foreach (self::TOOL_FIELDS as $field => $required) {
-            if ($required && !isset($pkg['tool'][$field])) {
-                throw new ValidationException("Package {$name} [tool] must have required field [{$field}]");
-            }
-            if (isset($pkg['tool'][$field])) {
-                self::validatePackageFieldType($field, $pkg['tool'][$field], $name);
-            }
-        }
-        // check for unknown fields in tool
-        self::validateNoInvalidFields('tool', $name, $pkg['tool'], array_keys(self::TOOL_FIELDS));
-    }
-
     private static function validateNoInvalidFields(string $config_type, int|string $item_name, mixed $item_content, array $allowed_fields): void
     {
         foreach ($item_content as $k => $v) {

src/StaticPHP/Config/PackageConfig.php

@@ -16,7 +16,7 @@ class PackageConfig
 
     /**
      * Load package configurations from a specified directory.
-     * Only processes .json, .yml, and .yaml files (skips .gitkeep etc.).
+     * It will look for files matching the pattern 'pkg.*.json' and 'pkg.json'.
      */
     public static function loadFromDir(string $dir, string $registry_name): array
     {
@@ -28,10 +28,6 @@ class PackageConfig
         $files = FileSystem::scanDirFiles($dir, false);
         if (is_array($files)) {
             foreach ($files as $file) {
-                $ext = pathinfo($file, PATHINFO_EXTENSION);
-                if (!in_array($ext, ['json', 'yml', 'yaml'], true)) {
-                    continue;
-                }
                 self::loadFromFile($file, $registry_name);
                 $loaded[] = $file;
             }

src/StaticPHP/DI/ApplicationContext.php

@@ -79,11 +79,11 @@ class ApplicationContext
     /**
      * Get a service from the container.
      *
-     * @template T of object
+     * @template T
      *
-     * @param class-string<T>|string $id Service identifier
+     * @param class-string<T> $id Service identifier
      *
-     * @return ($id is class-string<T> ? T : mixed)
+     * @return null|T
      */
     public static function get(string $id): mixed
     {
@@ -98,6 +98,25 @@ class ApplicationContext
         return self::getContainer()->has($id);
     }
 
+    /**
+     * Resolve $id, returning null if it can't be constructed.
+     * PHP-DI's has() returns true for any autowirable class even when get()
+     * would throw on missing scalar args — for "is this resolvable right now"
+     * semantics use this.
+     *
+     * @template T
+     * @param  class-string<T> $id
+     * @return null|T
+     */
+    public static function tryGet(string $id): mixed
+    {
+        try {
+            return self::getContainer()->get($id);
+        } catch (\Throwable) {
+            return null;
+        }
+    }
+
     /**
      * Set a service in the container.
      * Use sparingly - prefer configuration-based definitions.

src/StaticPHP/Doctor/Doctor.php

@@ -11,14 +11,11 @@ use StaticPHP\Registry\DoctorLoader;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
 use StaticPHP\Util\InteractiveTerm;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ConfirmationQuestion;
 use ZM\Logger\ConsoleColor;
 
+use function Laravel\Prompts\confirm;
+
 readonly class Doctor
 {
     public function __construct(private ?OutputInterface $output = null, private int $auto_fix = FIX_POLICY_PROMPT, public readonly bool $interactive = true)
@@ -128,14 +125,9 @@ readonly class Doctor
             return false;
         }
         // prompt for fix
-        if ($this->auto_fix === FIX_POLICY_PROMPT) {
+        if ($this->auto_fix === FIX_POLICY_PROMPT && !confirm('Do you want to try to fix this issue now?')) {
-            $helper = new QuestionHelper();
+            $this->output?->writeln('<comment>You canceled fix.</comment>');
-            $input = ApplicationContext::has(InputInterface::class) ? ApplicationContext::get(InputInterface::class) : new ArrayInput([]);
+            return false;
-            $output = ApplicationContext::has(OutputInterface::class) ? ApplicationContext::get(OutputInterface::class) : $this->output ?? new ConsoleOutput();
-            if (!$helper->ask($input, $output, new ConfirmationQuestion('Do you want to try to fix this issue now? [Y/n] ', true))) {
-                $this->output?->writeln('<comment>You canceled fix.</comment>');
-                return false;
-            }
         }
         // perform fix
         InteractiveTerm::indicateProgress("Fixing {$result->getFixItem()} ... ");

src/StaticPHP/Doctor/Item/LinuxMuslCheck.php

@@ -73,20 +73,13 @@ class LinuxMuslCheck
             $prefix = 'sudo ';
             logger()->warning('Current user is not root, using sudo for running command');
         }
-        $sysEnv = ['CC' => 'gcc', 'CXX' => 'g++', 'AR' => 'ar', 'LD' => 'ld', 'RANLIB' => 'ranlib'];
-        $envFlags = '';
-        foreach ($sysEnv as $k => $v) {
-            $envFlags .= "{$k}={$v} ";
-        }
-        $envFlags = rtrim($envFlags);
         $shell = shell()->cd(SOURCE_PATH . '/musl-wrapper')
-            ->setEnv($sysEnv)
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld ./configure --disable-gcc-wrapper')
-            ->exec('./configure --disable-gcc-wrapper')
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld make -j');
-            ->exec('make -j');
         if ($prefix !== '') {
-            f_passthru('cd ' . SOURCE_PATH . "/musl-wrapper && {$envFlags} {$prefix}make install");
+            f_passthru('cd ' . SOURCE_PATH . "/musl-wrapper && CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
         } else {
-            $shell->exec("{$prefix}make install");
+            $shell->exec("CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
         }
         return true;
     }

src/StaticPHP/Doctor/Item/LlvmToolsCheck.php

@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StaticPHP\Doctor\Item;
+
+use Package\Artifact\llvm_tools;
+use StaticPHP\Attribute\Doctor\CheckItem;
+use StaticPHP\Attribute\Doctor\FixItem;
+use StaticPHP\Attribute\Doctor\OptionalCheck;
+use StaticPHP\DI\ApplicationContext;
+use StaticPHP\Doctor\CheckResult;
+use StaticPHP\Package\PackageInstaller;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ZigToolchain;
+
+#[OptionalCheck([self::class, 'optionalCheck'])]
+class LlvmToolsCheck
+{
+    public static function optionalCheck(): bool
+    {
+        return ApplicationContext::get(ToolchainInterface::class) instanceof ZigToolchain;
+    }
+
+    /** @noinspection PhpUnused */
+    #[CheckItem('if llvm-tools (objcopy/strip/profdata) are built', level: 798)]
+    public function checkLlvmTools(): CheckResult
+    {
+        if (llvm_tools::isInstalled()) {
+            return CheckResult::ok(llvm_tools::path() . '/bin');
+        }
+        return CheckResult::fail('llvm-tools are not built', 'build-llvm-tools');
+    }
+
+    #[FixItem('build-llvm-tools')]
+    public function fixLlvmTools(): bool
+    {
+        $installer = new PackageInstaller(interactive: false);
+        $installer->addInstallPackage('llvm-tools');
+        $installer->run(true);
+        new llvm_tools()->buildForHost();
+        return llvm_tools::isInstalled();
+    }
+}

src/StaticPHP/Doctor/Item/MacOSToolCheck.php

@@ -33,20 +33,15 @@ class MacOSToolCheck
         'glibtoolize',
     ];
 
-    #[CheckItem('if homebrew or macports has installed', limit_os: 'Darwin', level: 998)]
+    #[CheckItem('if homebrew has installed', limit_os: 'Darwin', level: 998)]
-    public function checkBrewOrPorts(): ?CheckResult
+    public function checkBrew(): ?CheckResult
     {
-        $brewPath = MacOSUtil::findCommand('brew');
+        if (($path = MacOSUtil::findCommand('brew')) === null) {
-        $portPath = MacOSUtil::findCommand('port');
-
-        if ($brewPath && $brewPath !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
-            return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
-        }
-
-        if ($brewPath === null && $portPath === null) {
             return CheckResult::fail('Homebrew is not installed', 'brew');
         }
-
+        if ($path !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
+            return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
+        }
         return CheckResult::ok();
     }
 
@@ -65,8 +60,8 @@ class MacOSToolCheck
         return CheckResult::ok();
     }
 
-    #[CheckItem('if homebrew or macports llvm are installed', limit_os: 'Darwin')]
+    #[CheckItem('if homebrew llvm are installed', limit_os: 'Darwin')]
-    public function checkBrewOrPortsLLVM(): ?CheckResult
+    public function checkBrewLLVM(): ?CheckResult
     {
         if (getenv('SPC_USE_LLVM') === 'brew') {
             $homebrew_prefix = getenv('HOMEBREW_PREFIX') ?: (SystemTarget::getTargetArch() === 'aarch64' ? '/opt/homebrew' : '/usr/local/homebrew');
@@ -76,16 +71,6 @@ class MacOSToolCheck
             }
             return CheckResult::ok($path);
         }
-
-        if (getenv('SPC_USE_LLVM') === 'port') {
-            $macportsPrefix = '/opt/local';
-
-            if (($path = MacOSUtil::findCommand('clang', ["{$macportsPrefix}/bin"])) === null) {
-                return CheckResult::fail('MacPorts llvm is not installed', 'build-tools', ['missing' => ['llvm']]);
-            }
-            return CheckResult::ok($path);
-        }
-
         return null;
     }
 
@@ -106,7 +91,7 @@ class MacOSToolCheck
                 if ($command_path !== []) {
                     return CheckResult::fail("Current {$bison} version is too old: " . $matches[0]);
                 }
-                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin']);
+                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin']);
             }
             return CheckResult::ok($matches[0]);
         }
@@ -123,9 +108,6 @@ class MacOSToolCheck
     #[FixItem('build-tools')]
     public function fixBuildTools(array $missing): bool
     {
-        $brewPath = MacOSUtil::findCommand('brew');
-        $portPath = MacOSUtil::findCommand('port');
-
         $replacement = [
             'glibtoolize' => 'libtool',
         ];
@@ -133,18 +115,7 @@ class MacOSToolCheck
             if (isset($replacement[$cmd])) {
                 $cmd = $replacement[$cmd];
             }
-
+            shell()->exec('brew install --formula ' . escapeshellarg($cmd));
-            if ($brewPath !== null) {
-                shell()->exec('brew install --formula ' . escapeshellarg($cmd));
-                continue;
-            }
-
-            if ($portPath !== null) {
-                shell()->exec('port install ' . escapeshellarg($cmd));
-                continue;
-            }
-
-            return false;
         }
         return true;
     }

src/StaticPHP/Doctor/Item/WindowsToolCheck.php

@@ -54,24 +54,13 @@ class WindowsToolCheck
         return CheckResult::ok();
     }
 
-    #[CheckItem('if msys2-build-essentials is installed', limit_os: 'Windows', level: 996)]
+    #[CheckItem('if php-sdk-binary-tools are downloaded', limit_os: 'Windows', level: 996)]
-    public function checkMsys2(): ?CheckResult
+    public function checkSDK(): ?CheckResult
     {
-        $marker = PKG_ROOT_PATH . '\msys2-build-essentials\.spc-msys2-initialized';
+        if (!file_exists(getenv('PHP_SDK_PATH') . DIRECTORY_SEPARATOR . 'phpsdk-starter.bat')) {
-        if (!file_exists($marker)) {
+            return CheckResult::fail('php-sdk-binary-tools not downloaded', 'install-php-sdk');
-            return CheckResult::fail('msys2-build-essentials not installed', 'install-msys2-build-essentials');
         }
-        return CheckResult::ok(PKG_ROOT_PATH . '\msys2-build-essentials\msys64');
+        return CheckResult::ok(getenv('PHP_SDK_PATH'));
-    }
-
-    #[CheckItem('if 7za.exe is installed', limit_os: 'Windows', level: 999)]
-    public function check7zaWin(): ?CheckResult
-    {
-        $path = FileSystem::convertPath(PKG_ROOT_PATH . '\bin\7za.exe');
-        if (!file_exists($path)) {
-            return CheckResult::fail('7za.exe not found', 'install-7za-win');
-        }
-        return CheckResult::ok($path);
     }
 
     #[CheckItem('if nasm installed', level: 995)]
@@ -123,20 +112,12 @@ class WindowsToolCheck
         return true;
     }
 
-    #[FixItem('install-msys2-build-essentials')]
+    #[FixItem('install-php-sdk')]
-    public function installMsys2(): bool
+    public function installSDK(): bool
     {
+        FileSystem::removeDir(getenv('PHP_SDK_PATH'));
         $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('msys2-build-essentials');
+        $installer->addInstallPackage('php-sdk-binary-tools');
-        $installer->run(true);
-        return true;
-    }
-
-    #[FixItem('install-7za-win')]
-    public function install7zaWin(): bool
-    {
-        $installer = new PackageInstaller(interactive: false);
-        $installer->addInstallPackage('7za-win');
         $installer->run(true);
         return true;
     }

src/StaticPHP/Package/Package.php

@@ -120,20 +120,6 @@ abstract class Package
         return false;
     }
 
-    /**
-     * Get the target directory where this package's artifacts should be placed.
-     *
-     * Libraries install to BUILD_ROOT_PATH (static-libs, headers, pkg-configs).
-     * Tools install to PKG_ROOT_PATH (executables).
-     * Extensions install to php-src/ext/ (shared objects).
-     *
-     * Override in subclasses to change the default.
-     */
-    public function getInstallTarget(): string
-    {
-        return BUILD_ROOT_PATH;
-    }
-
     /**
      * Add a stage to the package.
      */

src/StaticPHP/Package/PackageBuilder.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace StaticPHP\Package;
 
+use Package\Artifact\llvm_tools;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Exception\SPCException;
@@ -11,6 +12,8 @@ use StaticPHP\Exception\SPCInternalException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Runtime\Shell\Shell;
 use StaticPHP\Runtime\SystemTarget;
+use StaticPHP\Toolchain\Interface\ToolchainInterface;
+use StaticPHP\Toolchain\ZigToolchain;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\GlobalPathTrait;
 use StaticPHP\Util\InteractiveTerm;
@@ -178,14 +181,18 @@ class PackageBuilder
         if (SystemTarget::getTargetOS() === 'Darwin') {
             shell()->exec("dsymutil -f {$binary_path} -o {$debug_file}");
         } elseif (SystemTarget::getTargetOS() === 'Linux') {
+            $objcopy = getenv('OBJCOPY')
+                ?: (ApplicationContext::tryGet(ToolchainInterface::class) instanceof ZigToolchain
+                    ? llvm_tools::binary('llvm-objcopy')
+                    : 'objcopy');
             if ($eu_strip = LinuxUtil::findCommand('eu-strip')) {
                 shell()
                     ->exec("{$eu_strip} -f {$debug_file} {$binary_path}")
-                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
             } else {
                 shell()
-                    ->exec("objcopy --only-keep-debug {$binary_path} {$debug_file}")
+                    ->exec("{$objcopy} --only-keep-debug {$binary_path} {$debug_file}")
-                    ->exec("objcopy --add-gnu-debuglink={$debug_file} {$binary_path}");
+                    ->exec("{$objcopy} --add-gnu-debuglink={$debug_file} {$binary_path}");
             }
         } else {
             logger()->debug('extractDebugInfo is only supported on Linux and macOS');
@@ -199,9 +206,12 @@ class PackageBuilder
      */
     public function stripBinary(string $binary_path): void
     {
+        $strip = ApplicationContext::tryGet(ToolchainInterface::class) instanceof ZigToolchain
+            ? llvm_tools::binary('llvm-strip')
+            : 'strip';
         shell()->exec(match (SystemTarget::getTargetOS()) {
-            'Darwin' => "strip -S {$binary_path}",
+            'Darwin' => "{$strip} -S {$binary_path}",
-            'Linux' => "strip --strip-unneeded {$binary_path}",
+            'Linux' => "{$strip} --strip-unneeded {$binary_path}",
             'Windows' => 'echo "Skip strip on Windows"', // Windows strip is not available for now
             default => throw new SPCInternalException('stripBinary is only supported on Linux and macOS'),
         });

src/StaticPHP/Package/PackageInstaller.php

@@ -11,7 +11,6 @@ use StaticPHP\Artifact\ArtifactExtractor;
 use StaticPHP\Artifact\DownloaderOptions;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
-use StaticPHP\Exception\EnvironmentException;
 use StaticPHP\Exception\WrongUsageException;
 use StaticPHP\Registry\PackageLoader;
 use StaticPHP\Runtime\SystemTarget;
@@ -76,9 +75,6 @@ class PackageInstaller
         }
         // special check for php target packages
         if (in_array($package->getName(), ['php', 'php-cli', 'php-fpm', 'php-micro', 'php-cgi', 'php-embed', 'frankenphp'], true)) {
-            if (!$package instanceof TargetPackage) {
-                throw new WrongUsageException("Package '{$package->getName()}' is expected to be a TargetPackage.");
-            }
             $this->handlePhpTargetPackage($package);
             return $this;
         }
@@ -168,9 +164,6 @@ class PackageInstaller
         // Early validation: check if packages can be built or installed before downloading
         $this->validatePackagesBeforeBuild();
 
-        // Check that all required tools are installed before proceeding
-        $this->ensureRequiredTools();
-
         // check download
         if ($this->download) {
             $downloaderOptions = DownloaderOptions::extractFromConsoleOptions($this->options, 'dl');
@@ -578,66 +571,6 @@ class PackageInstaller
         return null;
     }
 
-    /**
-     * Collect all tool packages required by the currently resolved packages.
-     *
-     * Reads the 'tools' field from each resolved package's YAML config.
-     * The field supports platform suffixes (tools@windows, tools@linux, etc.)
-     * resolved automatically by PackageConfig::get().
-     *
-     * Tools are NOT part of the library dependency graph — they are
-     * build-time prerequisites that must be installed before any library
-     * build begins.
-     *
-     * @return string[] Unique tool package names required for this build
-     */
-    public function collectRequiredTools(): array
-    {
-        $tools = [];
-        foreach ($this->packages as $package) {
-            $deps = PackageConfig::get($package->getName(), 'tools', []);
-            foreach ((array) $deps as $tool_name) {
-                $tools[$tool_name] = true;
-            }
-        }
-        return array_keys($tools);
-    }
-
-    /**
-     * Check that all required tools are installed.
-     *
-     * Iterates through tools collected by collectRequiredTools(),
-     * resolves each to a ToolPackage instance, and checks isInstalled().
-     *
-     * @return array{missing: array<string>, installed: array<string>}
-     */
-    public function checkRequiredTools(): array
-    {
-        $missing = [];
-        $installed = [];
-        foreach ($this->collectRequiredTools() as $tool_name) {
-            try {
-                $tool = PackageLoader::getPackage($tool_name);
-            } catch (WrongUsageException) {
-                $missing[] = $tool_name;
-                logger()->warning("Required tool '{$tool_name}' is not registered as a package.");
-                continue;
-            }
-
-            if (!$tool instanceof ToolPackage) {
-                logger()->warning("Package '{$tool_name}' is declared as a tool dependency but is not a ToolPackage (type: {$tool->getType()}).");
-                continue;
-            }
-
-            if ($tool->isInstalled()) {
-                $installed[] = $tool_name;
-            } else {
-                $missing[] = $tool_name;
-            }
-        }
-        return ['missing' => $missing, 'installed' => $installed];
-    }
-
     /**
      * @param Package[] $packages
      */
@@ -700,27 +633,6 @@ class PackageInstaller
         }
     }
 
-    /**
-     * Ensure all required tools are installed, throwing if any are missing.
-     *
-     * Called early in the build pipeline (before download/extract).
-     * When tools are missing, lists them with install hints.
-     */
-    private function ensureRequiredTools(): void
-    {
-        $status = $this->checkRequiredTools();
-        if (empty($status['missing'])) {
-            if (!empty($status['installed'])) {
-                logger()->info('Required tools: ' . implode(', ', $status['installed']) . ' — all installed.');
-            }
-            return;
-        }
-
-        $msg = 'Missing required build tools: ' . implode(', ', $status['missing']) . "\n";
-        $msg .= "Run 'bin/spc doctor' to check your environment, or install the missing tools manually.";
-        throw new EnvironmentException($msg);
-    }
-
     private function injectPackageEnvs(Package $package): void
     {
         $name = $package->getName();

src/StaticPHP/Package/ToolPackage.php

@@ -1,151 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Package;
-
-use StaticPHP\Config\PackageConfig;
-use StaticPHP\Util\FileSystem;
-use StaticPHP\Util\GlobalPathTrait;
-
-/**
- * Represents a build-time tool package.
- *
- * Tool packages are NOT link-time dependencies. They provide executables
- * that are needed during the build process (compilers, code generators,
- * assemblers, etc.) and are installed into PKG_ROOT_PATH.
- *
- * Tool packages do NOT produce static-libs, headers, or pkg-config files.
- * They are resolved and installed independently from the library dependency graph.
- *
- * YAML config schema (config/pkg/tool/<name>.yml):
- *
- *   nasm:
- *     type: tool
- *     tool:
- *       provides: [nasm.exe, ndisasm.exe]       # executables this tool installs
- *       binary-subdir: ''                        # subdirectory under install root (default: '')
- *       min-version: '2.16'                      # minimum required version (optional)
- *     artifact:
- *       binary:
- *         windows-x86_64:
- *           type: url
- *           url: 'https://...'
- *           extract:
- *             nasm.exe: '{php_sdk_path}/bin/nasm.exe'
- */
-class ToolPackage extends Package
-{
-    use GlobalPathTrait;
-
-    /**
-     * Get the install root directory for this tool.
-     *
-     * Defaults to PKG_ROOT_PATH. Override via 'tool.install-root' in YAML
-     * or via the TOOL_INSTALL_ROOT_{NAME} environment variable.
-     */
-    public function getInstallRoot(): string
-    {
-        $env_var = 'TOOL_INSTALL_ROOT_' . strtoupper(str_replace('-', '_', $this->name));
-        if ($root = getenv($env_var)) {
-            return $root;
-        }
-        $config_root = $this->getToolConfig()['install-root'] ?? null;
-        if ($config_root !== null) {
-            return FileSystem::replacePathVariable((string) $config_root);
-        }
-        return PKG_ROOT_PATH;
-    }
-
-    /**
-     * Get the directory where this tool's binaries reside.
-     *
-     * This is {install-root}/{binary-subdir}. If binary-subdir is not
-     * configured, returns the install root directly.
-     */
-    public function getBinaryDir(): string
-    {
-        $subdir = $this->getToolConfig()['binary-subdir'] ?? '';
-        if ($subdir === '') {
-            return $this->getInstallRoot();
-        }
-        return $this->getInstallRoot() . DIRECTORY_SEPARATOR . $subdir;
-    }
-
-    /**
-     * Get the list of executables this tool provides.
-     *
-     * Reads from YAML 'tool.provides' field. Each entry is a bare filename
-     * (e.g. 'nasm.exe'), resolved relative to getBinaryDir().
-     *
-     * @return string[] Bare executable names (not full paths)
-     */
-    public function getProvides(): array
-    {
-        return $this->getToolConfig()['provides'] ?? [];
-    }
-
-    /**
-     * Get the full path to a specific binary provided by this tool.
-     *
-     * @param  string $name Bare executable name (must be listed in tool.provides).
-     *                      If empty, defaults to the first entry in provides.
-     * @return string Full absolute path to the binary
-     */
-    public function getBinary(string $name = ''): string
-    {
-        $provides = $this->getProvides();
-        if ($name === '') {
-            $name = $provides[0] ?? throw new \RuntimeException("Tool '{$this->name}' has no 'tool.provides' configured.");
-        }
-        if (!in_array($name, $provides, true)) {
-            throw new \RuntimeException("Binary '{$name}' is not listed in tool.provides for '{$this->name}'. Available: " . implode(', ', $provides));
-        }
-        return $this->getBinaryDir() . DIRECTORY_SEPARATOR . $name;
-    }
-
-    /**
-     * Check whether this tool is installed (all provided binaries exist on disk).
-     */
-    public function isInstalled(): bool
-    {
-        return array_all($this->getProvides(), fn ($binary) => file_exists($this->getBinary($binary)));
-    }
-
-    /**
-     * Get the minimum required version for this tool, if specified.
-     *
-     * Returns null if no version constraint is configured.
-     */
-    public function getMinVersion(): ?string
-    {
-        $version = $this->getToolConfig()['min-version'] ?? null;
-        return $version !== null ? (string) $version : null;
-    }
-
-    /**
-     * Tools install to PKG_ROOT_PATH (or the configured install-root),
-     * not BUILD_ROOT_PATH.
-     */
-    public function getInstallTarget(): string
-    {
-        return $this->getBinaryDir();
-    }
-
-    /**
-     * Get the 'tool' sub-config for this package.
-     *
-     * Returns the nested array under the 'tool' key in the package YAML,
-     * or an empty array if not configured.
-     *
-     * @return array<string, mixed>
-     */
-    private function getToolConfig(): array
-    {
-        $config = PackageConfig::get($this->name);
-        if (!is_array($config) || !isset($config['tool']) || !is_array($config['tool'])) {
-            return [];
-        }
-        return $config['tool'];
-    }
-}

src/StaticPHP/Registry/PackageLoader.php

@@ -17,7 +17,6 @@ use StaticPHP\Attribute\Package\PatchBeforeBuild;
 use StaticPHP\Attribute\Package\ResolveBuild;
 use StaticPHP\Attribute\Package\Stage;
 use StaticPHP\Attribute\Package\Target;
-use StaticPHP\Attribute\Package\Tool;
 use StaticPHP\Attribute\Package\Validate;
 use StaticPHP\Config\PackageConfig;
 use StaticPHP\DI\ApplicationContext;
@@ -28,7 +27,6 @@ use StaticPHP\Package\Package;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
 use StaticPHP\Package\TargetPackage;
-use StaticPHP\Package\ToolPackage;
 use StaticPHP\Util\FileSystem;
 
 class PackageLoader
@@ -90,7 +88,6 @@ class PackageLoader
                 'target', 'virtual-target' => new TargetPackage($name, $item['type']),
                 'library' => new LibraryPackage($name, $item['type']),
                 'php-extension' => new PhpExtensionPackage($name, $item['type']),
-                'tool' => new ToolPackage($name, $item['type']),
                 default => null,
             };
             if ($pkg !== null) {
@@ -193,8 +190,7 @@ class PackageLoader
             $attribute_instance = $attribute->newInstance();
             if ($attribute_instance instanceof Target === false &&
                 $attribute_instance instanceof Library === false &&
-                $attribute_instance instanceof Extension === false &&
+                $attribute_instance instanceof Extension === false) {
-                $attribute_instance instanceof Tool === false) {
                 // not a package attribute
                 continue;
             }
@@ -220,7 +216,6 @@ class PackageLoader
                 Target::class => ['target', 'virtual-target'],
                 Library::class => ['library'],
                 Extension::class => ['php-extension'],
-                Tool::class => ['tool'],
                 default => null,
             };
             if (!in_array($package_type, $pkg_type_attr, true)) {
@@ -375,10 +370,7 @@ class PackageLoader
         // match condition
         $installer = ApplicationContext::get(PackageInstaller::class);
         $stages = self::$before_stages[$package_name][$stage] ?? [];
-        foreach ($stages as $entry) {
+        foreach ($stages as [$callback, $only_when_package_resolved, $conditionals]) {
-            $callback = $entry[0];
-            $only_when_package_resolved = $entry[1] ?? null;
-            $conditionals = $entry[2] ?? [];
             if ($only_when_package_resolved !== null && !$installer->isPackageResolved($only_when_package_resolved)) {
                 continue;
             }
@@ -397,10 +389,7 @@ class PackageLoader
         $installer = ApplicationContext::get(PackageInstaller::class);
         $stages = self::$after_stages[$package_name][$stage] ?? [];
         $result = [];
-        foreach ($stages as $entry) {
+        foreach ($stages as [$callback, $only_when_package_resolved, $conditionals]) {
-            $callback = $entry[0];
-            $only_when_package_resolved = $entry[1] ?? null;
-            $conditionals = $entry[2] ?? [];
             if ($only_when_package_resolved !== null && !$installer->isPackageResolved($only_when_package_resolved)) {
                 continue;
             }
@@ -444,9 +433,7 @@ class PackageLoader
                 }
                 $pkg = self::getPackage($package_name);
                 foreach ($stages as $stage_name => $before_events) {
-                    foreach ($before_events as $entry) {
+                    foreach ($before_events as [$event_callable, $only_when_package_resolved, $conditionals]) {
-                        $event_callable = $entry[0];
-                        $only_when_package_resolved = $entry[1] ?? null;
                         // check only_when_package_resolved package exists
                         if ($only_when_package_resolved !== null && !self::hasPackage($only_when_package_resolved)) {
                             throw new RegistryException("{$event_name} event in package [{$package_name}] for stage [{$stage_name}] has unknown only_when_package_resolved package [{$only_when_package_resolved}].");

src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php

@@ -117,7 +117,7 @@ class UnixAutoconfExecutor extends Executor
     /**
      * Add configure args.
      */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
     {
         $this->configure_args = [...$this->configure_args, ...$args];
         return $this;
@@ -126,7 +126,7 @@ class UnixAutoconfExecutor extends Executor
     /**
      * Remove some configure args, to bypass the configure option checking for some libs.
      */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
     {
         $this->configure_args = array_diff($this->configure_args, $args);
         return $this;

src/StaticPHP/Runtime/Executor/UnixCMakeExecutor.php

@@ -135,7 +135,7 @@ class UnixCMakeExecutor extends Executor
     /**
      * Add configure args.
      */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
     {
         $this->configure_args = [...$this->configure_args, ...$args];
         return $this;
@@ -144,7 +144,7 @@ class UnixCMakeExecutor extends Executor
     /**
      * Remove some configure args, to bypass the configure option checking for some libs.
      */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
     {
         $this->ignore_args = [...$this->ignore_args, ...$args];
         return $this;
@@ -302,12 +302,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "{$include}")
 set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "{$include}")
 CMAKE;
-        // pin AR/RANLIB so cmake uses zig-ar/zig-ranlib instead of system /usr/bin/ranlib (zig archives need it)
+        // Whoops, linux may need CMAKE_AR sometimes
         if (PHP_OS_FAMILY === 'Linux') {
-            $ar = getenv('SPC_DEFAULT_AR') ?: getenv('AR') ?: 'ar';
+            $toolchain .= "\nSET(CMAKE_AR \"ar\")";
-            $ranlib = getenv('SPC_DEFAULT_RANLIB') ?: (getenv('RANLIB') ?: 'ranlib');
-            $toolchain .= "\nSET(CMAKE_AR \"{$ar}\")";
-            $toolchain .= "\nSET(CMAKE_RANLIB \"{$ranlib}\")";
         }
         FileSystem::writeFile(SOURCE_PATH . '/toolchain.cmake', $toolchain);
         return $created = realpath(SOURCE_PATH . '/toolchain.cmake');

src/StaticPHP/Runtime/Executor/WindowsCMakeExecutor.php

@@ -99,7 +99,7 @@ class WindowsCMakeExecutor extends Executor
     /**
      * Add configure args.
      */
-    public function addConfigureArgs(string ...$args): static
+    public function addConfigureArgs(...$args): static
     {
         $this->configure_args = [...$this->configure_args, ...$args];
         return $this;
@@ -108,7 +108,7 @@ class WindowsCMakeExecutor extends Executor
     /**
      * Remove some configure args, to bypass the configure option checking for some libs.
      */
-    public function removeConfigureArgs(string ...$args): static
+    public function removeConfigureArgs(...$args): static
     {
         $this->ignore_args = [...$this->ignore_args, ...$args];
         return $this;
@@ -189,10 +189,6 @@ class WindowsCMakeExecutor extends Executor
     {
         return $this->custom_default_args ?? [
             '-A x64',
-            // CMake 4.x hard-errors on projects requesting compatibility with CMake < 3.5
-            // (e.g. wineditline). This is the documented escape hatch; modern projects and
-            // older CMake releases ignore it.
-            '-DCMAKE_POLICY_VERSION_MINIMUM=3.5',
             '-DCMAKE_BUILD_TYPE=Release',
             '-DBUILD_SHARED_LIBS=OFF',
             '-DBUILD_STATIC_LIBS=ON',

src/StaticPHP/Runtime/Shell/DefaultShell.php

@@ -184,14 +184,12 @@ class DefaultShell extends Shell
      */
     public function execute7zExtract(string $archive_path, string $target_path): bool
     {
-        // 7za.exe is installed by the 7za-win target package into PKG_ROOT_PATH\bin,
+        $sdk_path = getenv('PHP_SDK_PATH');
-        // which is added to PATH by MSVCToolchain::initEnv().
+        if ($sdk_path === false) {
-        $_7z_path = FileSystem::convertPath(PKG_ROOT_PATH . '\bin\7za.exe');
+            throw new SPCInternalException('PHP_SDK_PATH environment variable is not set');
-        if (!file_exists($_7z_path)) {
-            throw new SPCInternalException('7za.exe not found. Please install the 7za-win target package.');
         }
 
-        $_7z = escapeshellarg(FileSystem::convertPath($_7z_path));
+        $_7z = escapeshellarg(FileSystem::convertPath($sdk_path . '/bin/7za.exe'));
         $archive_arg = escapeshellarg(FileSystem::convertPath($archive_path));
         $target_arg = escapeshellarg(FileSystem::convertPath($target_path));
 

src/StaticPHP/Toolchain/ClangBrewToolchain.php

@@ -15,7 +15,6 @@ class ClangBrewToolchain extends ClangNativeToolchain
         GlobalEnvManager::putenv("SPC_DEFAULT_CC={$homebrew_prefix}/opt/llvm/bin/clang");
         GlobalEnvManager::putenv("SPC_DEFAULT_CXX={$homebrew_prefix}/opt/llvm/bin/clang++");
         GlobalEnvManager::putenv("SPC_DEFAULT_AR={$homebrew_prefix}/opt/llvm/bin/llvm-ar");
-        GlobalEnvManager::putenv("SPC_DEFAULT_RANLIB={$homebrew_prefix}/opt/llvm/bin/llvm-ranlib");
         GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
         GlobalEnvManager::addPathIfNotExists("{$homebrew_prefix}/opt/llvm/bin");
     }

src/StaticPHP/Toolchain/ClangNativeToolchain.php

@@ -21,7 +21,6 @@ class ClangNativeToolchain implements UnixToolchainInterface
         GlobalEnvManager::putenv('SPC_DEFAULT_CC=clang');
         GlobalEnvManager::putenv('SPC_DEFAULT_CXX=clang++');
         GlobalEnvManager::putenv('SPC_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_DEFAULT_RANLIB=ranlib');
         GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
     }
 

src/StaticPHP/Toolchain/ClangPortsToolchain.php

@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StaticPHP\Toolchain;
-
-use StaticPHP\Util\GlobalEnvManager;
-
-class ClangPortsToolchain extends ClangNativeToolchain
-{
-    public function initEnv(): void
-    {
-        $macports_prefix = getenv('MACPORTS_PREFIX') ?: '/opt/local';
-        GlobalEnvManager::putenv("SPC_DEFAULT_CC={$macports_prefix}/bin/clang");
-        GlobalEnvManager::putenv("SPC_DEFAULT_CXX={$macports_prefix}/bin/clang++");
-        GlobalEnvManager::putenv("SPC_DEFAULT_AR={$macports_prefix}/bin/llvm-ar");
-        GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
-        GlobalEnvManager::addPathIfNotExists("{$macports_prefix}/bin");
-    }
-}

src/StaticPHP/Toolchain/GccNativeToolchain.php

@@ -18,7 +18,6 @@ class GccNativeToolchain implements UnixToolchainInterface
         GlobalEnvManager::putenv('SPC_DEFAULT_CC=gcc');
         GlobalEnvManager::putenv('SPC_DEFAULT_CXX=g++');
         GlobalEnvManager::putenv('SPC_DEFAULT_AR=ar');
-        GlobalEnvManager::putenv('SPC_DEFAULT_RANLIB=ranlib');
         GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
     }
 

src/StaticPHP/Toolchain/MSVCToolchain.php

@@ -14,14 +14,10 @@ class MSVCToolchain implements ToolchainInterface
     public function initEnv(): void
     {
         GlobalEnvManager::addPathIfNotExists(PKG_ROOT_PATH . '\bin');
-        // msys2-build-essentials: add MSYS2 usr\bin to PATH so that 7za.exe, make, autoconf, etc. are available.
+        $sdk = getenv('PHP_SDK_PATH');
-        // This must be done here because msys2-build-essentials is not a dependency of any library package,
+        if ($sdk !== false) {
-        // so its path@windows entries are not automatically applied by the package installer at runtime.
+            GlobalEnvManager::addPathIfNotExists($sdk . '\bin');
-        $msys2_path = getenv('SPC_MSYS2_PATH') ?: (PKG_ROOT_PATH . '\msys2-build-essentials\msys64');
+            GlobalEnvManager::addPathIfNotExists($sdk . '\msys2\usr\bin');
-        if (is_dir($msys2_path)) {
-            GlobalEnvManager::putenv("SPC_MSYS2_PATH={$msys2_path}");
-            GlobalEnvManager::addPathIfNotExists($msys2_path . '\usr\bin');
-            GlobalEnvManager::addPathIfNotExists("{$msys2_path}\\usr\\lib\\p7zip");
         }
         // strawberry-perl
         if (is_dir(PKG_ROOT_PATH . '\strawberry-perl')) {

src/StaticPHP/Toolchain/ToolchainManager.php

@@ -41,7 +41,6 @@ class ToolchainManager
             'Windows' => MSVCToolchain::class,
             'Darwin' => match (getenv('SPC_USE_LLVM') ?: 'system') {
                 'brew' => ClangBrewToolchain::class,
-                'port' => ClangPortsToolchain::class,
                 default => ClangNativeToolchain::class,
             },
             default => throw new WrongUsageException('Unsupported OS family: ' . PHP_OS_FAMILY),

src/StaticPHP/Toolchain/ZigToolchain.php

@@ -16,7 +16,6 @@ class ZigToolchain implements UnixToolchainInterface
         GlobalEnvManager::putenv('SPC_DEFAULT_CC=zig-cc');
         GlobalEnvManager::putenv('SPC_DEFAULT_CXX=zig-c++');
         GlobalEnvManager::putenv('SPC_DEFAULT_AR=zig-ar');
-        GlobalEnvManager::putenv('SPC_DEFAULT_RANLIB=zig-ranlib');
         GlobalEnvManager::putenv('SPC_DEFAULT_LD=zig-ld.lld');
 
         // Generate additional objects needed for zig toolchain

src/StaticPHP/Util/FileSystem.php

@@ -411,7 +411,7 @@ class FileSystem
         $replacement = [
             '{build_root_path}' => BUILD_ROOT_PATH,
             '{pkg_root_path}' => PKG_ROOT_PATH,
-            '{spc_msys2_path}' => getenv('SPC_MSYS2_PATH') ?: (PKG_ROOT_PATH . DIRECTORY_SEPARATOR . 'msys2-build-essentials' . DIRECTORY_SEPARATOR . 'msys64'),
+            '{php_sdk_path}' => getenv('PHP_SDK_PATH') ? getenv('PHP_SDK_PATH') : WORKING_DIR . '/php-sdk-binary-tools',
             '{working_dir}' => WORKING_DIR,
             '{download_path}' => DOWNLOAD_PATH,
             '{source_path}' => SOURCE_PATH,

src/StaticPHP/Util/GlobalEnvManager.php

@@ -134,10 +134,10 @@ class GlobalEnvManager
         }
         // test bison
         if (PHP_OS_FAMILY === 'Darwin') {
-            if ($bison = MacOSUtil::findCommand('bison', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin/bison'])) {
+            if ($bison = MacOSUtil::findCommand('bison', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin'])) {
                 self::putenv("BISON={$bison}");
             }
-            if ($yacc = MacOSUtil::findCommand('yacc', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin/yacc'])) {
+            if ($yacc = MacOSUtil::findCommand('yacc', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin'])) {
                 self::putenv("YACC={$yacc}");
             }
         }

src/StaticPHP/Util/InteractiveTerm.php

@@ -17,8 +17,8 @@ class InteractiveTerm
 
     public static function notice(string $message, bool $indent = false): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             logger()->notice(strip_ansi_colors($message));
         } else {
@@ -29,8 +29,8 @@ class InteractiveTerm
 
     public static function success(string $message, bool $indent = false): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             logger()->info(strip_ansi_colors($message));
         } else {
@@ -41,8 +41,8 @@ class InteractiveTerm
 
     public static function plain(string $message, string $level = 'info'): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             match ($level) {
                 'debug' => logger()->debug(strip_ansi_colors($message)),
@@ -59,8 +59,8 @@ class InteractiveTerm
 
     public static function info(string $message): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if (!$output->isVerbose()) {
             $output->writeln(($no_ansi ? 'strip_ansi_colors' : 'strval')(ConsoleColor::green('▶ ') . $message));
         }
@@ -69,8 +69,8 @@ class InteractiveTerm
 
     public static function error(string $message, bool $indent = true): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             logger()->error(strip_ansi_colors($message));
         } else {
@@ -86,16 +86,16 @@ class InteractiveTerm
 
     public static function setMessage(string $message): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
         self::$indicator?->setMessage(($no_ansi ? 'strip_ansi_colors' : 'strval')($message));
         logger()->debug(strip_ansi_colors($message));
     }
 
     public static function finish(string $message, bool $status = true): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
         $message = $no_ansi ? strip_ansi_colors($message) : $message;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             if ($status) {
                 logger()->info($message);
@@ -116,8 +116,8 @@ class InteractiveTerm
 
     public static function indicateProgress(string $message): void
     {
-        $no_ansi = (bool) ApplicationContext::get(InputInterface::class)->getOption('no-ansi');
+        $no_ansi = ApplicationContext::get(InputInterface::class)?->getOption('no-ansi') ?? false;
-        $output = ApplicationContext::get(OutputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class) ?? new ConsoleOutput();
         if ($output->isVerbose()) {
             logger()->info(strip_ansi_colors($message));
             return;

src/globals/functions.php

@@ -256,30 +256,10 @@ function clean_spaces(string $string): string
  */
 function deduplicate_flags(string $flags): string
 {
-    // Flags that take their value as a separate token.
+    $tokens = preg_split('/\s+/', trim($flags));
-    static $paired = [
-        '-Xclang', '-Xpreprocessor', '-Xlinker', '-Xassembler',
-        '-framework', '-arch', '-target',
-        '-include', '-imacros', '-isystem', '-isysroot', '-iquote', '-idirafter',
-        '-MT', '-MF', '-MQ',
-    ];
-
-    $tokens = preg_split('/\s+/', trim($flags)) ?: [];
-
-    // Group paired flag+value into a single atom before dedup.
-    $atoms = [];
-    $n = count($tokens);
-    for ($i = 0; $i < $n; ++$i) {
-        if (in_array($tokens[$i], $paired, true) && $i + 1 < $n) {
-            $atoms[] = $tokens[$i] . ' ' . $tokens[$i + 1];
-            ++$i;
-        } else {
-            $atoms[] = $tokens[$i];
-        }
-    }
 
     // Reverse, unique, reverse back - keeps last occurrence of duplicates
-    $deduplicated = array_reverse(array_unique(array_reverse($atoms)));
+    $deduplicated = array_reverse(array_unique(array_reverse($tokens)));
 
     return implode(' ', $deduplicated);
 }

src/globals/internal-env.php

@@ -3,11 +3,22 @@
 declare(strict_types=1);
 
 // static-php-cli version string
+use Laravel\Prompts\ConfirmPrompt;
+use Laravel\Prompts\Prompt;
+use Laravel\Prompts\TextPrompt;
 use StaticPHP\ConsoleApplication;
+use StaticPHP\DI\ApplicationContext;
 use StaticPHP\Util\FileSystem;
 use StaticPHP\Util\System\LinuxUtil;
 use StaticPHP\Util\System\MacOSUtil;
 use StaticPHP\Util\System\WindowsUtil;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\ConsoleOutput;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+use Symfony\Component\Console\Question\Question;
 
 const SPC_VERSION = ConsoleApplication::VERSION;
 // output path for everything, other paths are defined relative to this by default
@@ -64,3 +75,31 @@ putenv('CPU_COUNT=' . CPU_COUNT);
 putenv('SPC_ARCH=' . php_uname('m'));
 putenv('GNU_ARCH=' . GNU_ARCH);
 putenv('MAC_ARCH=' . MAC_ARCH);
+
+// initialize windows prompt fallback for laravel-prompts
+Prompt::fallbackWhen(PHP_OS_FAMILY === 'Windows');
+ConfirmPrompt::fallbackUsing(function (ConfirmPrompt $prompt) {
+    $helper = new QuestionHelper();
+    $case = $prompt->default ? ' [Y/n] ' : ' [y/N] ';
+    $question = new ConfirmationQuestion($prompt->label . $case, $prompt->default);
+    if (ApplicationContext::has(InputInterface::class) && ApplicationContext::has(OutputInterface::class)) {
+        $input = ApplicationContext::get(InputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class);
+    } else {
+        $input = new ArrayInput([]);
+        $output = new ConsoleOutput();
+    }
+    return $helper->ask($input, $output, $question);
+});
+TextPrompt::fallbackUsing(function (TextPrompt $prompt) {
+    $helper = new QuestionHelper();
+    $question = new Question($prompt->label . ' ', $prompt->default);
+    if (ApplicationContext::has(InputInterface::class) && ApplicationContext::has(OutputInterface::class)) {
+        $input = ApplicationContext::get(InputInterface::class);
+        $output = ApplicationContext::get(OutputInterface::class);
+    } else {
+        $input = new ArrayInput([]);
+        $output = new ConsoleOutput();
+    }
+    return $helper->ask($input, $output, $question);
+});

tests/GlobalsFunctionsTest.php

@@ -21,8 +21,6 @@ class GlobalsFunctionsTest extends TestCase
     protected function tearDown(): void
     {
         $GLOBALS['spc_log_filters'] = null;
-        // Restore logger level to avoid polluting other tests with DEBUG noise
-        logger()->setLevel(LogLevel::ERROR);
     }
 
     public function testAddLogFilterDeduplicates(): void

tests/StaticPHP/Artifact/ArtifactDownloaderTest.php

@@ -23,10 +23,12 @@ class ArtifactDownloaderTest extends TestCase
         // Reset ArtifactConfig and ArtifactLoader static state
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $loaderReflection = new \ReflectionClass(ArtifactLoader::class);
         $loaderProperty = $loaderReflection->getProperty('artifacts');
+        $loaderProperty->setAccessible(true);
         $loaderProperty->setValue(null, null);
     }
 
@@ -36,10 +38,12 @@ class ArtifactDownloaderTest extends TestCase
 
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $loaderReflection = new \ReflectionClass(ArtifactLoader::class);
         $loaderProperty = $loaderReflection->getProperty('artifacts');
+        $loaderProperty->setAccessible(true);
         $loaderProperty->setValue(null, null);
     }
 
@@ -339,6 +343,7 @@ class ArtifactDownloaderTest extends TestCase
     {
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $configs = $property->getValue(null) ?? [];
         $configs[$name] = $config;
         $property->setValue(null, $configs);

tests/StaticPHP/Artifact/ArtifactExtractorTest.php

@@ -31,10 +31,12 @@ class ArtifactExtractorTest extends TestCase
 
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $loaderReflection = new \ReflectionClass(ArtifactLoader::class);
         $loaderProperty = $loaderReflection->getProperty('artifacts');
+        $loaderProperty->setAccessible(true);
         $loaderProperty->setValue(null, null);
 
         ApplicationContext::reset();
@@ -49,10 +51,12 @@ class ArtifactExtractorTest extends TestCase
 
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $loaderReflection = new \ReflectionClass(ArtifactLoader::class);
         $loaderProperty = $loaderReflection->getProperty('artifacts');
+        $loaderProperty->setAccessible(true);
         $loaderProperty->setValue(null, null);
 
         ApplicationContext::reset();
@@ -153,6 +157,7 @@ class ArtifactExtractorTest extends TestCase
         // Pre-populate the extracted map for 'my-pkg' via reflection
         $reflection = new \ReflectionClass(ArtifactExtractor::class);
         $extractedProperty = $reflection->getProperty('extracted');
+        $extractedProperty->setAccessible(true);
         $extractedProperty->setValue($extractor, ['my-pkg' => true]);
 
         $result = $extractor->extract($artifact, false);
@@ -176,6 +181,7 @@ class ArtifactExtractorTest extends TestCase
         // Pre-populate the extracted map so we don't need actual downloads
         $reflection = new \ReflectionClass(ArtifactExtractor::class);
         $extractedProperty = $reflection->getProperty('extracted');
+        $extractedProperty->setAccessible(true);
         $extractedProperty->setValue($extractor, ['my-pkg' => true]);
 
         $result = $extractor->extract('my-pkg', false);
@@ -198,6 +204,7 @@ class ArtifactExtractorTest extends TestCase
     {
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $configs = $property->getValue(null) ?? [];
         $configs[$name] = $config;
         $property->setValue(null, $configs);

tests/StaticPHP/Artifact/ArtifactTest.php

@@ -29,6 +29,7 @@ class ArtifactTest extends TestCase
         // Reset ArtifactConfig static state
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         // Reset DI container
@@ -44,6 +45,7 @@ class ArtifactTest extends TestCase
 
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         ApplicationContext::reset();
@@ -713,6 +715,7 @@ class ArtifactTest extends TestCase
     {
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $configs = $property->getValue(null) ?? [];
         $configs[$name] = $config;
         $property->setValue(null, $configs);

tests/StaticPHP/Command/Dev/GenExtTestMatrixCommandTest.php

@@ -1,291 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\StaticPHP\Command\Dev;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Log\LogLevel;
-use StaticPHP\Command\Dev\GenExtTestMatrixCommand;
-use StaticPHP\Config\PackageConfig;
-use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
-
-/**
- * @internal
- */
-class GenExtTestMatrixCommandTest extends TestCase
-{
-    private Application $app;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Reset PackageConfig static state
-        $ref = new \ReflectionClass(PackageConfig::class);
-        $prop = $ref->getProperty('package_configs');
-        $prop->setValue(null, []);
-
-        // Register fixture packages
-        PackageConfig::loadFromArray(self::buildFixture(), 'test');
-
-        // Set up Symfony Application with the command under test
-        $this->app = new Application();
-        $this->app->add(new GenExtTestMatrixCommand());
-        $this->app->setAutoExit(false);
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        // Reset PackageConfig static state
-        $ref = new \ReflectionClass(PackageConfig::class);
-        $prop = $ref->getProperty('package_configs');
-        $prop->setValue(null, []);
-
-        // Restore logger level (BaseCommand::execute() may have changed it)
-        logger()->setLevel(LogLevel::ERROR);
-    }
-
-    // ──────────────────────────────────────────────────────────────────────────
-    // Tests
-    // ──────────────────────────────────────────────────────────────────────────
-
-    /**
-     * swoole entry must contain all swoole-hook-* virtuals and nothing else.
-     */
-    public function testSwooleBundlesHookVirtuals(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        $swooleEntries = $this->findEntriesContaining($matrix, 'swoole');
-        $this->assertCount(1, $swooleEntries, 'Expected exactly one entry containing swoole');
-
-        $parts = explode(',', $swooleEntries[0]['extension']);
-        sort($parts);
-
-        $this->assertContains('swoole', $parts);
-        $this->assertContains('swoole-hook-mysql', $parts);
-        $this->assertContains('swoole-hook-pgsql', $parts);
-    }
-
-    /**
-     * curl must NOT appear in the same entry as swoole, even though swoole depends on it.
-     */
-    public function testCurlIsNotPulledIntoSwooleEntry(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        // The swoole entry must not contain 'curl'
-        $swooleEntries = $this->findEntriesContaining($matrix, 'swoole');
-        $this->assertCount(1, $swooleEntries);
-        $parts = explode(',', $swooleEntries[0]['extension']);
-        $this->assertNotContains('curl', $parts, 'curl must not appear inside the swoole matrix entry');
-
-        // curl must appear in a separate entry
-        $curlEntries = $this->findEntriesContaining($matrix, 'curl');
-        $this->assertNotEmpty($curlEntries, 'curl must have its own matrix entry');
-    }
-
-    /**
-     * swow must be fully isolated — its entry should only contain 'swow'.
-     */
-    public function testSwowIsIsolated(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        $swowEntries = $this->findEntriesContaining($matrix, 'swow');
-        $this->assertCount(1, $swowEntries, 'Expected exactly one entry containing swow');
-        $this->assertSame('swow', $swowEntries[0]['extension'], 'swow entry must contain only swow');
-    }
-
-    /**
-     * dom and xml must appear in the same matrix entry (DFS chain).
-     */
-    public function testDomXmlChain(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        $chainEntries = $this->findEntriesContaining($matrix, 'dom', 'xml');
-        $this->assertNotEmpty($chainEntries, 'dom and xml must appear in the same matrix entry');
-    }
-
-    /**
-     * --os=Windows must exclude ext-linux-only.
-     */
-    public function testOsFilterExcludesLinuxOnlyFromWindows(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Windows']);
-
-        $linuxOnlyEntries = $this->findEntriesContaining($matrix, 'linux-only');
-        $this->assertEmpty($linuxOnlyEntries, 'ext-linux-only must not appear in the Windows matrix');
-    }
-
-    /**
-     * --os=Linux must include ext-linux-only.
-     */
-    public function testOsFilterIncludesLinuxOnly(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        $linuxOnlyEntries = $this->findEntriesContaining($matrix, 'linux-only');
-        $this->assertNotEmpty($linuxOnlyEntries, 'ext-linux-only must appear in the Linux matrix');
-    }
-
-    /**
-     * All returned entries must reference the requested OS runner when --os is specified.
-     */
-    public function testOsFilterRestrictsRunners(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        foreach ($matrix as $entry) {
-            $this->assertSame('linux', $entry['os'], "Entry {$entry['extension']} must only target Linux");
-        }
-    }
-
-    /**
-     * --for-extensions=redis must return only entries that contain 'redis'.
-     */
-    public function testForExtensionsFilter(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux', '--for-extensions' => 'redis']);
-
-        $this->assertNotEmpty($matrix, '--for-extensions=redis must yield at least one entry');
-        foreach ($matrix as $entry) {
-            $parts = explode(',', $entry['extension']);
-            $this->assertContains('redis', $parts, "Entry {$entry['extension']} does not contain redis");
-        }
-    }
-
-    /**
-     * --for-libs=libxml2 must return only entries whose extension(s) depend on libxml2.
-     */
-    public function testForLibsFilter(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux', '--for-libs' => 'libxml2']);
-
-        $this->assertNotEmpty($matrix, '--for-libs=libxml2 must yield at least one entry');
-        foreach ($matrix as $entry) {
-            $parts = explode(',', $entry['extension']);
-            // xml depends on libxml2 directly; dom depends on xml (which depends on libxml2)
-            $match = count(array_intersect($parts, ['xml', 'dom'])) > 0;
-            $this->assertTrue($match, "Entry {$entry['extension']} should not appear in --for-libs=libxml2 results");
-        }
-    }
-
-    /**
-     * --tier2 must produce only Tier2 runners and no Windows entries.
-     */
-    public function testTier2Flag(): void
-    {
-        $matrix = $this->runMatrix(['--tier2' => true]);
-
-        $this->assertNotEmpty($matrix);
-        foreach ($matrix as $entry) {
-            $this->assertNotSame('windows', $entry['os'], '--tier2 must not include Windows entries');
-            $this->assertContains(
-                $entry['runner'],
-                ['ubuntu-24.04-arm', 'macos-15-intel'],
-                "Runner {$entry['runner']} is not a valid Tier2 runner"
-            );
-        }
-    }
-
-    /**
-     * Each entry must have the mandatory keys and correct types.
-     */
-    public function testEntryShape(): void
-    {
-        $matrix = $this->runMatrix(['--os' => 'Linux']);
-
-        $this->assertNotEmpty($matrix);
-        foreach ($matrix as $entry) {
-            $this->assertArrayHasKey('runner', $entry);
-            $this->assertArrayHasKey('os', $entry);
-            $this->assertArrayHasKey('arch', $entry);
-            $this->assertArrayHasKey('extension', $entry);
-            $this->assertArrayHasKey('build-args', $entry);
-            $this->assertIsString($entry['extension']);
-            $this->assertIsString($entry['build-args']);
-            $this->assertStringContainsString($entry['extension'], $entry['build-args']);
-        }
-    }
-
-    // ──────────────────────────────────────────────────────────────────────────
-    // Helpers
-    // ──────────────────────────────────────────────────────────────────────────
-
-    /**
-     * Run the command with the given options and return the parsed JSON matrix.
-     */
-    private function runMatrix(array $options = []): array
-    {
-        $tester = new CommandTester($this->app->find('dev:gen-ext-test-matrix'));
-        $tester->execute($options, ['decorated' => false]);
-        $output = $tester->getDisplay();
-        $matrix = json_decode($output, true);
-        $this->assertIsArray($matrix, "Command output is not valid JSON. Output:\n{$output}");
-        return $matrix;
-    }
-
-    /**
-     * Find matrix entries whose 'extension' field contains all of the given names.
-     *
-     * @return array[] matching entries
-     */
-    private function findEntriesContaining(array $matrix, string ...$names): array
-    {
-        return array_values(array_filter($matrix, static function (array $entry) use ($names): bool {
-            $parts = explode(',', $entry['extension']);
-            foreach ($names as $name) {
-                if (!in_array($name, $parts, true)) {
-                    return false;
-                }
-            }
-            return true;
-        }));
-    }
-
-    /**
-     * Minimal valid php-extension fixture.
-     *
-     * Layout:
-     *  - ext-swow            standalone isolated, no ext deps
-     *  - ext-swoole          standalone isolated, depends on ext-curl
-     *  - ext-swoole-hook-*   virtual (arg-type: none) — must be bundled with swoole
-     *  - ext-curl            simple orphan, depended on by swoole but must NOT be pulled into swoole entry
-     *  - ext-redis           simple orphan
-     *  - ext-xml             depends on lib 'libxml2'
-     *  - ext-dom             depends on ext-xml (DFS chain)
-     *  - ext-linux-only      restricted to Linux via os: [Linux]
-     */
-    private static function buildFixture(): array
-    {
-        // php-extension must be a non-empty assoc array ([] fails is_assoc_array() check).
-        $ext = static fn (array $phpExt = ['arg-type' => 'standard'], array $topLevel = []): array => array_merge(['type' => 'php-extension', 'php-extension' => $phpExt], $topLevel);
-
-        return [
-            // Isolated standalones
-            'ext-swow' => $ext(),
-            'ext-swoole' => $ext(['arg-type' => 'standard'], ['depends' => ['ext-curl']]),
-
-            // Swoole hook virtuals (arg-type: none → virtual)
-            'ext-swoole-hook-mysql' => $ext(['arg-type' => 'none']),
-            'ext-swoole-hook-pgsql' => $ext(['arg-type' => 'none']),
-
-            // Simple orphans
-            'ext-curl' => $ext(),
-            'ext-redis' => $ext(),
-
-            // DFS chain: dom depends on xml; xml depends on lib 'libxml2'
-            'ext-xml' => $ext(['arg-type' => 'standard'], ['depends' => ['libxml2']]),
-            'ext-dom' => $ext(['arg-type' => 'standard'], ['depends' => ['ext-xml']]),
-
-            // OS-restricted to Linux only
-            'ext-linux-only' => $ext(['os' => ['Linux']]),
-        ];
-    }
-}

tests/StaticPHP/Config/ArtifactConfigTest.php

@@ -25,6 +25,7 @@ class ArtifactConfigTest extends TestCase
         // Reset static state
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue([]);
     }
 
@@ -40,6 +41,7 @@ class ArtifactConfigTest extends TestCase
         // Reset static state
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $property->setValue([]);
     }
 

tests/StaticPHP/Config/ConfigTypeTest.php

@@ -27,7 +27,6 @@ class ConfigTypeTest extends TestCase
             'php-extension',
             'target',
             'virtual-target',
-            'tool',
         ];
 
         $this->assertEquals($expectedTypes, ConfigType::PACKAGE_TYPES);

tests/StaticPHP/Config/PackageConfigTest.php

@@ -26,6 +26,7 @@ class PackageConfigTest extends TestCase
         // Reset static state
         $reflection = new \ReflectionClass(PackageConfig::class);
         $property = $reflection->getProperty('package_configs');
+        $property->setAccessible(true);
         $property->setValue([]);
     }
 
@@ -40,6 +41,7 @@ class PackageConfigTest extends TestCase
         // Reset static state
         $reflection = new \ReflectionClass(PackageConfig::class);
         $property = $reflection->getProperty('package_configs');
+        $property->setAccessible(true);
         $property->setValue([]);
     }
 

tests/StaticPHP/Registry/ArtifactLoaderTest.php

@@ -32,10 +32,12 @@ class ArtifactLoaderTest extends TestCase
         // Reset ArtifactLoader and ArtifactConfig state
         $reflection = new \ReflectionClass(ArtifactLoader::class);
         $property = $reflection->getProperty('artifacts');
+        $property->setAccessible(true);
         $property->setValue(null, null);
 
         $configReflection = new \ReflectionClass(ArtifactConfig::class);
         $configProperty = $configReflection->getProperty('artifact_configs');
+        $configProperty->setAccessible(true);
         $configProperty->setValue(null, []);
     }
 
@@ -50,10 +52,12 @@ class ArtifactLoaderTest extends TestCase
         // Reset ArtifactLoader and ArtifactConfig state
         $reflection = new \ReflectionClass(ArtifactLoader::class);
         $property = $reflection->getProperty('artifacts');
+        $property->setAccessible(true);
         $property->setValue(null, null);
 
         $configReflection = new \ReflectionClass(ArtifactConfig::class);
         $configProperty = $configReflection->getProperty('artifact_configs');
+        $configProperty->setAccessible(true);
         $configProperty->setValue(null, []);
     }
 
@@ -425,6 +429,7 @@ class TestArtifact1 {
     {
         $reflection = new \ReflectionClass(ArtifactConfig::class);
         $property = $reflection->getProperty('artifact_configs');
+        $property->setAccessible(true);
         $configs = $property->getValue();
         $configs[$name] = [
             'type' => 'source',

tests/StaticPHP/Registry/DoctorLoaderTest.php

@@ -26,9 +26,11 @@ class DoctorLoaderTest extends TestCase
         // Reset DoctorLoader state
         $reflection = new \ReflectionClass(DoctorLoader::class);
         $property = $reflection->getProperty('doctor_items');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('fix_items');
+        $property->setAccessible(true);
         $property->setValue(null, []);
     }
 
@@ -43,9 +45,11 @@ class DoctorLoaderTest extends TestCase
         // Reset DoctorLoader state
         $reflection = new \ReflectionClass(DoctorLoader::class);
         $property = $reflection->getProperty('doctor_items');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('fix_items');
+        $property->setAccessible(true);
         $property->setValue(null, []);
     }
 

tests/StaticPHP/Registry/PackageLoaderTest.php

@@ -33,20 +33,25 @@ class PackageLoaderTest extends TestCase
         $reflection = new \ReflectionClass(PackageLoader::class);
 
         $property = $reflection->getProperty('packages');
+        $property->setAccessible(true);
         $property->setValue(null, null);
 
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('after_stages');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('loaded_classes');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         // Reset PackageConfig state
         $configReflection = new \ReflectionClass(PackageConfig::class);
         $configProperty = $configReflection->getProperty('package_configs');
+        $configProperty->setAccessible(true);
         $configProperty->setValue(null, []);
     }
 
@@ -62,20 +67,25 @@ class PackageLoaderTest extends TestCase
         $reflection = new \ReflectionClass(PackageLoader::class);
 
         $property = $reflection->getProperty('packages');
+        $property->setAccessible(true);
         $property->setValue(null, null);
 
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('after_stages');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         $property = $reflection->getProperty('loaded_classes');
+        $property->setAccessible(true);
         $property->setValue(null, []);
 
         // Reset PackageConfig state
         $configReflection = new \ReflectionClass(PackageConfig::class);
         $configProperty = $configReflection->getProperty('package_configs');
+        $configProperty->setAccessible(true);
         $configProperty->setValue(null, []);
     }
 
@@ -349,6 +359,7 @@ class PackageLoaderTest extends TestCase
         // Manually add a before_stage for non-existent package
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'non-existent-package' => [
                 'stage-name' => [[fn () => null, null]],
@@ -373,6 +384,7 @@ class PackageLoaderTest extends TestCase
         // Manually add a before_stage for non-existent stage
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'test-lib' => [
                 'non-existent-stage' => [[fn () => null, null]],
@@ -396,6 +408,7 @@ class PackageLoaderTest extends TestCase
         // Manually add a before_stage with unknown only_when_package_resolved
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'test-lib' => [
                 'test-stage' => [[fn () => null, 'non-existent-package']],
@@ -422,6 +435,7 @@ class PackageLoaderTest extends TestCase
         // This should NOT throw an exception because the package has no build function for current OS
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'test-lib' => [
                 'build' => [[fn () => null, null]],
@@ -444,6 +458,7 @@ class PackageLoaderTest extends TestCase
 
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('before_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'test-package' => [
                 'test-stage' => [
@@ -467,6 +482,7 @@ class PackageLoaderTest extends TestCase
 
         $reflection = new \ReflectionClass(PackageLoader::class);
         $property = $reflection->getProperty('after_stages');
+        $property->setAccessible(true);
         $property->setValue(null, [
             'test-package' => [
                 'test-stage' => [
@@ -554,6 +570,7 @@ class TestPackage1 {
     {
         $reflection = new \ReflectionClass(PackageConfig::class);
         $property = $reflection->getProperty('package_configs');
+        $property->setAccessible(true);
         $configs = $property->getValue();
         $configs[$name] = [
             'type' => $type,

tests/StaticPHP/Util/DependencyResolverTest.php

@@ -1,531 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\StaticPHP\Util;
-
-use PHPUnit\Framework\TestCase;
-use StaticPHP\Config\PackageConfig;
-use StaticPHP\Exception\WrongUsageException;
-use StaticPHP\Util\DependencyResolver;
-
-/**
- * Tests for the DependencyResolver — the topological sort engine that
- * determines the order in which packages (libraries, extensions, targets)
- * must be built.
- *
- * @internal
- */
-class DependencyResolverTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-        $this->resetPackageConfig();
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-        $this->resetPackageConfig();
-    }
-
-    // ──────────────────────────────────────────────
-    //  Basic resolution
-    // ──────────────────────────────────────────────
-
-    public function testResolveSinglePackageNoDependencies(): void
-    {
-        $this->loadConfig([
-            'zlib' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['zlib']);
-
-        $this->assertSame(['zlib'], $result);
-    }
-
-    public function testResolveLinearChain(): void
-    {
-        // a -> b -> c   (a depends on b, b depends on c)
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library', 'depends' => ['c']],
-            'c' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['a']);
-
-        // c must be first, then b, then a
-        $this->assertSame(['c', 'b', 'a'], $result);
-    }
-
-    public function testResolveMultipleIndependentChains(): void
-    {
-        // a -> b,   x -> y   (two independent dependency chains)
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library'],
-            'x' => ['type' => 'library', 'depends' => ['y']],
-            'y' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['a', 'x']);
-
-        // Dependencies must come before their dependants
-        $posB = array_search('b', $result, true);
-        $posA = array_search('a', $result, true);
-        $posY = array_search('y', $result, true);
-        $posX = array_search('x', $result, true);
-
-        $this->assertIsInt($posB);
-        $this->assertIsInt($posA);
-        $this->assertIsInt($posY);
-        $this->assertIsInt($posX);
-        $this->assertLessThan($posA, $posB, 'b should come before a');
-        $this->assertLessThan($posX, $posY, 'y should come before x');
-    }
-
-    public function testResolveSharedDependency(): void
-    {
-        // a -> c,   b -> c   (c is shared)
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['c']],
-            'b' => ['type' => 'library', 'depends' => ['c']],
-            'c' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['a', 'b']);
-
-        // c must appear exactly once and before both a and b
-        $cCount = count(array_keys($result, 'c', true));
-        $this->assertSame(1, $cCount, 'Shared dependency c should appear exactly once');
-
-        $posC = array_search('c', $result, true);
-        $posA = array_search('a', $result, true);
-        $posB = array_search('b', $result, true);
-
-        $this->assertLessThan($posA, $posC, 'c should come before a');
-        $this->assertLessThan($posB, $posC, 'c should come before b');
-    }
-
-    public function testResolveDiamondDependency(): void
-    {
-        //   a
-        //  / \
-        // b   c
-        //  \ /
-        //   d
-        $this->loadConfig([
-            'a' => ['type' => 'target', 'depends' => ['b', 'c']],
-            'b' => ['type' => 'library', 'depends' => ['d']],
-            'c' => ['type' => 'library', 'depends' => ['d']],
-            'd' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['a']);
-
-        // d must appear exactly once and before everything
-        $dCount = count(array_keys($result, 'd', true));
-        $this->assertSame(1, $dCount);
-
-        $posD = array_search('d', $result, true);
-        $posB = array_search('b', $result, true);
-        $posC = array_search('c', $result, true);
-        $posA = array_search('a', $result, true);
-
-        $this->assertLessThan($posB, $posD, 'd should come before b');
-        $this->assertLessThan($posC, $posD, 'd should come before c');
-        $this->assertLessThan($posA, $posB, 'b should come before a');
-        $this->assertLessThan($posA, $posC, 'c should come before a');
-    }
-
-    // ──────────────────────────────────────────────
-    //  Suggests (optional dependencies)
-    // ──────────────────────────────────────────────
-
-    public function testResolveSuggestsAreExcludedByDefault(): void
-    {
-        // a depends on b, suggests c
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b'], 'suggests' => ['c']],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['a']);
-
-        // c should NOT be in the resolved list (it's only suggested, not depended)
-        $this->assertNotContains('c', $result);
-        $this->assertSame(['b', 'a'], $result);
-    }
-
-    public function testResolveSuggestsIncludedWhenFlagSet(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b'], 'suggests' => ['c']],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library', 'depends' => ['b']],
-        ]);
-
-        $result = DependencyResolver::resolve(['a'], include_suggests: true);
-
-        // c IS a suggest of a and should be included when flag is set
-        $this->assertContains('c', $result);
-        $posB = array_search('b', $result, true);
-        $posC = array_search('c', $result, true);
-        $posA = array_search('a', $result, true);
-        $this->assertLessThan($posA, $posB, 'b should come before a');
-        $this->assertLessThan($posA, $posC, 'c should come before a');
-    }
-
-    // ──────────────────────────────────────────────
-    //  Virtual-target promotion
-    // ──────────────────────────────────────────────
-
-    public function testResolveVirtualTargetPromotesDepsToParent(): void
-    {
-        // php-cli (virtual-target) depends on [php, ext-ctype]
-        // When php-cli is in the input, ext-ctype should be promoted to php's deps
-        $this->loadConfig([
-            'php-cli' => ['type' => 'virtual-target', 'depends' => ['php', 'ext-ctype']],
-            'php' => ['type' => 'target', 'depends' => ['libxml2']],
-            'ext-ctype' => ['type' => 'php-extension', 'depends' => []],
-            'libxml2' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['php-cli']);
-
-        $posPhp = array_search('php', $result, true);
-        $posCtype = array_search('ext-ctype', $result, true);
-        $posLibxml2 = array_search('libxml2', $result, true);
-
-        $this->assertIsInt($posPhp);
-        $this->assertIsInt($posCtype);
-        $this->assertIsInt($posLibxml2);
-
-        // ext-ctype was promoted to php's deps, so it must come before php
-        $this->assertLessThan($posPhp, $posCtype, 'ext-ctype should come before php (promoted dep)');
-        // libxml2 is a native dep of php, so it must also come before php
-        $this->assertLessThan($posPhp, $posLibxml2, 'libxml2 should come before php');
-    }
-
-    public function testResolveVirtualTargetNotInInputDoesNotPromote(): void
-    {
-        // php-cli is a virtual-target but NOT in the input request,
-        // so its deps should NOT be injected into php
-        $this->loadConfig([
-            'php-cli' => ['type' => 'virtual-target', 'depends' => ['php', 'ext-ctype']],
-            'php' => ['type' => 'target', 'depends' => ['libxml2']],
-            'ext-ctype' => ['type' => 'php-extension'],
-            'libxml2' => ['type' => 'library'],
-        ]);
-
-        // Only php is requested, not php-cli
-        $result = DependencyResolver::resolve(['php']);
-
-        // ext-ctype should NOT be in the result since php-cli was not requested
-        $this->assertNotContains('ext-ctype', $result);
-        $this->assertSame(['libxml2', 'php'], $result);
-    }
-
-    // ──────────────────────────────────────────────
-    //  Dependency overrides
-    // ──────────────────────────────────────────────
-
-    public function testResolveDependencyOverridesAddDeps(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'library'],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library'],
-        ]);
-
-        // Override: a now depends on b and c
-        $result = DependencyResolver::resolve(['a'], dependency_overrides: [
-            'a' => ['b', 'c'],
-        ]);
-
-        $posA = array_search('a', $result, true);
-        $posB = array_search('b', $result, true);
-        $posC = array_search('c', $result, true);
-
-        $this->assertLessThan($posA, $posB, 'b should come before a (override)');
-        $this->assertLessThan($posA, $posC, 'c should come before a (override)');
-    }
-
-    public function testResolveDependencyOverridesMergeWithExisting(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library'],
-        ]);
-
-        // a natively depends on b, override adds c
-        $result = DependencyResolver::resolve(['a'], dependency_overrides: [
-            'a' => ['c'],
-        ]);
-
-        $this->assertContains('b', $result);
-        $this->assertContains('c', $result);
-        $posA = array_search('a', $result, true);
-        $posB = array_search('b', $result, true);
-        $posC = array_search('c', $result, true);
-        $this->assertLessThan($posA, $posB, 'b should come before a');
-        $this->assertLessThan($posA, $posC, 'c should come before a');
-    }
-
-    // ──────────────────────────────────────────────
-    //  Error handling
-    // ──────────────────────────────────────────────
-
-    public function testResolveUnknownPackageThrowsException(): void
-    {
-        $this->loadConfig([
-            'zlib' => ['type' => 'library'],
-        ]);
-
-        $this->expectException(WrongUsageException::class);
-        $this->expectExceptionMessage('does not exist in config');
-
-        DependencyResolver::resolve(['nonexistent']);
-    }
-
-    public function testResolveUnregisteredDependencyThrowsException(): void
-    {
-        // a depends on b, but b is not in the config
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-        ]);
-
-        $this->expectException(WrongUsageException::class);
-        $this->expectExceptionMessage('not exist');
-
-        DependencyResolver::resolve(['a']);
-    }
-
-    // ──────────────────────────────────────────────
-    //  Reverse dependency map ($why parameter)
-    // ──────────────────────────────────────────────
-
-    public function testReverseDependencyMap(): void
-    {
-        // a -> b -> c
-        $this->loadConfig([
-            'a' => ['type' => 'target', 'depends' => ['b']],
-            'b' => ['type' => 'library', 'depends' => ['c']],
-            'c' => ['type' => 'library'],
-        ]);
-
-        $why = [];
-        DependencyResolver::resolve(['a'], why: $why);
-
-        $this->assertArrayHasKey('c', $why, 'c is depended upon');
-        $this->assertContains('b', $why['c'], 'b depends on c');
-        $this->assertArrayHasKey('b', $why, 'b is depended upon');
-        $this->assertContains('a', $why['b'], 'a depends on b');
-    }
-
-    public function testReverseDependencyMapOnlyIncludesResolvedPackages(): void
-    {
-        // a -> b -> c, but only requesting a
-        // d is not in the resolved set
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library', 'depends' => ['c']],
-            'c' => ['type' => 'library'],
-            'd' => ['type' => 'library', 'depends' => ['c']], // not in input
-        ]);
-
-        $why = [];
-        DependencyResolver::resolve(['a'], why: $why);
-
-        // d should NOT appear in the reverse map since it's not in the resolved set
-        $this->assertArrayNotHasKey('d', $why);
-    }
-
-    // ──────────────────────────────────────────────
-    //  getSubDependencies
-    // ──────────────────────────────────────────────
-
-    public function testGetSubDependenciesLinearChain(): void
-    {
-        // a -> b -> c -> d
-        $this->loadConfig([
-            'a' => ['type' => 'target', 'depends' => ['b']],
-            'b' => ['type' => 'library', 'depends' => ['c']],
-            'c' => ['type' => 'library', 'depends' => ['d']],
-            'd' => ['type' => 'library'],
-        ]);
-
-        $subDeps = DependencyResolver::getSubDependencies('a', ['a', 'b', 'c', 'd']);
-
-        // Should return [d, c, b] in dependency order (a not included)
-        $this->assertNotContains('a', $subDeps);
-        $this->assertSame(['d', 'c', 'b'], $subDeps);
-    }
-
-    public function testGetSubDependenciesPackageNotInResolvedSet(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library'],
-        ]);
-
-        $subDeps = DependencyResolver::getSubDependencies('nonexistent', ['a', 'b']);
-
-        $this->assertSame([], $subDeps);
-    }
-
-    public function testGetSubDependenciesWithSuggests(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'target', 'depends' => ['b'], 'suggests' => ['c']],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library'],
-        ]);
-
-        // Without include_suggests: only b is a sub-dep
-        $without = DependencyResolver::getSubDependencies('a', ['a', 'b', 'c'], include_suggests: false);
-        $this->assertSame(['b'], $without);
-
-        // With include_suggests: both b and c are sub-deps
-        $with = DependencyResolver::getSubDependencies('a', ['a', 'b', 'c'], include_suggests: true);
-        $this->assertContains('b', $with);
-        $this->assertContains('c', $with);
-    }
-
-    public function testGetSubDependenciesOnlyIncludesResolvedDeps(): void
-    {
-        // a depends on b and c, but c is not in the resolved set
-        $this->loadConfig([
-            'a' => ['type' => 'target', 'depends' => ['b', 'c']],
-            'b' => ['type' => 'library'],
-            'c' => ['type' => 'library'],
-        ]);
-
-        // c is NOT in the resolved set
-        $subDeps = DependencyResolver::getSubDependencies('a', ['a', 'b']);
-
-        $this->assertContains('b', $subDeps);
-        $this->assertNotContains('c', $subDeps, 'c is not in the resolved set, should be excluded');
-    }
-
-    // ──────────────────────────────────────────────
-    //  Edge cases & defensive
-    // ──────────────────────────────────────────────
-
-    public function testResolveEmptyInput(): void
-    {
-        $this->loadConfig([
-            'zlib' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve([]);
-
-        $this->assertSame([], $result);
-    }
-
-    public function testResolveWithStringAndPackageInstanceMixed(): void
-    {
-        $this->loadConfig([
-            'a' => ['type' => 'library'],
-            'b' => ['type' => 'library'],
-        ]);
-
-        // Pass one as string, one as a mock Package
-        $mockPackage = $this->createMockPackage('a');
-
-        $result = DependencyResolver::resolve([$mockPackage, 'b']);
-
-        $this->assertContains('a', $result);
-        $this->assertContains('b', $result);
-    }
-
-    public function testResolveDuplicateInputPackages(): void
-    {
-        // Requesting the same package twice should not duplicate it in output
-        $this->loadConfig([
-            'zlib' => ['type' => 'library'],
-        ]);
-
-        $result = DependencyResolver::resolve(['zlib', 'zlib']);
-
-        $this->assertSame(['zlib'], $result);
-    }
-
-    /**
-     * Documents the current behavior for circular dependencies.
-     * The algorithm does not detect cycles; it silently resolves them
-     * using the visited-set to break infinite recursion. This test
-     * locks in the current behavior so any intentional change is caught.
-     */
-    public function testCircularDependencyDoesNotLoopInfinitely(): void
-    {
-        // a -> b -> a  (circular)
-        $this->loadConfig([
-            'a' => ['type' => 'library', 'depends' => ['b']],
-            'b' => ['type' => 'library', 'depends' => ['a']],
-        ]);
-
-        // Must not hang — should complete and return both packages
-        $result = DependencyResolver::resolve(['a']);
-
-        $this->assertCount(2, $result);
-        $this->assertContains('a', $result);
-        $this->assertContains('b', $result);
-    }
-
-    // ──────────────────────────────────────────────
-    //  Helpers
-    // ──────────────────────────────────────────────
-
-    /**
-     * Load package configurations directly into PackageConfig.
-     * Uses reflection to inject fixture data without needing YAML files on disk.
-     *
-     * @param array<string, array{type: string, depends?: string[], suggests?: string[]}> $configs
-     */
-    private function loadConfig(array $configs): void
-    {
-        $reflection = new \ReflectionClass(PackageConfig::class);
-        $property = $reflection->getProperty('package_configs');
-
-        $existing = $property->getValue();
-        if (!is_array($existing)) {
-            $existing = [];
-        }
-
-        foreach ($configs as $name => $config) {
-            $existing[$name] = $config;
-        }
-
-        $property->setValue(null, $existing);
-    }
-
-    /**
-     * Reset PackageConfig to empty state.
-     */
-    private function resetPackageConfig(): void
-    {
-        $reflection = new \ReflectionClass(PackageConfig::class);
-        $property = $reflection->getProperty('package_configs');
-        $property->setValue(null, []);
-    }
-
-    /**
-     * Create a minimal mock Package object that returns a given name.
-     */
-    private function createMockPackage(string $name): object
-    {
-        return new class($name) {
-            public function __construct(private string $name) {}
-
-            public function getName(): string
-            {
-                return $this->name;
-            }
-        };
-    }
-}

tests/bootstrap.php

@@ -2,10 +2,8 @@
 
 declare(strict_types=1);
 use Psr\Log\LogLevel;
-use StaticPHP\Registry\Registry;
 
 require_once __DIR__ . '/../src/bootstrap.php';
+\StaticPHP\Registry\Registry::resolve();
 
 logger()->setLevel(LogLevel::ERROR);
-
-Registry::resolve();