Skip to content

Commit 6953a44

Browse files
committed
Forward compatibility with upcoming Promise v3
1 parent 9bd9508 commit 6953a44

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/workflows/ci.yml

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

composer.json

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,37 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"clue/socks-react": "^1.0",
15+
"clue/socks-react": "dev-promise-v3 as 1.4.0",
1616
"react/child-process": "^0.6",
1717
"react/event-loop": "^1.2",
18-
"react/promise": "^2.1 || ^1.2.1",
19-
"react/socket": "^1.9",
18+
"react/promise": "^3@dev || ^2.1 || ^1.2.1",
19+
"react/socket": "dev-promise-3 as 1.12.0",
2020
"react/stream": "^1.2"
2121
},
2222
"require-dev": {
23-
"clue/block-react": "^1.3",
23+
"clue/block-react": "^1.5",
2424
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36",
25-
"react/http": "^1.5",
26-
"react/mysql": "^0.5.5"
25+
"react/mysql": "dev-promise-v3 as 0.5.7"
2726
},
2827
"autoload": {
2928
"psr-4": { "Clue\\React\\SshProxy\\": "src/" },
3029
"files": [ "src/Io/functions.php" ]
3130
},
3231
"autoload-dev": {
3332
"psr-4": { "Clue\\Tests\\React\\SshProxy\\": "tests/"}
34-
}
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+
]
3548
}

0 commit comments

Comments
 (0)