Skip to content

Commit

Permalink
Merge pull request #81 from clue-labs/php8.3-v4
Browse files Browse the repository at this point in the history
[4.x] Run tests on PHP 8.3 and update test suite
  • Loading branch information
WyriHaximus authored Nov 3, 2023
2 parents 8cc37cc + 9eb6332 commit 3fad975
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -29,10 +30,11 @@ jobs:
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand Down
8 changes: 5 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"react/promise": "^3.0 || ^2.8 || ^1.2.1"
},
"require-dev": {
"phpstan/phpstan": "1.10.18",
"phpunit/phpunit": "^9.5"
"phpstan/phpstan": "1.10.39",
"phpunit/phpunit": "^9.6"
},
"autoload": {
"psr-4": {
Expand All @@ -43,6 +43,8 @@
]
},
"autoload-dev": {
"psr-4": { "React\\Tests\\Async\\": "tests/" }
"psr-4": {
"React\\Tests\\Async\\": "tests/"
}
}
}
4 changes: 2 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
cacheResult="false"
colors="true"
Expand All @@ -19,7 +19,7 @@
<php>
<ini name="error_reporting" value="-1" />
<!-- Evaluate assertions, requires running with "php -d zend.assertions=1 vendor/bin/phpunit" -->
<!-- <ini name="zend.assertions=1" value="1" /> -->
<!-- <ini name="zend.assertions" value="1" /> -->
<ini name="assert.active" value="1" />
<ini name="assert.exception" value="1" />
<ini name="assert.bail" value="0" />
Expand Down
3 changes: 2 additions & 1 deletion src/functions_include.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace React\Async;

// @codeCoverageIgnoreStart
if (!function_exists(__NAMESPACE__ . '\\parallel')) {
if (!\function_exists(__NAMESPACE__ . '\\parallel')) {
require __DIR__ . '/functions.php';
}
// @codeCoverageIgnoreEnd

0 comments on commit 3fad975

Please sign in to comment.