Skip to content

Commit

Permalink
Merge pull request #9 from php-soap/PHP82
Browse files Browse the repository at this point in the history
Add PHP82 + PSL2 Support
  • Loading branch information
veewee authored Nov 25, 2022
2 parents 4197177 + 8db3f6f commit 8ae9292
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analyzers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.0', '8.1']
php-versions: ['8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.0', '8.1']
php-versions: ['8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['8.0', '8.1']
php-versions: ['8.1', '8.2']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .phive/phars.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="psalm" version="^4.13.1" installed="4.13.1" location="./tools/psalm.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.3.2" installed="3.3.2" location="./tools/php-cs-fixer.phar" copy="true"/>
<phar name="psalm" version="^4.30.0" installed="4.30.0" location="./tools/psalm.phar" copy="true"/>
<phar name="php-cs-fixer" version="^3.13.0" installed="3.13.0" location="./tools/php-cs-fixer.phar" copy="true"/>
</phive>
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,26 @@
}
],
"require": {
"php": "^8.0",
"php": "~8.1.0 || ~8.2.0",
"ext-dom": "*",
"php-soap/engine": "^1.0",
"php-soap/wsdl": "^1.0",
"php-soap/xml": "^1.3",
"php-soap/engine": "^1.3",
"php-soap/wsdl": "^1.3",
"php-soap/xml": "^1.4",
"php-http/discovery": "^1.12",
"psr/http-client-implementation": "^1.0",
"psr/http-factory-implementation": "^1.0",
"psr/http-message-implementation": "^1.0",
"psr/http-message": "^1.0.1",
"veewee/xml": "^1.2",
"veewee/xml": "^2.2",
"php-http/client-common": "^2.3"
},
"require-dev": {
"ext-soap": "*",
"nyholm/psr7": "^1.3",
"php-http/mock-client": "^1.4",
"php-soap/ext-soap-engine": "^1.0",
"php-soap/engine-integration-tests": "^1.0",
"nyholm/psr7": "^1.5",
"php-http/mock-client": "^1.5",
"php-soap/ext-soap-engine": "^1.4",
"php-soap/engine-integration-tests": "^1.3",
"phpunit/phpunit": "^9.5",
"guzzlehttp/guzzle": "^7.3"
"guzzlehttp/guzzle": "^7.5"
}
}
3 changes: 1 addition & 2 deletions psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<psalm
errorLevel="1"
resolveFromConfigFile="true"
forbidEcho="true"
strictBinaryOperands="true"
phpVersion="8.0"
phpVersion="8.1"
allowStringToStandInForClass="true"
rememberPropertyAssignmentsAfterCall="false"
skipChecksOnUnresolvableIncludes="false"
Expand Down
7 changes: 6 additions & 1 deletion tests/Integration/Psr18TransportTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ protected function getVcrPrefix(): string

protected function skipVcr(): bool
{
return false;
return true;
}

public function test_it_should_be_possible_to_hook_php_vcr_for_testing()
{
static::markTestSkipped('PHP VCR is not in a good shape anymore');
}

protected function configureForWsdl(string $wsdl)
Expand Down
3 changes: 3 additions & 0 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
define('FIXTURE_DIR', realpath(__DIR__ . '/fixtures'));
define('VCR_CASSETTE_DIR', realpath(__DIR__ . '/fixtures/vcr'));


/*
\VCR\VCR::configure()
->setCassettePath(VCR_CASSETTE_DIR)
->enableLibraryHooks(['soap', 'curl']);
VCR::turnOn();
*/
Binary file modified tools/php-cs-fixer.phar
Binary file not shown.
Binary file modified tools/psalm.phar
Binary file not shown.

0 comments on commit 8ae9292

Please sign in to comment.