Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 79e7b53

Browse files
committedJun 10, 2024·
Test test suite
1 parent 5861005 commit 79e7b53

File tree

6 files changed

+32
-24
lines changed

6 files changed

+32
-24
lines changed
 

Diff for: ‎.github/workflows/ci.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ on:
77
jobs:
88
PHPUnit:
99
name: PHPUnit (PHP ${{ matrix.php }})
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-22.04
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@v2
28+
- uses: actions/checkout@v4
2829
- uses: shivammathur/setup-php@v2
2930
with:
3031
php-version: ${{ matrix.php }}
@@ -39,13 +40,16 @@ jobs:
3940

4041
PHPUnit-hhvm:
4142
name: PHPUnit (HHVM)
42-
runs-on: ubuntu-18.04
43+
runs-on: ubuntu-22.04
4344
continue-on-error: true
4445
steps:
45-
- uses: actions/checkout@v2
46-
- uses: azjezz/setup-hhvm@v1
46+
- uses: actions/checkout@v4
47+
- run: cp "$(which composer)" composer.phar && ./composer.phar self-update --2.2 # downgrade Composer for HHVM
48+
- name: Run hhvm composer.phar install
49+
uses: docker://hhvm/hhvm:3.30-lts-latest
4750
with:
48-
version: lts-3.30
49-
- run: composer self-update --2.2 # downgrade Composer for HHVM
50-
- run: hhvm $(which composer) install
51-
- run: hhvm vendor/bin/phpunit
51+
args: hhvm composer.phar install
52+
- name: Run hhvm vendor/bin/phpunit
53+
uses: docker://hhvm/hhvm:3.30-lts-latest
54+
with:
55+
args: hhvm vendor/bin/phpunit

Diff for: ‎composer.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,16 @@
2626
"react/mysql": "^0.5.5"
2727
},
2828
"autoload": {
29-
"psr-4": { "Clue\\React\\SshProxy\\": "src/" },
30-
"files": [ "src/Io/functions.php" ]
29+
"psr-4": {
30+
"Clue\\React\\SshProxy\\": "src/"
31+
},
32+
"files": [
33+
"src/Io/functions.php"
34+
]
3135
},
3236
"autoload-dev": {
33-
"psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"}
37+
"psr-4": {
38+
"Clue\\Tests\\React\\SshProxy\\": "tests/"
39+
}
3440
}
3541
}

Diff for: ‎phpunit.xml.dist

+6-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.3+ -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
3+
<!-- PHPUnit configuration file with new format for PHPUnit 9.6+ -->
4+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
66
bootstrap="vendor/autoload.php"
77
cacheResult="false"
88
colors="true"
@@ -17,4 +17,7 @@
1717
<directory>./src/</directory>
1818
</include>
1919
</coverage>
20+
<php>
21+
<ini name="error_reporting" value="-1" />
22+
</php>
2023
</phpunit>

Diff for: ‎phpunit.xml.legacy

+3
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@
1515
<directory>./src/</directory>
1616
</whitelist>
1717
</filter>
18+
<php>
19+
<ini name="error_reporting" value="-1" />
20+
</php>
1821
</phpunit>

Diff for: ‎src/Io/CompositeConnection.php

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
/** @internal */
1212
class CompositeConnection extends EventEmitter implements ConnectionInterface
1313
{
14+
private $remote;
1415
private $read;
1516
private $write;
1617
private $closed = false;

Diff for: ‎tests/FunctionalSshSocksConnectorTest.php

-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ public function setUpConnector()
2323
$this->connector = new SshSocksConnector($url);
2424
}
2525

26-
/**
27-
* @after
28-
*/
29-
public function tearDownSSHClientProcess()
30-
{
31-
// run loop in order to shut down SSH client process again
32-
\React\Async\await(\React\Promise\Timer\sleep(0.001));
33-
}
34-
3526
public function testConnectInvalidProxyUriWillReturnRejectedPromise()
3627
{
3728
$this->connector = new SshSocksConnector(getenv('SSH_PROXY') . '.invalid');

0 commit comments

Comments
 (0)
Please sign in to comment.