Skip to content

Commit 6ef85ff

Browse files
authored
Merge pull request #29 from yoannrenard/add_PHP_8.1_support
Add PHP 8.2 support
2 parents 23126d3 + 7bd984d commit 6ef85ff

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Build and test
1616
strategy:
1717
matrix:
18-
php: [7.3, 7.4, 8.0, 8.1]
18+
php: [7.3, 7.4, 8.0, 8.1, 8.2]
1919
deps: [high]
2020
include:
2121
- php: 7.3
@@ -56,7 +56,7 @@ jobs:
5656
needs: tests
5757
strategy:
5858
matrix:
59-
php: [7.3, 7.4, 8.0, 8.1]
59+
php: [7.3, 7.4, 8.0, 8.1, 8.2]
6060

6161
steps:
6262
- uses: actions/checkout@v3

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ifeq ($(IS_PHP73),1)
3535
cs:
3636
else
3737
cs: tools/php-cs-fixer
38-
tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
38+
PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --dry-run --allow-risky=yes --no-interaction --ansi fix
3939
endif
4040
.PHONY: cs
4141

4242
ifeq ($(IS_PHP73),1)
4343
cs-fix:
4444
else
4545
cs-fix: tools/php-cs-fixer
46-
tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
46+
PHP_CS_FIXER_IGNORE_ENV=1 tools/php-cs-fixer --allow-risky=yes --no-interaction --ansi fix
4747
endif
4848
.PHONY: cs-fix
4949

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^7.3 || ~8.0.0 || ~8.1.0",
13+
"php": "^7.3 || ~8.0.0 || ~8.1.0 || ~8.2.0",
1414
"phpunit/phpunit": "^9.0"
1515
},
1616
"conflict": {

phpunit.xml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<directory suffix="Test.php">tests</directory>
1010
<exclude>tests/phar</exclude>
1111
</testsuite>
12+
<php>
13+
<env name="USER" value="test" force="true"/>
14+
</php>
1215
<extensions>
1316
<extension class="Zalas\PHPUnit\Globals\AnnotationExtension"/>
1417
</extensions>

0 commit comments

Comments
 (0)