Skip to content

Commit d1611b1

Browse files
authored
Merge pull request #23 from veewee/php-85-upgrade
Upgrade to PHP 8.5 and modern tooling
2 parents 06cb8c3 + 593309b commit d1611b1

File tree

10 files changed

+20
-17
lines changed

10 files changed

+20
-17
lines changed

.github/workflows/analyzers.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.2', '8.3', '8.4']
10+
php-versions: ['8.3', '8.4', '8.5']
1111
composer-options: ['--ignore-platform-req=php+']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -24,3 +24,4 @@ jobs:
2424
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
2525
- name: Run the tests
2626
run: ./vendor/bin/psalm
27+
continue-on-error: ${{ matrix.php-versions == '8.5' }}

.github/workflows/code-style.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.2', '8.3', '8.4']
10+
php-versions: ['8.3', '8.4', '8.5']
1111
composer-options: ['--ignore-platform-req=php+']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -23,4 +23,4 @@ jobs:
2323
- name: Install dependencies
2424
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
2525
- name: Run the tests
26-
run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run
26+
run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
operating-system: [ubuntu-latest]
10-
php-versions: ['8.2', '8.3', '8.4']
10+
php-versions: ['8.3', '8.4', '8.5']
1111
composer-options: ['--ignore-platform-req=php+']
1212
fail-fast: false
1313
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}

.phive/phars.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

composer.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@
1515
}
1616
],
1717
"require": {
18-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
19-
"azjezz/psl": "^3.0",
20-
"php-soap/xml": "^1.8.0"
18+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
19+
"azjezz/psl": "^3.0 || ^4.0",
20+
"php-soap/xml": "^1.9.0"
2121
},
2222
"autoload-dev": {
2323
"psr-4": {
2424
"SoapTest\\Engine\\": "tests/"
2525
}
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^10.5",
28+
"phpunit/phpunit": "^12.3",
2929
"php-standard-library/psalm-plugin": "^2.2",
30-
"vimeo/psalm": "^5.26"
30+
"vimeo/psalm": "^6.13",
31+
"php-cs-fixer/shim": "^3.88"
3132
}
3233
}

phpunit.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
44
displayDetailsOnPhpunitDeprecations="true"
5+
displayDetailsOnTestsThatTriggerWarnings="true"
6+
failOnWarning="true"
7+
failOnPhpunitWarning="true"
58
bootstrap="./vendor/autoload.php"
69
colors="true">
710
<testsuites>

psalm.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
skipChecksOnUnresolvableIncludes="false"
99
checkForThrowsDocblock="true"
1010
checkForThrowsInGlobalScope="true"
11+
findUnusedCode="false"
12+
ensureOverrideAttribute="false"
1113
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1214
xmlns="https://getpsalm.org/schema/config"
1315
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

tests/Unit/PartialDriverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class PartialDriverTest extends TestCase
1616
{
1717
public function test_it_can_encode(): void
1818
{
19-
$encoder = $this->createStub(Encoder::class);
19+
$encoder = static::createStub(Encoder::class);
2020
$encoder->method('encode')->willReturn(
2121
$request = new SoapRequest('', '', '', SoapRequest::SOAP_1_1)
2222
);
@@ -35,7 +35,7 @@ public function test_it_will_not_encode(): void
3535

3636
public function test_it_can_decode(): void
3737
{
38-
$decoder = $this->createStub(Decoder::class);
38+
$decoder = static::createStub(Decoder::class);
3939
$decoder->method('decode')->willReturn([]);
4040
$driver = new PartialDriver(decoder: $decoder);
4141

tests/Unit/SimpleDriverTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ final class SimpleDriverTest extends TestCase
1818

1919
protected function setUp(): void
2020
{
21-
$encoder = $this->createStub(Encoder::class);
21+
$encoder = static::createStub(Encoder::class);
2222
$encoder->method('encode')->willReturn(
2323
$this->request = new SoapRequest('', '', '', SoapRequest::SOAP_1_1)
2424
);
25-
$decoder = $this->createStub(Decoder::class);
25+
$decoder = static::createStub(Decoder::class);
2626
$decoder->method('decode')->willReturn([]);
2727
$metadata = new DummyInMemoryMetadata();
2828

tools/php-cs-fixer.phar

-3.08 MB
Binary file not shown.

0 commit comments

Comments
 (0)