Skip to content

Commit 202fa58

Browse files
authored
Merge pull request #16 from php-soap/php-85-upgrade
Upgrade project to PHP 8.5
2 parents de10705 + fb13519 commit 202fa58

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

.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

.phive/phars.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
}
1616
],
1717
"require": {
18-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
18+
"php": "~8.3.0 || ~8.4.0 || ~8.5.0",
1919
"ext-dom": "*",
20-
"phpunit/phpunit": "^10.5.0 || ^11.0",
21-
"php-soap/engine": "^2.13",
22-
"php-soap/xml": "^1.8",
20+
"phpunit/phpunit": "~12.3",
21+
"php-soap/engine": "^2.16",
22+
"php-soap/xml": "^1.9",
2323
"php-vcr/php-vcr": "^1.6.0",
2424
"veewee/xml": "^3.0"
25+
},
26+
"require-dev": {
27+
"php-cs-fixer/shim": "~3.88"
2528
}
2629
}

src/AbstractEngineTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
namespace Soap\EngineIntegrationTests;
66

7+
use PHPUnit\Framework\Attributes\RunInSeparateProcess;
78
use Soap\Engine\Engine;
89
use VCR\VCR;
910

@@ -17,11 +18,7 @@ abstract protected function getVcrPrefix(): string;
1718
*/
1819
abstract protected function skipVcr(): bool;
1920

20-
/**
21-
*
22-
* @runInSeparateProcess
23-
* Note: this method will throw Exceptions if VCR can't take over the configured SoapClient.
24-
*/
21+
#[RunInSeparateProcess]
2522
public function test_it_should_be_possible_to_hook_php_vcr_for_testing()
2623
{
2724
$this->runWithCasette('get-city-weather-by-zip-10013.yml', function () {

tools/php-cs-fixer.phar

-3.08 MB
Binary file not shown.

0 commit comments

Comments
 (0)