Skip to content

Commit fcaf36d

Browse files
authored
Merge pull request #18 from veewee/php84
Bump dependencies
2 parents ef7c8ae + ce9ed4b commit fcaf36d

File tree

11 files changed

+28
-15
lines changed

11 files changed

+28
-15
lines changed

.github/workflows/analyzers.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.1', '8.2', '8.3']
10+
php-versions: [ '8.2', '8.3' ]
11+
composer-options: [ '--ignore-platform-req=php+' ]
1112
fail-fast: false
1213
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1314
steps:

.github/workflows/code-style.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.1', '8.2', '8.3']
10+
php-versions: [ '8.2', '8.3', '8.4' ]
11+
composer-options: [ '--ignore-platform-req=php+' ]
1112
fail-fast: false
1213
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1314
steps:

.github/workflows/tests.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.1', '8.2', '8.3']
10+
php-versions: [ '8.2', '8.3', '8.4' ]
11+
composer-options: [ '--ignore-platform-req=php+' ]
1112
fail-fast: false
1213
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1314
steps:
@@ -20,6 +21,6 @@ jobs:
2021
tools: 'composer:v2'
2122
extensions: pcov, mbstring, posix, dom, soap
2223
- name: Install dependencies
23-
run: composer update --prefer-dist --no-progress --no-suggest
24+
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
2425
- name: Run the tests
2526
run: ./vendor/bin/phpunit

.phive/phars.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="psalm" version="^5.9.0" installed="5.16.0" location="./tools/psalm.phar" copy="true"/>
4-
<phar name="php-cs-fixer" version="^3.30.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
3+
<phar name="psalm" version="^5.9.0" installed="5.26.1" location="./tools/psalm.phar" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
55
</phive>

.php-cs-fixer.dist.php

+1
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@
5353
'static_lambda' => true,
5454
'strict_comparison' => true,
5555
'strict_param' => true,
56+
'nullable_type_declaration_for_default_null_value' => true,
5657
])
5758
;

composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
22+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
2323
"ext-dom": "*",
2424
"ext-openssl": "*",
25-
"azjezz/psl": "^2.1",
25+
"azjezz/psl": "^3.0",
2626
"paragonie/hidden-string": "^2.0",
27-
"php-soap/psr18-transport": "^1.3",
28-
"php-soap/engine": "^1.3|^2.0",
29-
"php-soap/xml": "^1.4",
27+
"php-soap/psr18-transport": "^1.7",
28+
"php-soap/engine": "^2.13",
29+
"php-soap/xml": "^1.8",
3030
"php-http/client-common": "^2.3",
3131
"robrichards/wse-php": "^2.0",
32-
"veewee/xml": "^2.2||^3.0"
32+
"veewee/xml": "^3.0"
3333
},
3434
"require-dev": {
3535
"nyholm/psr7": "^1.5",
3636
"php-http/mock-client": "^1.5",
3737
"symfony/http-client": "^6.1",
38-
"phpunit/phpunit": "^9.5",
38+
"phpunit/phpunit": "^10.0",
3939
"cweagans/composer-patches": "^1.7"
4040
},
4141
"extra": {

phpunit.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
<phpunit bootstrap="./tests/bootstrap.php" colors="true">
1+
<phpunit
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
4+
bootstrap="./tests/bootstrap.php"
5+
colors="true"
6+
displayDetailsOnPhpunitDeprecations="true"
7+
>
28
<testsuites>
39
<testsuite name="Unit">
410
<directory>./tests/Unit</directory>

src/OpenSSL/Parser/PrivateKeyParser.php

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
final class PrivateKeyParser
1111
{
12+
/**
13+
* @psalm-suppress RiskyTruthyFalsyComparison
14+
*/
1215
public function __invoke(HiddenString $privateKey, ?HiddenString $password = null): Key
1316
{
1417
$parsed = '';

src/WSSecurity/KeyIdentifier/X509SubjectKeyIdentifier.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function __construct(private Certificate $certificate)
2121
public function __invoke(Document $envelope, WSSESoap $wsse, DOMElement $parent): void
2222
{
2323
$x509 = openssl_x509_parse($this->certificate->contents());
24-
if (!$x509) {
24+
if ($x509 === false) {
2525
return;
2626
}
2727

tools/php-cs-fixer.phar

456 KB
Binary file not shown.

tools/psalm.phar

136 KB
Binary file not shown.

0 commit comments

Comments
 (0)