Update PHP 8.5 to RC3, enable swoole-stdext for upcoming 6.1.0 release. (#944)

config/source.json

@@ -306,16 +306,17 @@
         "regex": "/href=\"(?<file>gettext-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "license": {
             "type": "file",
-            "path": "COPYING"
+            "path": "gettext-runtime/intl/COPYING.LIB"
         }
     },
     "gmp": {
-        "type": "url",
-        "url": "https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz",
+        "type": "filelist",
+        "url": "https://gmplib.org/download/gmp/",
+        "regex": "/href=\"(?<file>gmp-(?<version>[^\"]+)\\.tar\\.xz)\"/",
         "provide-pre-built": true,
         "alt": {
-            "type": "ghtagtar",
-            "repo": "alisw/GMP"
+            "type": "url",
+            "url": "https://dl.static-php.dev/static-php-cli/deps/gmp/gmp-6.3.0.tar.xz"
         },
         "license": {
             "type": "text",

src/SPC/builder/extension/gettext.php

@@ -15,7 +15,11 @@ class gettext extends Extension
     public function patchBeforeBuildconf(): bool
     {
         if ($this->builder instanceof MacOSBuilder) {
-            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/gettext/config.m4', 'AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB(intl');
+            FileSystem::replaceFileStr(
+                SOURCE_PATH . '/php-src/ext/gettext/config.m4',
+                ['AC_CHECK_LIB($GETTEXT_CHECK_IN_LIB', 'AC_CHECK_LIB([$GETTEXT_CHECK_IN_LIB'],
+                ['AC_CHECK_LIB(intl', 'AC_CHECK_LIB([intl'] // new php versions use a bracket
+            );
         }
         return true;
     }

src/SPC/builder/extension/swoole.php

@@ -69,12 +69,15 @@ class swoole extends Extension
         $arg .= $this->builder->getExt('swoole-hook-pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
         $arg .= $this->builder->getExt('swoole-hook-mysql') ? ' --enable-mysqlnd' : ' --disable-mysqlnd';
         $arg .= $this->builder->getExt('swoole-hook-sqlite') ? ' --enable-swoole-sqlite' : ' --disable-swoole-sqlite';
-
         if ($this->builder->getExt('swoole-hook-odbc')) {
             $config = (new SPCConfigUtil($this->builder, ['libs_only_deps' => true]))->config([], ['unixodbc']);
             $arg .= ' --with-swoole-odbc=unixODBC,' . BUILD_ROOT_PATH . ' SWOOLE_ODBC_LIBS="' . $config['libs'] . '"';
         }
 
+        if ($this->getExtVersion() >= '6.1.0') {
+            $arg .= ' --enable-swoole-stdext';
+        }
+
         if (SPCTarget::getTargetOS() === 'Darwin') {
             $arg .= ' ac_cv_lib_pthread_pthread_barrier_init=no';
         }

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

@@ -31,7 +31,7 @@ trait gettext
             $autoconf->addConfigureArgs('--disable-threads');
         }
 
-        $autoconf->configure()->make();
+        $autoconf->configure()->make(dir: $this->getSourceDir() . '/gettext-runtime/intl');
         $this->patchLaDependencyPrefix();
     }
 }

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

@@ -10,7 +10,13 @@ trait libiconv
 {
     protected function build(): void
     {
-        UnixAutoconfExecutor::create($this)->configure('--enable-extra-encodings')->make();
+        UnixAutoconfExecutor::create($this)
+            ->configure(
+                '--enable-extra-encodings',
+                '--enable-year2038',
+            )
+            ->make('install-lib', with_install: false)
+            ->make('install-lib', with_install: false, dir: $this->getSourceDir() . '/libcharset');
         $this->patchLaDependencyPrefix();
     }
 }

src/SPC/doctor/item/LinuxToolCheckList.php

@@ -82,14 +82,14 @@ class LinuxToolCheckList
         return CheckResult::ok();
     }
 
-    #[AsCheckItem('if cmake version >= 3.18', limit_os: 'Linux')]
+    #[AsCheckItem('if cmake version >= 3.22', limit_os: 'Linux')]
     public function checkCMakeVersion(): ?CheckResult
     {
         $ver = get_cmake_version();
         if ($ver === null) {
             return CheckResult::fail('Failed to get cmake version');
         }
-        if (version_compare($ver, '3.18.0') < 0) {
+        if (version_compare($ver, '3.22.0') < 0) {
             return CheckResult::fail('cmake version is too low (' . $ver . '), please update it manually!');
         }
         return CheckResult::ok($ver);

src/SPC/store/source/PhpSource.php

@@ -16,7 +16,7 @@ class PhpSource extends CustomSourceBase
     {
         $major = defined('SPC_BUILD_PHP_VERSION') ? SPC_BUILD_PHP_VERSION : '8.4';
         if ($major === '8.5') {
-            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://github.com/php/php-src/archive/refs/tags/php-8.5.0RC2.tar.gz'], $force);
+            Downloader::downloadSource('php-src', ['type' => 'url', 'url' => 'https://downloads.php.net/~daniels/php-8.5.0RC3.tar.xz'], $force);
         } elseif ($major === 'git') {
             Downloader::downloadSource('php-src', ['type' => 'git', 'url' => 'https://github.com/php/php-src.git', 'rev' => 'master'], $force);
         } else {

src/SPC/util/executor/UnixAutoconfExecutor.php

@@ -50,18 +50,22 @@ class UnixAutoconfExecutor extends Executor
      * @param bool         $with_clean     Whether to clean before building
      * @param array        $after_env_vars Environment variables postfix
      */
-    public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = []): static
+    public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = [], ?string $dir = null): static
     {
-        return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars) {
+        return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars, $dir) {
+            $shell = $this->shell;
+            if ($dir) {
+                $shell = $shell->cd($dir);
+            }
             if ($with_clean) {
-                $this->shell->exec('make clean');
+                $shell->exec('make clean');
             }
             $after_env_vars_str = $after_env_vars !== [] ? shell()->setEnv($after_env_vars)->getEnvString() : '';
-            $this->shell->exec("make -j{$this->library->getBuilder()->concurrency} {$target} {$after_env_vars_str}");
+            $shell->exec("make -j{$this->library->getBuilder()->concurrency} {$target} {$after_env_vars_str}");
             if ($with_install !== false) {
-                $this->shell->exec("make {$with_install}");
+                $shell->exec("make {$with_install}");
             }
-            return $this->shell;
+            return $shell;
         });
     }
 

src/SPC/util/executor/UnixCMakeExecutor.php

@@ -205,7 +205,7 @@ SET(CMAKE_INSTALL_PREFIX "{$root}")
 SET(CMAKE_INSTALL_LIBDIR "lib")
 
 set(PKG_CONFIG_EXECUTABLE "{$pkgConfigExecutable}")
-list(APPEND PKG_CONFIG_EXECUTABLE "--static")
+set(PKG_CONFIG_ARGN "--static" CACHE STRING "Extra arguments for pkg-config" FORCE)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

src/SPC/util/shell/UnixShell.php

@@ -29,6 +29,7 @@ class UnixShell extends Shell
 
     public function exec(string $cmd): static
     {
+        $cmd = clean_spaces($cmd);
         /* @phpstan-ignore-next-line */
         logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd));
         $original_command = $cmd;

src/globals/test-extensions.php

@@ -13,11 +13,11 @@ declare(strict_types=1);
 
 // test php version (8.1 ~ 8.4 available, multiple for matrix)
 $test_php_version = [
-    // '8.1',
+    '8.1',
     // '8.2',
     // '8.3',
-    '8.4',
-    // '8.5',
+    // '8.4',
+    '8.5',
     // 'git',
 ];
 
@@ -25,7 +25,7 @@ $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-22.04-arm', // bin/spc-gnu-docker for arm64
@@ -49,14 +49,14 @@ $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' => 'spx',
+    'Linux', 'Darwin' => 'gettext',
     'Windows' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pdo,pdo_mysql,pdo_sqlite,phar,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip',
 };
 
 // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
 $shared_extensions = match (PHP_OS_FAMILY) {
-    'Linux' => 'mysqli',
-    'Darwin' => 'zip',
+    'Linux' => '',
+    'Darwin' => '',
     'Windows' => '',
 };