support for php-src switching by downloading different php version (like it was before, essentially)

config/ext.json

@@ -232,11 +232,13 @@
             "BSD": "wip"
         },
         "type": "external",
-        "source": "grpc",
+        "source": "ext-grpc",
         "arg-type-unix": "enable-path",
         "cpp-extension": true,
         "lib-depends": [
-            "grpc"
+            "zlib",
+            "openssl",
+            "libcares"
         ]
     },
     "iconv": {
@@ -487,6 +489,36 @@
             "zlib"
         ]
     },
+    "mysqlnd_ed25519": {
+        "type": "external",
+        "source": "mysqlnd_ed25519",
+        "arg-type": "enable",
+        "target": [
+            "shared"
+        ],
+        "ext-depends": [
+            "mysqlnd"
+        ],
+        "lib-depends": [
+            "libsodium",
+            "openssl"
+        ]
+    },
+    "mysqlnd_parsec": {
+        "type": "external",
+        "source": "mysqlnd_parsec",
+        "arg-type": "enable",
+        "target": [
+            "shared"
+        ],
+        "ext-depends": [
+            "mysqlnd"
+        ],
+        "lib-depends": [
+            "libsodium",
+            "openssl"
+        ]
+    },
     "oci8": {
         "type": "wip",
         "support": {

config/source.json

@@ -11,7 +11,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/amqp",
         "path": "php-src/ext/amqp",
-        "filename": "amqp.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -21,7 +20,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/APCu",
         "path": "php-src/ext/apcu",
-        "filename": "apcu.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -31,7 +29,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ast",
         "path": "php-src/ext/ast",
-        "filename": "ast.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -88,7 +85,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/dio",
         "path": "php-src/ext/dio",
-        "filename": "dio.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -98,7 +94,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ev",
         "path": "php-src/ext/ev",
-        "filename": "ev.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -118,7 +113,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ds",
         "path": "php-src/ext/ds",
-        "filename": "ds.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -151,11 +145,21 @@
             "path": "LICENSE"
         }
     },
+    "ext-grpc": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/grpc",
+        "path": "php-src/ext/grpc",
+        "license": {
+            "type": "file",
+            "path": [
+                "LICENSE"
+            ]
+        }
+    },
     "ext-imagick": {
         "type": "url",
         "url": "https://pecl.php.net/get/imagick",
         "path": "php-src/ext/imagick",
-        "filename": "imagick.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -165,7 +169,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/imap",
         "path": "php-src/ext/imap",
-        "filename": "imap.tgz",
         "license": {
             "type": "file",
             "path": [
@@ -187,7 +190,6 @@
     "ext-maxminddb": {
         "type": "url",
         "url": "https://pecl.php.net/get/maxminddb",
-        "filename": "ext-maxminddb.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -197,7 +199,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/memcache",
         "path": "php-src/ext/memcache",
-        "filename": "memcache.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -216,7 +217,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/simdjson",
         "path": "php-src/ext/simdjson",
-        "filename": "simdjson.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -236,7 +236,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/ssh2",
         "path": "php-src/ext/ssh2",
-        "filename": "ssh2.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -246,7 +245,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/trader",
         "path": "php-src/ext/trader",
-        "filename": "trader.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -256,7 +254,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/uuid",
         "path": "php-src/ext/uuid",
-        "filename": "uuid.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -266,7 +263,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/uv",
         "path": "php-src/ext/uv",
-        "filename": "uv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -285,7 +281,6 @@
     "ext-zip": {
         "type": "url",
         "url": "https://pecl.php.net/get/zip",
-        "filename": "ext-zip.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -393,7 +388,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/igbinary",
         "path": "php-src/ext/igbinary",
-        "filename": "igbinary.tgz",
         "license": {
             "type": "file",
             "path": "COPYING"
@@ -420,7 +414,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/inotify",
         "path": "php-src/ext/inotify",
-        "filename": "inotify.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -670,9 +663,10 @@
         }
     },
     "libpng": {
-        "type": "git",
-        "url": "https://github.com/glennrp/libpng.git",
-        "rev": "libpng16",
+        "type": "ghtagtar",
+        "repo": "pnggroup/libpng",
+        "match": "v1\\.6\\.\\d+",
+        "query": "?per_page=150",
         "provide-pre-built": true,
         "license": {
             "type": "file",
@@ -680,9 +674,9 @@
         }
     },
     "librabbitmq": {
-        "type": "git",
-        "url": "https://github.com/alanxz/rabbitmq-c.git",
-        "rev": "master",
+        "type": "ghtar",
+        "repo": "alanxz/rabbitmq-c",
+        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -824,7 +818,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/memcached",
         "path": "php-src/ext/memcached",
-        "filename": "memcached.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -865,7 +858,24 @@
         "type": "url",
         "url": "https://pecl.php.net/get/msgpack",
         "path": "php-src/ext/msgpack",
-        "filename": "msgpack.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "mysqlnd_ed25519": {
+        "type": "pie",
+        "repo": "mariadb/mysqlnd_ed25519",
+        "path": "php-src/ext/mysqlnd_ed25519",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "mysqlnd_parsec": {
+        "type": "pie",
+        "repo": "mariadb/mysqlnd_parsec",
+        "path": "php-src/ext/mysqlnd_parsec",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -950,7 +960,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/opentelemetry",
         "path": "php-src/ext/opentelemetry",
-        "filename": "opentelemetry.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -960,7 +969,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/parallel",
         "path": "php-src/ext/parallel",
-        "filename": "parallel.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -969,7 +977,6 @@
     "pcov": {
         "type": "url",
         "url": "https://pecl.php.net/get/pcov",
-        "filename": "pcov.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -979,7 +986,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/pdo_sqlsrv",
         "path": "php-src/ext/pdo_sqlsrv",
-        "filename": "pdo_sqlsrv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1015,7 +1021,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/protobuf",
         "path": "php-src/ext/protobuf",
-        "filename": "protobuf.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1077,7 +1082,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/redis",
         "path": "php-src/ext/redis",
-        "filename": "redis.tgz",
         "license": {
             "type": "file",
             "path": [
@@ -1117,7 +1121,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/sqlsrv",
         "path": "php-src/ext/sqlsrv",
-        "filename": "sqlsrv.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1183,7 +1186,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/xhprof",
         "path": "php-src/ext/xhprof-src",
-        "filename": "xhprof.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1193,7 +1195,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/xlswriter",
         "path": "php-src/ext/xlswriter",
-        "filename": "xlswriter.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -1214,7 +1215,6 @@
         "type": "url",
         "url": "https://pecl.php.net/get/yac",
         "path": "php-src/ext/yac",
-        "filename": "yac.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"

src/SPC/ConsoleApplication.php

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
  */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.7.10';
+    public const string VERSION = '2.7.11';
 
     public function __construct()
     {

src/SPC/builder/BuilderBase.php

@@ -160,7 +160,7 @@ abstract class BuilderBase
         }
         if (!$skip_extract) {
             $this->emitPatchPoint('before-php-extract');
-            SourceManager::initSource(sources: ['php-src'], source_only: true);
+            SourceManager::initSource(sources: [$this->getPhpSrcName()], source_only: true);
             $this->emitPatchPoint('after-php-extract');
             if ($this->getPHPVersionID() >= 80000) {
                 $this->emitPatchPoint('before-micro-extract');
@@ -319,7 +319,7 @@ abstract class BuilderBase
     public function getPHPVersionFromArchive(?string $file = null): false|string
     {
         if ($file === null) {
-            $lock = LockFile::get('php-src');
+            $lock = LockFile::get($this->getPhpSrcName());
             if ($lock === null) {
                 return false;
             }
@@ -498,6 +498,14 @@ abstract class BuilderBase
         }
     }
 
+    /**
+     * Get the php-src name to use for lock file lookups (supports version-specific names like php-src-8.2)
+     */
+    protected function getPhpSrcName(): string
+    {
+        return getenv('SPC_PHP_SRC_NAME') ?: 'php-src';
+    }
+
     /**
      * Generate micro extension test php code.
      */

src/SPC/builder/Extension.php

@@ -385,6 +385,9 @@ class Extension
                 logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)');
                 return;
             }
+            if ((string) Config::getExt($this->getName(), 'type') === 'addon') {
+                return;
+            }
             logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)');
             foreach ($this->dependencies as $dependency) {
                 if (!$dependency instanceof Extension) {

src/SPC/builder/LibraryBase.php

@@ -184,18 +184,18 @@ abstract class LibraryBase
 
             // extract first if not exists
             if (!is_dir($this->source_dir)) {
-                $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
                 SourceManager::initSource(libs: [static::NAME], source_only: true);
-                $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-extract');
+                $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
             }
 
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }
-            $this->getBuilder()->emitPatchPoint('before-library[ ' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-build');
             $this->build();
             $this->installLicense();
-            $this->getBuilder()->emitPatchPoint('after-library[ ' . static::NAME . ']-build');
+            $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-build');
             return LIB_STATUS_OK;
         }
 
@@ -346,19 +346,19 @@ abstract class LibraryBase
      */
     protected function installLicense(): void
     {
-        FileSystem::createDir(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName());
         $source = Config::getLib($this->getName(), 'source');
+        FileSystem::createDir(BUILD_ROOT_PATH . "/source-licenses/{$source}");
         $license_files = Config::getSource($source)['license'] ?? [];
         if (is_assoc_array($license_files)) {
             $license_files = [$license_files];
         }
         foreach ($license_files as $index => $license) {
             if ($license['type'] === 'text') {
-                FileSystem::writeFile(BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt", $license['text']);
+                FileSystem::writeFile(BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt", $license['text']);
                 continue;
             }
             if ($license['type'] === 'file') {
-                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . '/source-licenses/' . $this->getName() . "/{$index}.txt");
+                copy($this->source_dir . '/' . $license['path'], BUILD_ROOT_PATH . "/source-licenses/{$source}/{$index}.txt");
             }
         }
     }
@@ -375,8 +375,17 @@ abstract class LibraryBase
                 return false;
             }
         }
+        $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+        $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
         foreach (Config::getLib(static::NAME, 'pkg-configs', []) as $name) {
-            if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$name}.pc")) {
+            $found = false;
+            foreach ($search_paths as $path) {
+                if (file_exists($path . "/{$name}.pc")) {
+                    $found = true;
+                    break;
+                }
+            }
+            if (!$found) {
                 return false;
             }
         }

src/SPC/builder/extension/grpc.php

@@ -21,18 +21,14 @@ class grpc extends Extension
         if ($this->builder instanceof WindowsBuilder) {
             throw new ValidationException('grpc extension does not support windows yet');
         }
-        if (file_exists(SOURCE_PATH . '/php-src/ext/grpc')) {
-            return false;
-        }
-        // soft link to the grpc source code
-        if (is_dir($this->source_dir . '/src/php/ext/grpc')) {
-            shell()->exec('ln -s ' . $this->source_dir . '/src/php/ext/grpc ' . SOURCE_PATH . '/php-src/ext/grpc');
-        } else {
-            throw new ValidationException('Cannot find grpc source code in ' . $this->source_dir . '/src/php/ext/grpc');
-        }
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/php/ext/grpc/call.c',
+            'zend_exception_get_default(TSRMLS_C),',
+            'zend_ce_exception,',
+        );
         if (SPCTarget::getTargetOS() === 'Darwin') {
             FileSystem::replaceFileRegex(
-                SOURCE_PATH . '/php-src/ext/grpc/config.m4',
+                $this->source_dir . '/config.m4',
                 '/GRPC_LIBDIR=.*$/m',
                 'GRPC_LIBDIR=' . BUILD_LIB_PATH . "\n" . 'LDFLAGS="$LDFLAGS -framework CoreFoundation"'
             );

src/SPC/builder/extension/memcache.php

@@ -43,4 +43,9 @@ EOF
         );
         return true;
     }
+
+    protected function getExtraEnv(): array
+    {
+        return ['CFLAGS' => '-std=c17'];
+    }
 }

src/SPC/builder/extension/mysqlnd_ed25519.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('mysqlnd_ed25519')]
+class mysqlnd_ed25519 extends Extension
+{
+    public function getConfigureArg(bool $shared = false): string
+    {
+        return '--with-mysqlnd_ed25519' . ($shared ? '=shared' : '');
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return $this->getConfigureArg();
+    }
+}

src/SPC/builder/extension/mysqlnd_parsec.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('mysqlnd_parsec')]
+class mysqlnd_parsec extends Extension
+{
+    public function getConfigureArg(bool $shared = false): string
+    {
+        return '--enable-mysqlnd_parsec' . ($shared ? '=shared' : '');
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return $this->getConfigureArg();
+    }
+}

src/SPC/builder/extension/swoole.php

@@ -17,6 +17,7 @@ class swoole extends Extension
     public function patchBeforeMake(): bool
     {
         $patched = parent::patchBeforeMake();
+        FileSystem::replaceFileStr($this->source_dir . '/ext-src/php_swoole_private.h', 'PHP_VERSION_ID > 80500', 'PHP_VERSION_ID >= 80600');
         if ($this->builder instanceof MacOSBuilder) {
             // Fix swoole with event extension <util.h> conflict bug
             $util_path = shell()->execWithResult('xcrun --show-sdk-path', false)[1][0] . '/usr/include/util.h';

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -34,7 +34,7 @@ trait UnixLibraryTrait
             $files = array_map(fn ($x) => "{$x}.pc", $conf_pc);
         }
         foreach ($files as $name) {
-            $realpath = realpath(BUILD_ROOT_PATH . '/lib/pkgconfig/' . $name);
+            $realpath = realpath(BUILD_LIB_PATH . '/pkgconfig/' . $name);
             if ($realpath === false) {
                 throw new PatchException('pkg-config prefix patcher', 'Cannot find library [' . static::NAME . '] pkgconfig file [' . $name . '] in ' . BUILD_LIB_PATH . '/pkgconfig/ !');
             }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -145,11 +145,10 @@ abstract class UnixBuilderBase extends BuilderBase
             throw new SPCInternalException("Deploy failed. Cannot find file after copy: {$dst}");
         }
 
-        // extract debug info
-        $this->extractDebugInfo($dst);
-
-        // strip
         if (!$this->getOption('no-strip')) {
+            // extract debug info
+            $this->extractDebugInfo($dst);
+            // extra strip
             $this->stripBinary($dst);
         }
 

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

@@ -14,7 +14,9 @@ trait gmp
             ->appendEnv([
                 'CFLAGS' => '-std=c17',
             ])
-            ->configure()
+            ->configure(
+                '--enable-fat'
+            )
             ->make();
         $this->patchPkgconfPrefix(['gmp.pc']);
     }

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

@@ -5,12 +5,17 @@ declare(strict_types=1);
 namespace SPC\builder\unix\library;
 
 use SPC\util\executor\UnixCMakeExecutor;
-use SPC\util\SPCTarget;
 
 trait libwebp
 {
     protected function build(): void
     {
+        $code = '#include <immintrin.h>
+int main() { return _mm256_cvtsi256_si32(_mm256_setzero_si256()); }';
+        $cc = getenv('CC') ?: 'gcc';
+        [$ret] = shell()->execWithResult("printf '%s' '{$code}' | {$cc} -x c -mavx2 -o /dev/null - 2>&1");
+        $disableAvx2 = $ret !== 0 && GNU_ARCH === 'x86_64' && PHP_OS_FAMILY === 'Linux';
+
         UnixCMakeExecutor::create($this)
             ->addConfigureArgs(
                 '-DWEBP_BUILD_EXTRAS=OFF',
@@ -23,7 +28,7 @@ trait libwebp
                 '-DWEBP_BUILD_WEBPINFO=OFF',
                 '-DWEBP_BUILD_WEBPMUX=OFF',
                 '-DWEBP_BUILD_FUZZTEST=OFF',
-                SPCTarget::getLibcVersion() === '2.31' && GNU_ARCH === 'x86_64' ? '-DWEBP_ENABLE_SIMD=OFF' : '' // fix an edge bug for debian 11 with gcc 10
+                $disableAvx2 ? '-DWEBP_ENABLE_SIMD=OFF' : ''
             )
             ->build();
         // patch pkgconfig

src/SPC/command/BuildPHPCommand.php

@@ -49,6 +49,7 @@ class BuildPHPCommand extends BuildCommand
         $this->addOption('with-micro-logo', null, InputOption::VALUE_REQUIRED, 'Use custom .ico for micro.sfx (windows only)');
         $this->addOption('enable-micro-win32', null, null, 'Enable win32 mode for phpmicro (Windows only)');
         $this->addOption('with-frankenphp-app', null, InputOption::VALUE_REQUIRED, 'Path to a folder to be embedded in FrankenPHP');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'PHP version to build (e.g., 8.2, 8.3, 8.4). Uses php-src-X.Y if available, otherwise php-src');
     }
 
     public function handle(): int
@@ -120,6 +121,31 @@ class BuildPHPCommand extends BuildCommand
                 logger()->warning('Some cases micro.sfx cannot be packed via UPX due to dynamic size bug, be aware!');
             }
         }
+
+        // Determine which php-src to use based on --with-php option
+        $php_version = $this->getOption('with-php');
+        if ($php_version !== null) {
+            // Check if version-specific php-src exists in lock file
+            $version_specific_name = "php-src-{$php_version}";
+            $lock_file_path = DOWNLOAD_PATH . '/.lock.json';
+            if (file_exists($lock_file_path)) {
+                $lock_content = json_decode(file_get_contents($lock_file_path), true);
+                if (isset($lock_content[$version_specific_name])) {
+                    // Use version-specific php-src
+                    f_putenv("SPC_PHP_SRC_NAME={$version_specific_name}");
+                    logger()->info("Building with PHP {$php_version} (using {$version_specific_name})");
+                } else {
+                    logger()->error('No php-src found in downloads. Please run download command first.');
+                    return static::FAILURE;
+                }
+            } else {
+                logger()->error('Lock file not found. Please download sources first.');
+                return static::FAILURE;
+            }
+        } else {
+            f_putenv('SPC_PHP_SRC_NAME=php-src');
+        }
+
         // create builder
         $builder = BuilderProvider::makeBuilderByInput($this->input);
         $include_suggest_ext = $this->getOption('with-suggested-exts');

src/SPC/command/DownloadCommand.php

@@ -9,7 +9,9 @@ use SPC\exception\DownloaderException;
 use SPC\exception\SPCException;
 use SPC\store\Config;
 use SPC\store\Downloader;
+use SPC\store\FileSystem;
 use SPC\store\LockFile;
+use SPC\store\source\CustomSourceBase;
 use SPC\util\DependencyUtil;
 use SPC\util\SPCTarget;
 use Symfony\Component\Console\Attribute\AsCommand;
@@ -27,10 +29,10 @@ class DownloadCommand extends BaseCommand
 
     public function configure(): void
     {
-        $this->addArgument('sources', InputArgument::REQUIRED, 'The sources will be compiled, comma separated');
+        $this->addArgument('sources', InputArgument::OPTIONAL, 'The sources will be compiled, comma separated');
         $this->addOption('shallow-clone', null, null, 'Clone shallow');
         $this->addOption('with-openssl11', null, null, 'Use openssl 1.1');
-        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format (default 8.4)', '8.4');
+        $this->addOption('with-php', null, InputOption::VALUE_REQUIRED, 'version in major.minor format, comma-separated for multiple versions (default 8.4)', '8.4');
         $this->addOption('clean', null, null, 'Clean old download cache and source before fetch');
         $this->addOption('all', 'A', null, 'Fetch all sources that static-php-cli needed');
         $this->addOption('custom-url', 'U', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'Specify custom source download url, e.g "php-src:https://downloads.php.net/~eric/php-8.3.0beta1.tar.gz"');
@@ -43,10 +45,31 @@ class DownloadCommand extends BaseCommand
         $this->addOption('retry', 'R', InputOption::VALUE_REQUIRED, 'Set retry time when downloading failed (default: 0)', '0');
         $this->addOption('prefer-pre-built', 'P', null, 'Download pre-built libraries when available');
         $this->addOption('no-alt', null, null, 'Do not download alternative sources');
+        $this->addOption('update', null, null, 'Check and update downloaded sources');
     }
 
     public function initialize(InputInterface $input, OutputInterface $output): void
     {
+        // mode: --update
+        if ($input->getOption('update') && empty($input->getArgument('sources')) && empty($input->getOption('for-extensions')) && empty($input->getOption('for-libs'))) {
+            if (!file_exists(LockFile::LOCK_FILE)) {
+                parent::initialize($input, $output);
+                return;
+            }
+            $lock_content = json_decode(file_get_contents(LockFile::LOCK_FILE), true);
+            if (is_array($lock_content)) {
+                // Filter out pre-built sources
+                $sources_to_check = array_filter($lock_content, function ($name) {
+                    return
+                        !str_contains($name, '-Linux-') &&
+                        !str_contains($name, '-Windows-') &&
+                        !str_contains($name, '-Darwin-');
+                }, ARRAY_FILTER_USE_KEY);
+                $input->setArgument('sources', implode(',', array_keys($sources_to_check)));
+            }
+            parent::initialize($input, $output);
+            return;
+        }
         // mode: --all
         if ($input->getOption('all')) {
             $input->setArgument('sources', implode(',', array_keys(Config::getSources())));
@@ -94,17 +117,29 @@ class DownloadCommand extends BaseCommand
             return $this->downloadFromZip($path);
         }
 
-        // Define PHP major version
-        $ver = $this->php_major_ver = $this->getOption('with-php');
-        define('SPC_BUILD_PHP_VERSION', $ver);
-        if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
-            // If not git, we need to check the version format
-            if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
-                logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
-                return static::FAILURE;
+        if ($this->getOption('update')) {
+            return $this->handleUpdate();
+        }
+
+        // Define PHP major version(s)
+        $php_versions_str = $this->getOption('with-php');
+        $php_versions = array_map('trim', explode(',', $php_versions_str));
+
+        // Validate all versions
+        foreach ($php_versions as $ver) {
+            if ($ver !== 'git' && !preg_match('/^\d+\.\d+$/', $ver)) {
+                // If not git, we need to check the version format
+                if (!preg_match('/^\d+\.\d+(\.\d+)?$/', $ver)) {
+                    logger()->error("bad version arg: {$ver}, x.y or x.y.z required!");
+                    return static::FAILURE;
+                }
             }
         }
 
+        // Set the first version as the default for backward compatibility
+        $this->php_major_ver = $php_versions[0];
+        define('SPC_BUILD_PHP_VERSION', $this->php_major_ver);
+
         // retry
         $retry = (int) $this->getOption('retry');
         f_putenv('SPC_DOWNLOAD_RETRIES=' . $retry);
@@ -125,6 +160,20 @@ class DownloadCommand extends BaseCommand
 
         $chosen_sources = array_map('trim', array_filter(explode(',', $this->getArgument('sources'))));
 
+        // Handle multiple PHP versions
+        // If php-src is in the sources, replace it with version-specific sources
+        if (in_array('php-src', $chosen_sources)) {
+            // Remove php-src from the list
+            $chosen_sources = array_diff($chosen_sources, ['php-src']);
+            // Add version-specific php-src for each version
+            foreach ($php_versions as $ver) {
+                $version_specific_name = "php-src-{$ver}";
+                $chosen_sources[] = $version_specific_name;
+                // Store the version for this specific php-src
+                f_putenv("SPC_PHP_VERSION_{$version_specific_name}={$ver}");
+            }
+        }
+
         $sss = $this->getOption('ignore-cache-sources');
         if ($sss === false) {
             // false is no-any-ignores, that is, default.
@@ -201,7 +250,16 @@ class DownloadCommand extends BaseCommand
                 logger()->info("[{$ni}/{$cnt}] Downloading source {$source} from custom git: {$new_config['url']}");
                 Downloader::downloadSource($source, $new_config, true);
             } else {
-                $config = Config::getSource($source);
+                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
+                if (preg_match('/^php-src-[\d.]+$/', $source)) {
+                    $config = Config::getSource('php-src');
+                    if ($config === null) {
+                        logger()->error('php-src configuration not found in source.json');
+                        return static::FAILURE;
+                    }
+                } else {
+                    $config = Config::getSource($source);
+                }
                 // Prefer pre-built, we need to search pre-built library
                 if ($this->getOption('prefer-pre-built') && ($config['provide-pre-built'] ?? false) === true) {
                     // We need to replace pattern
@@ -222,8 +280,9 @@ class DownloadCommand extends BaseCommand
                     logger()->warning("Pre-built content not found for {$source}, fallback to source download");
                 }
                 logger()->info("[{$ni}/{$cnt}] Downloading source {$source}");
+                $force_download = $force_all || in_array($source, $force_list) || str_starts_with($source, 'php-src-') && in_array('php-src', $force_list);
                 try {
-                    Downloader::downloadSource($source, $config, $force_all || in_array($source, $force_list));
+                    Downloader::downloadSource($source, $config, $force_download);
                 } catch (SPCException $e) {
                     // if `--no-alt` option is set, we will not download alternative sources
                     if ($this->getOption('no-alt')) {
@@ -241,7 +300,7 @@ class DownloadCommand extends BaseCommand
                         logger()->notice("Trying to download alternative sources for {$source}");
                         $alt_config = array_merge($config, $alt_sources);
                     }
-                    Downloader::downloadSource($source, $alt_config, $force_all || in_array($source, $force_list));
+                    Downloader::downloadSource($source, $alt_config, $force_download);
                 }
             }
         }
@@ -362,4 +421,284 @@ class DownloadCommand extends BaseCommand
         }
         return static::FAILURE;
     }
+
+    private function handleUpdate(): int
+    {
+        logger()->info('Checking sources for updates...');
+
+        // Get lock file content
+        $lock_file_path = LockFile::LOCK_FILE;
+        if (!file_exists($lock_file_path)) {
+            logger()->warning('No lock file found. Please download sources first using "bin/spc download"');
+            return static::FAILURE;
+        }
+
+        $lock_content = json_decode(file_get_contents($lock_file_path), true);
+        if ($lock_content === null || !is_array($lock_content)) {
+            logger()->error('Failed to parse lock file');
+            return static::FAILURE;
+        }
+
+        // Filter sources to check
+        $sources_arg = $this->getArgument('sources');
+        if (!empty($sources_arg)) {
+            $requested_sources = array_map('trim', array_filter(explode(',', $sources_arg)));
+            $sources_to_check = [];
+            foreach ($requested_sources as $source) {
+                if (isset($lock_content[$source])) {
+                    $sources_to_check[$source] = $lock_content[$source];
+                } else {
+                    logger()->warning("Source '{$source}' not found in lock file, skipping");
+                }
+            }
+        } else {
+            $sources_to_check = $lock_content;
+        }
+
+        // Filter out pre-built sources (they are derivatives)
+        $sources_to_check = array_filter($sources_to_check, function ($lock_item, $name) {
+            // Skip pre-built sources (they contain OS/arch in the name)
+            if (str_contains($name, '-Linux-') || str_contains($name, '-Windows-') || str_contains($name, '-Darwin-')) {
+                logger()->debug("Skipping pre-built source: {$name}");
+                return false;
+            }
+            return true;
+        }, ARRAY_FILTER_USE_BOTH);
+
+        if (empty($sources_to_check)) {
+            logger()->warning('No sources to check');
+            return static::FAILURE;
+        }
+
+        $total = count($sources_to_check);
+        $current = 0;
+        $updated_sources = [];
+
+        foreach ($sources_to_check as $name => $lock_item) {
+            ++$current;
+            try {
+                // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
+                if (preg_match('/^php-src-[\d.]+$/', $name)) {
+                    $config = Config::getSource('php-src');
+                } else {
+                    $config = Config::getSource($name);
+                }
+
+                if ($config === null) {
+                    logger()->warning("[{$current}/{$total}] Source '{$name}' not found in source config, skipping");
+                    continue;
+                }
+
+                // Check and update based on source type
+                $source_type = $lock_item['source_type'] ?? 'unknown';
+
+                if ($source_type === SPC_SOURCE_ARCHIVE) {
+                    if ($this->checkArchiveSourceUpdate($name, $lock_item, $config, $current, $total)) {
+                        $updated_sources[] = $name;
+                    }
+                } elseif ($source_type === SPC_SOURCE_GIT) {
+                    if ($this->checkGitSourceUpdate($name, $lock_item, $config, $current, $total)) {
+                        $updated_sources[] = $name;
+                    }
+                } elseif ($source_type === SPC_SOURCE_LOCAL) {
+                    logger()->debug("[{$current}/{$total}] Source '{$name}' is local, skipping");
+                } else {
+                    logger()->warning("[{$current}/{$total}] Unknown source type '{$source_type}' for '{$name}', skipping");
+                }
+            } catch (\Throwable $e) {
+                logger()->error("[{$current}/{$total}] Error checking '{$name}': {$e->getMessage()}");
+                continue;
+            }
+        }
+
+        // Output summary
+        if (empty($updated_sources)) {
+            logger()->info('All sources are up to date.');
+        } else {
+            logger()->info('Updated sources: ' . implode(', ', $updated_sources));
+
+            // Write updated sources to file
+            $date = date('Y-m-d');
+            $update_file = DOWNLOAD_PATH . '/.update-' . $date . '.txt';
+            if (file_exists($update_file)) {
+                $existing_content = file_get_contents($update_file);
+                $existing_sources = array_map('trim', explode(',', $existing_content));
+                $updated_sources = array_unique(array_merge($existing_sources, $updated_sources));
+            }
+            $content = implode(',', $updated_sources);
+            file_put_contents($update_file, $content);
+            logger()->debug("Updated sources written to: {$update_file}");
+        }
+
+        return static::SUCCESS;
+    }
+
+    private function checkCustomSourceUpdate(string $name, array $lock, array $config, int $current, int $total): ?array
+    {
+        $classes = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/source', 'SPC\store\source');
+        foreach ($classes as $class) {
+            // Support php-src and php-src-X.Y patterns
+            $matches = ($class::NAME === $name) ||
+                ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
+            if (is_a($class, CustomSourceBase::class, true) && $matches) {
+                try {
+                    $config['source_name'] = $name;
+                    return (new $class())->update($lock, $config);
+                } catch (\Throwable $e) {
+                    logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
+                    return null;
+                }
+            }
+        }
+        logger()->debug("[{$current}/{$total}] Custom source handler for '{$name}' not found");
+        return null;
+    }
+
+    /**
+     * Check and update an archive source
+     *
+     * @param  string $name    Source name
+     * @param  array  $lock    Lock file entry
+     * @param  array  $config  Source configuration
+     * @param  int    $current Current progress number
+     * @param  int    $total   Total sources to check
+     * @return bool   True if updated, false otherwise
+     */
+    private function checkArchiveSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
+    {
+        $type = $config['type'] ?? 'unknown';
+        $locked_filename = $lock['filename'] ?? '';
+
+        // Skip local types that don't support version detection
+        if (in_array($type, ['local', 'unknown'])) {
+            logger()->debug("[{$current}/{$total}] Source '{$name}' (type: {$type}) doesn't support version detection, skipping");
+            return false;
+        }
+
+        try {
+            $latest_info = match ($type) {
+                'ghtar' => Downloader::getLatestGithubTarball($name, $config),
+                'ghtagtar' => Downloader::getLatestGithubTarball($name, $config, 'tags'),
+                'ghrel' => Downloader::getLatestGithubRelease($name, $config),
+                'pie' => Downloader::getPIEInfo($name, $config),
+                'bitbuckettag' => Downloader::getLatestBitbucketTag($name, $config),
+                'filelist' => Downloader::getFromFileList($name, $config),
+                'url' => Downloader::getLatestUrlInfo($name, $config),
+                'custom' => $this->checkCustomSourceUpdate($name, $lock, $config, $current, $total),
+                default => null,
+            };
+
+            if ($latest_info === null) {
+                logger()->warning("[{$current}/{$total}] Could not get version info for '{$name}' (type: {$type})");
+                return false;
+            }
+
+            $latest_filename = $latest_info[1] ?? '';
+
+            // Compare filenames
+            if ($locked_filename !== $latest_filename) {
+                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_filename} → {$latest_filename}");
+                $this->downloadSourceForUpdate($name, $config, $current, $total);
+                return true;
+            }
+
+            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
+            return false;
+        } catch (DownloaderException $e) {
+            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
+            return false;
+        }
+    }
+
+    /**
+     * Check and update a git source
+     *
+     * @param  string $name    Source name
+     * @param  array  $lock    Lock file entry
+     * @param  array  $config  Source configuration
+     * @param  int    $current Current progress number
+     * @param  int    $total   Total sources to check
+     * @return bool   True if updated, false otherwise
+     */
+    private function checkGitSourceUpdate(string $name, array $lock, array $config, int $current, int $total): bool
+    {
+        $locked_hash = $lock['hash'] ?? '';
+        $url = $config['url'] ?? '';
+        $branch = $config['rev'] ?? 'main';
+
+        if (empty($url)) {
+            logger()->warning("[{$current}/{$total}] No URL found for git source '{$name}'");
+            return false;
+        }
+
+        try {
+            $remote_hash = $this->getRemoteGitCommit($url, $branch);
+
+            if ($remote_hash === null) {
+                logger()->warning("[{$current}/{$total}] Could not fetch remote commit for '{$name}'");
+                return false;
+            }
+
+            // Compare hashes (use first 7 chars for display)
+            $locked_short = substr($locked_hash, 0, 7);
+            $remote_short = substr($remote_hash, 0, 7);
+
+            if ($locked_hash !== $remote_hash) {
+                logger()->info("[{$current}/{$total}] Update available for '{$name}': {$locked_short} → {$remote_short}");
+                $this->downloadSourceForUpdate($name, $config, $current, $total);
+                return true;
+            }
+
+            logger()->info("[{$current}/{$total}] Source '{$name}' is up to date");
+            return false;
+        } catch (\Throwable $e) {
+            logger()->warning("[{$current}/{$total}] Failed to check '{$name}': {$e->getMessage()}");
+            return false;
+        }
+    }
+
+    /**
+     * Download a source after removing old lock entry
+     *
+     * @param string $name    Source name
+     * @param array  $config  Source configuration
+     * @param int    $current Current progress number
+     * @param int    $total   Total sources to check
+     */
+    private function downloadSourceForUpdate(string $name, array $config, int $current, int $total): void
+    {
+        logger()->info("[{$current}/{$total}] Downloading '{$name}'...");
+
+        // Remove old lock entry
+        LockFile::put($name, null);
+
+        // Download new version
+        Downloader::downloadSource($name, $config, true);
+    }
+
+    /**
+     * Get remote git commit hash without cloning
+     *
+     * @param  string      $url    Git repository URL
+     * @param  string      $branch Branch or tag to check
+     * @return null|string Remote commit hash or null on failure
+     */
+    private function getRemoteGitCommit(string $url, string $branch): ?string
+    {
+        try {
+            $cmd = SPC_GIT_EXEC . ' ls-remote ' . escapeshellarg($url) . ' ' . escapeshellarg($branch);
+            f_exec($cmd, $output, $ret);
+
+            if ($ret !== 0 || empty($output)) {
+                return null;
+            }
+
+            // Output format: "commit_hash\trefs/heads/branch" or "commit_hash\tHEAD"
+            $parts = preg_split('/\s+/', $output[0]);
+            return $parts[0] ?? null;
+        } catch (\Throwable $e) {
+            logger()->debug("Failed to fetch remote git commit: {$e->getMessage()}");
+            return null;
+        }
+    }
 }

src/SPC/store/Downloader.php

@@ -97,8 +97,9 @@ class Downloader
     public static function getLatestGithubTarball(string $name, array $source, string $type = 'releases'): array
     {
         logger()->debug("finding {$name} source from github {$type} tarball");
+        $source['query'] ??= '';
         $data = json_decode(self::curlExec(
-            url: "https://api.github.com/repos/{$source['repo']}/{$type}",
+            url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
             hooks: [[CurlHook::class, 'setupGithubToken']],
             retries: self::getRetryAttempts()
         ), true, 512, JSON_THROW_ON_ERROR);
@@ -108,6 +109,9 @@ class Downloader
             if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
                 continue;
             }
+            if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
+                continue;
+            }
             if (!($source['match'] ?? null)) {
                 $url = $rel['tarball_url'] ?? null;
                 break;
@@ -216,6 +220,39 @@ class Downloader
         return [$source['url'] . end($versions), end($versions), key($versions)];
     }
 
+    /**
+     * Get latest version from direct URL (detect redirect and filename)
+     *
+     * @param  string             $name   Source name
+     * @param  array              $source Source meta info: [url]
+     * @return array<int, string> [url, filename]
+     */
+    public static function getLatestUrlInfo(string $name, array $source): array
+    {
+        logger()->debug("finding {$name} source from direct url");
+        $url = $source['url'];
+        $headers = self::curlExec(
+            url: $url,
+            method: 'HEAD',
+            retries: self::getRetryAttempts()
+        );
+
+        // Find redirect location if any
+        if (preg_match('/^location:\s+(?<url>.+)$/im', $headers, $matches)) {
+            $url = trim($matches['url']);
+            // If it's a relative URL, we need to handle it, but usually it's absolute for downloads
+        }
+
+        // Find filename from content-disposition
+        if (preg_match('/^content-disposition:\s+attachment;\s*filename=("?)(?<filename>.+)\1/im', $headers, $matches)) {
+            $filename = trim($matches['filename']);
+        } else {
+            $filename = $source['filename'] ?? basename($url);
+        }
+
+        return [$url, $filename];
+    }
+
     /**
      * Download file from URL
      *
@@ -243,7 +280,7 @@ class Downloader
         if ($download_as === SPC_DOWNLOAD_PRE_BUILT) {
             $name = self::getPreBuiltLockName($name);
         }
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_ARCHIVE, 'url' => $url, 'filename' => $filename, 'move_path' => $move_path, 'lock_as' => $download_as]);
     }
 
     /**
@@ -302,7 +339,7 @@ class Downloader
         }
         // Lock
         logger()->debug("Locking git source {$name}");
-        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);
+        LockFile::lockSource($name, ['source_type' => SPC_SOURCE_GIT, 'url' => $url, 'rev' => $branch, 'dirname' => $name, 'move_path' => $move_path, 'lock_as' => $lock_as]);
 
         /*
         // 复制目录过去
@@ -652,8 +689,7 @@ class Downloader
                     self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                     break;
                 case 'url': // Direct download URL
-                    $url = $conf['url'];
-                    $filename = $conf['filename'] ?? basename($conf['url']);
+                    [$url, $filename] = self::getLatestUrlInfo($name, $conf);
                     self::downloadFile($name, $url, $filename, $conf['path'] ?? $conf['extract'] ?? null, $download_as);
                     break;
                 case 'git': // Git repo
@@ -663,6 +699,8 @@ class Downloader
                     LockFile::lockSource($name, [
                         'source_type' => SPC_SOURCE_LOCAL,
                         'dirname' => $conf['dirname'],
+                        'url' => null,
+                        'path' => $conf['path'] ?? null,
                         'move_path' => $conf['path'] ?? $conf['extract'] ?? null,
                         'lock_as' => $download_as,
                     ]);
@@ -678,7 +716,11 @@ class Downloader
                         ...FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/store/pkg', 'SPC\store\pkg'),
                     ];
                     foreach ($classes as $class) {
-                        if (is_a($class, CustomSourceBase::class, true) && $class::NAME === $name) {
+                        // Support php-src and php-src-X.Y patterns
+                        $matches = ($class::NAME === $name) ||
+                                   ($class::NAME === 'php-src' && preg_match('/^php-src(-[\d.]+)?$/', $name));
+                        if (is_a($class, CustomSourceBase::class, true) && $matches) {
+                            $conf['source_name'] = $name; // Pass the actual source name
                             (new $class())->fetch($force, $conf, $download_as);
                             break;
                         }

src/SPC/store/FileSystem.php

@@ -408,13 +408,13 @@ class FileSystem
                 continue;
             }
             $sub_file = self::convertPath($dir . '/' . $v);
-            if (is_dir($sub_file)) {
-                # 如果是 目录 且 递推 , 则递推添加下级文件
-                if (!self::removeDir($sub_file)) {
+            if (is_link($sub_file) || is_file($sub_file)) {
+                if (!unlink($sub_file)) {
                     return false;
                 }
-            } elseif (is_link($sub_file) || is_file($sub_file)) {
-                if (!unlink($sub_file)) {
+            } elseif (is_dir($sub_file)) {
+                # 如果是 目录 且 递推 , 则递推添加下级文件
+                if (!self::removeDir($sub_file)) {
                     return false;
                 }
             }

src/SPC/store/LockFile.php

@@ -155,6 +155,7 @@ class LockFile
      * @param string $name Source name
      * @param array{
      *     source_type: string,
+     *     url: ?string,
      *     dirname?: ?string,
      *     filename?: ?string,
      *     move_path: ?string,

src/SPC/store/SourceManager.php

@@ -39,7 +39,14 @@ class SourceManager
 
         // start check
         foreach ($sources_extracted as $source => $item) {
-            if (Config::getSource($source) === null) {
+            $extract_dir_name = $source;
+            // Handle version-specific php-src (php-src-8.2, php-src-8.3, etc.)
+            $source_config = Config::getSource($source);
+            if ($source_config === null && preg_match('/^php-src-[\d.]+$/', $source)) {
+                $source_config = Config::getSource('php-src');
+                $extract_dir_name = 'php-src';
+            }
+            if ($source_config === null) {
                 throw new WrongUsageException("Source [{$source}] does not exist, please check the name and correct it !");
             }
             // check source downloaded
@@ -56,12 +63,12 @@ class SourceManager
             $lock_content = LockFile::get($lock_name);
 
             // check source dir exist
-            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
+            $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
             // $check = $lock[$lock_name]['move_path'] === null ? (SOURCE_PATH . '/' . $source) : (SOURCE_PATH . '/' . $lock[$lock_name]['move_path']);
             if (!is_dir($check)) {
                 logger()->debug("Extracting source [{$source}] to {$check} ...");
                 $filename = LockFile::getLockFullPath($lock_content);
-                FileSystem::extractSource($source, $lock_content['source_type'], $filename, $check);
+                FileSystem::extractSource($extract_dir_name, $lock_content['source_type'], $filename, $check);
                 LockFile::putLockSourceHash($lock_content, $check);
                 continue;
             }
@@ -89,7 +96,7 @@ class SourceManager
             logger()->notice("Source [{$source}] hash mismatch, removing old source dir and extracting again ...");
             FileSystem::removeDir($check);
             $filename = LockFile::getLockFullPath($lock_content);
-            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source);
+            $move_path = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $extract_dir_name);
             FileSystem::extractSource($source, $lock_content['source_type'], $filename, $move_path);
             LockFile::putLockSourceHash($lock_content, $check);
         }

src/SPC/store/pkg/Zig.php

@@ -72,8 +72,11 @@ class Zig extends CustomPackage
 
         $latest_version = null;
         foreach ($index_json as $version => $data) {
-            $latest_version = $version;
-            break;
+            // Skip the master branch, get the latest stable release
+            if ($version !== 'master') {
+                $latest_version = $version;
+                break;
+            }
         }
 
         if (!$latest_version) {

src/SPC/store/source/CustomSourceBase.php

@@ -25,4 +25,13 @@ abstract class CustomSourceBase
      * @param int        $lock_as Lock type constant
      */
     abstract public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void;
+
+    /**
+     * Update the source from its repository
+     *
+     * @param  array      $lock   Lock file entry
+     * @param  array      $config Optional configuration array
+     * @return null|array Latest version info [url, filename], or null if no update needed
+     */
+    abstract public function update(array $lock, ?array $config = null): ?array;
 }

src/SPC/store/source/PhpSource.php

@@ -7,6 +7,7 @@ namespace SPC\store\source;
 use JetBrains\PhpStorm\ArrayShape;
 use SPC\exception\DownloaderException;
 use SPC\store\Downloader;
+use SPC\store\LockFile;
 
 class PhpSource extends CustomSourceBase
 {
@@ -14,12 +15,46 @@ class PhpSource extends CustomSourceBase
 
     public function fetch(bool $force = false, ?array $config = null, int $lock_as = SPC_DOWNLOAD_SOURCE): void
     {
-        $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
-        if ($major === 'git') {
-            Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
+        $source_name = $config['source_name'] ?? 'php-src';
+
+        // Try to extract version from source name (e.g., "php-src-8.2" -> "8.2")
+        if (preg_match('/^php-src-([\d.]+)$/', $source_name, $matches)) {
+            $major = $matches[1];
         } else {
-            Downloader::downloadSource('php-src', $this->getLatestPHPInfo($major), $force);
+            $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
         }
+
+        if ($major === 'git') {
+            Downloader::downloadSource($source_name, ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
+        } else {
+            Downloader::downloadSource($source_name, $this->getLatestPHPInfo($major), $force);
+        }
+
+        if ($source_name !== 'php-src') {
+            LockFile::put('php-src', LockFile::get($source_name));
+        }
+    }
+
+    public function update(array $lock, ?array $config = null): ?array
+    {
+        $source_name = $config['source_name'] ?? 'php-src';
+
+        // Try to extract version from source name (e.g., "php-src-8.2" -> "8.2")
+        if (preg_match('/^php-src-([\d.]+)$/', $source_name, $matches)) {
+            $major = $matches[1];
+        } else {
+            $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
+        }
+
+        if ($major === 'git') {
+            return null;
+        }
+
+        $latest_php = $this->getLatestPHPInfo($major);
+        $latest_url = $latest_php['url'];
+        $filename = basename($latest_url);
+
+        return [$latest_url, $filename];
     }
 
     /**

src/SPC/store/source/PostgreSQLSource.php

@@ -15,6 +15,13 @@ class PostgreSQLSource extends CustomSourceBase
         Downloader::downloadSource('postgresql', self::getLatestInfo(), $force);
     }
 
+    public function update(array $lock, ?array $config = null): ?array
+    {
+        $latest = $this->getLatestInfo();
+        $filename = basename($latest['url']);
+        return [$latest['url'], $filename];
+    }
+
     public function getLatestInfo(): array
     {
         [, $filename, $version] = Downloader::getFromFileList('postgresql', [

src/SPC/toolchain/ZigToolchain.php

@@ -67,7 +67,8 @@ class ZigToolchain implements ToolchainInterface
         $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
         $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
         if (!$has_avx512) {
-            GlobalEnvManager::putenv('SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no');
+            $extra_vars = getenv('SPC_EXTRA_PHP_VARS') ?: '';
+            GlobalEnvManager::putenv("SPC_EXTRA_PHP_VARS=php_cv_have_avx512=no php_cv_have_avx512vbmi=no {$extra_vars}");
         }
     }
 

src/SPC/util/SPCConfigUtil.php

@@ -226,9 +226,17 @@ class SPCConfigUtil
         // parse pkg-configs
         foreach ($libraries as $library) {
             $pc = Config::getLib($library, 'pkg-configs', []);
+            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
             foreach ($pc as $file) {
-                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$file}.pc")) {
-                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
+                $found = false;
+                foreach ($search_paths as $path) {
+                    if (file_exists($path . "/{$file}.pc")) {
+                        $found = true;
+                    }
+                }
+                if (!$found) {
+                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
                 }
             }
             $pc_cflags = implode(' ', $pc);
@@ -257,9 +265,17 @@ class SPCConfigUtil
         foreach ($libraries as $library) {
             // add pkg-configs libs
             $pkg_configs = Config::getLib($library, 'pkg-configs', []);
-            foreach ($pkg_configs as $pkg_config) {
-                if (!file_exists(BUILD_LIB_PATH . "/pkgconfig/{$pkg_config}.pc")) {
-                    throw new WrongUsageException("pkg-config file '{$pkg_config}.pc' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "/pkgconfig'. Please build it first.");
+            $pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
+            $search_paths = array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path));
+            foreach ($pkg_configs as $file) {
+                $found = false;
+                foreach ($search_paths as $path) {
+                    if (file_exists($path . "/{$file}.pc")) {
+                        $found = true;
+                    }
+                }
+                if (!$found) {
+                    throw new WrongUsageException("pkg-config file '{$file}.pc' for lib [{$library}] does not exist. Please build it first.");
                 }
             }
             $pkg_configs = implode(' ', $pkg_configs);

src/globals/test-extensions.php

@@ -14,8 +14,8 @@ declare(strict_types=1);
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
     // '8.1',
-    // '8.2',
-    // '8.3',
+    '8.2',
+    '8.3',
     '8.4',
     '8.5',
     // 'git',
@@ -25,11 +25,11 @@ $test_php_version = [
 $test_os = [
     'macos-15-intel', // bin/spc for x86_64
     'macos-15', // bin/spc for arm64
-    // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
+    'ubuntu-latest', // bin/spc-alpine-docker for x86_64
     'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
-    // 'ubuntu-24.04', // bin/spc for x86_64
+    'ubuntu-24.04', // bin/spc for x86_64
     // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
-    'ubuntu-24.04-arm', // bin/spc for arm64
+    // 'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
     // 'windows-2025',
 ];
@@ -50,13 +50,13 @@ $prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'bcmath,xsl,xml',
+    'Linux', 'Darwin' => 'mysqli,gmp',
     'Windows' => 'bcmath',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => '',
+    'Linux' => 'grpc,mysqlnd_parsec,mysqlnd_ed25519',
     'Darwin' => '',
     'Windows' => '',
 };
@@ -66,7 +66,7 @@ $with_suggested_libs = false;
 
 // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
+    'Linux', 'Darwin' => 'libwebp',
     'Windows' => '',
 };