From 7d9c8cbbdac28722bd6fb0e0d7838ed1eb4fb071 Mon Sep 17 00:00:00 2001 From: Marcin Warzybok Date: Mon, 15 Jan 2024 15:40:41 +0100 Subject: [PATCH 1/2] SP-763 PHP SDK - PHP 8.3 --- .github/workflows/test.yml | 2 +- composer.json | 2 +- composer.lock | 50 ++++++++++++++++++++------------------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa3c6b2d..bd914d2f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: - php-version: ['8.1', '8.2'] + php-version: ['8.1', '8.2', '8.3'] steps: - uses: actions/checkout@v3 diff --git a/composer.json b/composer.json index 3a8c9b27..6853c62a 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "homepage": "https://github.com/bitpay/php-bitpay-client-v2", "require": { - "php": "^8.0 || ^8.1 || ^8.2", + "php": "^8.1 || ^8.2 || ^8.3", "ext-json": "*", "ext-reflection": "*", "bitpay/key-utils": "^1.1", diff --git a/composer.lock b/composer.lock index b2c5e803..62a743a4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "451eb76a8505f9377f6bc5294dfcc1c8", + "content-hash": "ec3ee155f901809c88d2e0b55e084128", "packages": [ { "name": "bitpay/key-utils", @@ -920,25 +920,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v5.0.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -946,7 +948,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -970,9 +972,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-01-07T17:17:35+00:00" }, { "name": "phar-io/manifest", @@ -1408,16 +1410,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.3", + "version": "10.5.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19" + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19", - "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e5c5b397a95cb0db013270a985726fcae93e61b8", + "reference": "e5c5b397a95cb0db013270a985726fcae93e61b8", "shasum": "" }, "require": { @@ -1489,7 +1491,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.3" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.7" }, "funding": [ { @@ -1505,7 +1507,7 @@ "type": "tidelift" } ], - "time": "2023-12-13T07:25:23+00:00" + "time": "2024-01-14T16:40:30+00:00" }, { "name": "sebastian/cli-parser", @@ -1811,16 +1813,16 @@ }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -1833,7 +1835,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -1866,7 +1868,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -1874,7 +1876,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -2479,7 +2481,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.0 || ^8.1 || ^8.2", + "php": "^8.1 || ^8.2 || ^8.3", "ext-json": "*", "ext-reflection": "*" }, From 1d4fe1fdb05672af0a1accbf96b994264862333e Mon Sep 17 00:00:00 2001 From: Marcin Warzybok Date: Mon, 15 Jan 2024 15:55:37 +0100 Subject: [PATCH 2/2] SP-763 PHP SDK - PHP 8.3 --- .github/workflows/test.yml | 22 ---------------------- test/unit/BitPaySDK/ClientTest.php | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bd914d2f..e728070b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,28 +3,6 @@ name: Test on: [push, pull_request] jobs: - phpunit9: - runs-on: ubuntu-20.04 - - strategy: - matrix: - php-version: ['8.0'] - - steps: - - uses: actions/checkout@v3 - - uses: php-actions/composer@v5 - with: - php_version: ${{ matrix.php-version }} - args: --ignore-platform-reqs - - uses: php-actions/phpunit@v3 - with: - configuration: phpunit.xml - php_version: ${{ matrix.php-version }} - php_extensions: bcmath gmp xdebug - testsuite: Unit - version: 9 - env: - XDEBUG_MODE: coverage phpunit10: runs-on: ubuntu-20.04 diff --git a/test/unit/BitPaySDK/ClientTest.php b/test/unit/BitPaySDK/ClientTest.php index 0686b81c..6986b907 100644 --- a/test/unit/BitPaySDK/ClientTest.php +++ b/test/unit/BitPaySDK/ClientTest.php @@ -3540,7 +3540,7 @@ private function refreshResourceClients(): void foreach ($listOfClientsToClear as $className) { $refProperty = new ReflectionProperty($className, 'instance'); $refProperty->setAccessible(true); - $refProperty->setValue(null); + $refProperty->setValue(null, null); } }