From 1a0e6ee7174a53b2d60e2bb57f4f995164db1190 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 5 Dec 2024 11:03:16 +0800 Subject: [PATCH] cs-fix, add tests --- composer.lock | 28 ++++++++++----------- config/source.json | 10 +++++--- src/SPC/builder/extension/pgsql.php | 1 - src/SPC/builder/freebsd/library/openssl.php | 1 + src/SPC/builder/linux/library/libpng.php | 1 + src/SPC/builder/linux/library/libwebp.php | 1 + src/SPC/builder/linux/library/openssl.php | 1 + src/SPC/builder/macos/library/bzip2.php | 1 + src/SPC/builder/macos/library/curl.php | 1 + src/SPC/builder/macos/library/libavif.php | 1 + src/SPC/builder/macos/library/libiconv.php | 1 + src/SPC/builder/macos/library/libpng.php | 1 + src/SPC/builder/macos/library/libwebp.php | 1 + src/SPC/builder/macos/library/nghttp2.php | 1 + src/SPC/builder/macos/library/openssl.php | 1 + src/SPC/builder/macos/library/zlib.php | 1 + src/globals/test-extensions.php | 2 +- 17 files changed, 35 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 3a7b9356..a5378127 100644 --- a/composer.lock +++ b/composer.lock @@ -2529,16 +2529,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.64.0", + "version": "v3.65.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "58dd9c931c785a79739310aef5178928305ffa67" + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67", - "reference": "58dd9c931c785a79739310aef5178928305ffa67", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f", + "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f", "shasum": "" }, "require": { @@ -2548,7 +2548,7 @@ "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", - "fidry/cpu-core-counter": "^1.0", + "fidry/cpu-core-counter": "^1.2", "php": "^7.4 || ^8.0", "react/child-process": "^0.6.5", "react/event-loop": "^1.0", @@ -2568,18 +2568,18 @@ "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "facile-it/paraunit": "^1.3 || ^2.3", - "infection/infection": "^0.29.5", - "justinrainbow/json-schema": "^5.2", + "facile-it/paraunit": "^1.3.1 || ^2.4", + "infection/infection": "^0.29.8", + "justinrainbow/json-schema": "^5.3 || ^6.0", "keradus/cli-executor": "^2.1", - "mikey179/vfsstream": "^1.6.11", + "mikey179/vfsstream": "^1.6.12", "php-coveralls/php-coveralls": "^2.7", "php-cs-fixer/accessible-object": "^1.1", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5", - "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2", - "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", - "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3", + "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8", + "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6" }, "suggest": { "ext-dom": "For handling output formats in XML", @@ -2620,7 +2620,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0" }, "funding": [ { @@ -2628,7 +2628,7 @@ "type": "github" } ], - "time": "2024-08-30T23:09:38+00:00" + "time": "2024-11-25T00:39:24+00:00" }, { "name": "humbug/box", diff --git a/config/source.json b/config/source.json index 9b27fae5..8f9437cc 100644 --- a/config/source.json +++ b/config/source.json @@ -36,9 +36,13 @@ } }, "bzip2": { - "type": "filelist", - "url": "https://sourceware.org/pub/bzip2/", - "regex": "/href=\"(?bzip2-(?[^\"]+)\\.tar\\.gz)\"/", + "alt": { + "type": "filelist", + "url": "https://sourceware.org/pub/bzip2/", + "regex": "/href=\"(?bzip2-(?[^\"]+)\\.tar\\.gz)\"/" + }, + "type": "url", + "url": "https://dl.static-php.dev/static-php-cli/deps/bzip2/bzip2-1.0.8.tar.gz", "provide-pre-built": true, "license": { "type": "text", diff --git a/src/SPC/builder/extension/pgsql.php b/src/SPC/builder/extension/pgsql.php index 1c82d7d0..d159008a 100644 --- a/src/SPC/builder/extension/pgsql.php +++ b/src/SPC/builder/extension/pgsql.php @@ -15,7 +15,6 @@ use SPC\util\CustomExt; class pgsql extends Extension { /** - * @return bool * @throws FileSystemException * @throws RuntimeException * @throws WrongUsageException diff --git a/src/SPC/builder/freebsd/library/openssl.php b/src/SPC/builder/freebsd/library/openssl.php index e525745a..fb029a77 100644 --- a/src/SPC/builder/freebsd/library/openssl.php +++ b/src/SPC/builder/freebsd/library/openssl.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/linux/library/libpng.php b/src/SPC/builder/linux/library/libpng.php index 1946e925..5049a647 100644 --- a/src/SPC/builder/linux/library/libpng.php +++ b/src/SPC/builder/linux/library/libpng.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/linux/library/libwebp.php b/src/SPC/builder/linux/library/libwebp.php index d376e341..8cd3c670 100644 --- a/src/SPC/builder/linux/library/libwebp.php +++ b/src/SPC/builder/linux/library/libwebp.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/linux/library/openssl.php b/src/SPC/builder/linux/library/openssl.php index 46fcd75e..e427bbf9 100644 --- a/src/SPC/builder/linux/library/openssl.php +++ b/src/SPC/builder/linux/library/openssl.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/bzip2.php b/src/SPC/builder/macos/library/bzip2.php index bd44e0bc..7719770c 100644 --- a/src/SPC/builder/macos/library/bzip2.php +++ b/src/SPC/builder/macos/library/bzip2.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/curl.php b/src/SPC/builder/macos/library/curl.php index 3a24f31a..0555f66e 100644 --- a/src/SPC/builder/macos/library/curl.php +++ b/src/SPC/builder/macos/library/curl.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/libavif.php b/src/SPC/builder/macos/library/libavif.php index 74b84b6a..8201c64d 100644 --- a/src/SPC/builder/macos/library/libavif.php +++ b/src/SPC/builder/macos/library/libavif.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/libiconv.php b/src/SPC/builder/macos/library/libiconv.php index d5c2b693..945c82e0 100644 --- a/src/SPC/builder/macos/library/libiconv.php +++ b/src/SPC/builder/macos/library/libiconv.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/libpng.php b/src/SPC/builder/macos/library/libpng.php index 39522a8c..b61cc898 100644 --- a/src/SPC/builder/macos/library/libpng.php +++ b/src/SPC/builder/macos/library/libpng.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/libwebp.php b/src/SPC/builder/macos/library/libwebp.php index 1b2a2ee8..324b5543 100644 --- a/src/SPC/builder/macos/library/libwebp.php +++ b/src/SPC/builder/macos/library/libwebp.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/nghttp2.php b/src/SPC/builder/macos/library/nghttp2.php index 09277912..61aceb24 100644 --- a/src/SPC/builder/macos/library/nghttp2.php +++ b/src/SPC/builder/macos/library/nghttp2.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/openssl.php b/src/SPC/builder/macos/library/openssl.php index 1e171ef2..54ebe975 100644 --- a/src/SPC/builder/macos/library/openssl.php +++ b/src/SPC/builder/macos/library/openssl.php @@ -1,4 +1,5 @@ * diff --git a/src/SPC/builder/macos/library/zlib.php b/src/SPC/builder/macos/library/zlib.php index 2f451c10..a5c0b2b0 100644 --- a/src/SPC/builder/macos/library/zlib.php +++ b/src/SPC/builder/macos/library/zlib.php @@ -1,4 +1,5 @@ * diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 1064f2d2..49bda62c 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -38,7 +38,7 @@ $prefer_pre_built = false; // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'grpc', + 'Linux', 'Darwin' => 'grpc,openssl', 'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,gd,iconv,igbinary,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_sqlite,pdo_sqlsrv,phar,rar,redis,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,swow,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib', };