diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97e71d7..78795dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} @@ -39,13 +40,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/bin/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 diff --git a/composer.json b/composer.json index e441cb6..8a2a994 100644 --- a/composer.json +++ b/composer.json @@ -20,16 +20,23 @@ "react/stream": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", "react/async": "^4 || ^3 || ^2", "react/http": "^1.5", - "react/mysql": "^0.5.5" + "react/mysql": "^0.5.5", + "react/promise-timer": "^1.11" }, "autoload": { - "psr-4": { "Clue\\React\\SshProxy\\": "src/" }, - "files": [ "src/Io/functions.php" ] + "psr-4": { + "Clue\\React\\SshProxy\\": "src/" + }, + "files": [ + "src/Io/functions.php" + ] }, "autoload-dev": { - "psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"} + "psr-4": { + "Clue\\Tests\\React\\SshProxy\\": "tests/" + } } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5d73783..e1ce165 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,8 +1,8 @@ - - +./src/ + + + diff --git a/phpunit.xml.legacy b/phpunit.xml.legacy index 8df9160..0cdf7cc 100644 --- a/phpunit.xml.legacy +++ b/phpunit.xml.legacy @@ -1,6 +1,6 @@ - + ./src/ + + + diff --git a/src/Io/CompositeConnection.php b/src/Io/CompositeConnection.php index adb728a..0f5e027 100644 --- a/src/Io/CompositeConnection.php +++ b/src/Io/CompositeConnection.php @@ -11,6 +11,7 @@ /** @internal */ class CompositeConnection extends EventEmitter implements ConnectionInterface { + private $remote; private $read; private $write; private $closed = false;