Skip to content

Commit 6b3bb75

Browse files
committed
Update to stable reactphp/socket v1.12.0
1 parent 6953a44 commit 6b3bb75

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
with:
2929
php-version: ${{ matrix.php }}
3030
coverage: xdebug
31-
env:
32-
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3331
- run: composer remove react/mysql --dev --no-interaction # do not install react/mysql example on legacy PHP
3432
if: ${{ matrix.php == 5.3 }}
3533
- run: composer install
@@ -42,7 +40,6 @@ jobs:
4240
name: PHPUnit (HHVM)
4341
runs-on: ubuntu-18.04
4442
continue-on-error: true
45-
if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed
4643
steps:
4744
- uses: actions/checkout@v2
4845
- uses: azjezz/setup-hhvm@v1

composer.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,24 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"clue/socks-react": "dev-promise-v3 as 1.4.0",
15+
"clue/socks-react": "^1.4",
1616
"react/child-process": "^0.6",
1717
"react/event-loop": "^1.2",
18-
"react/promise": "^3@dev || ^2.1 || ^1.2.1",
19-
"react/socket": "dev-promise-3 as 1.12.0",
18+
"react/promise": "^3 || ^2.1 || ^1.2.1",
19+
"react/socket": "^1.12.0",
2020
"react/stream": "^1.2"
2121
},
2222
"require-dev": {
2323
"clue/block-react": "^1.5",
2424
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36",
25-
"react/mysql": "dev-promise-v3 as 0.5.7"
25+
"react/http": "^1.5",
26+
"react/mysql": "^0.5.5"
2627
},
2728
"autoload": {
2829
"psr-4": { "Clue\\React\\SshProxy\\": "src/" },
2930
"files": [ "src/Io/functions.php" ]
3031
},
3132
"autoload-dev": {
3233
"psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"}
33-
},
34-
"repositories": [
35-
{
36-
"type": "vcs",
37-
"url": "https://github.com/WyriHaximus-labs/socket"
38-
},
39-
{
40-
"type": "vcs",
41-
"url": "https://github.com/clue-labs/reactphp-socks"
42-
},
43-
{
44-
"type": "vcs",
45-
"url": "https://github.com/clue-labs/mysql"
46-
}
47-
]
34+
}
4835
}

0 commit comments

Comments
 (0)