Skip to content

Commit a4720b5

Browse files
authored
Merge pull request #5 from php-soap/php81
PHP 8.1 Compatibility
2 parents 3654d0d + d79fa0b commit a4720b5

File tree

10 files changed

+14
-12
lines changed

10 files changed

+14
-12
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ tools/* binary
77
/phpunit.xml export-ignore
88
/.phive/phars.xml export-ignore
99
/.phive/phars.xml export-ignore
10-
/.php_cs.dist export-ignore
10+
/.php-cs-fixer.cache export-ignore

.github/workflows/analyzers.yaml

Lines changed: 1 addition & 1 deletion
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.0']
10+
php-versions: ['8.0', '8.1']
1111
fail-fast: false
1212
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1313
steps:

.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.0']
10+
php-versions: ['8.0', '8.1']
1111
fail-fast: false
1212
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1313
steps:
@@ -22,4 +22,4 @@ jobs:
2222
- name: Install dependencies
2323
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
2424
- name: Run the tests
25-
run: ./tools/php-cs-fixer.phar fix --dry-run
25+
run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
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.0']
10+
php-versions: ['8.0', '8.1']
1111
fail-fast: false
1212
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
1313
steps:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/vendor/
22
composer.lock
33
.phpunit.result.cache
4-
.php_cs.cache
4+
.php-cs-fixer.cache
55

.phive/phars.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="psalm" version="^4.3.1" installed="4.12.0" location="./tools/psalm.phar" copy="true"/>
4-
<phar name="php-cs-fixer" version="^2.18.2" installed="2.19.0" location="./tools/php-cs-fixer.phar" copy="true"/>
3+
<phar name="psalm" version="^4.13.1" installed="4.13.1" location="./tools/psalm.phar" copy="true"/>
4+
<phar name="php-cs-fixer" version="^3.3.2" installed="3.3.2" location="./tools/php-cs-fixer.phar" copy="true"/>
55
</phive>

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
return PhpCsFixer\Config::create()
3+
return (new PhpCsFixer\Config())
44
->setFinder(
55
\Symfony\Component\Finder\Finder::create()
66
->in([
@@ -24,7 +24,9 @@
2424
'list_syntax' => [
2525
'syntax' => 'short',
2626
],
27-
'lowercase_constants' => true,
27+
'constant_case' => [
28+
'case' => 'lower',
29+
],
2830
'multiline_comment_opening_closing' => true,
2931
'native_function_casing' => true,
3032
'no_empty_phpdoc' => true,

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"php": "^8.0",
2424
"ext-soap": "*",
2525
"ext-dom": "*",
26-
"azjezz/psl": "^1.7",
26+
"azjezz/psl": "^1.9",
2727
"php-soap/engine": "^1.1",
2828
"php-soap/wsdl": "^1.0",
29-
"symfony/options-resolver": "^5.3"
29+
"symfony/options-resolver": "^5.3 || ^6.0"
3030
},
3131
"require-dev": {
3232
"php-soap/engine-integration-tests": "^1.1",

tools/php-cs-fixer.phar

285 KB
Binary file not shown.

tools/psalm.phar

25 KB
Binary file not shown.

0 commit comments

Comments
 (0)