Refactor ConfigValidator, make it more strict

Author: crazywhalecc

config/ext.json

@@ -453,7 +453,7 @@
         "type": "external",
         "source": "msgpack",
         "arg-type-unix": "with",
-        "arg-type-win": "enable",
+        "arg-type-windows": "enable",
         "ext-depends": [
             "session"
         ]
@@ -885,36 +885,38 @@
             "mysqli"
         ]
     },
-    "swoole-hook-pgsql": {
+    "swoole-hook-odbc": {
         "support": {
             "Windows": "no",
-            "BSD": "wip",
-            "Darwin": "partial"
+            "BSD": "wip"
         },
         "notes": true,
         "type": "addon",
         "arg-type": "none",
         "ext-depends": [
-            "pgsql",
             "pdo",
             "swoole"
+        ],
+        "lib-depends": [
+            "unixodbc"
         ]
     },
-    "swoole-hook-sqlite": {
+    "swoole-hook-pgsql": {
         "support": {
             "Windows": "no",
-            "BSD": "wip"
+            "BSD": "wip",
+            "Darwin": "partial"
         },
         "notes": true,
         "type": "addon",
         "arg-type": "none",
         "ext-depends": [
-            "sqlite3",
+            "pgsql",
             "pdo",
             "swoole"
         ]
     },
-    "swoole-hook-odbc": {
+    "swoole-hook-sqlite": {
         "support": {
             "Windows": "no",
             "BSD": "wip"
@@ -923,11 +925,9 @@
         "type": "addon",
         "arg-type": "none",
         "ext-depends": [
+            "sqlite3",
             "pdo",
             "swoole"
-        ],
-        "lib-depends": [
-            "unixodbc"
         ]
     },
     "swow": {

config/lib.json

@@ -203,7 +203,6 @@
             "libcares"
         ],
         "cpp-library": true,
-        "provide-pre-built": true,
         "frameworks": [
             "CoreFoundation"
         ]
@@ -560,6 +559,21 @@
             "zstd"
         ]
     },
+    "liburing": {
+        "source": "liburing",
+        "pkg-configs": [
+            "liburing",
+            "liburing-ffi"
+        ],
+        "static-libs-linux": [
+            "liburing.a",
+            "liburing-ffi.a"
+        ],
+        "headers-linux": [
+            "liburing/",
+            "liburing.h"
+        ]
+    },
     "libuuid": {
         "source": "libuuid",
         "static-libs-unix": [
@@ -940,20 +954,5 @@
             "zstd.h",
             "zstd_errors.h"
         ]
-    },
-    "liburing": {
-        "source": "liburing",
-        "pkg-configs": [
-            "liburing",
-            "liburing-ffi"
-        ],
-        "static-libs-linux": [
-            "liburing.a",
-            "liburing-ffi.a"
-        ],
-        "headers-linux": [
-            "liburing/",
-            "liburing.h"
-        ]
     }
 }

config/source.json

@@ -669,6 +669,15 @@
             "path": "LICENSE.md"
         }
     },
+    "liburing": {
+        "type": "ghtar",
+        "repo": "axboe/liburing",
+        "prefer-stable": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "libuuid": {
         "type": "git",
         "url": "https://github.com/static-php/libuuid.git",
@@ -990,7 +999,6 @@
     },
     "snappy": {
         "type": "git",
-        "repo": "google/snappy",
         "rev": "main",
         "url": "https://github.com/google/snappy",
         "license": {
@@ -1154,14 +1162,5 @@
             "type": "file",
             "path": "LICENSE"
         }
-    },
-    "liburing": {
-        "type": "ghtar",
-        "repo": "axboe/liburing",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
     }
 }

src/SPC/store/LockFile.php

@@ -155,8 +155,8 @@ public static function putLockSourceHash(array $lock_options, string $destinatio
      * @param string $name Source name
      * @param array{
      *     source_type: string,
-     *     dirname: ?string,
-     *     filename: ?string,
+     *     dirname?: ?string,
+     *     filename?: ?string,
      *     move_path: ?string,
      *     lock_as: int
      * } $data Source data