Skip to content

Commit 6e7bc57

Browse files
authored
Merge pull request #83 from clue-labs/php8.3-v3
[3.x] Run tests on PHP 8.3 and update test suite
2 parents c41af0c + b10ce79 commit 6e7bc57

File tree

5 files changed

+16
-11
lines changed

5 files changed

+16
-11
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
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
@@ -19,7 +20,7 @@ jobs:
1920
- 7.2
2021
- 7.1
2122
steps:
22-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2324
- uses: shivammathur/setup-php@v2
2425
with:
2526
php-version: ${{ matrix.php }}
@@ -37,14 +38,15 @@ jobs:
3738
strategy:
3839
matrix:
3940
php:
41+
- 8.3
4042
- 8.2
4143
- 8.1
4244
- 8.0
4345
- 7.4
4446
- 7.3
4547
- 7.2
4648
steps:
47-
- uses: actions/checkout@v3
49+
- uses: actions/checkout@v4
4850
- uses: shivammathur/setup-php@v2
4951
with:
5052
php-version: ${{ matrix.php }}

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@
3131
"react/promise": "^3.0 || ^2.8 || ^1.2.1"
3232
},
3333
"require-dev": {
34-
"phpstan/phpstan": "1.10.18 || 1.4.10",
35-
"phpunit/phpunit": "^9.5 || ^7.5"
34+
"phpstan/phpstan": "1.10.39 || 1.4.10",
35+
"phpunit/phpunit": "^9.6 || ^7.5"
3636
},
3737
"autoload": {
3838
"files": [
3939
"src/functions_include.php"
4040
]
4141
},
4242
"autoload-dev": {
43-
"psr-4": { "React\\Tests\\Async\\": "tests/" }
43+
"psr-4": {
44+
"React\\Tests\\Async\\": "tests/"
45+
}
4446
}
4547
}

phpunit.xml.dist

Lines changed: 3 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.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"
@@ -20,7 +20,7 @@
2020
<php>
2121
<ini name="error_reporting" value="-1" />
2222
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
23-
<!-- <ini name="zend.assertions=1" value="1" /> -->
23+
<!-- <ini name="zend.assertions" value="1" /> -->
2424
<ini name="assert.active" value="1" />
2525
<ini name="assert.exception" value="1" />
2626
<ini name="assert.bail" value="0" />

phpunit.xml.legacy

Lines changed: 2 additions & 2 deletions
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/7.5/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
@@ -18,7 +18,7 @@
1818
<php>
1919
<ini name="error_reporting" value="-1" />
2020
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
21-
<!-- <ini name="zend.assertions=1" value="1" /> -->
21+
<!-- <ini name="zend.assertions" value="1" /> -->
2222
<ini name="assert.active" value="1" />
2323
<ini name="assert.exception" value="1" />
2424
<ini name="assert.bail" value="0" />

src/functions_include.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace React\Async;
44

55
// @codeCoverageIgnoreStart
6-
if (!function_exists(__NAMESPACE__ . '\\parallel')) {
6+
if (!\function_exists(__NAMESPACE__ . '\\parallel')) {
77
require __DIR__ . '/functions.php';
88
}
9+
// @codeCoverageIgnoreEnd

0 commit comments

Comments
 (0)