Merge branch 'main' into ext/rdkafka

# Conflicts:
#	src/globals/test-extensions.php

src/SPC/builder/extension/grpc.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\builder\macos\MacOSBuilder;
+use SPC\builder\windows\WindowsBuilder;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+use SPC\util\GlobalEnvManager;
+
+#[CustomExt('grpc')]
+class grpc extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        // soft link to the grpc source code
+        if ($this->builder instanceof WindowsBuilder) {
+            // not support windows yet
+            throw new \RuntimeException('grpc extension does not support windows yet');
+        }
+        if (!is_link(SOURCE_PATH . '/php-src/ext/grpc')) {
+            shell()->exec('ln -s ' . $this->builder->getLib('grpc')->getSourceDir() . '/src/php/ext/grpc ' . SOURCE_PATH . '/php-src/ext/grpc');
+            $macos = $this->builder instanceof MacOSBuilder ? "\n" . '  LDFLAGS="$LDFLAGS -framework CoreFoundation"' : '';
+            FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/ext/grpc/config.m4', '/GRPC_LIBDIR=.*$/m', 'GRPC_LIBDIR=' . BUILD_LIB_PATH . $macos);
+            FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/ext/grpc/config.m4', '/SEARCH_PATH=.*$/m', 'SEARCH_PATH="' . BUILD_ROOT_PATH . '"');
+            return true;
+        }
+        return false;
+    }
+
+    public function patchBeforeMake(): bool
+    {
+        // add -Wno-strict-prototypes
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -Wno-strict-prototypes');
+        return true;
+    }
+
+    public function getUnixConfigureArg(): string
+    {
+        return '--enable-grpc=' . BUILD_ROOT_PATH . '/grpc GRPC_LIB_SUBDIR=' . BUILD_LIB_PATH;
+    }
+}

src/SPC/builder/extension/parallel.php

@@ -6,6 +6,7 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('parallel')]
@@ -17,4 +18,10 @@ class parallel extends Extension
             throw new WrongUsageException('ext-parallel must be built with ZTS builds. Use "--enable-zts" option!');
         }
     }
+
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileRegex(SOURCE_PATH . '/php-src/ext/parallel/config.m4', '/PHP_VERSION=.*/m', '');
+        return true;
+    }
 }

src/SPC/builder/extension/pgsql.php

@@ -6,6 +6,8 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
@@ -14,6 +16,8 @@ class pgsql extends Extension
 {
     /**
      * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
      */
     public function patchBeforeConfigure(): bool
     {
@@ -24,4 +28,16 @@ class pgsql extends Extension
         );
         return true;
     }
+
+    /**
+     * @throws WrongUsageException
+     * @throws RuntimeException
+     */
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getPHPVersionID() >= 80400) {
+            return '--with-pgsql PGSQL_CFLAGS=-I' . BUILD_INCLUDE_PATH . ' PGSQL_LIBS="-L' . BUILD_LIB_PATH . ' -lpq -lpgport -lpgcommon"';
+        }
+        return '--with-pgsql=' . BUILD_ROOT_PATH;
+    }
 }

src/SPC/builder/extension/sodium.php

@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('sodium')]
-class sodium extends Extension
-{
-    public function patchBeforeBuildconf(): bool
-    {
-        // bypass error: unknown warning option '-Wno-logical-op' for macOS
-        return $this->removeLineContainingString();
-    }
-
-    private function removeLineContainingString(): bool
-    {
-        $path = SOURCE_PATH . '/php-src/ext/sodium/config.m4';
-        $search = '-Wno-logical-op';
-        if (!file_exists($path)) {
-            return false;
-        }
-        $content = file_get_contents($path);
-        $lines = preg_split('/\r\n|\n/', $content);
-        $filteredLines = array_filter($lines, function ($line) use ($search) {
-            return strpos($line, $search) === false;
-        });
-        $newContent = implode("\n", $filteredLines);
-        file_put_contents($path, $newContent);
-        return true;
-    }
-}

src/SPC/builder/extension/zlib.php

@@ -12,6 +12,9 @@ class zlib extends Extension
 {
     public function getUnixConfigureArg(): string
     {
+        if ($this->builder->getPHPVersionID() >= 80400) {
+            return '--with-zlib';
+        }
         return '--with-zlib --with-zlib-dir="' . BUILD_ROOT_PATH . '"';
     }
 }