From d36c3cf656d5d3536e6bb74f1884b999bcda7efe Mon Sep 17 00:00:00 2001 From: Robert Brodie Date: Tue, 18 Jun 2024 11:23:35 -0400 Subject: [PATCH 1/2] SP-971 Update PHPUnit --- README.md | 4 ++-- composer.json | 2 +- composer.lock | 29 +++++++++++++++-------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 2995042..34e0068 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Add to your composer.json file by hand. ... "require": { ... - "bitpay/key-utils": "~1.0" + "bitpay/key-utils": "~2.0" } ... } @@ -42,7 +42,7 @@ php composer.phar update bitpay/key-utils ### Install using composer ```bash -php composer.phar require bitpay/key-utils:~1.0 +php composer.phar require bitpay/key-utils:~2.0 ``` # Usage diff --git a/composer.json b/composer.json index bbb81ce..db99e38 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "ext-iconv": "*" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "10.5.20" }, "suggest": { "ext-gmp": "Required to use this package with GMP instead of BCMath" diff --git a/composer.lock b/composer.lock index 892942b..60b8495 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f185ce6164630b763b6e490ebbdf242c", + "content-hash": "116f702aad79000727a2bf2b126cd6c9", "packages": [], "packages-dev": [ { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -26,11 +26,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -56,7 +57,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -64,7 +65,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nikic/php-parser", @@ -565,16 +566,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.19", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c726f0de022368f6ed103e452a765d3304a996a4", - "reference": "c726f0de022368f6ed103e452a765d3304a996a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -646,7 +647,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.5.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -662,7 +663,7 @@ "type": "tidelift" } ], - "time": "2024-04-17T14:06:18+00:00" + "time": "2024-04-24T06:32:35+00:00" }, { "name": "sebastian/cli-parser", From fcee8426ddfcdb51710f10ec7e1ef7de78f9a48f Mon Sep 17 00:00:00 2001 From: Robert Brodie Date: Tue, 18 Jun 2024 11:25:11 -0400 Subject: [PATCH 2/2] SP-971 Lock PHPUnit to 10.5.20 --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0faa04d..34a962a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: configuration: phpunit.xml php_version: ${{ matrix.php-version }} php_extensions: bcmath gmp xdebug - version: 10 + version: 10.5.20 env: XDEBUG_MODE: coverage phpcs: