Skip to content

Commit

Permalink
Run tests on PHP 8.3 and update test suite
Browse files Browse the repository at this point in the history
  • Loading branch information
yadaiio committed Apr 26, 2024
1 parent 6ddf7da commit 45ed00f
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 16 deletions.
22 changes: 13 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ on:
jobs:
PHPUnit:
name: PHPUnit (PHP ${{ matrix.php }})
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
strategy:
matrix:
php:
- 8.3
- 8.2
- 8.1
- 8.0
Expand All @@ -24,7 +25,7 @@ jobs:
- 5.4
- 5.3
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
Expand All @@ -37,13 +38,16 @@ jobs:

PHPUnit-hhvm:
name: PHPUnit (HHVM)
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: azjezz/setup-hhvm@v1
- uses: actions/checkout@v4
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
- name: Run hhvm composer.phar install
uses: docker://hhvm/hhvm:3.30-lts-latest
with:
version: lts-3.30
- run: composer self-update --2.2 # downgrade Composer for HHVM
- run: hhvm $(which composer) install
- run: hhvm vendor/phpunit/phpunit/phpunit
args: hhvm composer.phar install
- name: Run hhvm vendor/bin/phpunit
uses: docker://hhvm/hhvm:3.30-lts-latest
with:
args: hhvm vendor/bin/phpunit
10 changes: 7 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@
}
],
"autoload": {
"psr-4": { "ConnectionManager\\Extra\\": "src" }
"psr-4": {
"ConnectionManager\\Extra\\": "src"
}
},
"autoload-dev": {
"psr-4": { "ConnectionManager\\Tests\\Extra\\": "tests/" }
"psr-4": {
"ConnectionManager\\Tests\\Extra\\": "tests/"
}
},
"require": {
"php": ">=5.3",
Expand All @@ -24,6 +28,6 @@
"react/socket": "^1.12"
},
"require-dev": {
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8"
"phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
}
}
6 changes: 3 additions & 3 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
<!-- PHPUnit configuration file with new format for PHPUnit 9.6+ -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
bootstrap="vendor/autoload.php"
cacheResult="false"
colors="true"
Expand Down
5 changes: 4 additions & 1 deletion phpunit.xml.legacy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- PHPUnit configuration file with old format for PHPUnit 9.2 or older -->
<!-- PHPUnit configuration file with old format for legacy PHPUnit -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
bootstrap="vendor/autoload.php"
Expand All @@ -15,4 +15,7 @@
<directory>./src/</directory>
</whitelist>
</filter>
<php>
<ini name="error_reporting" value="-1" />
</php>
</phpunit>
12 changes: 12 additions & 0 deletions tests/Multiple/ConnectionManagerConcurrentTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ public function testEmptyListsThrows()

public function testWillForwardToInnerConnector()
{
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM with Promise v3');
}

$pending = new Promise\Promise(function() { });

$only = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
Expand All @@ -30,6 +34,10 @@ public function testWillForwardToInnerConnector()

public function testWillCancelOtherIfOneResolves()
{
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM with Promise v3');
}

$resolved = Promise\resolve($this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock());
$first = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
$first->expects($this->once())->method('connect')->with('google.com:80')->willReturn($resolved);
Expand All @@ -47,6 +55,10 @@ public function testWillCancelOtherIfOneResolves()

public function testWillCloseOtherIfOneResolves()
{
if (defined('HHVM_VERSION')) {
$this->markTestSkipped('Not supported on HHVM with Promise v3');
}

$resolved = Promise\resolve($this->getMockBuilder('React\Stream\DuplexStreamInterface')->getMock());
$first = $this->getMockBuilder('React\Socket\ConnectorInterface')->getMock();
$first->expects($this->once())->method('connect')->with('google.com:80')->willReturn($resolved);
Expand Down

0 comments on commit 45ed00f

Please sign in to comment.