.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 extensions)" --with-php=${{ matrix.php }} --debug
+        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php)" --with-php=${{ matrix.php }} --debug
 
       - name: "Run Build Tests (build)"
-        run: bin/spc build $(php src/globals/test-extensions.php cmd) --build-cli --build-micro --build-fpm --debug
+        run: bin/spc build "$(php src/globals/test-extensions.php)" --build-cli --build-micro --build-fpm --debug

config/ext.json

@@ -122,10 +122,6 @@
             "libiconv"
         ]
     },
-    "igbinary": {
-        "type": "external",
-        "source": "igbinary"
-    },
     "imagick": {
         "type": "external",
         "source": "ext-imagick",
@@ -335,12 +331,7 @@
         "source": "redis",
         "arg-type": "custom",
         "ext-suggests": [
-            "session",
-            "igbinary"
-        ],
-        "lib-suggests": [
-            "zstd",
-            "liblz4"
+            "session"
         ]
     },
     "session": {
@@ -471,14 +462,6 @@
     "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"
         ]
     },
-    "liblz4": {
-        "source": "liblz4",
+    "libmcrypt": {
+        "source": "libmcrypt",
         "static-libs-unix": [
-            "liblz4.a"
+            "libmcrypt.a"
         ]
     },
     "libmemcached": {
@@ -284,12 +284,6 @@
             "zlib"
         ]
     },
-    "libuv": {
-        "source": "libuv",
-        "static-libs-unix": [
-            "libuv.a"
-        ]
-    },
     "libwebp": {
         "source": "libwebp",
         "static-libs-unix": [
@@ -374,6 +368,12 @@
             "openssl"
         ]
     },
+    "mcrypt": {
+        "source": "mcrypt",
+        "static-libs-unix": [
+            "libmcrypt.a"
+        ]
+    },
     "ncurses": {
         "source": "ncurses",
         "static-libs-unix": [

config/source.json

@@ -100,16 +100,6 @@
             "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",
@@ -146,16 +136,6 @@
             "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",
@@ -244,13 +224,12 @@
             "path": "LICENSE.md"
         }
     },
-    "liblz4": {
-        "type": "ghrel",
-        "repo": "lz4/lz4",
-        "match": "lz4-.+\\.tar\\.gz",
+    "libmcrypt": {
+        "type": "url",
+        "url": "https://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz",
         "license": {
             "type": "file",
-            "path": "LICENSE"
+            "path": "COPYING"
         }
     },
     "libmemcached": {
@@ -272,9 +251,8 @@
         }
     },
     "libsodium": {
-        "type": "ghrel",
-        "repo": "jedisct1/libsodium",
-        "match": "libsodium-\\d+(\\.\\d+)*\\.tar\\.gz",
+        "type": "url",
+        "url": "https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -289,20 +267,6 @@
             "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",
@@ -346,6 +310,14 @@
             "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",

src/SPC/builder/extension/redis.php

@@ -13,14 +13,14 @@ class redis extends Extension
     public function getUnixConfigureArg(): string
     {
         $arg = '--enable-redis';
-        $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->getExt('session')) {
+            $arg .= ' --disable-redis-session';
+        } else {
+            $arg .= ' --enable-redis-session';
+        }
         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/library/liblz4.php

@@ -1,12 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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/macos/library/liblz4.php

@@ -1,12 +0,0 @@
-<?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

@@ -1,12 +0,0 @@
-<?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/unix/library/liblz4.php

@@ -1,26 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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/globals/test-extensions.php

@@ -2,24 +2,11 @@
 
 declare(strict_types=1);
 
-# 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 you want to test new extensions here, just modify it.
+$extensions = 'sqlsrv,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 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");
+if (PHP_OS_FAMILY === 'Darwin') {
+    $extensions .= ',sodium';
 }
-echo match ($argv[1]) {
-    'extensions' => $extensions,
-    'libs' => $additional_libs,
-    'cmd' => $extensions . ' --with-libs=' . $additional_libs,
-    default => '',
-};
+
+echo $extensions;