Add redis, igbinary extension for Windows

.github/workflows/release-build.yml

@@ -71,10 +71,10 @@ jobs:
       - name: "Download Minimal Combination"
         run: |
           if [ "${{ matrix.operating-system.name }}" = "windows-x64" ]; then
-            curl https://dl.static-php.dev/static-php-cli/windows/spc-min/php-${{ env.MICRO_VERSION }}-micro-win.zip -o tmp.zip
+            curl -fsSL https://dl.static-php.dev/static-php-cli/windows/spc-min/php-${{ env.MICRO_VERSION }}-micro-win.zip -o tmp.zip
             unzip tmp.zip
           else
-            curl https://dl.static-php.dev/static-php-cli/minimal/php-${{ env.MICRO_VERSION }}-micro-${{ matrix.operating-system.name }}.tar.gz -o tmp.tgz
+            curl -fsSL https://dl.static-php.dev/static-php-cli/minimal/php-${{ env.MICRO_VERSION }}-micro-${{ matrix.operating-system.name }}.tar.gz -o tmp.tgz
             tar -zxvf tmp.tgz
           fi
 

.github/workflows/tests.yml

@@ -176,7 +176,7 @@ jobs:
 
       - name: "Run Build Tests (download)"
         run: |
-          bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=5 --shallow-clone --prefer-pre-built
+          bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=5 --shallow-clone
 
       - name: "Download pre-built libraries for pkg-config"
         if: matrix.os != 'windows-latest'

README-zh.md

@@ -124,15 +124,15 @@ static-php-cli（简称 `spc`）有许多特性：
 ```bash
 # Download from self-hosted nightly builds (sync with main branch)
 # For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
 # For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
 # macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
 # Windows (x86_64, win10 build 17063 or later)
-curl.exe -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
 
 # Add execute perm (Linux and macOS only)
 chmod +x ./spc

README.md

@@ -134,15 +134,15 @@ Download from self-hosted nightly builds using commands below:
 ```bash
 # Download from self-hosted nightly builds (sync with main branch)
 # For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
 # For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
 # macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
 # Windows (x86_64, win10 build 17063 or later)
-curl.exe -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+curl.exe -fsSL -o spc.exehttps://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
 
 # Add execute perm (Linux and macOS only)
 chmod +x ./spc

config/ext.json

@@ -205,11 +205,14 @@
     },
     "igbinary": {
         "support": {
-            "Windows": "wip",
             "BSD": "wip"
         },
         "type": "external",
-        "source": "igbinary"
+        "source": "igbinary",
+        "ext-suggests": [
+            "session",
+            "apcu"
+        ]
     },
     "imagick": {
         "support": {
@@ -537,7 +540,6 @@
     },
     "redis": {
         "support": {
-            "Windows": "wip",
             "BSD": "wip"
         },
         "type": "external",
@@ -547,7 +549,7 @@
             "session",
             "igbinary"
         ],
-        "lib-suggests": [
+        "lib-suggests-unix": [
             "zstd",
             "liblz4"
         ]

config/lib.json

@@ -53,7 +53,8 @@
             "libssh2",
             "brotli",
             "nghttp2",
-            "zstd"
+            "zstd",
+            "libcares"
         ],
         "lib-suggests-windows": [
             "brotli",

config/source.json

@@ -546,9 +546,15 @@
         }
     },
     "openssl": {
-        "type": "filelist",
+        "type": "ghrel",
-        "url": "https://www.openssl.org/source/",
+        "repo": "openssl/openssl",
-        "regex": "/href=\"(?<file>openssl-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "match": "openssl.+\\.tar\\.gz",
+        "prefer-stable": true,
+        "alt": {
+            "type": "filelist",
+            "url": "https://www.openssl.org/source/",
+            "regex": "/href=\"(?<file>openssl-(?<version>[^\"]+)\\.tar\\.gz)\"/"
+        },
         "provide-pre-built": true,
         "license": {
             "type": "file",

docs/.vitepress/components/CliGenerator.vue

@@ -129,7 +129,7 @@
     <div v-if="selectedEnv === 'spc'" class="command-container">
       <b>{{ I18N[lang].downloadSPCBinaryCommand }}</b>
       <div class="command-preview" v-if="selectedSystem !== 'windows'">
-        curl -o spc.tgz https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-{{ selectedSystem }}-{{ selectedArch }}.tar.gz && tar -zxvf spc.tgz && rm spc.tgz<br>
+        curl -fsSL -o spc.tgz https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-{{ selectedSystem }}-{{ selectedArch }}.tar.gz && tar -zxvf spc.tgz && rm spc.tgz<br>
       </div>
       <div v-else>
         <div class="warning custom-block">

docs/en/guide/manual-build.md

@@ -14,15 +14,15 @@ Here's how to download from self-hosted server:
 ```bash
 # Download from self-hosted nightly builds (sync with main branch)
 # For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
 # For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
 # macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
 # Windows (x86_64, win10 build 17063 or later)
-curl.exe -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
 
 # Add execute perm (Linux and macOS only)
 chmod +x ./spc

docs/zh/guide/manual-build.md

@@ -11,15 +11,15 @@
 ```bash
 # Download from self-hosted nightly builds (sync with main branch)
 # For Linux x86_64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-x86_64
 # For Linux aarch64
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-linux-aarch64
 # macOS x86_64 (Intel)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-x86_64
 # macOS aarch64 (Apple)
-curl -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
+curl -fsSL -o spc https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-macos-aarch64
 # Windows (x86_64, win10 build 17063 or later)
-curl.exe -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
+curl.exe -fsSL -o spc.exe https://dl.static-php.dev/static-php-cli/spc-bin/nightly/spc-windows-x64.exe
 
 # Add execute perm (Linux and macOS only)
 chmod +x ./spc

src/SPC/ConsoleApplication.php

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

src/SPC/builder/Extension.php

@@ -180,8 +180,8 @@ class Extension
         if (file_exists(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php')) {
             // Trim additional content & escape special characters to allow inline usage
             $test = str_replace(
-                ['<?php', 'declare(strict_types=1);', "\n", '"', '$'],
+                ['<?php', 'declare(strict_types=1);', "\n", '"', '$', '!'],
-                ['', '', '', '\"', '\$'],
+                ['', '', '', '\"', '\$', '"\'!\'"'],
                 file_get_contents(ROOT_DIR . '/src/globals/ext-tests/' . $this->getName() . '.php')
             );
 

src/SPC/builder/extension/imap.php

@@ -6,11 +6,23 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('imap')]
 class imap extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        if ($this->builder->getLib('openssl')) {
+            // sometimes imap with openssl does not contain zlib (required by openssl)
+            // we need to add it manually
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/imap/config.m4', 'TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"', 'TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD -lz"');
+            return true;
+        }
+        return false;
+    }
+
     /**
      * @throws WrongUsageException
      */

src/SPC/builder/extension/rar.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\builder\macos\MacOSBuilder;
+use SPC\exception\FileSystemException;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('rar')]
+class rar extends Extension
+{
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuildconf(): bool
+    {
+        // workaround for newer Xcode clang (>= 15.0)
+        if ($this->builder instanceof MacOSBuilder) {
+            FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/rar/config.m4', '-Wall -fvisibility=hidden', '-Wall -Wno-incompatible-function-pointer-types -fvisibility=hidden');
+            return true;
+        }
+        return false;
+    }
+}

src/SPC/builder/extension/redis.php

@@ -23,4 +23,12 @@ class redis extends Extension
         }
         return $arg;
     }
+
+    public function getWindowsConfigureArg(): string
+    {
+        $arg = '--enable-redis';
+        $arg .= $this->builder->getExt('session') ? ' --enable-redis-session' : ' --disable-redis-session';
+        $arg .= $this->builder->getExt('igbinary') ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary';
+        return $arg;
+    }
 }

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

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\store\FileSystem;
+
 class icu extends LinuxLibraryBase
 {
     use \SPC\builder\unix\library\icu;
@@ -12,7 +14,7 @@ class icu extends LinuxLibraryBase
 
     protected function build(): void
     {
-        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
+        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"';
         $cxxflags = 'CXXFLAGS="-std=c++17"';
         $ldflags = 'LDFLAGS="-static"';
         shell()->cd($this->source_dir . '/source')
@@ -26,7 +28,7 @@ class icu extends LinuxLibraryBase
                 '--enable-extras=no ' .
                 '--enable-icuio=yes ' .
                 '--enable-dyload=no ' .
-                '--enable-tools=no ' .
+                '--enable-tools=yes ' .
                 '--enable-tests=no ' .
                 '--enable-samples=no ' .
                 '--prefix=' . BUILD_ROOT_PATH
@@ -36,5 +38,6 @@ class icu extends LinuxLibraryBase
             ->exec('make install');
 
         $this->patchPkgconfPrefix(['icu-i18n.pc', 'icu-io.pc', 'icu-uc.pc'], PKGCONF_PATCH_PREFIX);
+        FileSystem::removeDir(BUILD_LIB_PATH . '/icu');
     }
 }

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

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\store\FileSystem;
+
 class icu extends MacOSLibraryBase
 {
     use \SPC\builder\unix\library\icu;
@@ -14,11 +16,12 @@ class icu extends MacOSLibraryBase
     {
         $root = BUILD_ROOT_PATH;
         shell()->cd($this->source_dir . '/source')
-            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --disable-extras --disable-samples --disable-tests --disable-tools --prefix={$root}")
+            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --disable-extras --disable-samples --disable-tests --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');
 
         $this->patchPkgconfPrefix(['icu-i18n.pc', 'icu-io.pc', 'icu-uc.pc'], PKGCONF_PATCH_PREFIX);
+        FileSystem::removeDir(BUILD_LIB_PATH . '/icu');
     }
 }

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

@@ -47,6 +47,7 @@ class imap extends MacOSLibraryBase
         } else {
             $ssl_options = 'SSLTYPE=none';
         }
+        $out = shell()->execWithResult('echo "-include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h"')[1][0];
         shell()->cd($this->source_dir)
             ->exec('make clean')
             ->exec('touch ip6')
@@ -55,7 +56,7 @@ class imap extends MacOSLibraryBase
             ->exec('chmod +x src/osdep/unix/drivers')
             ->exec('chmod +x src/osdep/unix/mkauths')
             ->exec(
-                "yes | EXTRACFLAGS='-Wimplicit-function-declaration -include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h' make osx {$ssl_options}"
+                "yes | make osx {$ssl_options} EXTRACFLAGS='-Wimplicit-function-declaration -Wno-incompatible-function-pointer-types {$out}'"
             );
         try {
             shell()

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

@@ -47,6 +47,8 @@ trait curl
         $extra .= $this->builder->getLib('idn2') ? '-DUSE_LIBIDN2=ON ' : '-DUSE_LIBIDN2=OFF ';
         // lib:psl
         $extra .= $this->builder->getLib('psl') ? '-DCURL_USE_LIBPSL=ON ' : '-DCURL_USE_LIBPSL=OFF ';
+        // lib:libcares
+        $extra .= $this->builder->getLib('libcares') ? '-DENABLE_ARES=ON ' : '';
 
         FileSystem::resetDir($this->source_dir . '/build');
         // compile！

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

@@ -15,6 +15,7 @@ trait libiconv
                 './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
+                '--enable-extra-encodings ' .
                 '--prefix='
             )
             ->exec('make clean')

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

@@ -12,6 +12,7 @@ class curl extends WindowsLibraryBase
 
     protected function build(): void
     {
+        FileSystem::createDir(BUILD_BIN_PATH);
         cmd()->cd($this->source_dir . '\winbuild')
             ->execWithWrapper(
                 $this->builder->makeSimpleWrapper('nmake'),

src/SPC/store/SourcePatcher.php

@@ -57,6 +57,9 @@ 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->getOption('enable-micro-win32')) {
             SourcePatcher::patchMicroWin32();
         } else {

src/globals/ext-tests/iconv.php

@@ -0,0 +1,6 @@
+<?php
+
+declare(strict_types=1);
+
+assert(function_exists('iconv'));
+assert(iconv('UTF-8', 'CP437', 'foo') === 'foo');

src/globals/ext-tests/intl.php

@@ -3,3 +3,6 @@
 declare(strict_types=1);
 
 assert(class_exists(NumberFormatter::class));
+assert(function_exists('locale_get_default'));
+$fmt = new NumberFormatter('de-DE', NumberFormatter::DECIMAL);
+assert(strval($fmt->parse('1.100')) === '1100');

src/globals/test-extensions.php

@@ -19,13 +19,13 @@ $upx = 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' => 'swoole,bz2,gmp,intl,password-argon2,gd,mbregex,iconv,redis,sodium,yaml,readline,openssl,sqlite3,sqlsrv,zip,zlib',
+    'Linux', 'Darwin' => 'iconv',
-    'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,gd,iconv,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_sqlite,pdo_sqlsrv,phar,rar,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,swow,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib',
+    'Windows' => 'igbinary,redis,session',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
 $with_libs = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'brotli,bzip2,gmp,icu,libargon2,libavif,libcares,libevent,libiconv,liblz4,libpng,libsodium,libtiff,libwebp,libyaml,ncurses,onig,openssl,pkg-config,readline,sqlite,unixodbc,xz,zlib',
+    'Linux', 'Darwin' => '',
     'Windows' => '',
 };