Skip to content

Commit

Permalink
PHP 8.1 Compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
veewee committed Nov 26, 2021
1 parent e22e794 commit 63f27a0
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ tools/* binary
/phpunit.xml export-ignore
/.phive/phars.xml export-ignore
/.phive/phars.xml export-ignore
/.php_cs.dist export-ignore
/.php-cs-fixer.cache export-ignore
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']
php-versions: ['8.0', '8.1']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .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']
php-versions: ['8.0', '8.1']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand All @@ -22,4 +22,4 @@ jobs:
- name: Install dependencies
run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
- name: Run the tests
run: ./tools/php-cs-fixer.phar fix --dry-run
run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run
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']
php-versions: ['8.0', '8.1']
fail-fast: false
name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/vendor/
.phpunit.result.cache
composer.lock
.php_cs.cache
.php-cs-fixer.cache
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.3.1" installed="4.8.1" location="./tools/psalm.phar" copy="true"/>
<phar name="php-cs-fixer" version="^2.18.2" installed="2.19.0" location="./tools/php-cs-fixer.phar" copy="true"/>
<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"/>
</phive>
6 changes: 4 additions & 2 deletions .php_cs.dist → .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return PhpCsFixer\Config::create()
return (new PhpCsFixer\Config())
->setFinder(
\Symfony\Component\Finder\Finder::create()
->in([
Expand All @@ -24,7 +24,9 @@
'list_syntax' => [
'syntax' => 'short',
],
'lowercase_constants' => true,
'constant_case' => [
'case' => 'lower',
],
'multiline_comment_opening_closing' => true,
'native_function_casing' => true,
'no_empty_phpdoc' => true,
Expand Down
1 change: 0 additions & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
forbidEcho="true"
strictBinaryOperands="true"
phpVersion="8.0"
allowPhpStormGenerics="true"
allowStringToStandInForClass="true"
rememberPropertyAssignmentsAfterCall="false"
skipChecksOnUnresolvableIncludes="false"
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/HttpBinding/Psr7ConverterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function setUp(): void

public function test_it_can_create_a_request()
{
$soapRequest = new SoapRequest('request', '/url', 'action', 1, 0);
$soapRequest = new SoapRequest('request', '/url', 'action', 1, false);

$request = $this->converter->convertSoapRequest($soapRequest);

Expand Down
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 63f27a0

Please sign in to comment.