Skip to content

Commit 0df56ae

Browse files
authored
Merge pull request #256 from clue-labs/php8.3-v2
[2.x] Run tests on PHP 8.3 and update test suite
2 parents f913fb8 + 010b1db commit 0df56ae

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.github/workflows/ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
php:
14+
- 8.3
1415
- 8.2
1516
- 8.1
1617
- 8.0
@@ -23,7 +24,7 @@ jobs:
2324
- 5.5
2425
- 5.4
2526
steps:
26-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2728
- uses: shivammathur/setup-php@v2
2829
with:
2930
php-version: ${{ matrix.php }}
@@ -40,7 +41,7 @@ jobs:
4041
runs-on: ubuntu-22.04
4142
continue-on-error: true
4243
steps:
43-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4445
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
4546
- name: Run hhvm composer.phar install
4647
uses: docker://hhvm/hhvm:3.30-lts-latest

composer.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,22 @@
2828
"php": ">=5.4.0"
2929
},
3030
"require-dev": {
31-
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36"
31+
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
3232
},
3333
"autoload": {
3434
"psr-4": {
3535
"React\\Promise\\": "src/"
3636
},
37-
"files": ["src/functions_include.php"]
37+
"files": [
38+
"src/functions_include.php"
39+
]
3840
},
3941
"autoload-dev": {
4042
"psr-4": {
41-
"React\\Promise\\": ["tests", "tests/fixtures"]
43+
"React\\Promise\\": [
44+
"tests/",
45+
"tests/fixtures/"
46+
]
4247
}
4348
},
4449
"keywords": [

phpunit.xml.dist

+3-3
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.5+ -->
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.6+ -->
44
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
cacheResult="false"
88
colors="true"
@@ -23,7 +23,7 @@
2323
<php>
2424
<ini name="error_reporting" value="-1" />
2525
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
26-
<!-- <ini name="zend.assertions=1" value="1" /> -->
26+
<!-- <ini name="zend.assertions" value="1" /> -->
2727
<ini name="assert.active" value="1" />
2828
<ini name="assert.exception" value="1" />
2929
<ini name="assert.bail" value="0" />

phpunit.xml.legacy

+2-2
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 before PHPUnit 9 -->
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"
@@ -21,7 +21,7 @@
2121
<php>
2222
<ini name="error_reporting" value="-1" />
2323
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
24-
<!-- <ini name="zend.assertions=1" value="1" /> -->
24+
<!-- <ini name="zend.assertions" value="1" /> -->
2525
<ini name="assert.active" value="1" />
2626
<ini name="assert.exception" value="1" />
2727
<ini name="assert.bail" value="0" />

0 commit comments

Comments
 (0)