Skip to content

Commit fdf77f9

Browse files
bobbrodiebobbrodie
authored
Merge pull request #42 from swlodarski-sumoheavy/2.1.x
SP-1167 - Add support for PHP 8.4
2 parents 814cf46 + 50d4b42 commit fdf77f9

File tree

19 files changed

+154
-95
lines changed

19 files changed

+154
-95
lines changed

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88

99
strategy:
1010
matrix:
11-
php-version: ['8.1', '8.2', '8.3']
12-
11+
php-version: ["8.1", "8.2", "8.3", "8.4"]
12+
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: php-actions/composer@v5
15+
- uses: php-actions/composer@v6
1616
with:
1717
php_version: ${{ matrix.php-version }}
1818
args: --ignore-platform-reqs
@@ -26,14 +26,14 @@ jobs:
2626
XDEBUG_MODE: coverage
2727
phpcs:
2828
runs-on: ubuntu-latest
29-
29+
3030
steps:
3131
- uses: actions/checkout@v4
32-
- uses: php-actions/composer@v5
32+
- uses: php-actions/composer@v6
3333
with:
3434
php_version: 8.1
3535
php_extensions: bcmath gmp xdebug
3636
- name: Install PHP_CodeSniffer
3737
run: |
3838
curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
39-
php phpcs.phar src --standard=ruleset.xml
39+
php phpcs.phar src --standard=ruleset.xml

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121
},
2222
"require": {
23-
"php": "^8.1 || ^8.2 || ^8.3",
23+
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4",
2424
"ext-bcmath": "*",
2525
"ext-openssl": "*",
2626
"ext-curl": "*",

‎composer.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818

1919
try {
2020
// Use the EncryptedFilesystemStorage to load the Merchant's encrypted private key with the Master Password.
21+
/**
22+
* @var PrivateKey
23+
*/
2124
$privateKey = $storageEngine->load(__DIR__ . '/secure/SecurePathPlusYourClientName.key');
2225
} catch (Exception $ex) {
2326
// Check if the loaded keys is a valid key
@@ -86,4 +89,4 @@
8689
**/
8790
echo $resultData['data'][0]['pairingCode'];
8891

89-
/** End of request **/
92+
/** End of request **/

‎src/BitPayKeyUtils/KeyHelper/KeyInterface.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@ public function generate();
1818
* @return boolean
1919
*/
2020
public function isValid();
21+
22+
/**
23+
* @return string
24+
*/
25+
public function getId();
2126
}

‎src/BitPayKeyUtils/KeyHelper/PublicKey.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function getSin()
103103
* @return PublicKey
104104
* @throws Exception
105105
*/
106-
public function generate(PrivateKey $privateKey = null)
106+
public function generate(?PrivateKey $privateKey = null)
107107
{
108108
if ($privateKey instanceof PrivateKey) {
109109
$this->setPrivateKey($privateKey);

‎src/BitPayKeyUtils/Math/BcEngine.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function __construct()
1616
}
1717

1818
/**
19-
* @param String $a Numeric String
20-
* @param String $b Numeric String
19+
* @param string $a Numeric String
20+
* @param string $b Numeric String
2121
* @return string
2222
* @throws Exception
2323
* @throws Exception
@@ -56,8 +56,8 @@ public function input($x)
5656
}
5757

5858
/**
59-
* @param String $a Numeric String
60-
* @param String $b Numeric String
59+
* @param string $a Numeric String
60+
* @param string $b Numeric String
6161
* @return int
6262
* @throws Exception
6363
* @throws Exception
@@ -72,8 +72,8 @@ public function cmp($a, $b)
7272
}
7373

7474
/**
75-
* @param String $a Numeric String
76-
* @param String $b Numeric String
75+
* @param string $a Numeric String
76+
* @param string $b Numeric String
7777
* @return string|null
7878
* @throws Exception
7979
* @throws Exception
@@ -136,8 +136,8 @@ public function invertm($num, $mod)
136136
}
137137

138138
/**
139-
* @param String $a Numeric String
140-
* @param String $b Numeric String
139+
* @param string $a Numeric String
140+
* @param string $b Numeric String
141141
* @return string|null
142142
* @throws Exception
143143
* @throws Exception
@@ -156,8 +156,8 @@ public function mod($a, $b)
156156
}
157157

158158
/**
159-
* @param String $a Numeric String
160-
* @param String $b Numeric String
159+
* @param string $a Numeric String
160+
* @param string $b Numeric String
161161
* @return string
162162
* @throws Exception
163163
* @throws Exception
@@ -172,8 +172,8 @@ public function mul($a, $b)
172172
}
173173

174174
/**
175-
* @param String $a Numeric String
176-
* @param String $b Numeric String
175+
* @param string $a Numeric String
176+
* @param string $b Numeric String
177177
* @return string
178178
* @throws Exception
179179
* @throws Exception
@@ -188,8 +188,8 @@ public function pow($a, $b)
188188
}
189189

190190
/**
191-
* @param String $a Numeric String
192-
* @param String $b Numeric String
191+
* @param string $a Numeric String
192+
* @param string $b Numeric String
193193
* @return string
194194
* @throws Exception
195195
* @throws Exception

‎src/BitPayKeyUtils/Math/EngineInterface.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,50 @@
88
interface EngineInterface
99
{
1010
/**
11-
* @param String $a Numeric String
12-
* @param String $b Numeric String
11+
* @param string $a Numeric String
12+
* @param string $b Numeric String
1313
*/
1414
public function add($a, $b);
1515

1616
/**
17-
* @param String $a Numeric String
18-
* @param String $b Numeric String
17+
* @param string $a Numeric String
18+
* @param string $b Numeric String
1919
*/
2020
public function cmp($a, $b);
2121

2222
/**
23-
* @param String $a Numeric String
24-
* @param String $b Numeric String
23+
* @param string $a Numeric String
24+
* @param string $b Numeric String
2525
*/
2626
public function div($a, $b);
2727

2828
/**
29-
* @param String $a Numeric String
30-
* @param String $b Numeric String
29+
* @param string $a Numeric String
30+
* @param string $b Numeric String
3131
*/
3232
public function invertm($a, $b);
3333

3434
/**
35-
* @param String $a Numeric String
36-
* @param String $b Numeric String
35+
* @param string $a Numeric String
36+
* @param string $b Numeric String
3737
*/
3838
public function mod($a, $b);
3939

4040
/**
41-
* @param String $a Numeric String
42-
* @param String $b Numeric String
41+
* @param string $a Numeric String
42+
* @param string $b Numeric String
4343
*/
4444
public function mul($a, $b);
4545

4646
/**
47-
* @param String $a Numeric String
48-
* @param String $b Numeric String
47+
* @param string $a Numeric String
48+
* @param string $b Numeric String
4949
*/
5050
public function pow($a, $b);
5151

5252
/**
53-
* @param String $a Numeric String
54-
* @param String $b Numeric String
53+
* @param string $a Numeric String
54+
* @param string $b Numeric String
5555
*/
5656
public function sub($a, $b);
5757
}

‎src/BitPayKeyUtils/Math/GmpEngine.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
class GmpEngine implements EngineInterface
66
{
77
/**
8-
* @param String $a Numeric String
9-
* @param String $b Numeric String
8+
* @param string $a Numeric String
9+
* @param string $b Numeric String
1010
* @return string
1111
*/
1212
public function add($a, $b)
@@ -15,8 +15,8 @@ public function add($a, $b)
1515
}
1616

1717
/**
18-
* @param String $a Numeric String
19-
* @param String $b Numeric String
18+
* @param string $a Numeric String
19+
* @param string $b Numeric String
2020
* @return string
2121
*/
2222
public function cmp($a, $b)
@@ -25,8 +25,8 @@ public function cmp($a, $b)
2525
}
2626

2727
/**
28-
* @param String $a Numeric String
29-
* @param String $b Numeric String
28+
* @param string $a Numeric String
29+
* @param string $b Numeric String
3030
* @param int $round
3131
* @return string
3232
*/
@@ -36,8 +36,8 @@ public function div($a, $b, $round = GMP_ROUND_ZERO)
3636
}
3737

3838
/**
39-
* @param String $a Numeric String
40-
* @param String $b Numeric String
39+
* @param string $a Numeric String
40+
* @param string $b Numeric String
4141
* @return string
4242
*/
4343
public function invertm($a, $b)
@@ -46,8 +46,8 @@ public function invertm($a, $b)
4646
}
4747

4848
/**
49-
* @param String $a Numeric String
50-
* @param String $b Numeric String
49+
* @param string $a Numeric String
50+
* @param string $b Numeric String
5151
* @return string
5252
*/
5353
public function mod($a, $b)
@@ -56,8 +56,8 @@ public function mod($a, $b)
5656
}
5757

5858
/**
59-
* @param String $a Numeric String
60-
* @param String $b Numeric String
59+
* @param string $a Numeric String
60+
* @param string $b Numeric String
6161
* @return string
6262
*/
6363
public function mul($a, $b)
@@ -66,8 +66,8 @@ public function mul($a, $b)
6666
}
6767

6868
/**
69-
* @param String $a Numeric String
70-
* @param String $b Numeric String
69+
* @param string $a Numeric String
70+
* @param string $b Numeric String
7171
* @return string
7272
*/
7373
public function pow($a, $b)
@@ -76,8 +76,8 @@ public function pow($a, $b)
7676
}
7777

7878
/**
79-
* @param String $a Numeric String
80-
* @param String $b Numeric String
79+
* @param string $a Numeric String
80+
* @param string $b Numeric String
8181
* @return string
8282
*/
8383
public function sub($a, $b)

0 commit comments

Comments
 (0)