From 86ee5efcd46c5ddead7d729c67b2875b4027c915 Mon Sep 17 00:00:00 2001 From: Denis Smet Date: Thu, 9 Mar 2023 12:54:36 +0400 Subject: [PATCH 1/2] Prefer stable versions --- composer.json | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 0e3345a..89475e2 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,9 @@ { - "name" : "jbzoo/phpunit", - "type" : "library", - "description" : "PHPUnit toolbox with short assert aliases and useful functions around testing", - "license" : "MIT", - "keywords" : [ + "name" : "jbzoo/phpunit", + "type" : "library", + "description" : "PHPUnit toolbox with short assert aliases and useful functions around testing", + "license" : "MIT", + "keywords" : [ "phpunit", "jbzoo", "aliases", @@ -14,7 +14,7 @@ "debug" ], - "authors" : [ + "authors" : [ { "name" : "Denis Smetannikov", "email" : "admin@jbzoo.com", @@ -22,7 +22,10 @@ } ], - "require" : { + "minimum-stability" : "dev", + "prefer-stable" : true, + + "require" : { "php" : "^8.1", "ext-filter" : "*", "ext-mbstring" : "*", @@ -32,7 +35,7 @@ "jbzoo/markdown" : "7.x-dev" }, - "require-dev" : { + "require-dev" : { "jbzoo/toolbox-dev" : "7.x-dev", "jbzoo/codestyle" : "7.x-dev", "jbzoo/http-client" : "7.x-dev", @@ -43,11 +46,11 @@ "symfony/process" : ">=5.4.8" }, - "suggest" : { + "suggest" : { "jbzoo/utils" : "^4.2.3" }, - "autoload" : { + "autoload" : { "psr-4" : {"JBZoo\\PHPUnit\\" : "src"}, "files" : [ "src/functions/defines.php", @@ -56,16 +59,16 @@ ] }, - "autoload-dev" : { + "autoload-dev" : { "psr-4" : {"JBZoo\\PHPUnit\\" : "tests"} }, - "config" : { + "config" : { "optimize-autoloader" : true, "allow-plugins" : {"composer/package-versions-deprecated" : true} }, - "extra" : { + "extra" : { "branch-alias" : { "dev-master" : "7.x-dev" } From a31af32a2454daad9f361303af89e4d6245a9866 Mon Sep 17 00:00:00 2001 From: Denis Smet Date: Sat, 8 Jul 2023 13:21:08 +0400 Subject: [PATCH 2/2] Fixed nullable_type_declaration --- src/functions/tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions/tools.php b/src/functions/tools.php index e146e89..8f409af 100644 --- a/src/functions/tools.php +++ b/src/functions/tools.php @@ -78,7 +78,7 @@ function openFile(string $path): ?string */ function httpRequest( string $url, - array|string $args = null, + array|string|null $args = null, string $method = Request::GET, array $options = [], ): Response {