pin zstd, proper fix: https://github.com/kjdev/php-ext-zstd/pull/100 (#1195)

Removed unused import of FileSystem.

config/ext.json

@@ -63,7 +63,8 @@
         ],
         "ext-depends-windows": [
             "zlib",
-            "openssl"
+            "openssl",
+            "brotli"
         ]
     },
     "dba": {
@@ -73,6 +74,19 @@
             "qdbm"
         ]
     },
+    "decimal": {
+        "type": "external",
+        "source": "ext-decimal",
+        "arg-type": "custom",
+        "lib-depends": [
+            "libmpdec"
+        ]
+    },
+    "deepclone": {
+        "type": "external",
+        "source": "deepclone",
+        "arg-type": "enable"
+    },
     "dio": {
         "support": {
             "BSD": "wip"

config/lib.json

@@ -109,8 +109,7 @@
             "krb5"
         ],
         "lib-suggests-windows": [
-            "brotli",
+            "brotli"
-            "zstd"
         ],
         "frameworks": [
             "CoreFoundation",
@@ -529,6 +528,18 @@
             "maxminddb_config.h"
         ]
     },
+    "libmpdec": {
+        "source": "libmpdec",
+        "static-libs-unix": [
+            "libmpdec.a"
+        ],
+        "static-libs-windows": [
+            "libmpdec_a.lib"
+        ],
+        "headers": [
+            "mpdecimal.h"
+        ]
+    },
     "libmemcached": {
         "source": "libmemcached",
         "cpp-library": true,
@@ -763,7 +774,6 @@
             "xz"
         ],
         "lib-suggests-windows": [
-            "zstd",
             "openssl"
         ]
     },
@@ -1000,6 +1010,9 @@
         ],
         "headers": [
             "wtr/watcher-c.h"
+        ],
+        "frameworks": [
+            "CoreServices"
         ]
     },
     "xz": {

config/source.json

@@ -84,6 +84,25 @@
             "path": "COPYING"
         }
     },
+    "ext-decimal": {
+        "type": "ghtagtar",
+        "repo": "php-decimal/ext-decimal",
+        "match": "v2\\.\\d.*",
+        "path": "php-src/ext/decimal",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
+    "deepclone": {
+        "type": "ghtagtar",
+        "repo": "symfony/php-ext-deepclone",
+        "path": "php-src/ext/deepclone",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "dio": {
         "type": "url",
         "url": "https://pecl.php.net/get/dio",
@@ -227,7 +246,7 @@
     },
     "ext-rdkafka": {
         "type": "ghtar",
-        "repo": "arnaud-lb/php-rdkafka",
+        "repo": "php-rdkafka/php-rdkafka",
         "path": "php-src/ext/rdkafka",
         "license": {
             "type": "file",
@@ -314,10 +333,9 @@
         }
     },
     "ext-zstd": {
-        "type": "git",
+        "type": "ghtagtar",
+        "repo": "kjdev/php-ext-zstd",
         "path": "php-src/ext/zstd",
-        "rev": "master",
-        "url": "https://github.com/kjdev/php-ext-zstd",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -462,10 +480,8 @@
         }
     },
     "krb5": {
-        "type": "ghtagtar",
+        "type": "url",
-        "repo": "krb5/krb5",
+        "url": "https://web.mit.edu/kerberos/dist/krb5/1.22/krb5-1.22.2.tar.gz",
-        "match": "krb5.+-final",
-        "prefer-stable": true,
         "license": {
             "type": "file",
             "path": "NOTICE"
@@ -683,6 +699,14 @@
             "path": "LICENSE"
         }
     },
+    "libmpdec": {
+        "type": "url",
+        "url": "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.1.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "COPYRIGHT.txt"
+        }
+    },
     "libmemcached": {
         "type": "ghtagtar",
         "repo": "awesomized/libmemcached",
@@ -975,7 +999,7 @@
     "openssl": {
         "type": "ghrel",
         "repo": "openssl/openssl",
-        "match": "openssl.+\\.tar\\.gz",
+        "match": "openssl-3.+\\.tar\\.gz",
         "prefer-stable": true,
         "alt": {
             "type": "filelist",
@@ -1169,7 +1193,6 @@
         "path": "php-src/ext/swoole",
         "type": "ghtar",
         "repo": "swoole/swoole-src",
-        "match": "v6\\.+",
         "prefer-stable": true,
         "license": {
             "type": "file",

phpstan.neon

@@ -14,6 +14,7 @@ parameters:
     - PHP_OS_FAMILY
   excludePaths:
       analyseAndScan:
+            - ./src/globals/ext-tests/decimal.php
             - ./src/globals/ext-tests/swoole.php
             - ./src/globals/ext-tests/swoole.phpt
             - ./src/globals/test-extensions.php

src/SPC/ConsoleApplication.php

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

src/SPC/builder/Extension.php

@@ -11,6 +11,9 @@ use SPC\exception\ValidationException;
 use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 use SPC\store\FileSystem;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
+use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
 
@@ -231,7 +234,7 @@ class Extension
         if (preg_match('/^(.*_SHARED_LIBADD\s*=\s*)(.*)$/m', $makefileContent, $matches)) {
             $prefix = $matches[1];
             $currentLibs = trim($matches[2]);
-            $newLibs = trim("{$currentLibs} {$staticLibs} {$lstdcpp}");
+            $newLibs = clean_spaces("{$currentLibs} {$staticLibs} {$lstdcpp}");
             $deduplicatedLibs = deduplicate_flags($newLibs);
 
             FileSystem::replaceFileRegex(
@@ -543,6 +546,11 @@ class Extension
      */
     protected function getSharedExtensionEnv(): array
     {
+        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
+            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
+        }
         $config = (new SPCConfigUtil($this->builder, ['no_php' => true]))->getExtensionConfig($this);
         [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']);
         $preStatic = PHP_OS_FAMILY === 'Darwin' ? '' : '-Wl,--start-group ';

src/SPC/builder/extension/decimal.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('decimal')]
+class decimal extends Extension
+{
+    // TODO: remove this when https://github.com/php-decimal/ext-decimal/issues/92 is merged
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/php_decimal.c',
+            [
+                'zend_module_entry decimal_module_entry',
+                'ZEND_GET_MODULE(decimal)',
+            ],
+            [
+                'zend_module_entry php_decimal_module_entry',
+                'ZEND_GET_MODULE(php_decimal)',
+            ]
+        );
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/config.w32',
+            'ARG_WITH("decimal", "for decimal support", "no");',
+            'ARG_WITH("decimal", "for decimal support",  "no");' . "\n" .
+            'ADD_EXTENSION_DEP("decimal", "json");'
+        );
+        return true;
+    }
+
+    public function getUnixConfigureArg(bool $shared = false): string
+    {
+        return '--enable-decimal --with-libmpdec-path="' . BUILD_ROOT_PATH . '"';
+    }
+
+    public function getWindowsConfigureArg(bool $shared = false): string
+    {
+        return '--with-decimal';
+    }
+}

src/SPC/builder/extension/grpc.php

@@ -28,6 +28,15 @@ class grpc extends Extension
             'zend_ce_exception,',
         );
 
+        // Fix include path conflict with pdo_sqlsrv: grpc's PHP ext dir is added to the global include path via
+        $grpc_php_dir = "{$this->source_dir}/src/php/ext/grpc";
+        if (file_exists("{$grpc_php_dir}/version.h")) {
+            copy("{$grpc_php_dir}/version.h", "{$grpc_php_dir}/php_grpc_version.h");
+            unlink("{$grpc_php_dir}/version.h");
+            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.h", '#include "version.h"', '#include "php_grpc_version.h"');
+            FileSystem::replaceFileStr("{$grpc_php_dir}/php_grpc.c", '#include "version.h"', '#include "php_grpc_version.h"');
+        }
+
         $config_m4 = <<<'M4'
 PHP_ARG_ENABLE(grpc, [whether to enable grpc support], [AS_HELP_STRING([--enable-grpc], [Enable grpc support])])
 

src/SPC/builder/extension/mongodb.php

@@ -5,11 +5,22 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/php-src/ext/mongodb/config.m4',
+            '/^(\s+)(src\/libmongoc\/)/m',
+            '$1${ac_config_dir}/$2'
+        );
+        return true;
+    }
+
     public function getUnixConfigureArg(bool $shared = false): string
     {
         $arg = ' --enable-mongodb' . ($shared ? '=shared' : '') . ' ';

src/SPC/builder/extension/password_argon2.php

@@ -26,7 +26,7 @@ class password_argon2 extends Extension
 
     public function getConfigureArg(bool $shared = false): string
     {
-        if ($this->builder->getLib('openssl') !== null) {
+        if ($this->builder->getExt('openssl')?->isBuildStatic() || $this->isBuildShared()) {
             if ($this->builder->getPHPVersionID() >= 80500 || ($this->builder->getPHPVersionID() >= 80400 && !$this->builder->getOption('enable-zts'))) {
                 return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
             }

src/SPC/builder/extension/sqlsrv.php

@@ -33,4 +33,14 @@ class sqlsrv extends Extension
         }
         return false;
     }
+
+    public function patchBeforeMake(): bool
+    {
+        $makefile = SOURCE_PATH . '/php-src/Makefile';
+        $makeContent = file_get_contents($makefile);
+        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/W4\b/m', '$1', $makeContent);
+        $makeContent = preg_replace('/^(CFLAGS_(?:PDO_)?SQLSRV=.*?)\s+\/WX\b/m', '$1', $makeContent);
+        file_put_contents($makefile, $makeContent);
+        return true;
+    }
 }

src/SPC/builder/extension/swoole.php

@@ -59,7 +59,7 @@ class swoole extends Extension
         $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('nghttp2') ? (' --with-nghttp2-dir=' . BUILD_ROOT_PATH) : '';
         $arg .= $this->builder->getLib('zstd') ? ' --enable-zstd' : '';
-        $arg .= $this->builder->getLib('liburing') ? ' --enable-iouring --enable-uring-socket' : '';
+        $arg .= $this->builder->getLib('liburing') && getenv('SPC_LIBC') !== 'glibc' ? ' --enable-iouring --enable-uring-socket' : '--disable-iouring';
         $arg .= $this->builder->getExt('sockets') ? ' --enable-sockets' : '';
 
         // enable additional features that require the pdo extension, but conflict with pdo_* extensions

src/SPC/builder/freebsd/library/libmpdec.php

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

src/SPC/builder/linux/LinuxBuilder.php

@@ -11,6 +11,8 @@ use SPC\store\Config;
 use SPC\store\DirDiff;
 use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\GlobalEnvManager;
 use SPC\util\SPCConfigUtil;
 use SPC\util\SPCTarget;
@@ -65,7 +67,8 @@ class LinuxBuilder extends UnixBuilderBase
             // php 8.5 contains opcache extension by default,
             // if opcache_jit is enabled for 8.5 or opcache enabled,
             // we need to disable undefined behavior sanitizer.
-            f_putenv('SPC_COMPILER_EXTRA=-fno-sanitize=undefined');
+            $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+            f_putenv('SPC_COMPILER_EXTRA=' . trim($compiler_extra . ' -fno-sanitize=undefined'));
         }
 
         if ($this->getOption('enable-zts', false)) {
@@ -266,6 +269,11 @@ class LinuxBuilder extends UnixBuilderBase
      */
     protected function buildEmbed(): void
     {
+        $compiler_extra = getenv('SPC_COMPILER_EXTRA') ?: '';
+        if (!str_contains($compiler_extra, '-lcompiler_rt') && ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $compiler_extra = trim($compiler_extra . ' -lcompiler_rt');
+            GlobalEnvManager::putenv("SPC_COMPILER_EXTRA={$compiler_extra}");
+        }
         $sharedExts = array_filter($this->exts, static fn ($ext) => $ext->isBuildShared());
         $sharedExts = array_filter($sharedExts, static function ($ext) {
             return Config::getExt($ext->getName(), 'build-with-php') === true;

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

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

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

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

src/SPC/builder/traits/UnixSystemUtilTrait.php

@@ -50,7 +50,7 @@ trait UnixSystemUtilTrait
         $defined = array_unique($defined);
         sort($defined);
         // export
-        if (SPCTarget::getTargetOS() === 'Linux') {
+        if (SPCTarget::getTargetOS() === 'Linux' && ToolchainManager::getToolchainClass() !== ZigToolchain::class) {
             file_put_contents("{$lib_file}.dynsym", "{\n" . implode("\n", array_map(fn ($x) => "  {$x};", $defined)) . "};\n");
         } else {
             file_put_contents("{$lib_file}.dynsym", implode("\n", $defined) . "\n");
@@ -72,10 +72,6 @@ trait UnixSystemUtilTrait
         if (!is_file($symbol_file)) {
             throw new SPCInternalException("The symbol file {$symbol_file} does not exist, please check if nm command is available.");
         }
-        // https://github.com/ziglang/zig/issues/24662
-        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
-            return '-Wl,--export-dynamic'; // needs release 0.16, can be removed then
-        }
         // macOS/zig
         if (SPCTarget::getTargetOS() !== 'Linux' || ToolchainManager::getToolchainClass() === ZigToolchain::class) {
             return "-Wl,-exported_symbols_list,{$symbol_file}";

src/SPC/builder/unix/UnixBuilderBase.php

@@ -463,9 +463,10 @@ abstract class UnixBuilderBase extends BuilderBase
                 "-tags={$muslTags}nobadger,nomysql,nopgx{$nobrotli}{$nowatcher}",
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ], ...GoXcaddy::getEnvironment()];
+        $pgo = file_exists("{$frankenphpSourceDir}/caddy/frankenphp/default.pgo") ? "--pgo {$frankenphpSourceDir}/caddy/frankenphp/default.pgo " : '';
         shell()->cd(BUILD_BIN_PATH)
             ->setEnv($env)
-            ->exec("xcaddy build --output frankenphp {$xcaddyModules}");
+            ->exec("xcaddy build --output frankenphp {$pgo}{$xcaddyModules}");
 
         $this->deploySAPIBinary(BUILD_TARGET_FRANKENPHP);
     }

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\store\FileSystem;
 use SPC\util\executor\UnixCMakeExecutor;
 
 trait curl
@@ -32,8 +33,16 @@ trait curl
             )
             ->build();
 
-        // patch pkgconf
         $this->patchPkgconfPrefix(['libcurl.pc']);
+        // On glibc <2.28 without built-in pthreads, FindThreads sets
+        // INTERFACE_LINK_LIBRARIES to '-lpthread'
+        // curls .pc generator walks and prepends '-l' to each
+        // entry, resulting in -l-lpthread
+        FileSystem::replaceFileRegex(
+            BUILD_LIB_PATH . '/pkgconfig/libcurl.pc',
+            '/-l(-l\S+)/',
+            '$1'
+        );
         shell()->cd(BUILD_LIB_PATH . '/cmake/CURL/')
             ->exec("sed -ie 's|\"/lib/libcurl.a\"|\"" . BUILD_LIB_PATH . "/libcurl.a\"|g' CURLTargets-release.cmake");
     }

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

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\toolchain\ToolchainManager;
+use SPC\toolchain\ZigToolchain;
 use SPC\util\executor\UnixAutoconfExecutor;
 use SPC\util\SPCConfigUtil;
 
@@ -13,7 +15,10 @@ trait krb5
     {
         $origin_source_dir = $this->source_dir;
         $this->source_dir .= '/src';
-        shell()->cd($this->source_dir)->exec('autoreconf -if');
+        shell()->cd($this->source_dir)->exec('ls -lah');
+        if (!file_exists($this->source_dir . '/configure')) {
+            shell()->cd($this->source_dir)->exec('autoreconf -if');
+        }
         $libs = array_map(fn ($x) => $x->getName(), $this->getDependencies(true));
         $spc = new SPCConfigUtil($this->builder, ['no_php' => true, 'libs_only_deps' => true]);
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
@@ -36,12 +41,16 @@ trait krb5
             $extraEnv['LDFLAGS'] = '-framework Kerberos';
             $args[] = 'ac_cv_func_secure_getenv=no';
         }
-        UnixAutoconfExecutor::create($this)
+        $make = UnixAutoconfExecutor::create($this)
             ->appendEnv($extraEnv)
             ->optionalLib('ldap', '--with-ldap', '--without-ldap')
             ->optionalLib('libedit', '--with-libedit', '--without-libedit')
-            ->configure(...$args)
+            ->configure(...$args);
-            ->make();
+
+        if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
+            $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +');
+        }
+        $make->make();
         $this->patchPkgconfPrefix([
             'krb5-gssapi.pc',
             'krb5.pc',

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

@@ -13,7 +13,8 @@ trait libde265
         UnixCMakeExecutor::create($this)
             ->addConfigureArgs(
                 '-DENABLE_SDL=OFF',
-                '-DENABLE_DECODER=OFF'
+                '-DENABLE_DECODER=OFF',
+                '-DHAVE_NEON=OFF',
             )
             ->build();
         $this->patchPkgconfPrefix(['libde265.pc']);

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

@@ -11,15 +11,28 @@ trait libheif
 {
     public function patchBeforeBuild(): bool
     {
+        $patched = false;
         if (!str_contains(file_get_contents($this->source_dir . '/CMakeLists.txt'), 'libbrotlienc')) {
             FileSystem::replaceFileStr(
                 $this->source_dir . '/CMakeLists.txt',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")',
                 'list(APPEND REQUIRES_PRIVATE "libbrotlidec")' . "\n" . '        list(APPEND REQUIRES_PRIVATE "libbrotlienc")'
             );
-            return true;
+            $patched = true;
         }
-        return false;
+        // libheif 1.22+ ships a C-incompatible header: `struct heif_bad_pixel`
+        $heif_properties = $this->source_dir . '/libheif/api/libheif/heif_properties.h';
+        if (file_exists($heif_properties)
+            && str_contains(file_get_contents($heif_properties), 'struct heif_bad_pixel { uint32_t row; uint32_t column; };')
+        ) {
+            FileSystem::replaceFileStr(
+                $heif_properties,
+                'struct heif_bad_pixel { uint32_t row; uint32_t column; };',
+                'typedef struct heif_bad_pixel { uint32_t row; uint32_t column; } heif_bad_pixel;'
+            );
+            $patched = true;
+        }
+        return $patched;
     }
 
     protected function build(): void

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

@@ -14,7 +14,10 @@ trait libjpeg
             ->addConfigureArgs(
                 '-DENABLE_STATIC=ON',
                 '-DENABLE_SHARED=OFF',
-                '-DWITH_SYSTEM_ZLIB=ON'
+                '-DWITH_SYSTEM_ZLIB=ON',
+                '-DWITH_TOOLS=OFF',
+                '-DWITH_TESTS=OFF',
+                '-DWITH_SIMD=OFF',
             )
             ->build();
         // patch pkgconfig

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

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+
+trait libmpdec
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->configure('--disable-cxx --disable-shared --enable-static')
+            ->make();
+    }
+}

src/SPC/builder/windows/library/icu_static_win.php

@@ -12,16 +12,16 @@ class icu_static_win extends WindowsLibraryBase
 
     protected function build(): void
     {
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
+        copy("{$this->source_dir}\\lib\\icudt.lib", "{$this->getLibDir()}\\icudt.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
+        copy("{$this->source_dir}\\lib\\icuin.lib", "{$this->getLibDir()}\\icuin.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
+        copy("{$this->source_dir}\\lib\\icuio.lib", "{$this->getLibDir()}\\icuio.lib");
-        copy("{$this->source_dir}\\x64-windows-static\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
+        copy("{$this->source_dir}\\lib\\icuuc.lib", "{$this->getLibDir()}\\icuuc.lib");
 
         // create libpq folder in buildroot/includes/libpq
         if (!file_exists("{$this->getIncludeDir()}\\unicode")) {
             mkdir("{$this->getIncludeDir()}\\unicode");
         }
 
-        FileSystem::copyDir("{$this->source_dir}\\x64-windows-static\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
+        FileSystem::copyDir("{$this->source_dir}\\include\\unicode", "{$this->getIncludeDir()}\\unicode");
     }
 }

src/SPC/builder/windows/library/libjpeg.php

@@ -28,6 +28,7 @@ class libjpeg extends WindowsLibraryBase
                 '-DENABLE_STATIC=ON ' .
                 '-DBUILD_TESTING=OFF ' .
                 '-DWITH_JAVA=OFF ' .
+                '-DWITH_SIMD=OFF ' .
                 '-DWITH_CRT_DLL=OFF ' .
                 "-DENABLE_ZLIB_COMPRESSION={$zlib} " .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '

src/SPC/builder/windows/library/libmpdec.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+class libmpdec extends WindowsLibraryBase
+{
+    public const NAME = 'libmpdec';
+
+    protected function build(): void
+    {
+        $makefile_dir = $this->source_dir . '\libmpdec';
+        $nmake = $this->builder->makeSimpleWrapper('nmake /nologo');
+
+        cmd()->cd($makefile_dir)
+            ->exec('copy /y Makefile.vc Makefile')
+            ->execWithWrapper($nmake, 'clean')
+            ->execWithWrapper($nmake, 'MACHINE=x64');
+
+        // Copy static lib (rename from versioned name to libmpdec_a.lib)
+        $libs = glob($makefile_dir . '\libmpdec-*.lib');
+        foreach ($libs as $lib) {
+            if (!str_contains($lib, '.dll.')) {
+                copy($lib, BUILD_LIB_PATH . '\libmpdec_a.lib');
+                break;
+            }
+        }
+        copy($makefile_dir . '\mpdecimal.h', BUILD_INCLUDE_PATH . '\mpdecimal.h');
+    }
+}

src/SPC/builder/windows/library/ngtcp2.php

@@ -29,6 +29,7 @@ class ngtcp2 extends WindowsLibraryBase
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DENABLE_STATIC_CRT=ON ' .
                 '-DENABLE_LIB_ONLY=ON ' .
+                '-DENABLE_OPENSSL=OFF ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' '
             )
             ->execWithWrapper(

src/SPC/builder/windows/library/postgresql_win.php

@@ -10,9 +10,9 @@ class postgresql_win extends WindowsLibraryBase
 
     protected function build(): void
     {
-        copy($this->source_dir . '\pgsql\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
+        copy($this->source_dir . '\lib\libpq.lib', BUILD_LIB_PATH . '\libpq.lib');
-        copy($this->source_dir . '\pgsql\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
+        copy($this->source_dir . '\lib\libpgport.lib', BUILD_LIB_PATH . '\libpgport.lib');
-        copy($this->source_dir . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
+        copy($this->source_dir . '\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
 
         // create libpq folder in buildroot/includes/libpq
         if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
@@ -21,7 +21,7 @@ class postgresql_win extends WindowsLibraryBase
 
         $headerFiles = ['libpq-fe.h', 'postgres_ext.h', 'pg_config_ext.h', 'libpq\libpq-fs.h'];
         foreach ($headerFiles as $header) {
-            copy($this->source_dir . '\pgsql\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
+            copy($this->source_dir . '\include\\' . $header, BUILD_INCLUDE_PATH . '\\' . $header);
         }
     }
 }

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -109,7 +109,7 @@ class LinuxToolCheckList
     public function fixBuildTools(array $distro, array $missing): bool
     {
         $install_cmd = match ($distro['dist']) {
-            'ubuntu', 'debian', 'Deepin' => 'apt-get install -y',
+            'ubuntu', 'debian', 'linuxmint', 'Deepin' => 'apt-get install -y',
             'alpine' => 'apk add',
             'redhat' => 'dnf install -y',
             'centos' => 'yum install -y',

src/SPC/store/Downloader.php

@@ -98,31 +98,50 @@ class Downloader
     {
         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}{$source['query']}",
-            hooks: [[CurlHook::class, 'setupGithubToken']],
-            retries: self::getRetryAttempts()
-        ), true, 512, JSON_THROW_ON_ERROR);
 
-        $url = null;
+        // Use /releases/latest when possible: it returns the semantically latest stable
-        foreach ($data as $rel) {
+        // release regardless of publish order, avoiding issues with concurrent release branches.
-            if (($rel['prerelease'] ?? false) === true && ($source['prefer-stable'] ?? false)) {
+        if ($type === 'releases' && empty($source['query']) && !($source['match'] ?? null)) {
-                continue;
+            $data = json_decode(self::curlExec(
+                url: "https://api.github.com/repos/{$source['repo']}/releases/latest",
+                hooks: [[CurlHook::class, 'setupGithubToken']],
+                retries: self::getRetryAttempts()
+            ), true, 512, JSON_THROW_ON_ERROR);
+            if (!is_array($data) || empty($data['tarball_url'])) {
+                throw new DownloaderException("failed to find {$name} source");
             }
-            if (($rel['draft'] ?? false) === true && (($source['prefer-stable'] ?? false) || !$rel['tarball_url'])) {
+            $url = $data['tarball_url'];
-                continue;
+            $version = $data['tag_name'] ?? $data['name'] ?? null;
+        } else {
+            $data = json_decode(self::curlExec(
+                url: "https://api.github.com/repos/{$source['repo']}/{$type}{$source['query']}",
+                hooks: [[CurlHook::class, 'setupGithubToken']],
+                retries: self::getRetryAttempts()
+            ), true, 512, JSON_THROW_ON_ERROR);
+
+            $url = null;
+            $version = null;
+            foreach ($data as $rel) {
+                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;
+                    $version = $rel['tag_name'] ?? $rel['name'] ?? null;
+                    break;
+                }
+                if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
+                    $url = $rel['tarball_url'];
+                    $version = $rel['tag_name'] ?? $rel['name'] ?? null;
+                    break;
+                }
             }
-            if (!($source['match'] ?? null)) {
+            if (!$url) {
-                $url = $rel['tarball_url'] ?? null;
+                throw new DownloaderException("failed to find {$name} source");
-                break;
             }
-            if (preg_match('|' . $source['match'] . '|', $rel['tarball_url'])) {
-                $url = $rel['tarball_url'];
-                break;
-            }
-        }
-        if (!$url) {
-            throw new DownloaderException("failed to find {$name} source");
         }
         $headers = self::curlExec(
             url: $url,
@@ -134,7 +153,7 @@ class Downloader
         if ($matches) {
             $filename = $matches['filename'];
         } else {
-            $filename = "{$name}-" . ($type === 'releases' ? $data['tag_name'] : $data['name']) . '.tar.gz';
+            $filename = "{$name}-" . ($version ?? 'latest') . '.tar.gz';
         }
 
         return [$url, $filename];

src/SPC/store/FileSystem.php

@@ -152,7 +152,7 @@ class FileSystem
         $src_path = FileSystem::convertPath($from);
         switch (PHP_OS_FAMILY) {
             case 'Windows':
-                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/v/y/i');
+                f_passthru('xcopy "' . $src_path . '" "' . $dst_path . '" /s/e/y/i');
                 break;
             case 'Linux':
             case 'Darwin':

src/SPC/store/SourcePatcher.php

@@ -95,6 +95,10 @@ class SourcePatcher
         // patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
         FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');
 
+        if ($builder->getPHPVersionID() >= 80300 && $builder->getPHPVersionID() < 80400) {
+            self::patchFile('spc_fix_avx512_cache_before_80400.patch', SOURCE_PATH . '/php-src');
+        }
+
         if ($builder->getOption('enable-micro-win32')) {
             self::patchMicroWin32();
         } else {
@@ -125,6 +129,15 @@ class SourcePatcher
             FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/configure', '/have_capstone="yes"/', 'have_capstone="no"');
         }
 
+        // PHP 8.2 and below: bcmath libbcmath uses K&R style C function
+        if (is_unix() && $builder->getPHPVersionID() < 80300) {
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/configure',
+                "for ac_arg in '' -std=gnu23",
+                "for ac_arg in '' -std=gnu17",
+            );
+        }
+
         if (file_exists(SOURCE_PATH . '/php-src/configure.ac.bak')) {
             // restore configure.ac
             FileSystem::restoreBackupFile(SOURCE_PATH . '/php-src/configure.ac');

src/SPC/store/pkg/GoXcaddy.php

@@ -85,7 +85,7 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->exec('CGO_ENABLED=0 go install github.com/caddyserver/xcaddy/cmd/xcaddy@master');
     }
 
     public static function getEnvironment(): array

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -182,7 +182,8 @@ class UnixCMakeExecutor extends Executor
         $target_arch = arch2gnu(php_uname('m'));
         $cflags = getenv('SPC_DEFAULT_C_FLAGS');
         $cc = getenv('CC');
-        $cxx = getenv('CCX');
+        $cxx = getenv('CXX');
+        $include = BUILD_INCLUDE_PATH;
         logger()->debug("making cmake tool chain file for {$os} {$target_arch} with CFLAGS='{$cflags}'");
         $root = BUILD_ROOT_PATH;
         $pkgConfigExecutable = PkgConfigUtil::findPkgConfig();
@@ -210,6 +211,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "{$include}")
+set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES "{$include}")
 set(CMAKE_EXE_LINKER_FLAGS "-ldl -lpthread -lm -lutil")
 CMAKE;
         // Whoops, linux may need CMAKE_AR sometimes

src/globals/common-tests/embed.c

@@ -1,17 +1,12 @@
 #include <sapi/embed/php_embed.h>
 
-int main(int argc,char **argv){
+int main(int argc, char **argv) {
-
+    PHP_EMBED_START_BLOCK(argc, argv)
-    PHP_EMBED_START_BLOCK(argc,argv)
-
     zend_file_handle file_handle;
-
+    zend_stream_init_filename(&file_handle, "embed.php");
-    zend_stream_init_filename(&file_handle,"embed.php");
+    if(!php_execute_script(&file_handle)) {
-
-    if(!php_execute_script(&file_handle)){
         php_printf("Failed to execute PHP script.\n");
     }
-
     PHP_EMBED_END_BLOCK()
     return 0;
 }

src/globals/defines.php

@@ -25,12 +25,16 @@ const DANGER_CMD = [
 // spc internal extensions
 const SPC_INTERNAL_EXTENSIONS = [
     'core',
+    'date',
     'hash',
     'json',
+    'lexbor',
     'pcre',
+    'random',
     'reflection',
     'spl',
     'standard',
+    'uri',
 ];
 
 // spc extension alias

src/globals/ext-tests/decimal.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+assert(class_exists('Decimal\Decimal'));
+assert(method_exists('Decimal\Decimal', 'valueOf'));
+assert(0.1 + 0.2 !== 0.3);
+$result = Decimal\Decimal::valueOf('0.1') + Decimal\Decimal::valueOf('0.2');
+$expected = Decimal\Decimal::valueOf('0.3');
+assert($result == $expected);

src/globals/ext-tests/openssl.php

@@ -31,6 +31,6 @@ if (file_exists('/etc/ssl/openssl.cnf')) {
     }
     assert($valid);
 }
-if (PHP_VERSION_ID >= 80500 && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
+if (PHP_VERSION_ID >= 80500 && (!PHP_ZTS || PHP_OS_FAMILY !== 'Windows') && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
     assert(function_exists('openssl_password_hash'));
 }

src/globals/patch/spc_fix_avx512_cache_before_80400.patch

@@ -0,0 +1,91 @@
+--- a/build/php.m4
++++ b/build/php.m4
+@@ -2812,27 +2812,26 @@
+ dnl PHP_CHECK_AVX512_SUPPORTS
+ dnl
+ AC_DEFUN([PHP_CHECK_AVX512_SUPPORTS], [
+-  AC_MSG_CHECKING([for avx512 supports in compiler])
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
+-
+-  AC_LINK_IFELSE([AC_LANG_SOURCE([[
+-    #include <immintrin.h>
+-      int main(void) {
+-        __m512i mask = _mm512_set1_epi32(0x1);
+-        char out[32];
+-        _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
+-        return 0;
+-    }]])], [
++  AC_CACHE_CHECK([whether compiler supports AVX-512], [php_cv_have_avx512], [
++    save_CFLAGS="$CFLAGS"
++    CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw $CFLAGS"
++    AC_LINK_IFELSE([AC_LANG_SOURCE([[
++      #include <immintrin.h>
++        int main(void) {
++          __m512i mask = _mm512_set1_epi32(0x1);
++          char out[32];
++          _mm512_storeu_si512(out, _mm512_shuffle_epi8(mask, mask));
++          return 0;
++      }]])],
++      [php_cv_have_avx512=yes],
++      [php_cv_have_avx512=no])
++    CFLAGS="$save_CFLAGS"
++  ])
++  if test "$php_cv_have_avx512" = "yes"; then
+     have_avx512_supports=1
+-    AC_MSG_RESULT([yes])
+-  ], [
++  else
+     have_avx512_supports=0
+-    AC_MSG_RESULT([no])
+-  ])
+-
+-  CFLAGS="$save_CFLAGS"
+-
++  fi
+   AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_SUPPORTS],
+    [$have_avx512_supports], [Whether the compiler supports AVX512])
+ ])
+@@ -2841,24 +2840,26 @@
+ dnl PHP_CHECK_AVX512_VBMI_SUPPORTS
+ dnl
+ AC_DEFUN([PHP_CHECK_AVX512_VBMI_SUPPORTS], [
+-  AC_MSG_CHECKING([for avx512 vbmi supports in compiler])
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
+-  AC_LINK_IFELSE([AC_LANG_SOURCE([[
+-    #include <immintrin.h>
+-      int main(void) {
+-        __m512i mask = _mm512_set1_epi32(0x1);
+-        char out[32];
+-        _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
+-        return 0;
+-    }]])], [
++  AC_CACHE_CHECK([whether compiler supports AVX-512 VBMI], [php_cv_have_avx512vbmi], [
++    save_CFLAGS="$CFLAGS"
++    CFLAGS="-mavx512f -mavx512cd -mavx512vl -mavx512dq -mavx512bw -mavx512vbmi $CFLAGS"
++    AC_LINK_IFELSE([AC_LANG_SOURCE([[
++      #include <immintrin.h>
++        int main(void) {
++          __m512i mask = _mm512_set1_epi32(0x1);
++          char out[32];
++          _mm512_storeu_si512(out, _mm512_permutexvar_epi8(mask, mask));
++          return 0;
++      }]])],
++      [php_cv_have_avx512vbmi=yes],
++      [php_cv_have_avx512vbmi=no])
++    CFLAGS="$save_CFLAGS"
++  ])
++  if test "$php_cv_have_avx512vbmi" = "yes"; then
+     have_avx512_vbmi_supports=1
+-    AC_MSG_RESULT([yes])
+-  ], [
++  else
+     have_avx512_vbmi_supports=0
+-    AC_MSG_RESULT([no])
+-  ])
+-  CFLAGS="$save_CFLAGS"
++  fi
+   AC_DEFINE_UNQUOTED([PHP_HAVE_AVX512_VBMI_SUPPORTS],
+    [$have_avx512_vbmi_supports], [Whether the compiler supports AVX512 VBMI])
+ ])

src/globals/test-extensions.php

@@ -16,7 +16,7 @@ $test_php_version = [
     // '8.1',
     // '8.2',
     // '8.3',
-    '8.4',
+    // '8.4',
     '8.5',
     // 'git',
 ];
@@ -24,14 +24,14 @@ $test_php_version = [
 // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
     // 'macos-15-intel', // bin/spc for x86_64
-    'macos-15', // bin/spc for arm64
+    // '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-22.04-arm', // bin/spc-gnu-docker for arm64
     // 'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
-    'windows-2025',
+    // 'windows-2025',
 ];
 
 // whether enable thread safe
@@ -43,15 +43,15 @@ $no_strip = false;
 $upx = false;
 
 // whether to test frankenphp build, only available for macOS and linux
-$frankenphp = false;
+$frankenphp = true;
 
 // prefer downloading pre-built packages to speed up the build process
-$prefer_pre_built = false;
+$prefer_pre_built = true;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'zlib',
+    'Linux', 'Darwin' => 'curl,gd',
-    'Windows' => 'gd,zlib,mbstring,filter',
+    'Windows' => 'bcmath,brotli,bz2,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,iconv,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_pgsql,pgsql,session,simdjson,simplexml,sodium,sqlite3,tokenizer,xml,xmlreader,xmlwriter,zip,zlib',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
@@ -66,7 +66,7 @@ $with_suggested_libs = true;
 
 // 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' => 'libjpeg',
+    'Linux', 'Darwin' => '',
     'Windows' => '',
 };
 

tests/mock/SPC_store.php

@@ -12,6 +12,15 @@ use SPC\exception\SPCInternalException;
 function f_exec(string $command, mixed &$output, mixed &$result_code): bool
 {
     $result_code = 0;
+    if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases/latest')) {
+        $output = explode("\n", json_encode([
+            'tag_name' => 'v1.1.1',
+            'tarball_url' => 'https://api.github.com/repos/AOMediaCodec/libavif/tarball/v1.1.1',
+            'prerelease' => false,
+            'draft' => false,
+        ]));
+        return true;
+    }
     if (str_contains($command, 'https://api.github.com/repos/AOMediaCodec/libavif/releases')) {
         $output = explode("\n", gzdecode(file_get_contents(__DIR__ . '/../assets/github_api_AOMediaCodec_libavif_releases.json.gz')));
         return true;