Skip to content

Commit a716389

Browse files
authored
Merge pull request #359 from swlodarski-sumoheavy/9.2.x
SP-1167 - Add support for PHP 8.4
2 parents e54070e + 8127fdf commit a716389

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1162
-957
lines changed

.github/workflows/documentation.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Documentation
33
on:
44
push:
55
branches:
6-
- '*.*.x'
6+
- "*.*.x"
77

88
concurrency:
99
group: documentation
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- name: Run phpdoc
1919
run: |
2020
docker run --rm -v $(pwd):/data phpdoc/phpdoc:3 -d ./src -t ./docs
@@ -24,4 +24,4 @@ jobs:
2424
git config user.email ""
2525
git add docs/
2626
git commit -m "Update phpdoc" || echo "No changes to commit"
27-
git push
27+
git push

.github/workflows/test.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ name: Test
33
on: [push, pull_request]
44

55
jobs:
6-
76
phpunit10:
87
runs-on: ubuntu-20.04
98

109
strategy:
1110
matrix:
12-
php-version: ['8.1', '8.2', '8.3']
11+
php-version: ["8.1", "8.2", "8.3", "8.4"]
1312

1413
steps:
15-
- uses: actions/checkout@v3
16-
- uses: php-actions/composer@v5
14+
- uses: actions/checkout@v4
15+
- uses: php-actions/composer@v6
1716
with:
1817
php_version: ${{ matrix.php-version }}
1918
args: --ignore-platform-reqs
20-
- uses: php-actions/phpunit@v3
19+
- uses: php-actions/phpunit@v4
2120
with:
2221
configuration: phpunit.xml
2322
php_version: ${{ matrix.php-version }}
@@ -31,12 +30,12 @@ jobs:
3130
runs-on: ubuntu-latest
3231

3332
steps:
34-
- uses: actions/checkout@v3
35-
- uses: php-actions/composer@v5
33+
- uses: actions/checkout@v4
34+
- uses: php-actions/composer@v6
3635
with:
3736
php_version: 8.1
3837
php_extensions: bcmath gmp xdebug
3938
- name: Install PHP_CodeSniffer
4039
run: |
4140
curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
42-
php phpcs.phar src --standard=ruleset.xml
41+
php phpcs.phar src --standard=ruleset.xml

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
],
1313
"homepage": "https://github.com/bitpay/php-bitpay-client-v2",
1414
"require": {
15-
"php": "^8.1 || ^8.2 || ^8.3",
15+
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
1616
"ext-json": "*",
1717
"ext-reflection": "*",
18-
"bitpay/key-utils": "^2.0",
18+
"bitpay/key-utils": "^2.1",
1919
"guzzlehttp/guzzle": "^7.0",
20-
"symfony/yaml": "^5.4 || ^6.0 || ^7.0",
21-
"netresearch/jsonmapper": "^4.1",
20+
"symfony/yaml": "^6.0 || ^7.0",
21+
"netresearch/jsonmapper": "^5.0",
2222
"symfony/console": "^6.0"
2323
},
2424
"authors": [
@@ -28,7 +28,7 @@
2828
}
2929
],
3030
"require-dev": {
31-
"phpunit/phpunit": "^9.0 || ^10.2.2"
31+
"phpunit/phpunit": "^10.5.45 || ^11.5.7 || ^12.0.2"
3232
},
3333
"scripts": {
3434
"setup": [

composer.lock

+15-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/classes/BitPaySDK-Client.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -2253,7 +2253,7 @@ <h4 class="phpdocumentor-element__name" id="method_getBills">
22532253

22542254
<code class="phpdocumentor-code phpdocumentor-signature ">
22552255
<span class="phpdocumentor-signature__visibility">public</span>
2256-
<span class="phpdocumentor-signature__name">getBills</span><span>(</span><span class="phpdocumentor-signature__argument"><span>[</span><span class="phpdocumentor-signature__argument__return-type">string&nbsp;</span><span class="phpdocumentor-signature__argument__name">$status</span><span> = </span><span class="phpdocumentor-signature__argument__default-value">null</span><span> ]</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">array&lt;string|int, <a href="classes/BitPaySDK-Model-Bill-Bill.html"><abbr title="\BitPaySDK\Model\Bill\Bill">Bill</abbr></a>&gt;</span></code>
2256+
<span class="phpdocumentor-signature__name">getBills</span><span>(</span><span class="phpdocumentor-signature__argument"><span>[</span><span class="phpdocumentor-signature__argument__return-type">string|null&nbsp;</span><span class="phpdocumentor-signature__argument__name">$status</span><span> = </span><span class="phpdocumentor-signature__argument__default-value">null</span><span> ]</span></span><span>)</span><span> : </span><span class="phpdocumentor-signature__response_type">array&lt;string|int, <a href="classes/BitPaySDK-Model-Bill-Bill.html"><abbr title="\BitPaySDK\Model\Bill\Bill">Bill</abbr></a>&gt;</span></code>
22572257

22582258
<div class="phpdocumentor-label-line">
22592259
</div>
@@ -2263,7 +2263,7 @@ <h5 class="phpdocumentor-argument-list__heading">Parameters</h5>
22632263
<dl class="phpdocumentor-argument-list">
22642264
<dt class="phpdocumentor-argument-list__entry">
22652265
<span class="phpdocumentor-signature__argument__name">$status</span>
2266-
: <span class="phpdocumentor-signature__argument__return-type">string</span>
2266+
: <span class="phpdocumentor-signature__argument__return-type">string|null</span>
22672267
= <span class="phpdocumentor-signature__argument__default-value">null</span> </dt>
22682268
<dd class="phpdocumentor-argument-list__definition">
22692269

docs/classes/BitPaySDK-Env.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ <h4 id="toc-constants">
216216
<dt class="phpdocumentor-table-of-contents__entry -constant -public">
217217
<a class="" href="classes/BitPaySDK-Env.html#constant_BITPAY_PLUGIN_INFO">BITPAY_PLUGIN_INFO</a>
218218
<span>
219-
&nbsp;= &quot;BitPay_PHP_Client_v9.1.6&quot; </span>
219+
&nbsp;= &quot;BitPay_PHP_Client_v9.2.0&quot; </span>
220220
</dt>
221221

222222
<dt class="phpdocumentor-table-of-contents__entry -constant -public">
@@ -371,7 +371,7 @@ <h4 class="phpdocumentor-element__name" id="constant_BITPAY_PLUGIN_INFO">
371371
<span class="phpdocumentor-signature__visibility">public</span>
372372
<span class="phpdocumentor-signature__type">mixed</span>
373373
<span class="phpdocumentor-signature__name">BITPAY_PLUGIN_INFO</span>
374-
= <span class="phpdocumentor-signature__default-value">&quot;BitPay_PHP_Client_v9.1.6&quot;</span>
374+
= <span class="phpdocumentor-signature__default-value">&quot;BitPay_PHP_Client_v9.2.0&quot;</span>
375375
</code>
376376

377377

0 commit comments

Comments
 (0)