Skip to content

Commit fee4be6

Browse files
authored
Merge pull request #21 from php-soap/php-85-upgrade
Upgrade PHP project to support PHP 8.5
2 parents 159c3a0 + 4df20de commit fee4be6

File tree

9 files changed

+25
-18
lines changed

9 files changed

+25
-18
lines changed

.github/workflows/analyzers.yaml

Lines changed: 3 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' ]
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,5 @@ 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: ./tools/psalm.phar --no-cache
26+
run: ./vendor/bin/psalm --no-cache
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 & 5 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
}
2121
],
2222
"require": {
23-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
23+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
2424
"ext-dom": "*",
25-
"php-soap/engine": "^2.13",
26-
"php-soap/wsdl": "^1.12",
27-
"php-soap/xml": "^1.8",
25+
"php-soap/engine": "^2.16",
26+
"php-soap/wsdl": "^1.14",
27+
"php-soap/xml": "^1.9",
2828
"php-http/discovery": "^1.12",
2929
"psr/http-client-implementation": "^1.0",
3030
"psr/http-factory-implementation": "^1.0",
@@ -38,8 +38,10 @@
3838
"nyholm/psr7": "^1.5",
3939
"php-http/mock-client": "^1.5",
4040
"php-soap/ext-soap-engine": "^1.7",
41-
"php-soap/engine-integration-tests": "^1.9",
42-
"phpunit/phpunit": "^10.0 || ^11.0",
41+
"php-soap/engine-integration-tests": "^1.10",
42+
"phpunit/phpunit": "~12.3",
43+
"vimeo/psalm": "~6.13",
44+
"php-cs-fixer/shim": "~3.88",
4345
"guzzlehttp/guzzle": "^7.5"
4446
},
4547
"config": {

phpunit.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
<phpunit bootstrap="./tests/bootstrap.php" colors="true">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
bootstrap="./tests/bootstrap.php"
5+
colors="true"
6+
displayDetailsOnTestsThatTriggerWarnings="true"
7+
failOnWarning="true"
8+
failOnPhpunitWarning="true">
29
<testsuites>
310
<testsuite name="Integration">
411
<directory>./tests/Integration</directory>

psalm.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
errorLevel="1"
44
resolveFromConfigFile="true"
55
strictBinaryOperands="true"
6-
phpVersion="8.1"
6+
phpVersion="8.3"
77
allowStringToStandInForClass="true"
88
rememberPropertyAssignmentsAfterCall="false"
99
skipChecksOnUnresolvableIncludes="false"
10+
findUnusedCode="false"
11+
ensureOverrideAttribute="false"
1012
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1113
xmlns="https://getpsalm.org/schema/config"
1214
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

tools/php-cs-fixer.phar

-3.08 MB
Binary file not shown.

tools/psalm.phar

-12.1 MB
Binary file not shown.

0 commit comments

Comments
 (0)