Skip to content

Commit 2c1461b

Browse files
authored
Merge pull request #23 from veewee/php-85-upgrade
Upgrade PHP project to support 8.3, 8.4, and 8.5
2 parents 32c909a + 76ba797 commit 2c1461b

File tree

9 files changed

+19
-16
lines changed

9 files changed

+19
-16
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
26+
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 & 5 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
22+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
2323
"ext-dom": "*",
2424
"ext-openssl": "*",
25-
"azjezz/psl": "^3.0",
25+
"azjezz/psl": "^3.0 || ^4.0",
2626
"paragonie/hidden-string": "^2.0",
27-
"php-soap/psr18-transport": "^1.7",
28-
"php-soap/engine": "^2.13",
29-
"php-soap/xml": "^1.8",
27+
"php-soap/psr18-transport": "^1.8",
28+
"php-soap/engine": "^2.16",
29+
"php-soap/xml": "^1.9",
3030
"php-http/client-common": "^2.3",
3131
"robrichards/wse-php": "^2.0",
3232
"veewee/xml": "^3.0"
@@ -35,7 +35,9 @@
3535
"nyholm/psr7": "^1.5",
3636
"php-http/mock-client": "^1.5",
3737
"symfony/http-client": "^7.1",
38-
"phpunit/phpunit": "^11.4",
38+
"phpunit/phpunit": "~12.3",
39+
"vimeo/psalm": "~6.13",
40+
"php-cs-fixer/shim": "~3.88",
3941
"cweagans/composer-patches": "^1.7"
4042
},
4143
"extra": {

phpunit.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
bootstrap="./tests/bootstrap.php"
55
colors="true"
66
displayDetailsOnPhpunitDeprecations="true"
7+
displayDetailsOnTestsThatTriggerWarnings="true"
8+
failOnWarning="true"
9+
failOnPhpunitWarning="true"
710
>
811
<testsuites>
912
<testsuite name="Unit">

psalm.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
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)