Merge branch 'v3' into v3c/library-fixes

config/pkg/ext/ext-fastchart.yml

@@ -0,0 +1,20 @@
+ext-fastchart:
+  type: php-extension
+  artifact:
+    source:
+      type: ghtar
+      repo: iliaal/fastchart
+      extract: php-src/ext/fastchart
+      prefer-stable: true
+    metadata:
+      license-files: [LICENSE]
+  depends:
+    - freetype
+  suggests:
+    - libpng
+    - libjpeg
+    - libwebp
+  php-extension:
+    os:
+      - Linux
+      - Darwin

config/pkg/ext/ext-fastjson.yml

@@ -0,0 +1,14 @@
+ext-fastjson:
+  type: php-extension
+  artifact:
+    source:
+      type: ghtar
+      repo: iliaal/fastjson
+      extract: php-src/ext/fastjson
+      prefer-stable: true
+    metadata:
+      license-files: [LICENSE]
+  php-extension:
+    os:
+      - Linux
+      - Darwin

src/Package/Library/unixodbc.php

@@ -20,8 +20,8 @@ class unixodbc extends LibraryPackage
     {
         $sysconf_selector = match ($os = SystemTarget::getTargetOS()) {
             'Darwin' => match (SystemTarget::getTargetArch()) {
-                'x86_64' => '/usr/local/etc',
+                'x86_64' => is_dir('/usr/local/etc') ? '/usr/local/etc' : '/opt/local/etc',
-                'aarch64' => '/opt/homebrew/etc',
+                'aarch64' => is_dir('/opt/homebrew/etc') ? '/opt/homebrew/etc' : '/opt/local/etc',
                 default => throw new WrongUsageException('Unsupported architecture: ' . GNU_ARCH),
             },
             'Linux' => '/etc',

src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php

@@ -60,6 +60,8 @@ class GenExtTestMatrixCommand extends BaseCommand
         'glfw',
         'imagick',
         'intl',
+        'mongodb',
+        'gmssl',
     ];
 
     /**

src/StaticPHP/Doctor/Item/MacOSToolCheck.php

@@ -33,15 +33,20 @@ class MacOSToolCheck
         'glibtoolize',
     ];
 
-    #[CheckItem('if homebrew has installed', limit_os: 'Darwin', level: 998)]
+    #[CheckItem('if homebrew or macports has installed', limit_os: 'Darwin', level: 998)]
-    public function checkBrew(): ?CheckResult
+    public function checkBrewOrPorts(): ?CheckResult
     {
-        if (($path = MacOSUtil::findCommand('brew')) === null) {
+        $brewPath = MacOSUtil::findCommand('brew');
-            return CheckResult::fail('Homebrew is not installed', 'brew');
+        $portPath = MacOSUtil::findCommand('port');
-        }
+
-        if ($path !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
+        if ($brewPath && $brewPath !== '/opt/homebrew/bin/brew' && getenv('GNU_ARCH') === 'aarch64') {
             return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
         }
+
+        if ($brewPath === null && $portPath === null) {
+            return CheckResult::fail('Homebrew is not installed', 'brew');
+        }
+
         return CheckResult::ok();
     }
 
@@ -60,8 +65,8 @@ class MacOSToolCheck
         return CheckResult::ok();
     }
 
-    #[CheckItem('if homebrew llvm are installed', limit_os: 'Darwin')]
+    #[CheckItem('if homebrew or macports llvm are installed', limit_os: 'Darwin')]
-    public function checkBrewLLVM(): ?CheckResult
+    public function checkBrewOrPortsLLVM(): ?CheckResult
     {
         if (getenv('SPC_USE_LLVM') === 'brew') {
             $homebrew_prefix = getenv('HOMEBREW_PREFIX') ?: (SystemTarget::getTargetArch() === 'aarch64' ? '/opt/homebrew' : '/usr/local/homebrew');
@@ -71,6 +76,16 @@ class MacOSToolCheck
             }
             return CheckResult::ok($path);
         }
+
+        if (getenv('SPC_USE_LLVM') === 'port') {
+            $macportsPrefix = '/opt/local';
+
+            if (($path = MacOSUtil::findCommand('clang', ["{$macportsPrefix}/bin"])) === null) {
+                return CheckResult::fail('MacPorts llvm is not installed', 'build-tools', ['missing' => ['llvm']]);
+            }
+            return CheckResult::ok($path);
+        }
+
         return null;
     }
 
@@ -91,7 +106,7 @@ class MacOSToolCheck
                 if ($command_path !== []) {
                     return CheckResult::fail("Current {$bison} version is too old: " . $matches[0]);
                 }
-                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin']);
+                return $this->checkBisonVersion(['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin']);
             }
             return CheckResult::ok($matches[0]);
         }
@@ -108,6 +123,9 @@ class MacOSToolCheck
     #[FixItem('build-tools')]
     public function fixBuildTools(array $missing): bool
     {
+        $brewPath = MacOSUtil::findCommand('brew');
+        $portPath = MacOSUtil::findCommand('port');
+
         $replacement = [
             'glibtoolize' => 'libtool',
         ];
@@ -115,7 +133,18 @@ class MacOSToolCheck
             if (isset($replacement[$cmd])) {
                 $cmd = $replacement[$cmd];
             }
-            shell()->exec('brew install --formula ' . escapeshellarg($cmd));
+
+            if ($brewPath !== null) {
+                shell()->exec('brew install --formula ' . escapeshellarg($cmd));
+                continue;
+            }
+
+            if ($portPath !== null) {
+                shell()->exec('port install ' . escapeshellarg($cmd));
+                continue;
+            }
+
+            return false;
         }
         return true;
     }

src/StaticPHP/Toolchain/ClangPortsToolchain.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace StaticPHP\Toolchain;
+
+use StaticPHP\Util\GlobalEnvManager;
+
+class ClangPortsToolchain extends ClangNativeToolchain
+{
+    public function initEnv(): void
+    {
+        $macports_prefix = getenv('MACPORTS_PREFIX') ?: '/opt/local';
+        GlobalEnvManager::putenv("SPC_DEFAULT_CC={$macports_prefix}/bin/clang");
+        GlobalEnvManager::putenv("SPC_DEFAULT_CXX={$macports_prefix}/bin/clang++");
+        GlobalEnvManager::putenv("SPC_DEFAULT_AR={$macports_prefix}/bin/llvm-ar");
+        GlobalEnvManager::putenv('SPC_DEFAULT_LD=ld');
+        GlobalEnvManager::addPathIfNotExists("{$macports_prefix}/bin");
+    }
+}

src/StaticPHP/Toolchain/ToolchainManager.php

@@ -41,6 +41,7 @@ class ToolchainManager
             'Windows' => MSVCToolchain::class,
             'Darwin' => match (getenv('SPC_USE_LLVM') ?: 'system') {
                 'brew' => ClangBrewToolchain::class,
+                'port' => ClangPortsToolchain::class,
                 default => ClangNativeToolchain::class,
             },
             default => throw new WrongUsageException('Unsupported OS family: ' . PHP_OS_FAMILY),

src/StaticPHP/Util/GlobalEnvManager.php

@@ -134,10 +134,10 @@ class GlobalEnvManager
         }
         // test bison
         if (PHP_OS_FAMILY === 'Darwin') {
-            if ($bison = MacOSUtil::findCommand('bison', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin'])) {
+            if ($bison = MacOSUtil::findCommand('bison', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin/bison'])) {
                 self::putenv("BISON={$bison}");
             }
-            if ($yacc = MacOSUtil::findCommand('yacc', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin'])) {
+            if ($yacc = MacOSUtil::findCommand('yacc', ['/opt/homebrew/opt/bison/bin', '/usr/local/opt/bison/bin', '/opt/local/bin/yacc'])) {
                 self::putenv("YACC={$yacc}");
             }
         }