Skip to content

Commit 82c9098

Browse files
authored
Merge pull request #84 from clue-labs/php8.3-v2
[2.x] Run tests on PHP 8.3 and update test suite
2 parents 69b771a + 9f56cec commit 82c9098

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
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
@@ -24,7 +25,7 @@ jobs:
2425
- 5.4
2526
- 5.3
2627
steps:
27-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2829
- uses: shivammathur/setup-php@v2
2930
with:
3031
php-version: ${{ matrix.php }}

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@
3131
"react/promise": "^3.0 || ^2.8 || ^1.2.1"
3232
},
3333
"require-dev": {
34-
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
34+
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.35"
3535
},
3636
"autoload": {
3737
"files": [
3838
"src/functions_include.php"
3939
]
4040
},
4141
"autoload-dev": {
42-
"psr-4": { "React\\Tests\\Async\\": "tests/" }
42+
"psr-4": {
43+
"React\\Tests\\Async\\": "tests/"
44+
}
4345
}
4446
}

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/4.8/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)