Add uv/libuv support (#296)

* add uv/libuv support

* sort config

.github/workflows/tests.yml

@@ -140,7 +140,7 @@ jobs:
         run: bin/spc doctor --auto-fix
 
       - name: "Run Build Tests (download)"
-        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php)" --with-php=${{ matrix.php }} --debug
+        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --with-php=${{ matrix.php }} --debug
 
       - name: "Run Build Tests (build)"
-        run: bin/spc build "$(php src/globals/test-extensions.php)" --build-cli --build-micro --build-fpm --debug
+        run: bin/spc build $(php src/globals/test-extensions.php cmd) --build-cli --build-micro --build-fpm --debug

config/ext.json

@@ -122,6 +122,10 @@
             "libiconv"
         ]
     },
+    "igbinary": {
+        "type": "external",
+        "source": "igbinary"
+    },
     "imagick": {
         "type": "external",
         "source": "ext-imagick",
@@ -331,7 +335,12 @@
         "source": "redis",
         "arg-type": "custom",
         "ext-suggests": [
-            "session"
+            "session",
+            "igbinary"
+        ],
+        "lib-suggests": [
+            "zstd",
+            "liblz4"
         ]
     },
     "session": {
@@ -391,6 +400,17 @@
             "sqlite"
         ]
     },
+    "sqlsrv": {
+        "type": "external",
+        "source": "sqlsrv",
+        "lib-depends": [
+            "unixodbc"
+        ],
+        "cpp-extension": true,
+        "ext-depends-linux": [
+            "pcntl"
+        ]
+    },
     "ssh2": {
         "type": "external",
         "source": "ext-ssh2",
@@ -451,6 +471,14 @@
     "tokenizer": {
         "type": "builtin"
     },
+    "uv": {
+        "type": "external",
+        "source": "ext-uv",
+        "arg-type": "with-prefix",
+        "lib-depends": [
+            "libuv"
+        ]
+    },
     "xlswriter": {
         "type": "external",
         "source": "xlswriter",

config/lib.json

@@ -224,10 +224,10 @@
             "libturbojpeg.a"
         ]
     },
-    "libmcrypt": {
-        "source": "libmcrypt",
+    "liblz4": {
+        "source": "liblz4",
         "static-libs-unix": [
-            "libmcrypt.a"
+            "liblz4.a"
         ]
     },
     "libmemcached": {
@@ -284,6 +284,12 @@
             "zlib"
         ]
     },
+    "libuv": {
+        "source": "libuv",
+        "static-libs-unix": [
+            "libuv.a"
+        ]
+    },
     "libwebp": {
         "source": "libwebp",
         "static-libs-unix": [
@@ -368,12 +374,6 @@
             "openssl"
         ]
     },
-    "mcrypt": {
-        "source": "mcrypt",
-        "static-libs-unix": [
-            "libmcrypt.a"
-        ]
-    },
     "ncurses": {
         "source": "ncurses",
         "static-libs-unix": [
@@ -496,6 +496,17 @@
             "libtidy.a"
         ]
     },
+    "unixodbc": {
+        "source": "unixodbc",
+        "static-libs-unix": [
+            "libodbc.a",
+            "libodbccr.a",
+            "libodbcinst.a"
+        ],
+        "lib-depends": [
+            "libiconv"
+        ]
+    },
     "xz": {
         "source": "xz",
         "static-libs-unix": [

config/source.json

@@ -100,6 +100,16 @@
             "path": "LICENSE"
         }
     },
+    "ext-uv": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/uv",
+        "path": "php-src/ext/uv",
+        "filename": "uv.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ext-zstd": {
         "type": "git",
         "path": "php-src/ext/zstd",
@@ -136,6 +146,16 @@
             "path": "LICENSE"
         }
     },
+    "igbinary": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/igbinary",
+        "path": "php-src/ext/igbinary",
+        "filename": "igbinary.tgz",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "imagemagick": {
         "type": "ghtar",
         "repo": "ImageMagick/ImageMagick",
@@ -224,12 +244,13 @@
             "path": "LICENSE.md"
         }
     },
-    "libmcrypt": {
-        "type": "url",
-        "url": "https://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz",
+    "liblz4": {
+        "type": "ghrel",
+        "repo": "lz4/lz4",
+        "match": "lz4-.+\\.tar\\.gz",
         "license": {
             "type": "file",
-            "path": "COPYING"
+            "path": "LICENSE"
         }
     },
     "libmemcached": {
@@ -251,8 +272,9 @@
         }
     },
     "libsodium": {
-        "type": "url",
-        "url": "https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz",
+        "type": "ghrel",
+        "repo": "jedisct1/libsodium",
+        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -267,6 +289,20 @@
             "path": "COPYING"
         }
     },
+    "libuv": {
+        "type": "ghtar",
+        "repo": "libuv/libuv",
+        "license": [
+            {
+                "type": "file",
+                "path": "LICENSE"
+            },
+            {
+                "type": "file",
+                "path": "LICENSE-extra"
+            }
+        ]
+    },
     "libwebp": {
         "type": "url",
         "url": "https://github.com/webmproject/libwebp/archive/refs/tags/v1.3.2.tar.gz",
@@ -310,14 +346,6 @@
             "path": "LICENSE"
         }
     },
-    "mcrypt": {
-        "type": "url",
-        "url": "https://downloads.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz",
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "memcached": {
         "type": "url",
         "url": "https://pecl.php.net/get/memcached",
@@ -457,6 +485,16 @@
             "text": "The author disclaims copyright to this source code.  In place of\na legal notice, here is a blessing:\n\n  *   May you do good and not evil.\n  *   May you find forgiveness for yourself and forgive others.\n  *   May you share freely, never taking more than you give."
         }
     },
+    "sqlsrv": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/sqlsrv",
+        "path": "php-src/ext/sqlsrv",
+        "filename": "sqlsrv.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "swoole": {
         "type": "ghtar",
         "path": "php-src/ext/swoole",
@@ -486,6 +524,14 @@
             "path": "README/LICENSE.md"
         }
     },
+    "unixodbc": {
+        "type": "url",
+        "url": "https://www.unixodbc.org/unixODBC-2.3.12.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "xlswriter": {
         "type": "url",
         "url": "https://pecl.php.net/get/xlswriter",

src/SPC/builder/extension/redis.php

@@ -13,14 +13,14 @@ class redis extends Extension
     public function getUnixConfigureArg(): string
     {
         $arg = '--enable-redis';
-        if (!$this->builder->getExt('session')) {
-            $arg .= ' --disable-redis-session';
-        } else {
-            $arg .= ' --enable-redis-session';
-        }
+        $arg .= $this->builder->getExt('session') ? ' --enable-redis-session' : ' --disable-redis-session';
+        $arg .= $this->builder->getExt('igbinary') ? ' --enable-redis-igbinary' : ' --disable-redis-igbinary';
         if ($this->builder->getLib('zstd')) {
             $arg .= ' --enable-redis-zstd --with-libzstd="' . BUILD_ROOT_PATH . '"';
         }
+        if ($this->builder->getLib('liblz4')) {
+            $arg .= ' --enable-redis-lz4 --with-liblz4="' . BUILD_ROOT_PATH . '"';
+        }
         return $arg;
     }
 }

src/SPC/builder/linux/LinuxBuilder.php

@@ -144,6 +144,7 @@ class LinuxBuilder extends BuilderBase
         // prepare build php envs
         $envs_build_php = SystemUtil::makeEnvVarString([
             'CFLAGS' => $cflags,
+            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
             'LIBS' => '-ldl -lpthread',
         ]);
 

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class liblz4 extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\liblz4;
+
+    public const NAME = 'liblz4';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libuv extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libuv;
+
+    public const NAME = 'libuv';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class unixodbc extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\unixodbc;
+
+    public const NAME = 'unixodbc';
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -163,6 +163,7 @@ class MacOSBuilder extends BuilderBase
                 '--enable-shared=no ' .
                 '--enable-static=yes ' .
                 "CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " .
+                "CPPFLAGS='-I" . BUILD_INCLUDE_PATH . "' " .
                 '--disable-all ' .
                 '--disable-cgi ' .
                 '--disable-phpdbg ' .

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class liblz4 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\liblz4;
+
+    public const NAME = 'liblz4';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libuv extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libuv;
+
+    public const NAME = 'libuv';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class unixodbc extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\unixodbc;
+
+    public const NAME = 'unixodbc';
+}

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

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\store\FileSystem;
+
+trait liblz4
+{
+    protected function build()
+    {
+        shell()->cd($this->source_dir)
+            ->exec("make PREFIX='' clean")
+            ->exec("make -j{$this->builder->concurrency} PREFIX=''")
+            ->exec("make install PREFIX='' DESTDIR=" . BUILD_ROOT_PATH);
+
+        $this->patchPkgconfPrefix(['liblz4.pc']);
+
+        foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
+            if (str_starts_with($filename, 'liblz4') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
+                unlink(BUILD_ROOT_PATH . '/lib/' . $filename);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+trait libuv
+{
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        // CMake needs a clean build directory
+        FileSystem::resetDir($this->source_dir . '/build');
+        // Start build
+        shell()->cd($this->source_dir . '/build')
+            ->exec("cmake {$this->builder->makeCmakeArgs()} -DLIBUV_BUILD_SHARED=OFF ..")
+            ->exec("cmake --build . -j {$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        // patch pkgconfig
+        $this->patchPkgconfPrefix(['libuv-static.pc']);
+    }
+}

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

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
+trait unixodbc
+{
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static --disable-shared ' .
+                '--disable-debug ' .
+                '--disable-dependency-tracking ' .
+                '--with-libiconv-prefix=' . BUILD_ROOT_PATH . ' ' .
+                '--with-included-ltdl ' .
+                '--enable-gui=no ' .
+                '--prefix='
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['odbc.pc', 'odbccr.pc', 'odbcinst.pc']);
+        $this->cleanLaFiles();
+    }
+}

src/globals/test-extensions.php

@@ -2,11 +2,24 @@
 
 declare(strict_types=1);
 
-# If you want to test new extensions here, just modify it.
-$extensions = 'password-argon2,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,event,exif,fileinfo,filter,ftp,gd,gmp,iconv,imagick,imap,intl,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pcntl,pdo,pdo_mysql,pdo_pgsql,pdo_sqlite,pgsql,phar,posix,protobuf,readline,redis,session,shmop,simplexml,soap,sockets,sqlite3,swoole,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,zip,zlib';
+# Normal test, contains `common` extension.
+$extensions = 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip';
 
-if (PHP_OS_FAMILY === 'Darwin') {
-    $extensions .= ',sodium';
+# Normal test, contains gd extra libraries.
+$additional_libs = 'libwebp,libavif,libjpeg,freetype';
+
+# If you want to test additional extensions, add them below. (comma start)
+$extensions .= ',uv';
+
+# If you want to test additional features for extensions, add libs below. (comma start like extensions)
+$additional_libs .= '';
+
+if (!isset($argv[1])) {
+    exit("Please use 'extensions', 'cmd' or 'libs' as output type");
 }
-
-echo $extensions;
+echo match ($argv[1]) {
+    'extensions' => $extensions,
+    'libs' => $additional_libs,
+    'cmd' => $extensions . ' --with-libs=' . $additional_libs,
+    default => '',
+};