diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml index 8670bcf..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', '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 }} @@ -24,3 +24,4 @@ jobs: run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }} - name: Run the tests 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 4aa93da..0000000 --- a/.phive/phars.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/composer.json b/composer.json index 7db5d74..c3c5eff 100644 --- a/composer.json +++ b/composer.json @@ -15,9 +15,9 @@ } ], "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4.0", - "azjezz/psl": "^3.0", - "php-soap/xml": "^1.8.0" + "php": "~8.3.0 || ~8.4.0 || ~8.5.0", + "azjezz/psl": "^3.0 || ^4.0", + "php-soap/xml": "^1.9.0" }, "autoload-dev": { "psr-4": { @@ -25,8 +25,9 @@ } }, "require-dev": { - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^12.3", "php-standard-library/psalm-plugin": "^2.2", - "vimeo/psalm": "^5.26" + "vimeo/psalm": "^6.13", + "php-cs-fixer/shim": "^3.88" } } diff --git a/phpunit.xml b/phpunit.xml index 9b20708..fd3fd9b 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -2,6 +2,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" displayDetailsOnPhpunitDeprecations="true" + displayDetailsOnTestsThatTriggerWarnings="true" + failOnWarning="true" + failOnPhpunitWarning="true" bootstrap="./vendor/autoload.php" colors="true"> diff --git a/psalm.xml b/psalm.xml index f371756..4752746 100644 --- a/psalm.xml +++ b/psalm.xml @@ -8,6 +8,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/PartialDriverTest.php b/tests/Unit/PartialDriverTest.php index e5bedf4..f864faf 100644 --- a/tests/Unit/PartialDriverTest.php +++ b/tests/Unit/PartialDriverTest.php @@ -16,7 +16,7 @@ final class PartialDriverTest extends TestCase { public function test_it_can_encode(): void { - $encoder = $this->createStub(Encoder::class); + $encoder = static::createStub(Encoder::class); $encoder->method('encode')->willReturn( $request = new SoapRequest('', '', '', SoapRequest::SOAP_1_1) ); @@ -35,7 +35,7 @@ public function test_it_will_not_encode(): void public function test_it_can_decode(): void { - $decoder = $this->createStub(Decoder::class); + $decoder = static::createStub(Decoder::class); $decoder->method('decode')->willReturn([]); $driver = new PartialDriver(decoder: $decoder); diff --git a/tests/Unit/SimpleDriverTest.php b/tests/Unit/SimpleDriverTest.php index 6b092cb..ab6bdc4 100644 --- a/tests/Unit/SimpleDriverTest.php +++ b/tests/Unit/SimpleDriverTest.php @@ -18,11 +18,11 @@ final class SimpleDriverTest extends TestCase protected function setUp(): void { - $encoder = $this->createStub(Encoder::class); + $encoder = static::createStub(Encoder::class); $encoder->method('encode')->willReturn( $this->request = new SoapRequest('', '', '', SoapRequest::SOAP_1_1) ); - $decoder = $this->createStub(Decoder::class); + $decoder = static::createStub(Decoder::class); $decoder->method('decode')->willReturn([]); $metadata = new DummyInMemoryMetadata(); 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