Merge branch 'refactor' into libargon2-support

src/SPC/builder/BuilderProvider.php

@@ -31,13 +31,13 @@ class BuilderProvider
                 cc: $input->getOption('cc'),
                 cxx: $input->getOption('cxx'),
                 arch: $input->getOption('arch'),
-                zts: $input->getOption('enable-zts'),
+                zts: $input->hasOption('enable-zts') ? $input->getOption('enable-zts') : false,
             ),
             'Linux' => new LinuxBuilder(
                 cc: $input->getOption('cc'),
                 cxx: $input->getOption('cxx'),
                 arch: $input->getOption('arch'),
-                zts: $input->getOption('enable-zts'),
+                zts: $input->hasOption('enable-zts') ? $input->getOption('enable-zts') : false,
             ),
             default => throw new WrongUsageException('Current OS "' . PHP_OS_FAMILY . '" is not supported yet'),
         };

src/SPC/builder/extension/mongodb.php

@@ -12,6 +12,17 @@ class mongodb extends Extension
 {
     public function getUnixConfigureArg(): string
     {
-        return '--enable-mongodb --without-mongodb-sasl';
+        $arg = ' --enable-mongodb ';
+        $arg .= ' --with-mongodb-system-libs=no ';
+        $arg .= ' --with-mongodb-sasl=no  ';
+        if ($this->builder->getLib('openssl')) {
+            $arg .= '--with-mongodb-ssl=openssl';
+        }
+        if ($this->builder->getLib('icu')) {
+            $arg .= ' --with-mongodb-icu=yes ';
+        } else {
+            $arg .= ' --with-mongodb-icu=no ';
+        }
+        return $arg;
     }
 }

src/SPC/builder/linux/LinuxBuilder.php

@@ -139,7 +139,7 @@ class LinuxBuilder extends BuilderBase
                 )
             );
         }
-        if ($this->getExt('swoole')) {
+        if ($this->getExt('swoole') || $this->getExt('intl')) {
             $extra_libs .= ' -lstdc++';
         }
         if ($this->getExt('imagick')) {

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

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class icu extends LinuxLibraryBase
+{
+    public const NAME = 'icu';
+
+    protected function build()
+    {
+        $root = BUILD_ROOT_PATH;
+        $cppflag = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
+        shell()->cd($this->source_dir . '/source')
+            ->exec(
+                "{$this->builder->configure_env} {$cppflag} ./runConfigureICU Linux " .
+                '--enable-static ' .
+                '--disable-shared ' .
+                '--with-data-packaging=static ' .
+                '--enable-release=yes ' .
+                '--enable-extras=yes ' .
+                '--enable-icuio=yes ' .
+                '--enable-dyload=no ' .
+                '--enable-tools=yes ' .
+                '--enable-tests=no ' .
+                '--enable-samples=no ' .
+                "--prefix={$root}"
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install');
+    }
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -123,7 +123,7 @@ class MacOSBuilder extends BuilderBase
      */
     public function buildPHP(int $build_target = BUILD_TARGET_NONE, bool $bloat = false): void
     {
-        $extra_libs = $this->getFrameworks(true) . ' ' . ($this->getExt('swoole') ? '-lc++ ' : '');
+        $extra_libs = $this->getFrameworks(true) . ' ' . ($this->getExt('swoole') || $this->getExt('intl') ? '-lc++ ' : '');
         if (!$bloat) {
             $extra_libs .= implode(' ', $this->getAllStaticLibFiles());
         } else {

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

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class icu extends MacOSLibraryBase
+{
+    public const NAME = 'icu';
+
+    protected function build()
+    {
+        $root = BUILD_ROOT_PATH;
+        shell()->cd($this->source_dir . '/source')
+            ->exec("{$this->builder->configure_env} ./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install');
+    }
+}

src/globals/tests/intl.php

@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+assert(class_exists(NumberFormatter::class));