Skip to content

Commit ec1cfc2

Browse files
authored
Merge pull request #3 from veewee/php-85-upgrade
Upgrade to PHP 8.5 and latest dependencies
2 parents ee2e099 + d9dcc85 commit ec1cfc2

File tree

8 files changed

+22
-14
lines changed

8 files changed

+22
-14
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: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
}
2121
],
2222
"require": {
23-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
24-
"php-soap/engine": "^2.13.0",
23+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
24+
"php-soap/engine": "^2.16.0",
2525
"psr/cache": "^3.0",
26-
"psr/cache-implementation": "^3.0"
26+
"psr/cache-implementation": "^3.0",
27+
"azjezz/psl": "^3.0 || ^4.0"
2728
},
2829
"require-dev": {
29-
"phpunit/phpunit": "^10.0",
30-
"vimeo/psalm": "^5.26",
30+
"phpunit/phpunit": "~12.3.0",
31+
"vimeo/psalm": "~6.13.0",
32+
"php-cs-fixer/shim": "~3.88.0",
3133
"symfony/cache": "^7.0 || ^6.4"
3234
}
3335
}

phpunit.xml

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

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"

tools/php-cs-fixer.phar

-3.08 MB
Binary file not shown.

0 commit comments

Comments
 (0)