Skip to content

Commit 685614d

Browse files
committed
Forward compatibility with upcoming Promise v3
1 parent cd3a6f4 commit 685614d

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-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 install
3234
- run: vendor/bin/phpunit --coverage-text
3335
if: ${{ matrix.php >= 7.3 }}
@@ -38,6 +40,7 @@ jobs:
3840
name: PHPUnit (HHVM)
3941
runs-on: ubuntu-18.04
4042
continue-on-error: true
43+
if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed
4144
steps:
4245
- uses: actions/checkout@v2
4346
- uses: azjezz/setup-hhvm@v1

composer.json

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,29 @@
1212
],
1313
"require": {
1414
"php": ">=5.3",
15-
"react/promise": "^2.1 || ^1.2",
16-
"react/socket": "^1.11"
15+
"react/promise": "^3@dev || ^2.1 || ^1.2",
16+
"react/socket": "dev-promise-3 as 1.12.0"
1717
},
1818
"require-dev": {
19-
"clue/block-react": "^1.1",
20-
"clue/connection-manager-extra": "^1.0 || ^0.7",
19+
"clue/block-react": "^1.5",
20+
"clue/connection-manager-extra": "dev-promise-v3 as 1.3.0",
2121
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
22-
"react/event-loop": "^1.2",
23-
"react/http": "^1.6"
22+
"react/event-loop": "^1.2"
2423
},
2524
"autoload": {
2625
"psr-4": { "Clue\\React\\Socks\\": "src/" }
2726
},
2827
"autoload-dev": {
2928
"psr-4": { "Clue\\Tests\\React\\Socks\\": "tests/" }
30-
}
29+
},
30+
"repositories": [
31+
{
32+
"type": "vcs",
33+
"url": "https://github.com/WyriHaximus-labs/socket"
34+
},
35+
{
36+
"type": "vcs",
37+
"url": "https://github.com/clue-labs/reactphp-connection-manager-extra"
38+
}
39+
]
3140
}

0 commit comments

Comments
 (0)