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/.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 530a4d2..f8aab2a 100644 --- a/composer.json +++ b/composer.json @@ -15,12 +15,15 @@ } ], "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4.0", + "php": "~8.3.0 || ~8.4.0 || ~8.5.0", "ext-dom": "*", - "phpunit/phpunit": "^10.5.0 || ^11.0", - "php-soap/engine": "^2.13", - "php-soap/xml": "^1.8", + "phpunit/phpunit": "~12.3", + "php-soap/engine": "^2.16", + "php-soap/xml": "^1.9", "php-vcr/php-vcr": "^1.6.0", "veewee/xml": "^3.0" + }, + "require-dev": { + "php-cs-fixer/shim": "~3.88" } } diff --git a/src/AbstractEngineTest.php b/src/AbstractEngineTest.php index 3124187..d4dcf12 100644 --- a/src/AbstractEngineTest.php +++ b/src/AbstractEngineTest.php @@ -4,6 +4,7 @@ namespace Soap\EngineIntegrationTests; +use PHPUnit\Framework\Attributes\RunInSeparateProcess; use Soap\Engine\Engine; use VCR\VCR; @@ -17,11 +18,7 @@ abstract protected function getVcrPrefix(): string; */ abstract protected function skipVcr(): bool; - /** - * - * @runInSeparateProcess - * Note: this method will throw Exceptions if VCR can't take over the configured SoapClient. - */ + #[RunInSeparateProcess] public function test_it_should_be_possible_to_hook_php_vcr_for_testing() { $this->runWithCasette('get-city-weather-by-zip-10013.yml', function () { 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