Merge branch 'main' into feat/xdebug-dynamic

src/SPC/ConsoleApplication.php

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

src/SPC/builder/extension/odbc.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('odbc')]
+class odbc extends Extension
+{
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-unixODBC=' . BUILD_ROOT_PATH;
+    }
+}

src/SPC/builder/extension/pdo_odbc.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('pdo_odbc')]
+class pdo_odbc extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/pdo_odbc/config.m4', 'PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags', 'PDO_ODBC_LDFLAGS="-liconv $pdo_odbc_def_ldflags');
+        return true;
+    }
+
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-pdo-odbc=unixODBC,' . BUILD_ROOT_PATH;
+    }
+
+    public function getWindowsConfigureArg(): string
+    {
+        return '--with-pdo-odbc';
+    }
+}

src/SPC/builder/extension/pdo_pgsql.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('pdo_pgsql')]
+class pdo_pgsql extends Extension
+{
+    public function getWindowsConfigureArg(): string
+    {
+        return '--with-pdo-pgsql=yes';
+    }
+}

src/SPC/builder/extension/pgsql.php

@@ -40,4 +40,16 @@ class pgsql extends Extension
         }
         return '--with-pgsql=' . BUILD_ROOT_PATH;
     }
+
+    /**
+     * @throws WrongUsageException
+     * @throws RuntimeException
+     */
+    public function getWindowsConfigureArg(): string
+    {
+        if ($this->builder->getPHPVersionID() >= 80400) {
+            return '--with-pgsql';
+        }
+        return '--with-pgsql=' . BUILD_ROOT_PATH;
+    }
 }

src/SPC/builder/windows/WindowsBuilder.php

@@ -95,8 +95,9 @@ class WindowsBuilder extends BuilderBase
 
         if (($logo = $this->getOption('with-micro-logo')) !== null) {
             // realpath
-            $logo = realpath($logo);
+            // $logo = realpath($logo);
             $micro_logo = '--enable-micro-logo=' . $logo . ' ';
+            copy($logo, SOURCE_PATH . '\php-src\\' . $logo);
         } else {
             $micro_logo = '';
         }

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

@@ -37,6 +37,8 @@ class curl extends WindowsLibraryBase
                 '-DBUILD_EXAMPLES=OFF ' . // disable examples
                 '-DUSE_LIBIDN2=OFF ' . // disable libidn2
                 '-DCURL_USE_LIBPSL=OFF ' . // disable libpsl
+                '-DCURL_USE_SCHANNEL=ON ' . // use Schannel instead of OpenSSL
+                '-DCURL_USE_OPENSSL=OFF ' . // disable openssl due to certificate issue
                 '-DCURL_ENABLE_SSL=ON ' .
                 '-DUSE_NGHTTP2=ON ' . // enable nghttp2
                 '-DCURL_USE_LIBSSH2=ON ' . // enable libssh2

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

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+class postgresql_win extends WindowsLibraryBase
+{
+    public const NAME = 'postgresql-win';
+
+    protected function build(): void
+    {
+        copy($this->source_dir . '\pgsql\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 . '\pgsql\lib\libpgcommon.lib', BUILD_LIB_PATH . '\libpgcommon.lib');
+
+        // create libpq folder in buildroot/includes/libpq
+        if (!file_exists(BUILD_INCLUDE_PATH . '\libpq')) {
+            mkdir(BUILD_INCLUDE_PATH . '\libpq');
+        }
+
+        $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);
+        }
+    }
+}

src/globals/ext-tests/curl.php

@@ -3,3 +3,16 @@
 declare(strict_types=1);
 
 assert(function_exists('curl_init'));
+assert(function_exists('curl_setopt'));
+assert(function_exists('curl_exec'));
+assert(function_exists('curl_close'));
+$curl_version = curl_version();
+if (stripos($curl_version['ssl_version'], 'schannel') !== false) {
+    $curl = curl_init();
+    curl_setopt($curl, CURLOPT_URL, 'https://example.com/');
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($curl, CURLOPT_HEADER, 0);
+    $data = curl_exec($curl);
+    curl_close($curl);
+    assert($data !== false);
+}

src/globals/test-extensions.php

@@ -21,10 +21,10 @@ $test_php_version = [
 
 // test os (macos-13, macos-14, ubuntu-latest, windows-latest are available)
 $test_os = [
-    'macos-13',
-    'macos-14',
+    // 'macos-13',
+    // 'macos-14',
     'ubuntu-latest',
-    // 'windows-latest',
+    'windows-latest',
 ];
 
 // whether enable thread safe
@@ -40,21 +40,21 @@ $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' => '',
-    'Windows' => 'bz2,ctype,curl,dom,filter,gd,iconv,mbstring,opcache,openssl,pdo,pdo_sqlite,phar,session,simplexml,sqlite3,tokenizer,xml,xmlwriter,yaml,zip,zlib',
+    'Linux', 'Darwin' => 'pgsql,pdo_pgsql',
+    'Windows' => 'pgsql,pdo_pgsql',
 };
 
 // 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' => 'mimalloc',
-    'Windows' => 'libjpeg,libavif,freetype,libwebp',
+    'Linux', 'Darwin' => '',
+    'Windows' => '',
 };
 
 // Please change your test base combination. We recommend testing with `common`.
 // You can use `common`, `bulk`, `minimal` or `none`.
 // note: combination is only available for *nix platform. Windows must use `none` combination
 $base_combination = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'bulk',
+    'Linux', 'Darwin' => 'minimal',
     'Windows' => 'none',
 };