Skip to content

Commit c7f7026

Browse files
authored
Merge pull request #14 from veewee/php-85-upgrade
Php 85 upgrade
2 parents 7f3c48b + 3ff7cfc commit c7f7026

9 files changed

Lines changed: 15 additions & 14 deletions

File tree

.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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
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-
"veewee/xml": "^3.0"
25+
"veewee/xml": "^3.4"
2626
},
2727
"require-dev": {
28-
"phpunit/phpunit": "^10.0 || ^11.0"
28+
"phpunit/phpunit": "~12.3",
29+
"vimeo/psalm": "~6.13",
30+
"php-cs-fixer/shim": "^3.88"
2931
}
3032
}

psalm.xml

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

tests/Unit/XmlnsTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
namespace SoapTest\Xml\Unit\Xpath;
55

6+
use PHPUnit\Framework\Attributes\DataProvider;
67
use PHPUnit\Framework\TestCase;
78
use Soap\Xml\Xmlns;
89
use VeeWee\Xml\Xmlns\Xmlns as XmlXmlns;
@@ -11,8 +12,8 @@ final class XmlnsTest extends TestCase
1112
{
1213
/**
1314
* @param callable(): XmlXmlns
14-
* @dataProvider provideKnownXmlnses
1515
*/
16+
#[DataProvider('provideKnownXmlnses')]
1617
public function test_it_knows_some_xmlnses(callable $factory, string $uri): void
1718
{
1819
$xmlns = $factory();

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)