diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f93f1e8..9e0f721 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,8 +28,6 @@ jobs: with: php-version: ${{ matrix.php }} coverage: xdebug - env: - COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: composer remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP if: ${{ matrix.php == 5.3 }} - run: composer install @@ -42,7 +40,6 @@ jobs: name: PHPUnit (HHVM) runs-on: ubuntu-18.04 continue-on-error: true - if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed steps: - uses: actions/checkout@v2 - uses: azjezz/setup-hhvm@v1 diff --git a/composer.json b/composer.json index 712abe9..112115b 100644 --- a/composer.json +++ b/composer.json @@ -12,17 +12,18 @@ ], "require": { "php": ">=5.3", - "clue/socks-react": "dev-promise-v3 as 1.4.0", + "clue/socks-react": "^1.4", "react/child-process": "^0.6", "react/event-loop": "^1.2", - "react/promise": "^3@dev || ^2.1 || ^1.2.1", - "react/socket": "dev-promise-3 as 1.12.0", + "react/promise": "^3 || ^2.1 || ^1.2.1", + "react/socket": "^1.12.0", "react/stream": "^1.2" }, "require-dev": { "clue/block-react": "^1.5", "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36", - "react/mysql": "dev-promise-v3 as 0.5.7" + "react/http": "^1.5", + "react/mysql": "^0.5.7" }, "autoload": { "psr-4": { "Clue\\React\\SshProxy\\": "src/" }, @@ -30,19 +31,5 @@ }, "autoload-dev": { "psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"} - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/WyriHaximus-labs/socket" - }, - { - "type": "vcs", - "url": "https://github.com/clue-labs/reactphp-socks" - }, - { - "type": "vcs", - "url": "https://github.com/clue-labs/mysql" - } - ] + } }