diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml index c5d9d9a..a1d3d57 100644 --- a/.github/workflows/analyzers.yaml +++ b/.github/workflows/analyzers.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.2', '8.3'] + php-versions: ['8.3', '8.4', '8.5'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} @@ -23,4 +23,5 @@ jobs: - name: Install dependencies run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} - name: Run the tests - run: ./tools/psalm.phar + run: ./vendor/bin/psalm + continue-on-error: ${{ matrix.php-versions == '8.5' }} diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml index a8a0975..867b2ee 100644 --- a/.github/workflows/code-style.yaml +++ b/.github/workflows/code-style.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.4', '8.5'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} @@ -23,4 +23,4 @@ jobs: - name: Install dependencies run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} - name: Run the tests - run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run + run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index b471eec..6229de6 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: operating-system: [ubuntu-latest] - php-versions: ['8.2', '8.3', '8.4'] + php-versions: ['8.3', '8.4', '8.5'] composer-options: ['--ignore-platform-req=php+'] fail-fast: false name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} diff --git a/.phive/phars.xml b/.phive/phars.xml deleted file mode 100644 index 76dea74..0000000 --- a/.phive/phars.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/composer.json b/composer.json index 214a061..1312ec7 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,13 @@ } ], "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.3.0 || ~8.4.0 || ~8.5.0", "ext-dom": "*", - "veewee/xml": "^3.0" + "veewee/xml": "^3.4" }, "require-dev": { - "phpunit/phpunit": "^10.0 || ^11.0" + "phpunit/phpunit": "~12.3", + "vimeo/psalm": "~6.13", + "php-cs-fixer/shim": "^3.88" } } diff --git a/psalm.xml b/psalm.xml index 4f717ec..fe948bb 100644 --- a/psalm.xml +++ b/psalm.xml @@ -9,6 +9,8 @@ skipChecksOnUnresolvableIncludes="false" checkForThrowsDocblock="true" checkForThrowsInGlobalScope="true" + findUnusedCode="false" + ensureOverrideAttribute="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" diff --git a/tests/Unit/XmlnsTest.php b/tests/Unit/XmlnsTest.php index e25637e..3b51e80 100644 --- a/tests/Unit/XmlnsTest.php +++ b/tests/Unit/XmlnsTest.php @@ -3,6 +3,7 @@ namespace SoapTest\Xml\Unit\Xpath; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Soap\Xml\Xmlns; use VeeWee\Xml\Xmlns\Xmlns as XmlXmlns; @@ -11,8 +12,8 @@ final class XmlnsTest extends TestCase { /** * @param callable(): XmlXmlns - * @dataProvider provideKnownXmlnses */ + #[DataProvider('provideKnownXmlnses')] public function test_it_knows_some_xmlnses(callable $factory, string $uri): void { $xmlns = $factory(); diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar deleted file mode 100755 index d071fa5..0000000 Binary files a/tools/php-cs-fixer.phar and /dev/null differ diff --git a/tools/psalm.phar b/tools/psalm.phar deleted file mode 100755 index 24b9ae3..0000000 Binary files a/tools/psalm.phar and /dev/null differ