Skip to content

Commit cdfd621

Browse files
authored
Merge pull request #38 from clue-labs/php8.2
Test on PHP 8.2 and update test environment
2 parents 9d74cf3 + 277cc3a commit cdfd621

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ on:
77
jobs:
88
PHPUnit:
99
name: PHPUnit (PHP ${{ matrix.php }})
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.2
1415
- 8.1
1516
- 8.0
1617
- 7.4
@@ -22,15 +23,15 @@ jobs:
2223
- 5.5
2324
- 5.4
2425
steps:
25-
- uses: actions/checkout@v2
26+
- uses: actions/checkout@v3
2627
- uses: shivammathur/setup-php@v2
2728
with:
2829
php-version: ${{ matrix.php }}
2930
coverage: xdebug
3031
- run: composer install
3132
- run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml
3233
if: ${{ matrix.php >= 7.3 }}
33-
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy --coverage-clover=clover.xml
34+
- run: vendor/bin/phpunit --coverage-text --coverage-clover=clover.xml -c phpunit.xml.legacy
3435
if: ${{ matrix.php < 7.3 }}
3536
- name: Check 100% code coverage
3637
shell: php {0}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"react/http": "^1.6"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
20+
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
2121
},
2222
"autoload": {
2323
"psr-4": { "Clue\\React\\EventSource\\": "src/" }

phpunit.xml.dist

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.5+ -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
cacheResult="false"
88
colors="true"
@@ -17,4 +17,7 @@
1717
<directory>./src/</directory>
1818
</include>
1919
</coverage>
20+
<php>
21+
<ini name="error_reporting" value="-1" />
22+
</php>
2023
</phpunit>

phpunit.xml.legacy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
3+
<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
66
bootstrap="vendor/autoload.php"

0 commit comments

Comments
 (0)