Skip to content

Commit c76bbc7

Browse files
committed
Forward compatibility with upcoming Promise v3
1 parent 7b4428d commit c76bbc7

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
with:
2828
php-version: ${{ matrix.php }}
2929
coverage: xdebug
30+
env:
31+
COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3032
- run: composer install
3133
- run: docker run -d --name mysql --net=host -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=test -e MYSQL_USER=test -e MYSQL_PASSWORD=test mysql:5
3234
- run: bash tests/wait-for-mysql.sh
@@ -39,6 +41,7 @@ jobs:
3941
name: PHPUnit (HHVM)
4042
runs-on: ubuntu-18.04
4143
continue-on-error: true
44+
if: false # temporarily skipped until https://github.com/azjezz/setup-hhvm/issues/3 is addressed
4245
steps:
4346
- uses: actions/checkout@v2
4447
- uses: azjezz/setup-hhvm@v1

composer.json

+12-6
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"php": ">=5.4.0",
88
"evenement/evenement": "^3.0 || ^2.1 || ^1.1",
99
"react/event-loop": "^1.2",
10-
"react/promise": "^2.7",
11-
"react/promise-stream": "^1.1",
12-
"react/promise-timer": "^1.8",
13-
"react/socket": "^1.9"
10+
"react/promise": "^3@dev || ^2.7",
11+
"react/promise-stream": "^1.4",
12+
"react/promise-timer": "^1.9",
13+
"react/socket": "dev-promise-3 as 1.12.0"
1414
},
1515
"require-dev": {
16-
"clue/block-react": "^1.2",
16+
"clue/block-react": "^1.5",
1717
"phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
1818
},
1919
"autoload": {
@@ -25,5 +25,11 @@
2525
"psr-4": {
2626
"React\\Tests\\MySQL\\": "tests"
2727
}
28-
}
28+
},
29+
"repositories": [
30+
{
31+
"type": "vcs",
32+
"url": "https://github.com/WyriHaximus-labs/socket"
33+
}
34+
]
2935
}

0 commit comments

Comments
 (0)