From 951c4e6a1837b7d015c1634e55cbe0d3133c1d4b Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:23:53 -0500 Subject: [PATCH 1/6] Update composer.json Signed-off-by: Nathanael Esayeas --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 05a1c07..296829d 100644 --- a/composer.json +++ b/composer.json @@ -30,8 +30,8 @@ } ], "require": { - "php": ">=8.1,<8.3", - "ghostwriter/option": "^1.4" + "php": ">=8.1 <8.3", + "ghostwriter/option": "^1.5" }, "require-dev": { "ghostwriter/coding-standard": "dev-main" From 1da5b3eb2375a16c35a992488c190f3368635b14 Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:23:56 -0500 Subject: [PATCH 2/6] Update composer.lock Signed-off-by: Nathanael Esayeas --- composer.lock | 314 +++++++++++++++++++++++++------------------------- 1 file changed, 160 insertions(+), 154 deletions(-) diff --git a/composer.lock b/composer.lock index 162546b..cdc6144 100644 --- a/composer.lock +++ b/composer.lock @@ -4,24 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b75b069eea36ef8418be27e887c43be8", + "content-hash": "658f7492780885de510d877746240753", "packages": [ { "name": "ghostwriter/option", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/ghostwriter/option.git", - "reference": "e8a0044c88501ba198e4e616c0e906d8fd85fdf7" + "reference": "f6ab1c1ba18c14669fd2a2c64a9d4e6e4490aae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ghostwriter/option/zipball/e8a0044c88501ba198e4e616c0e906d8fd85fdf7", - "reference": "e8a0044c88501ba198e4e616c0e906d8fd85fdf7", + "url": "https://api.github.com/repos/ghostwriter/option/zipball/f6ab1c1ba18c14669fd2a2c64a9d4e6e4490aae0", + "reference": "f6ab1c1ba18c14669fd2a2c64a9d4e6e4490aae0", "shasum": "" }, "require": { - "php": ">=8.1,<8.3" + "php": ">=8.1 <8.3" }, "require-dev": { "ghostwriter/coding-standard": "dev-main" @@ -63,7 +63,7 @@ "type": "github" } ], - "time": "2023-03-21T18:31:36+00:00" + "time": "2023-04-25T17:38:32+00:00" } ], "packages-dev": [ @@ -1090,16 +1090,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.15.1", + "version": "v3.16.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "d48755372a113bddb99f749e34805d83f3acfe04" + "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d48755372a113bddb99f749e34805d83f3acfe04", - "reference": "d48755372a113bddb99f749e34805d83f3acfe04", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", + "reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc", "shasum": "" }, "require": { @@ -1174,7 +1174,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.15.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0" }, "funding": [ { @@ -1182,7 +1182,7 @@ "type": "github" } ], - "time": "2023-03-13T23:26:30+00:00" + "time": "2023-04-02T19:30:06+00:00" }, { "name": "ghostwriter/coding-standard", @@ -1190,25 +1190,25 @@ "source": { "type": "git", "url": "https://github.com/ghostwriter/coding-standard.git", - "reference": "95e4c494e309739cae95e8b6f7665c01a0f91f7a" + "reference": "4089117284ad0acb61d9a29d0021b7945408b7e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ghostwriter/coding-standard/zipball/95e4c494e309739cae95e8b6f7665c01a0f91f7a", - "reference": "95e4c494e309739cae95e8b6f7665c01a0f91f7a", + "url": "https://api.github.com/repos/ghostwriter/coding-standard/zipball/4089117284ad0acb61d9a29d0021b7945408b7e3", + "reference": "4089117284ad0acb61d9a29d0021b7945408b7e3", "shasum": "" }, "require": { - "friendsofphp/php-cs-fixer": "^3.15.1", - "infection/infection": "^0.26.19", + "friendsofphp/php-cs-fixer": "^3.16.0", + "infection/infection": "^0.26.21", "php": ">=8.1,<8.3", - "phpunit/phpunit": "^10.0.18", + "phpunit/phpunit": "^10.1.2", "psalm/plugin-phpunit": "^0.18.4", - "rector/rector": "^0.15.23", - "slevomat/coding-standard": "^8.8", + "rector/rector": "^0.15.25", + "slevomat/coding-standard": "^8.11.1", "squizlabs/php_codesniffer": "^3.7.2", "symplify/easy-coding-standard": "^11.3.2", - "vimeo/psalm": "^5.8.0" + "vimeo/psalm": "^5.9.0" }, "default-branch": true, "type": "library", @@ -1243,7 +1243,7 @@ "type": "github" } ], - "time": "2023-03-22T17:19:14+00:00" + "time": "2023-04-29T21:15:40+00:00" }, { "name": "infection/abstract-testframework-adapter", @@ -1424,16 +1424,16 @@ }, { "name": "infection/infection", - "version": "0.26.19", + "version": "0.26.21", "source": { "type": "git", "url": "https://github.com/infection/infection.git", - "reference": "bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f" + "reference": "9bbe4994d204587e0e27475e6681b66608a690a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/infection/infection/zipball/bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f", - "reference": "bd7351c88f3a797ea8977e68fe6a3f4d4c5f457f", + "url": "https://api.github.com/repos/infection/infection/zipball/9bbe4994d204587e0e27475e6681b66608a690a9", + "reference": "9bbe4994d204587e0e27475e6681b66608a690a9", "shasum": "" }, "require": { @@ -1451,7 +1451,7 @@ "justinrainbow/json-schema": "^5.2.10", "nikic/php-parser": "^4.15.1", "ondram/ci-detector": "^4.1.0", - "php": "^8.0", + "php": "^8.1", "sanmai/later": "^0.1.1", "sanmai/pipeline": "^5.1 || ^6", "sebastian/diff": "^3.0.2 || ^4.0 || ^5.0", @@ -1463,6 +1463,7 @@ "webmozart/assert": "^1.11" }, "conflict": { + "antecedent/patchwork": "<2.1.25", "dg/bypass-finals": "<1.4.1", "phpunit/php-code-coverage": ">9,<9.1.4 || >9.2.17,<9.2.21" }, @@ -1471,6 +1472,7 @@ "ext-simplexml": "*", "fidry/makefile": "^0.2.0", "helmich/phpunit-json-assert": "^3.0", + "phpspec/prophecy": "^1.15", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1.0", "phpstan/phpstan": "^1.3.0", @@ -1536,7 +1538,7 @@ ], "support": { "issues": "https://github.com/infection/infection/issues", - "source": "https://github.com/infection/infection/tree/0.26.19" + "source": "https://github.com/infection/infection/tree/0.26.21" }, "funding": [ { @@ -1548,7 +1550,7 @@ "type": "open_collective" } ], - "time": "2023-02-05T21:47:26+00:00" + "time": "2023-04-25T19:40:27+00:00" }, { "name": "justinrainbow/json-schema", @@ -1681,16 +1683,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.1.0", + "version": "v4.2.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f" + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", - "reference": "cfa81ea1d35294d64adb9c68aa4cb9e92400e53f", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", + "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", "shasum": "" }, "require": { @@ -1726,9 +1728,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.1.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" }, - "time": "2022-12-08T20:46:14+00:00" + "time": "2023-04-09T17:37:40+00:00" }, { "name": "nikic/php-parser", @@ -2087,16 +2089,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5" + "reference": "dfc078e8af9c99210337325ff5aa152872c98714" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5", - "reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714", + "reference": "dfc078e8af9c99210337325ff5aa152872c98714", "shasum": "" }, "require": { @@ -2139,22 +2141,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1" }, - "time": "2023-03-12T10:13:29+00:00" + "time": "2023-03-27T19:02:04+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.15.3", + "version": "1.20.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "61800f71a5526081d1b5633766aa88341f1ade76" + "reference": "6c04009f6cae6eda2f040745b6b846080ef069c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/61800f71a5526081d1b5633766aa88341f1ade76", - "reference": "61800f71a5526081d1b5633766aa88341f1ade76", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6c04009f6cae6eda2f040745b6b846080ef069c2", + "reference": "6c04009f6cae6eda2f040745b6b846080ef069c2", "shasum": "" }, "require": { @@ -2184,22 +2186,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.15.3" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.3" }, - "time": "2022-12-20T20:56:55+00:00" + "time": "2023-04-25T09:01:03+00:00" }, { "name": "phpstan/phpstan", - "version": "1.10.7", + "version": "1.10.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975" + "reference": "d232901b09e67538e5c86a724be841bea5768a7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b10ceb526d9607903c5b2673f1fc8775dbe48975", - "reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c", + "reference": "d232901b09e67538e5c86a724be841bea5768a7c", "shasum": "" }, "require": { @@ -2248,20 +2250,20 @@ "type": "tidelift" } ], - "time": "2023-03-16T15:24:20+00:00" + "time": "2023-04-19T13:47:27+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.0.2", + "version": "10.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4" + "reference": "884a0da7f9f46f28b2cb69134217fd810b793974" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/20800e84296ea4732f9a125e08ce86b4004ae3e4", - "reference": "20800e84296ea4732f9a125e08ce86b4004ae3e4", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/884a0da7f9f46f28b2cb69134217fd810b793974", + "reference": "884a0da7f9f46f28b2cb69134217fd810b793974", "shasum": "" }, "require": { @@ -2280,7 +2282,7 @@ "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -2289,7 +2291,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.0-dev" + "dev-main": "10.1-dev" } }, "autoload": { @@ -2317,7 +2319,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.0.2" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.1" }, "funding": [ { @@ -2325,7 +2328,7 @@ "type": "github" } ], - "time": "2023-03-06T13:00:19+00:00" + "time": "2023-04-17T12:15:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2570,16 +2573,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.0.18", + "version": "10.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "582563ed2edc62d1455cdbe00ea49fe09428eef3" + "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/582563ed2edc62d1455cdbe00ea49fe09428eef3", - "reference": "582563ed2edc62d1455cdbe00ea49fe09428eef3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6f0cd95be71add539f8fd2be25b2a4a29789000b", + "reference": "6f0cd95be71add539f8fd2be25b2a4a29789000b", "shasum": "" }, "require": { @@ -2593,7 +2596,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=8.1", - "phpunit/php-code-coverage": "^10.0", + "phpunit/php-code-coverage": "^10.1.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-invoker": "^4.0", "phpunit/php-text-template": "^3.0", @@ -2619,7 +2622,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "10.0-dev" + "dev-main": "10.1-dev" } }, "autoload": { @@ -2651,7 +2654,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.18" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.1.2" }, "funding": [ { @@ -2667,7 +2670,7 @@ "type": "tidelift" } ], - "time": "2023-03-22T06:15:31+00:00" + "time": "2023-04-22T07:38:19+00:00" }, { "name": "psalm/plugin-phpunit", @@ -2933,21 +2936,21 @@ }, { "name": "rector/rector", - "version": "0.15.23", + "version": "0.15.25", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "f4984ebd62b3613002869b0ddd6868261d62819e" + "reference": "015935c7ed9e48a4f5895ba974f337e20a263841" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/f4984ebd62b3613002869b0ddd6868261d62819e", - "reference": "f4984ebd62b3613002869b0ddd6868261d62819e", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/015935c7ed9e48a4f5895ba974f337e20a263841", + "reference": "015935c7ed9e48a4f5895ba974f337e20a263841", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.10.1" + "phpstan/phpstan": "^1.10.14" }, "conflict": { "rector/rector-doctrine": "*", @@ -2982,7 +2985,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/0.15.23" + "source": "https://github.com/rectorphp/rector/tree/0.15.25" }, "funding": [ { @@ -2990,7 +2993,7 @@ "type": "github" } ], - "time": "2023-03-22T15:22:45+00:00" + "time": "2023-04-20T16:07:39+00:00" }, { "name": "sanmai/later", @@ -3052,30 +3055,30 @@ }, { "name": "sanmai/pipeline", - "version": "v6.3", + "version": "v6.7", "source": { "type": "git", "url": "https://github.com/sanmai/pipeline.git", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43" + "reference": "0e5c45c8046298212347a0bfb659126af8e75d2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sanmai/pipeline/zipball/929b115ca58d62b6b2574702df1ebde4562c7c43", - "reference": "929b115ca58d62b6b2574702df1ebde4562c7c43", + "url": "https://api.github.com/repos/sanmai/pipeline/zipball/0e5c45c8046298212347a0bfb659126af8e75d2e", + "reference": "0e5c45c8046298212347a0bfb659126af8e75d2e", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.8", "friendsofphp/php-cs-fixer": "^3", "infection/infection": ">=0.10.5", - "league/pipeline": "^1.0 || ^0.3", + "league/pipeline": "^0.3 || ^1.0", "phan/phan": ">=1.1", "php-coveralls/php-coveralls": "^2.4.1", "phpstan/phpstan": ">=0.10", - "phpunit/phpunit": "^7.4 || ^8.1 || ^9.4", + "phpunit/phpunit": ">=9.4", "vimeo/psalm": ">=2" }, "type": "library", @@ -3105,7 +3108,7 @@ "description": "General-purpose collections pipeline", "support": { "issues": "https://github.com/sanmai/pipeline/issues", - "source": "https://github.com/sanmai/pipeline/tree/v6.3" + "source": "https://github.com/sanmai/pipeline/tree/v6.7" }, "funding": [ { @@ -3113,7 +3116,7 @@ "type": "github" } ], - "time": "2022-11-30T06:07:06+00:00" + "time": "2023-04-29T11:21:51+00:00" }, { "name": "sebastian/cli-parser", @@ -3417,16 +3420,16 @@ }, { "name": "sebastian/diff", - "version": "5.0.0", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "70dd1b20bc198da394ad542e988381b44e64e39f" + "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f", - "reference": "70dd1b20bc198da394ad542e988381b44e64e39f", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", "shasum": "" }, "require": { @@ -3471,7 +3474,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" }, "funding": [ { @@ -3479,20 +3483,20 @@ "type": "github" } ], - "time": "2023-02-03T07:00:31+00:00" + "time": "2023-05-01T07:48:21+00:00" }, { "name": "sebastian/environment", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc" + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b6f3694c6386c7959915a0037652e0c40f6f69cc", - "reference": "b6f3694c6386c7959915a0037652e0c40f6f69cc", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", "shasum": "" }, "require": { @@ -3534,7 +3538,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.0" + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" }, "funding": [ { @@ -3542,7 +3547,7 @@ "type": "github" } ], - "time": "2023-02-03T07:03:04+00:00" + "time": "2023-04-11T05:39:26+00:00" }, { "name": "sebastian/exporter", @@ -4025,32 +4030,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.8.0", + "version": "8.11.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "59e25146a4ef0a7b194c5bc55b32dd414345db89" + "reference": "af87461316b257e46e15bb041dca6fca3796d822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/59e25146a4ef0a7b194c5bc55b32dd414345db89", - "reference": "59e25146a4ef0a7b194c5bc55b32dd414345db89", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/af87461316b257e46e15bb041dca6fca3796d822", + "reference": "af87461316b257e46e15bb041dca6fca3796d822", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": ">=1.15.2 <1.16.0", + "phpstan/phpdoc-parser": ">=1.20.0 <1.21.0", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.4.10|1.9.6", - "phpstan/phpstan-deprecation-rules": "1.1.1", - "phpstan/phpstan-phpunit": "1.0.0|1.3.3", - "phpstan/phpstan-strict-rules": "1.4.4", - "phpunit/phpunit": "7.5.20|8.5.21|9.5.27" + "phpstan/phpstan": "1.10.14", + "phpstan/phpstan-deprecation-rules": "1.1.3", + "phpstan/phpstan-phpunit": "1.3.11", + "phpstan/phpstan-strict-rules": "1.5.1", + "phpunit/phpunit": "7.5.20|8.5.21|9.6.6|10.1.1" }, "type": "phpcodesniffer-standard", "extra": { @@ -4060,7 +4065,7 @@ }, "autoload": { "psr-4": { - "SlevomatCodingStandard\\": "SlevomatCodingStandard" + "SlevomatCodingStandard\\": "SlevomatCodingStandard/" } }, "notification-url": "https://packagist.org/downloads/", @@ -4074,7 +4079,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.8.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.11.1" }, "funding": [ { @@ -4086,7 +4091,7 @@ "type": "tidelift" } ], - "time": "2023-01-09T10:46:13+00:00" + "time": "2023-04-24T08:19:01+00:00" }, { "name": "spatie/array-to-xml", @@ -4210,16 +4215,16 @@ }, { "name": "symfony/console", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45" + "reference": "12288d9f4500f84a4d02254d4aa968b15488476f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45", - "reference": "cbad09eb8925b6ad4fb721c7a179344dc4a19d45", + "url": "https://api.github.com/repos/symfony/console/zipball/12288d9f4500f84a4d02254d4aa968b15488476f", + "reference": "12288d9f4500f84a4d02254d4aa968b15488476f", "shasum": "" }, "require": { @@ -4281,12 +4286,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.7" + "source": "https://github.com/symfony/console/tree/v6.2.10" }, "funding": [ { @@ -4302,7 +4307,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T17:00:03+00:00" + "time": "2023-04-28T13:37:43+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4373,16 +4378,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v6.2.7", + "version": "v6.2.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "404b307de426c1c488e5afad64403e5f145e82a5" + "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5", - "reference": "404b307de426c1c488e5afad64403e5f145e82a5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339", + "reference": "04046f35fd7d72f9646e721fc2ecb8f9c67d3339", "shasum": "" }, "require": { @@ -4436,7 +4441,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.7" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.2.8" }, "funding": [ { @@ -4452,7 +4457,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:44:56+00:00" + "time": "2023-03-20T16:06:02+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4535,16 +4540,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "82b6c62b959f642d000456f08c6d219d749215b3" + "reference": "fd588debf7d1bc16a2c84b4b3b71145d9946b894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/82b6c62b959f642d000456f08c6d219d749215b3", - "reference": "82b6c62b959f642d000456f08c6d219d749215b3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/fd588debf7d1bc16a2c84b4b3b71145d9946b894", + "reference": "fd588debf7d1bc16a2c84b4b3b71145d9946b894", "shasum": "" }, "require": { @@ -4578,7 +4583,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.2.7" + "source": "https://github.com/symfony/filesystem/tree/v6.2.10" }, "funding": [ { @@ -4594,7 +4599,7 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:44:56+00:00" + "time": "2023-04-18T13:46:08+00:00" }, { "name": "symfony/finder", @@ -5221,16 +5226,16 @@ }, { "name": "symfony/process", - "version": "v6.2.7", + "version": "v6.2.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902" + "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/680e8a2ea6b3f87aecc07a6a65a203ae573d1902", - "reference": "680e8a2ea6b3f87aecc07a6a65a203ae573d1902", + "url": "https://api.github.com/repos/symfony/process/zipball/b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", + "reference": "b34cdbc9c5e75d45a3703e63a48ad07aafa8bf2e", "shasum": "" }, "require": { @@ -5262,7 +5267,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.7" + "source": "https://github.com/symfony/process/tree/v6.2.10" }, "funding": [ { @@ -5278,7 +5283,7 @@ "type": "tidelift" } ], - "time": "2023-02-24T10:42:00+00:00" + "time": "2023-04-18T13:56:57+00:00" }, { "name": "symfony/service-contracts", @@ -5429,16 +5434,16 @@ }, { "name": "symfony/string", - "version": "v6.2.7", + "version": "v6.2.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d" + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d", - "reference": "67b8c1eec78296b85dc1c7d9743830160218993d", + "url": "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef", + "reference": "193e83bbd6617d6b2151c37fff10fa7168ebddef", "shasum": "" }, "require": { @@ -5495,7 +5500,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.7" + "source": "https://github.com/symfony/string/tree/v6.2.8" }, "funding": [ { @@ -5511,7 +5516,7 @@ "type": "tidelift" } ], - "time": "2023-02-24T10:42:00+00:00" + "time": "2023-03-20T16:06:02+00:00" }, { "name": "symplify/easy-coding-standard", @@ -5573,16 +5578,16 @@ }, { "name": "thecodingmachine/safe", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/thecodingmachine/safe.git", - "reference": "e788f3d09dcd36f806350aedb77eac348fafadd3" + "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/e788f3d09dcd36f806350aedb77eac348fafadd3", - "reference": "e788f3d09dcd36f806350aedb77eac348fafadd3", + "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0", + "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0", "shasum": "" }, "require": { @@ -5706,9 +5711,9 @@ "description": "PHP core functions that throw exceptions instead of returning FALSE on error", "support": { "issues": "https://github.com/thecodingmachine/safe/issues", - "source": "https://github.com/thecodingmachine/safe/tree/v2.4.0" + "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0" }, - "time": "2022-10-07T14:02:17+00:00" + "time": "2023-04-05T11:54:14+00:00" }, { "name": "theseer/tokenizer", @@ -5762,16 +5767,16 @@ }, { "name": "vimeo/psalm", - "version": "5.8.0", + "version": "5.9.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "9cf4f60a333f779ad3bc704a555920e81d4fdcda" + "reference": "8b9ad1eb9e8b7d3101f949291da2b9f7767cd163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/9cf4f60a333f779ad3bc704a555920e81d4fdcda", - "reference": "9cf4f60a333f779ad3bc704a555920e81d4fdcda", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/8b9ad1eb9e8b7d3101f949291da2b9f7767cd163", + "reference": "8b9ad1eb9e8b7d3101f949291da2b9f7767cd163", "shasum": "" }, "require": { @@ -5803,6 +5808,7 @@ "psalm/psalm": "self.version" }, "require-dev": { + "amphp/phpunit-util": "^2.0", "bamarni/composer-bin-plugin": "^1.4", "brianium/paratest": "^6.9", "ext-curl": "*", @@ -5861,9 +5867,9 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.8.0" + "source": "https://github.com/vimeo/psalm/tree/5.9.0" }, - "time": "2023-03-09T04:14:35+00:00" + "time": "2023-03-29T21:38:21+00:00" }, { "name": "webmozart/assert", @@ -5932,7 +5938,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=8.1,<8.3" + "php": ">=8.1 <8.3" }, "platform-dev": [], "plugin-api-version": "2.3.0" From 08d45cbed8db547e29512aac8299caf4961424a5 Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:23:59 -0500 Subject: [PATCH 3/6] Update Collection.php Signed-off-by: Nathanael Esayeas --- src/Collection.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Collection.php b/src/Collection.php index 520af31..9decfe0 100644 --- a/src/Collection.php +++ b/src/Collection.php @@ -8,8 +8,8 @@ use Countable; use Generator; use Ghostwriter\Collection\Exception\CollectionException; -use Ghostwriter\Option\Contract\SomeInterface; use Ghostwriter\Option\Some; +use Ghostwriter\Option\SomeInterface; use IteratorAggregate; use Traversable; @@ -35,7 +35,7 @@ private function __construct( */ public function append(iterable $iterable = []): self { - if ([] === $iterable) { + if ($iterable === []) { return $this; } @@ -99,7 +99,7 @@ public function filter(Closure $function): self */ public function first(Closure $function = null): mixed { - $function ??= static fn (mixed $value, int $_): bool => null !== $value; + $function ??= static fn (mixed $value, int $_): bool => $value !== null; foreach ($this->getIterator() as $key => $value) { if ($function($value, $key)) { return $value; @@ -145,7 +145,7 @@ public function getIterator(): Traversable public function last(?Closure $function = null): mixed { $last = null; - $function ??= static fn (mixed $value, int $_): bool => null !== $value; + $function ??= static fn (mixed $value, int $_): bool => $value !== null; foreach ($this->getIterator() as $key => $value) { if ($function($value, $key)) { $last = $value; From 55d7ea548e3083caf5d40b222bb2400af5f3cdcc Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:24:04 -0500 Subject: [PATCH 4/6] Update CollectionTest.php Signed-off-by: Nathanael Esayeas --- tests/Unit/CollectionTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/Unit/CollectionTest.php b/tests/Unit/CollectionTest.php index 57d602d..2a990b6 100644 --- a/tests/Unit/CollectionTest.php +++ b/tests/Unit/CollectionTest.php @@ -45,12 +45,12 @@ public function testContains(): void self::assertTrue($collection->contains(2)); - self::assertTrue($collection->contains(static fn (int $value, int $key): bool => 3 === $value && 2 === $key)); + self::assertTrue($collection->contains(static fn (int $value, int $key): bool => $value === 3 && $key === 2)); - self::assertTrue($collection->contains(static fn (int $value): bool => 1 === $value)); + self::assertTrue($collection->contains(static fn (int $value): bool => $value === 1)); self::assertFalse( - $collection->contains(static fn (int $value, int $key): bool => 0 === $value && 1 === $key) + $collection->contains(static fn (int $value, int $key): bool => $value === 0 && $key === 1) ); } @@ -76,7 +76,7 @@ public function testDropTakeSlice(): void $collection = $collection->append([4, 5, 6, 7, 8, 9]) ->map(static fn (int $v): int => $v * 10) - ->filter(static fn (int $v): bool => 0 === $v % 20) + ->filter(static fn (int $v): bool => $v % 20 === 0) ->slice(1, 3) ->drop(1) ->take(1); @@ -120,7 +120,7 @@ public function testLast(): void { $collection = Collection::fromIterable([1, 2, 3]); self::assertSame(3, $collection->last()); - self::assertSame(2, $collection->last(static fn (int $value): bool => 0 === $value % 2)); + self::assertSame(2, $collection->last(static fn (int $value): bool => $value % 2 === 0)); } /** @@ -144,7 +144,7 @@ public function testReadMeExample(): void $collection = $collection->append([4, 5, 6, 7, 8, 9]) ->map(static fn (int $v): int => $v * 10) - ->filter(static fn (int $v): bool => 0 === $v % 20); + ->filter(static fn (int $v): bool => $v % 20 === 0); self::assertSame([20, 40, 60, 80], $collection->toArray()); self::assertSame([60], $collection->drop(1)->take(2)->slice(1, 1)->toArray()); @@ -163,7 +163,7 @@ public function testReduce(): void self::assertSame(6, $collection->reduce( static fn (mixed $accumulator, int $value): int => /** @var null|int $accumulator */ - null !== $accumulator ? $accumulator + $value : $value + $accumulator !== null ? $accumulator + $value : $value )); self::assertSame('123', $collection->reduce( From b8f12b984459d38db7ef8af32f9062f6230ae49e Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:24:08 -0500 Subject: [PATCH 5/6] Update psalm-baseline.xml Signed-off-by: Nathanael Esayeas --- psalm-baseline.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index c351846..3ab366d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,5 +1,5 @@ - + append @@ -15,5 +15,8 @@ take toArray + + >]]> + From d1225f45b97e540e28257ddfdd1776e9f94111c9 Mon Sep 17 00:00:00 2001 From: Nathanael Esayeas Date: Mon, 1 May 2023 07:35:39 -0500 Subject: [PATCH 6/6] Update phpunit.xml.dist Signed-off-by: Nathanael Esayeas --- phpunit.xml.dist | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index cfe95b1..3a24eec 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,27 +1,23 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd" + beStrictAboutCoverageMetadata="true" + beStrictAboutOutputDuringTests="true" + bootstrap="vendor/autoload.php" + cacheDirectory=".cache/phpunit" + colors="true" + executionOrder="depends,defects" + failOnRisky="true" + failOnWarning="true" + requireCoverageMetadata="true" + testdox="true"> tests - - src - @@ -31,4 +27,9 @@ + + + src + +