Merge branch 'refactor' into feature_ext_mongodb

config/ext.json

@@ -1,4 +1,8 @@
 {
+    "apcu": {
+        "type": "external",
+        "source": "apcu"
+    },
     "bcmath": {
         "type": "builtin"
     },
@@ -35,10 +39,6 @@
             "zlib"
         ]
     },
-    "apcu": {
-        "type": "external",
-        "source": "apcu"
-    },
     "event": {
         "type": "external",
         "source": "ext-event",
@@ -114,6 +114,14 @@
             "libiconv"
         ]
     },
+    "imagick": {
+        "type": "external",
+        "source": "ext-imagick",
+        "arg-type": "custom",
+        "lib-depends": [
+            "imagemagick"
+        ]
+    },
     "imap": {
         "type": "builtin",
         "arg-type": "with",
@@ -288,7 +296,7 @@
         "type": "builtin",
         "arg-type": "with",
         "lib-depends": [
-            "sodium"
+            "libsodium"
         ]
     },
     "sqlite3": {
@@ -298,6 +306,14 @@
             "sqlite"
         ]
     },
+    "ssh2": {
+        "type": "external",
+        "source": "ext-ssh2",
+        "arg-type": "with-prefix",
+        "lib-depends": [
+            "libssh2"
+        ]
+    },
     "swoole": {
         "type": "external",
         "source": "swoole",

config/lib.json

@@ -15,21 +15,6 @@
             "brotli"
         ]
     },
-    "ncurses": {
-        "source": "ncurses",
-        "static-libs-unix": [
-            "libncurses.a"
-        ]
-    },
-    "readline": {
-        "source": "readline",
-        "static-libs-unix": [
-            "libreadline.a"
-        ],
-        "lib-depends": [
-            "ncurses"
-        ]
-    },
     "bzip2": {
         "source": "bzip2",
         "static-libs-unix": [
@@ -111,6 +96,28 @@
             "gmp.h"
         ]
     },
+    "imagemagick": {
+        "source": "imagemagick",
+        "static-libs-unix": [
+            "libMagick++-7.Q16HDRI.a",
+            "libMagickCore-7.Q16HDRI.a",
+            "libMagickWand-7.Q16HDRI.a"
+        ],
+        "lib-depends": [
+            "zlib",
+            "libpng",
+            "libjpeg",
+            "bzip2",
+            "libwebp",
+            "freetype"
+        ],
+        "lib-suggests": [
+            "zstd",
+            "xz",
+            "libzip",
+            "libxml2"
+        ]
+    },
     "libavif": {
         "source": "libavif",
         "static-libs-unix": [
@@ -294,6 +301,12 @@
             "libmcrypt.a"
         ]
     },
+    "ncurses": {
+        "source": "ncurses",
+        "static-libs-unix": [
+            "libncurses.a"
+        ]
+    },
     "nghttp2": {
         "source": "nghttp2",
         "static-libs-unix": [
@@ -346,6 +359,9 @@
             "zlib"
         ]
     },
+    "pkg-config": {
+        "source": "pkg-config"
+    },
     "postgresql": {
         "source": "postgresql",
         "static-libs-unix": [
@@ -364,6 +380,15 @@
             "semaphore.h"
         ]
     },
+    "readline": {
+        "source": "readline",
+        "static-libs-unix": [
+            "libreadline.a"
+        ],
+        "lib-depends": [
+            "ncurses"
+        ]
+    },
     "sqlite": {
         "source": "sqlite",
         "static-libs-unix": [
@@ -429,5 +454,11 @@
             "zstd.h",
             "zstd_errors.h"
         ]
+    },
+    "libsodium": {
+        "source": "libsodium",
+        "static-libs-unix": [
+            "libsodium.a"
+        ]
     }
 }

config/source.json

@@ -6,6 +6,16 @@
             "path": "LICENSE"
         }
     },
+    "apcu": {
+        "type": "url",
+        "url": "http://pecl.php.net/get/APCu",
+        "path": "php-src/ext/apcu",
+        "filename": "apcu.tgz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "brotli": {
         "type": "ghtar",
         "repo": "google/brotli",
@@ -41,22 +51,24 @@
             "path": "LICENSE"
         }
     },
-    "ncurses": {
-        "type": "filelist",
-        "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
-        "regex": "/href=\"(?<file>ncurses-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+    "ext-imagick": {
+        "type": "url",
+        "url": "https://pecl.php.net/get/imagick",
+        "path": "php-src/ext/imagick",
+        "filename": "imagick.tgz",
         "license": {
             "type": "file",
-            "path": "COPYING"
+            "path": "LICENSE"
         }
     },
-    "readline": {
-        "type": "filelist",
-        "url": "https://ftp.gnu.org/pub/gnu/readline/",
-        "regex": "/href=\"(?<file>readline-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+    "ext-ssh2": {
+        "type": "url",
+        "url": "http://pecl.php.net/get/ssh2",
+        "path": "php-src/ext/ssh2",
+        "filename": "ssh2.tgz",
         "license": {
             "type": "file",
-            "path": "COPYING"
+            "path": "LICENSE"
         }
     },
     "ext-zstd": {
@@ -87,6 +99,14 @@
             "text": "Since version 6, GMP is distributed under the dual licenses, GNU LGPL v3 and GNU GPL v2. These licenses make the library free to use, share, and improve, and allow you to pass on the result. The GNU licenses give freedoms, but also set firm restrictions on the use with non-free programs."
         }
     },
+    "imagemagick": {
+        "type": "ghtar",
+        "repo": "ImageMagick/ImageMagick",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "inotify": {
         "type": "url",
         "url": "http://pecl.php.net/get/inotify",
@@ -209,16 +229,6 @@
             "path": "LICENSE"
         }
     },
-    "apcu": {
-        "type": "url",
-        "url": "http://pecl.php.net/get/APCu",
-        "path": "php-src/ext/apcu",
-        "filename": "apcu.tgz",
-        "license": {
-            "type": "file",
-            "path": "LICENSE"
-        }
-    },
     "mcrypt": {
         "type": "url",
         "url": "https://jaist.dl.sourceforge.net/project/mcrypt/MCrypt/2.6.8/mcrypt-2.6.8.tar.gz",
@@ -247,6 +257,15 @@
             "path": "LICENSE"
         }
     },
+    "ncurses": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/pub/gnu/ncurses/",
+        "regex": "/href=\"(?<file>ncurses-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "nghttp2": {
         "type": "ghrel",
         "repo": "nghttp2/nghttp2",
@@ -274,6 +293,15 @@
             "path": "LICENSE.txt"
         }
     },
+    "pkg-config": {
+        "type": "filelist",
+        "url": "https://pkgconfig.freedesktop.org/releases/",
+        "regex": "/href=\"(?<file>pkg-config-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "postgresql": {
         "type": "custom",
         "license": {
@@ -300,6 +328,15 @@
             "path": "LICENSE"
         }
     },
+    "readline": {
+        "type": "filelist",
+        "url": "https://ftp.gnu.org/pub/gnu/readline/",
+        "regex": "/href=\"(?<file>readline-(?<version>[^\"]+)\\.tar\\.gz)\"/",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "redis": {
         "type": "git",
         "path": "php-src/ext/redis",
@@ -374,5 +411,13 @@
             "type": "file",
             "path": "LICENSE"
         }
+    },
+    "libsodium": {
+        "type": "url",
+        "url": "https://download.libsodium.org/libsodium/releases/libsodium-1.0.18.tar.gz",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
     }
 }