Skip to content

Commit

Permalink
Merge pull request #18 from veewee/php84
Browse files Browse the repository at this point in the history
Bump dependencies
  • Loading branch information
veewee authored Oct 25, 2024
2 parents ef7c8ae + ce9ed4b commit fcaf36d
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/analyzers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3' ]
composer-options: [ '--ignore-platform-req=php+' ]
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/code-style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3', '8.4' ]
composer-options: [ '--ignore-platform-req=php+' ]
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.1', '8.2', '8.3']
php-versions: [ '8.2', '8.3', '8.4' ]
composer-options: [ '--ignore-platform-req=php+' ]
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand All @@ -20,6 +21,6 @@ jobs:
tools: 'composer:v2'
extensions: pcov, mbstring, posix, dom, soap
- name: Install dependencies
run: composer update --prefer-dist --no-progress --no-suggest
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
- name: Run the tests
run: ./vendor/bin/phpunit
4 changes: 2 additions & 2 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="psalm" version="^5.9.0" installed="5.16.0" location="./tools/psalm.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.30.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
<phar name="psalm" version="^5.9.0" installed="5.26.1" location="./tools/psalm.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
</phive>
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,6 @@
'static_lambda' => true,
'strict_comparison' => true,
'strict_param' => true,
'nullable_type_declaration_for_default_null_value' => true,
])
;
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
}
],
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
"ext-dom": "*",
"ext-openssl": "*",
"azjezz/psl": "^2.1",
"azjezz/psl": "^3.0",
"paragonie/hidden-string": "^2.0",
"php-soap/psr18-transport": "^1.3",
"php-soap/engine": "^1.3|^2.0",
"php-soap/xml": "^1.4",
"php-soap/psr18-transport": "^1.7",
"php-soap/engine": "^2.13",
"php-soap/xml": "^1.8",
"php-http/client-common": "^2.3",
"robrichards/wse-php": "^2.0",
"veewee/xml": "^2.2||^3.0"
"veewee/xml": "^3.0"
},
"require-dev": {
"nyholm/psr7": "^1.5",
"php-http/mock-client": "^1.5",
"symfony/http-client": "^6.1",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^10.0",
"cweagans/composer-patches": "^1.7"
},
"extra": {
Expand Down
8 changes: 7 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<phpunit bootstrap="./tests/bootstrap.php" colors="true">
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./tests/bootstrap.php"
colors="true"
displayDetailsOnPhpunitDeprecations="true"
>
<testsuites>
<testsuite name="Unit">
<directory>./tests/Unit</directory>
Expand Down
3 changes: 3 additions & 0 deletions src/OpenSSL/Parser/PrivateKeyParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@

final class PrivateKeyParser
{
/**
* @psalm-suppress RiskyTruthyFalsyComparison
*/
public function __invoke(HiddenString $privateKey, ?HiddenString $password = null): Key
{
$parsed = '';
Expand Down
2 changes: 1 addition & 1 deletion src/WSSecurity/KeyIdentifier/X509SubjectKeyIdentifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(private Certificate $certificate)
public function __invoke(Document $envelope, WSSESoap $wsse, DOMElement $parent): void
{
$x509 = openssl_x509_parse($this->certificate->contents());
if (!$x509) {
if ($x509 === false) {
return;
}

Expand Down
Binary file modified tools/php-cs-fixer.phar
Binary file not shown.
Binary file modified tools/psalm.phar
Binary file not shown.

0 comments on commit fcaf36d

Please sign in to comment.